Skip to content

Commit 6a0249b

Browse files
authored
get-env fixes (#205)
* get-env fixes * CR: format like forbidden
1 parent 9ad3832 commit 6a0249b

File tree

4 files changed

+23
-7
lines changed

4 files changed

+23
-7
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/oklog/run v1.1.0
2121
github.com/panta/machineid v1.0.2
2222
github.com/signadot/go-sdk v0.3.8-0.20250828202325-847d6b735fc1
23-
github.com/signadot/libconnect v0.1.1-0.20250814203329-98381c7863de
23+
github.com/signadot/libconnect v0.1.1-0.20250902153333-254cc4b5dfe2
2424
github.com/spf13/cobra v1.8.1
2525
github.com/spf13/viper v1.11.0
2626
github.com/theckman/yacspin v0.13.12
@@ -143,4 +143,5 @@ require (
143143

144144
// Used for local dev
145145
// replace github.com/signadot/libconnect => ../libconnect/
146+
146147
// replace github.com/signadot/go-sdk => ../go-sdk

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,12 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
354354
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
355355
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
356356
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
357+
github.com/signadot/go-sdk v0.3.8-0.20250730210632-13a6fc0827df h1:3Ii88OxvhZFzNru0tAziGti2XBtwrQqChzcCKKigbjU=
358+
github.com/signadot/go-sdk v0.3.8-0.20250730210632-13a6fc0827df/go.mod h1:oX12C9I/8QaXcl9XLIrc6bUOYVCOGrYPExe+Sln/3IY=
357359
github.com/signadot/go-sdk v0.3.8-0.20250828202325-847d6b735fc1 h1:nq8WXCqtlN8J615VVwdotSM0493W3EEr1VHOucDf5Rc=
358360
github.com/signadot/go-sdk v0.3.8-0.20250828202325-847d6b735fc1/go.mod h1:qgQQHdnLzfDIWJwTvVCfBr5hfPC6pgl/N8yiAMozQLc=
359-
github.com/signadot/libconnect v0.1.1-0.20250814203329-98381c7863de h1:nSClpbMu2p7aJMFDSNiEtwYXY4RqoToE+wsHiP0tK9M=
360-
github.com/signadot/libconnect v0.1.1-0.20250814203329-98381c7863de/go.mod h1:slkLIQlZTXajyc16CmuA2s4E2dcfYpykp9dBYn2Z8Do=
361+
github.com/signadot/libconnect v0.1.1-0.20250902153333-254cc4b5dfe2 h1:9R8v+QYyMs8Ugp0/SZzVG7q7idrBAXmv49i9g4AODA8=
362+
github.com/signadot/libconnect v0.1.1-0.20250902153333-254cc4b5dfe2/go.mod h1:slkLIQlZTXajyc16CmuA2s4E2dcfYpykp9dBYn2Z8Do=
361363
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
362364
github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
363365
github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=

internal/command/sandbox/get_env.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ func getEnv(cfg *config.SandboxGetEnv, out, errOut io.Writer, name string) error
8686
if err := printForbidden(errOut, containerEnv.Forbidden); err != nil {
8787
return err
8888
}
89-
90-
resEnv = k8senv.ResolveEnv(ctx, resEnv)
91-
if err != nil {
89+
if err := printWarnings(errOut, containerEnv.Warnings); err != nil {
9290
return err
9391
}
9492

93+
resEnv = k8senv.ResolveEnv(ctx, resEnv)
94+
9595
// print output
9696
return printEnv(out, cfg.OutputFormat, resEnv)
9797
}

internal/command/sandbox/get_utils.go

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,20 @@ func printForbidden(out io.Writer, forbidden []k8senv.Forbidden) error {
222222
}
223223
for i := range forbidden {
224224
f := &forbidden[i]
225-
_, err = fmt.Fprintf(out, "\t- %s %s/%s", f.Kind, f.Namespace, f.Name)
225+
_, err = fmt.Fprintf(out, "\t- %s %s/%s\n", f.Kind, f.Namespace, f.Name)
226+
if err != nil {
227+
return err
228+
}
229+
}
230+
return nil
231+
}
232+
233+
func printWarnings(out io.Writer, warnings []string) error {
234+
if len(warnings) == 0 {
235+
return nil
236+
}
237+
for _, warning := range warnings {
238+
_, err := fmt.Fprintf(out, "WARNING: %s\n", warning)
226239
if err != nil {
227240
return err
228241
}

0 commit comments

Comments
 (0)