Skip to content

Commit ba934d9

Browse files
committed
fixup: Set defaults before logging
1 parent 313e0c3 commit ba934d9

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

tests/fixture/tmpnet/network.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,13 @@ func ReadNetwork(ctx context.Context, log logging.Logger, dir string) (*Network,
235235

236236
// Initializes a new network with default configuration.
237237
func (n *Network) EnsureDefaultConfig(ctx context.Context, log logging.Logger) error {
238+
// Populate runtime defaults before logging it
239+
if n.DefaultRuntimeConfig.Kube != nil {
240+
if err := n.DefaultRuntimeConfig.Kube.ensureDefaults(ctx, log); err != nil {
241+
return err
242+
}
243+
}
244+
238245
log.Info("preparing configuration for new network",
239246
zap.Any("runtimeConfig", n.DefaultRuntimeConfig),
240247
)
@@ -281,10 +288,6 @@ func (n *Network) EnsureDefaultConfig(ctx context.Context, log logging.Logger) e
281288
return errMissingRuntimeConfig
282289
}
283290

284-
if n.DefaultRuntimeConfig.Kube != nil {
285-
return n.DefaultRuntimeConfig.Kube.ensureDefaults(ctx, log)
286-
}
287-
288291
return nil
289292
}
290293

0 commit comments

Comments
 (0)