Skip to content

Commit d164ff7

Browse files
committed
Fix secrets subcommand output
Signed-off-by: Juan Antonio Osorio <ozz@stacklok.com>
1 parent e6596b9 commit d164ff7

File tree

1 file changed

+27
-28
lines changed

1 file changed

+27
-28
lines changed

cmd/thv/secret.go

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/spf13/cobra"
99
"golang.org/x/term"
1010

11-
"github.com/stacklok/toolhive/pkg/logger"
1211
"github.com/stacklok/toolhive/pkg/secrets"
1312
)
1413

@@ -41,44 +40,44 @@ func newSecretSetCommand() *cobra.Command {
4140

4241
// Validate input
4342
if name == "" {
44-
logger.Log.Info("Validation Error: Secret name cannot be empty")
43+
fmt.Println("Validation Error: Secret name cannot be empty")
4544
return
4645
}
4746

4847
// Prompt for the secret value
49-
logger.Log.Info("Enter secret value (input will be hidden): ")
48+
fmt.Print("Enter secret value (input will be hidden): ")
5049
valueBytes, err := term.ReadPassword(int(syscall.Stdin))
51-
logger.Log.Info("") // Add a newline after the hidden input
50+
fmt.Println("") // Add a newline after the hidden input
5251

5352
if err != nil {
54-
logger.Log.Error(fmt.Sprintf("Error reading secret from terminal: %v", err))
53+
fmt.Fprintf(os.Stderr, "Error reading secret from terminal: %v\n", err)
5554
return
5655
}
5756

5857
value := string(valueBytes)
5958
if value == "" {
60-
logger.Log.Info("Validation Error: Secret value cannot be empty")
59+
fmt.Println("Validation Error: Secret value cannot be empty")
6160
return
6261
}
6362

6463
providerType, err := GetSecretsProviderType(cmd)
6564
if err != nil {
66-
logger.Log.Error(fmt.Sprintf("Error: %v", err))
65+
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
6766
os.Exit(1)
6867
}
6968

7069
manager, err := secrets.CreateSecretManager(providerType)
7170
if err != nil {
72-
logger.Log.Error(fmt.Sprintf("Failed to create secrets manager: %v", err))
71+
fmt.Fprintf(os.Stderr, "Failed to create secrets manager: %v\n", err)
7372
return
7473
}
7574

7675
err = manager.SetSecret(name, value)
7776
if err != nil {
78-
logger.Log.Error(fmt.Sprintf("Failed to set secret %s: %v", name, err))
77+
fmt.Fprintf(os.Stderr, "Failed to set secret %s: %v\n", name, err)
7978
return
8079
}
81-
logger.Log.Info(fmt.Sprintf("Secret %s set successfully", name))
80+
fmt.Printf("Secret %s set successfully\n", name)
8281
},
8382
}
8483
}
@@ -93,28 +92,28 @@ func newSecretGetCommand() *cobra.Command {
9392

9493
// Validate input
9594
if name == "" {
96-
logger.Log.Info("Validation Error Secret name cannot be empty")
95+
fmt.Println("Validation Error: Secret name cannot be empty")
9796
return
9897
}
9998

10099
providerType, err := GetSecretsProviderType(cmd)
101100
if err != nil {
102-
logger.Log.Error(fmt.Sprintf("Error: %v", err))
101+
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
103102
os.Exit(1)
104103
}
105104

106105
manager, err := secrets.CreateSecretManager(providerType)
107106
if err != nil {
108-
logger.Log.Error(fmt.Sprintf("Failed to create secrets manager: %v", err))
107+
fmt.Fprintf(os.Stderr, "Failed to create secrets manager: %v\n", err)
109108
return
110109
}
111110

112111
value, err := manager.GetSecret(name)
113112
if err != nil {
114-
logger.Log.Error(fmt.Sprintf("Failed to get secret %s: %v", name, err))
113+
fmt.Fprintf(os.Stderr, "Failed to get secret %s: %v\n", name, err)
115114
return
116115
}
117-
logger.Log.Info(fmt.Sprintf("Secret %s: %s", name, value))
116+
fmt.Printf("Secret %s: %s\n", name, value)
118117
},
119118
}
120119
}
@@ -129,28 +128,28 @@ func newSecretDeleteCommand() *cobra.Command {
129128

130129
// Validate input
131130
if name == "" {
132-
logger.Log.Info("Validation Error: Secret name cannot be empty")
131+
fmt.Println("Validation Error: Secret name cannot be empty")
133132
return
134133
}
135134

136135
providerType, err := GetSecretsProviderType(cmd)
137136
if err != nil {
138-
logger.Log.Error(fmt.Sprintf("Error: %v", err))
137+
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
139138
os.Exit(1)
140139
}
141140

142141
manager, err := secrets.CreateSecretManager(providerType)
143142
if err != nil {
144-
logger.Log.Error(fmt.Sprintf("Failed to create secrets manager: %v", err))
143+
fmt.Fprintf(os.Stderr, "Failed to create secrets manager: %v\n", err)
145144
return
146145
}
147146

148147
err = manager.DeleteSecret(name)
149148
if err != nil {
150-
logger.Log.Error(fmt.Sprintf("Failed to delete secret %s: %v", name, err))
149+
fmt.Fprintf(os.Stderr, "Failed to delete secret %s: %v\n", name, err)
151150
return
152151
}
153-
logger.Log.Info(fmt.Sprintf("Secret %s deleted successfully", name))
152+
fmt.Printf("Secret %s deleted successfully\n", name)
154153
},
155154
}
156155
}
@@ -163,30 +162,30 @@ func newSecretListCommand() *cobra.Command {
163162
Run: func(cmd *cobra.Command, _ []string) {
164163
providerType, err := GetSecretsProviderType(cmd)
165164
if err != nil {
166-
logger.Log.Error(fmt.Sprintf("Error: %v", err))
165+
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
167166
os.Exit(1)
168167
}
169168

170169
manager, err := secrets.CreateSecretManager(providerType)
171170
if err != nil {
172-
logger.Log.Error(fmt.Sprintf("Failed to create secrets manager: %v", err))
171+
fmt.Fprintf(os.Stderr, "Failed to create secrets manager: %v\n", err)
173172
return
174173
}
175174

176175
secretNames, err := manager.ListSecrets()
177176
if err != nil {
178-
logger.Log.Error(fmt.Sprintf("Failed to list secrets: %v", err))
177+
fmt.Fprintf(os.Stderr, "Failed to list secrets: %v\n", err)
179178
return
180179
}
181180

182181
if len(secretNames) == 0 {
183-
logger.Log.Info("No secrets found")
182+
fmt.Println("No secrets found")
184183
return
185184
}
186185

187-
logger.Log.Info("Available secrets:")
186+
fmt.Println("Available secrets:")
188187
for _, name := range secretNames {
189-
logger.Log.Info(fmt.Sprintf(" - %s", name))
188+
fmt.Printf(" - %s\n", name)
190189
}
191190
},
192191
}
@@ -199,10 +198,10 @@ func newSecretResetKeyringCommand() *cobra.Command {
199198
Args: cobra.NoArgs,
200199
Run: func(_ *cobra.Command, _ []string) {
201200
if err := secrets.ResetKeyringSecret(); err != nil {
202-
logger.Log.Error(fmt.Sprintf("Failed to reset keyring secret: %v", err))
201+
fmt.Fprintf(os.Stderr, "Failed to reset keyring secret: %v\n", err)
203202
return
204203
}
205-
logger.Log.Info("Successfully reset keyring secret")
204+
fmt.Println("Successfully reset keyring secret")
206205
},
207206
}
208207
}

0 commit comments

Comments
 (0)