Skip to content

Commit d270050

Browse files
authored
Merge pull request #290 from hashicorp/deprecate-msg
Deprecating `Message` method in UI interface
2 parents 2faa16e + 79da793 commit d270050

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

packer/ui.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ type Ui interface {
3030
Askf(string, ...any) (string, error)
3131
Say(string)
3232
Sayf(string, ...any)
33+
// Deprecated: Use `Say` instead.
3334
Message(string)
3435
Error(string)
3536
Errorf(string, ...any)
@@ -124,18 +125,9 @@ func (rw *BasicUi) Say(message string) {
124125
}
125126
}
126127

128+
// Deprecated: Use `Say` instead.
127129
func (rw *BasicUi) Message(message string) {
128-
rw.l.Lock()
129-
defer rw.l.Unlock()
130-
131-
// Use LogSecretFilter to scrub out sensitive variables
132-
message = LogSecretFilter.FilterString(message)
133-
134-
log.Printf("ui: %s", message)
135-
_, err := fmt.Fprint(rw.Writer, message+"\n")
136-
if err != nil {
137-
log.Printf("[ERR] Failed to write to UI: %s", err)
138-
}
130+
rw.Say(message)
139131
}
140132

141133
func (rw *BasicUi) Errorf(message string, args ...any) {

packer/ui_mock.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ func (u *MockUi) Machine(t string, args ...string) {
6969
u.MachineArgs = args
7070
}
7171

72+
// Deprecated: Use `Say` instead.
7273
func (u *MockUi) Message(message string) {
73-
u.MessageCalled = true
74-
u.MessageMessage = message
74+
u.Say(message)
7575
}
7676

7777
func (u *MockUi) Sayf(message string, args ...any) {

rpc/ui.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ func (u *Ui) Machine(t string, args ...string) {
6060
}
6161
}
6262

63+
// Deprecated: Use `Say` instead.
6364
func (u *Ui) Message(message string) {
6465
if err := u.client.Call("Ui.Message", message, new(interface{})); err != nil {
6566
log.Printf("Error in Ui.Message RPC call: %s", err)
@@ -94,6 +95,7 @@ func (u *UiServer) Machine(args *UiMachineArgs, reply *interface{}) error {
9495
return nil
9596
}
9697

98+
// Deprecated: Use `Say` instead.
9799
func (u *UiServer) Message(message *string, reply *interface{}) error {
98100
u.ui.Message(*message)
99101
*reply = nil

rpc/ui_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ func (u *testUi) Machine(t string, args ...string) {
5252
u.machineArgs = args
5353
}
5454

55+
// Deprecated: Use `Say` instead.
5556
func (u *testUi) Message(message string) {
5657
u.messageCalled = true
5758
u.messageMessage = message

0 commit comments

Comments
 (0)