Skip to content

Commit e6596b9

Browse files
committed
Fix outputs for registry info
Signed-off-by: Juan Antonio Osorio <ozz@stacklok.com>
1 parent 4b42415 commit e6596b9

File tree

1 file changed

+28
-29
lines changed

1 file changed

+28
-29
lines changed

cmd/thv/registry.go

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
"github.com/spf13/cobra"
1414

15-
"github.com/stacklok/toolhive/pkg/logger"
1615
"github.com/stacklok/toolhive/pkg/registry"
1716
)
1817

@@ -104,7 +103,7 @@ func printJSONServers(servers []*registry.Server) error {
104103
}
105104

106105
// Print JSON
107-
logger.Log.Info(string(jsonData))
106+
fmt.Println(string(jsonData))
108107
return nil
109108
}
110109

@@ -117,7 +116,7 @@ func printJSONServer(server *registry.Server) error {
117116
}
118117

119118
// Print JSON
120-
logger.Log.Info(string(jsonData))
119+
fmt.Println(string(jsonData))
121120
return nil
122121
}
123122

@@ -145,32 +144,32 @@ func printTextServers(servers []*registry.Server) {
145144

146145
// Flush the tabwriter
147146
if err := w.Flush(); err != nil {
148-
logger.Log.Warn(fmt.Sprintf("Warning: Failed to flush tabwriter: %v", err))
147+
fmt.Fprintf(os.Stderr, "Warning: Failed to flush tabwriter: %v\n", err)
149148
}
150149
}
151150

152151
// printTextServerInfo prints detailed information about a server in text format
153152
// nolint:gocyclo
154153
func printTextServerInfo(name string, server *registry.Server) {
155-
logger.Log.Info(fmt.Sprintf("Name: %s", name))
156-
logger.Log.Info(fmt.Sprintf("Image: %s", server.Image))
157-
logger.Log.Info(fmt.Sprintf("Description: %s", server.Description))
158-
logger.Log.Info(fmt.Sprintf("Transport: %s", server.Transport))
159-
logger.Log.Info(fmt.Sprintf("Repository URL: %s", server.RepositoryURL))
160-
logger.Log.Info(fmt.Sprintf("Popularity: %d stars, %d pulls", server.Metadata.Stars, server.Metadata.Pulls))
161-
logger.Log.Info(fmt.Sprintf("Last Updated: %s", server.Metadata.LastUpdated))
154+
fmt.Printf("Name: %s\n", name)
155+
fmt.Printf("Image: %s\n", server.Image)
156+
fmt.Printf("Description: %s\n", server.Description)
157+
fmt.Printf("Transport: %s\n", server.Transport)
158+
fmt.Printf("Repository URL: %s\n", server.RepositoryURL)
159+
fmt.Printf("Popularity: %d stars, %d pulls\n", server.Metadata.Stars, server.Metadata.Pulls)
160+
fmt.Printf("Last Updated: %s\n", server.Metadata.LastUpdated)
162161

163162
// Print tools
164163
if len(server.Tools) > 0 {
165-
logger.Log.Info("Tools:")
164+
fmt.Println("Tools:")
166165
for _, tool := range server.Tools {
167-
logger.Log.Info(fmt.Sprintf(" - %s", tool))
166+
fmt.Printf(" - %s\n", tool)
168167
}
169168
}
170169

171170
// Print environment variables
172171
if len(server.EnvVars) > 0 {
173-
logger.Log.Info("\nEnvironment Variables:")
172+
fmt.Println("\nEnvironment Variables:")
174173
for _, envVar := range server.EnvVars {
175174
required := ""
176175
if envVar.Required {
@@ -180,66 +179,66 @@ func printTextServerInfo(name string, server *registry.Server) {
180179
if envVar.Default != "" {
181180
defaultValue = fmt.Sprintf(" [default: %s]", envVar.Default)
182181
}
183-
logger.Log.Info(fmt.Sprintf(" - %s%s%s: %s", envVar.Name, required, defaultValue, envVar.Description))
182+
fmt.Printf(" - %s%s%s: %s\n", envVar.Name, required, defaultValue, envVar.Description)
184183
}
185184
}
186185

187186
// Print tags
188187
if len(server.Tags) > 0 {
189-
logger.Log.Info("Tags:")
190-
logger.Log.Info(fmt.Sprintf(" %s", strings.Join(server.Tags, ", ")))
188+
fmt.Println("Tags:")
189+
fmt.Printf(" %s\n", strings.Join(server.Tags, ", "))
191190
}
192191

193192
// Print permissions
194193
if server.Permissions != nil {
195-
logger.Log.Info("Permissions:")
194+
fmt.Println("Permissions:")
196195

197196
// Print read permissions
198197
if len(server.Permissions.Read) > 0 {
199-
logger.Log.Info(" Read:")
198+
fmt.Println(" Read:")
200199
for _, path := range server.Permissions.Read {
201-
logger.Log.Info(fmt.Sprintf(" - %s", path))
200+
fmt.Printf(" - %s\n", path)
202201
}
203202
}
204203

205204
// Print write permissions
206205
if len(server.Permissions.Write) > 0 {
207-
logger.Log.Info(" Write:")
206+
fmt.Println(" Write:")
208207
for _, path := range server.Permissions.Write {
209-
logger.Log.Info(fmt.Sprintf(" - %s", path))
208+
fmt.Printf(" - %s\n", path)
210209
}
211210
}
212211

213212
// Print network permissions
214213
if server.Permissions.Network != nil && server.Permissions.Network.Outbound != nil {
215-
logger.Log.Info(" Network:")
214+
fmt.Println(" Network:")
216215
outbound := server.Permissions.Network.Outbound
217216

218217
if outbound.InsecureAllowAll {
219-
logger.Log.Info(" Insecure Allow All: true")
218+
fmt.Println(" Insecure Allow All: true")
220219
}
221220

222221
if len(outbound.AllowTransport) > 0 {
223-
logger.Log.Info(fmt.Sprintf(" Allow Transport: %s", strings.Join(outbound.AllowTransport, ", ")))
222+
fmt.Printf(" Allow Transport: %s\n", strings.Join(outbound.AllowTransport, ", "))
224223
}
225224

226225
if len(outbound.AllowHost) > 0 {
227-
logger.Log.Info(fmt.Sprintf(" Allow Host: %s", strings.Join(outbound.AllowHost, ", ")))
226+
fmt.Printf(" Allow Host: %s\n", strings.Join(outbound.AllowHost, ", "))
228227
}
229228

230229
if len(outbound.AllowPort) > 0 {
231230
ports := make([]string, len(outbound.AllowPort))
232231
for i, port := range outbound.AllowPort {
233232
ports[i] = fmt.Sprintf("%d", port)
234233
}
235-
logger.Log.Info(fmt.Sprintf(" Allow Port: %s", strings.Join(ports, ", ")))
234+
fmt.Printf(" Allow Port: %s\n", strings.Join(ports, ", "))
236235
}
237236
}
238237
}
239238

240239
// Print example command
241-
logger.Log.Info("Example Command:")
242-
logger.Log.Info(fmt.Sprintf(" thv run %s", name))
240+
fmt.Println("Example Command:")
241+
fmt.Printf(" thv run %s\n", name)
243242
}
244243

245244
// truncateString truncates a string to the specified length and adds "..." if truncated

0 commit comments

Comments
 (0)