From 8635f1166cec2a6cd9355450b6b5d52e17e9e04b Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Fri, 8 Nov 2024 17:20:56 +0000 Subject: [PATCH 1/2] fix(envbuilder): make init command more readable --- envbuilder.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/envbuilder.go b/envbuilder.go index e6f9c8d4..5aabb900 100644 --- a/envbuilder.go +++ b/envbuilder.go @@ -47,6 +47,7 @@ import ( "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/kballard/go-shellquote" "github.com/mattn/go-isatty" + "github.com/mitchellh/go-wordwrap" "github.com/sirupsen/logrus" "github.com/tailscale/hujson" "golang.org/x/xerrors" @@ -104,7 +105,11 @@ func Run(ctx context.Context, opts options.Options, preExec ...func()) error { return fmt.Errorf("set uid: %w", err) } - opts.Logger(log.LevelInfo, "=== Running init command as user %q: %q", args.UserInfo.user.Username, append([]string{opts.InitCommand}, args.InitArgs...)) + initCmd := append([]string{opts.InitCommand}, args.InitArgs...) + opts.Logger(log.LevelInfo, "=== Running init command as user %q", args.UserInfo.user.Username) + for _, line := range wordwrap.WrapString(initCmd, 76) { + opts.Logger(log.LevelInfo, " "+line) + } for _, fn := range preExec { fn() } From 5a74d25cdde32f8c9e0b22441068b13832f4ddd9 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Fri, 8 Nov 2024 18:00:31 +0000 Subject: [PATCH 2/2] fixup! fix(envbuilder): make init command more readable --- envbuilder.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/envbuilder.go b/envbuilder.go index 5aabb900..bcefd022 100644 --- a/envbuilder.go +++ b/envbuilder.go @@ -105,11 +105,10 @@ func Run(ctx context.Context, opts options.Options, preExec ...func()) error { return fmt.Errorf("set uid: %w", err) } - initCmd := append([]string{opts.InitCommand}, args.InitArgs...) - opts.Logger(log.LevelInfo, "=== Running init command as user %q", args.UserInfo.user.Username) - for _, line := range wordwrap.WrapString(initCmd, 76) { - opts.Logger(log.LevelInfo, " "+line) - } + initCmd := strings.Join(append([]string{opts.InitCommand}, args.InitArgs...), " ") + opts.Logger(log.LevelInfo, "=== Running init command as user %q:", args.UserInfo.user.Username) + opts.Logger(log.LevelInfo, wordwrap.WrapString(initCmd, 80)) + opts.Logger(log.LevelInfo, "===") for _, fn := range preExec { fn() }