From a6384b03c66270a5982aa73498170a24c5528535 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Thu, 25 Jun 2026 18:41:20 -0500 Subject: [PATCH] refactor: migrate logging from devsy-org/log to devsy/pkg/log --- cmd/command.go | 7 +++---- cmd/delete.go | 7 +++---- cmd/enter.go | 7 +++---- cmd/find.go | 8 ++++---- cmd/root.go | 13 ++++++------- cmd/run.go | 7 +++---- cmd/start.go | 7 +++---- cmd/stop.go | 7 +++---- cmd/target_architecture.go | 4 +--- go.mod | 13 ++++++------- go.sum | 22 ++++++++-------------- pkg/dockerless/create.go | 11 ++++++----- pkg/dockerless/dockerless.go | 11 ++++------- pkg/dockerless/pull.go | 19 ++++++++++--------- pkg/dockerless/start.go | 13 +++++++------ 15 files changed, 70 insertions(+), 86 deletions(-) diff --git a/cmd/command.go b/cmd/command.go index b1fd833a..37fb2d3c 100644 --- a/cmd/command.go +++ b/cmd/command.go @@ -6,7 +6,6 @@ import ( "github.com/devsy-org/devsy-provider-dockerless/pkg/dockerless" "github.com/devsy-org/devsy-provider-dockerless/pkg/options" - "github.com/devsy-org/log" "github.com/spf13/cobra" ) @@ -25,7 +24,7 @@ func NewCommandCmd() *cobra.Command { return err } - return cmd.Run(context.Background(), options, log.Default) + return cmd.Run(context.Background(), options) }, } @@ -33,8 +32,8 @@ func NewCommandCmd() *cobra.Command { } // Run runs the command logic. -func (cmd *CommandCmd) Run(ctx context.Context, options *options.Options, log log.Logger) error { - dockerlessProvider, err := dockerless.NewProvider(ctx, options, log) +func (cmd *CommandCmd) Run(ctx context.Context, options *options.Options) error { + dockerlessProvider, err := dockerless.NewProvider(ctx, options) if err != nil { return err } diff --git a/cmd/delete.go b/cmd/delete.go index b9b4e5dc..d714fc7f 100644 --- a/cmd/delete.go +++ b/cmd/delete.go @@ -5,7 +5,6 @@ import ( "github.com/devsy-org/devsy-provider-dockerless/pkg/dockerless" "github.com/devsy-org/devsy-provider-dockerless/pkg/options" - "github.com/devsy-org/log" "github.com/spf13/cobra" ) @@ -24,7 +23,7 @@ func NewDeleteCmd() *cobra.Command { return err } - return cmd.Run(context.Background(), options, log.Default) + return cmd.Run(context.Background(), options) }, } @@ -32,8 +31,8 @@ func NewDeleteCmd() *cobra.Command { } // Run runs the command logic. -func (cmd *DeleteCmd) Run(ctx context.Context, options *options.Options, log log.Logger) error { - dockerlessProvider, err := dockerless.NewProvider(ctx, options, log) +func (cmd *DeleteCmd) Run(ctx context.Context, options *options.Options) error { + dockerlessProvider, err := dockerless.NewProvider(ctx, options) if err != nil { return err } diff --git a/cmd/enter.go b/cmd/enter.go index 843c3272..db953f23 100644 --- a/cmd/enter.go +++ b/cmd/enter.go @@ -5,7 +5,6 @@ import ( "github.com/devsy-org/devsy-provider-dockerless/pkg/dockerless" "github.com/devsy-org/devsy-provider-dockerless/pkg/options" - "github.com/devsy-org/log" "github.com/spf13/cobra" ) @@ -24,7 +23,7 @@ func NewEnterCmd() *cobra.Command { return err } - return cmd.Run(context.Background(), options, log.Default) + return cmd.Run(context.Background(), options) }, } @@ -32,8 +31,8 @@ func NewEnterCmd() *cobra.Command { } // Run runs the command logic. -func (cmd *EnterCmd) Run(ctx context.Context, options *options.Options, log log.Logger) error { - dockerlessProvider, err := dockerless.NewProvider(ctx, options, log) +func (cmd *EnterCmd) Run(ctx context.Context, options *options.Options) error { + dockerlessProvider, err := dockerless.NewProvider(ctx, options) if err != nil { return err } diff --git a/cmd/find.go b/cmd/find.go index ec99c58f..37b5a7c8 100644 --- a/cmd/find.go +++ b/cmd/find.go @@ -8,7 +8,7 @@ import ( "github.com/devsy-org/devsy-provider-dockerless/pkg/dockerless" "github.com/devsy-org/devsy-provider-dockerless/pkg/options" - "github.com/devsy-org/log" + "github.com/devsy-org/devsy/pkg/log" "github.com/spf13/cobra" ) @@ -27,7 +27,7 @@ func NewFindCmd() *cobra.Command { return err } - return cmd.Run(context.Background(), options, log.Default) + return cmd.Run(context.Background(), options) }, } @@ -35,8 +35,8 @@ func NewFindCmd() *cobra.Command { } // Run runs the command logic. -func (cmd *FindCmd) Run(ctx context.Context, options *options.Options, log log.Logger) error { - dockerlessProvider, err := dockerless.NewProvider(ctx, options, log) +func (cmd *FindCmd) Run(ctx context.Context, options *options.Options) error { + dockerlessProvider, err := dockerless.NewProvider(ctx, options) if err != nil { return err } diff --git a/cmd/root.go b/cmd/root.go index 2ec8ee2a..e2f9591e 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -4,8 +4,7 @@ import ( "os" "os/exec" - "github.com/devsy-org/log" - "github.com/sirupsen/logrus" + "github.com/devsy-org/devsy/pkg/log" "github.com/spf13/cobra" ) @@ -18,11 +17,11 @@ func NewRootCmd() *cobra.Command { SilenceUsage: true, PersistentPreRunE: func(cobraCmd *cobra.Command, args []string) error { + cfg := log.Config{Verbosity: 1} if os.Getenv("DEVSY_DEBUG") == "true" { - log.Default.SetLevel(logrus.DebugLevel) + cfg.Debug = true } - - log.Default.MakeRaw() + log.Init(cfg) return nil }, @@ -44,12 +43,12 @@ func Execute() { exitErr, ok := err.(*exec.ExitError) if ok { if len(exitErr.Stderr) > 0 { - log.Default.ErrorStreamOnly().Error(string(exitErr.Stderr)) + log.Error(string(exitErr.Stderr)) } os.Exit(exitErr.ExitCode()) } - log.Default.Fatal(err) + log.Fatal(err) } } diff --git a/cmd/run.go b/cmd/run.go index 7c384dd4..ee2f5e61 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -9,7 +9,6 @@ import ( "github.com/devsy-org/devsy-provider-dockerless/pkg/dockerless" "github.com/devsy-org/devsy-provider-dockerless/pkg/options" "github.com/devsy-org/devsy/pkg/driver" - "github.com/devsy-org/log" "github.com/spf13/cobra" ) @@ -28,7 +27,7 @@ func NewRunCmd() *cobra.Command { return err } - return cmd.Run(context.Background(), options, log.Default) + return cmd.Run(context.Background(), options) }, } @@ -36,14 +35,14 @@ func NewRunCmd() *cobra.Command { } // Run runs the command logic. -func (cmd *RunCmd) Run(ctx context.Context, options *options.Options, log log.Logger) error { +func (cmd *RunCmd) Run(ctx context.Context, options *options.Options) error { runOptions := &driver.RunOptions{} err := json.Unmarshal([]byte(os.Getenv("DEVCONTAINER_RUN_OPTIONS")), runOptions) if err != nil { return fmt.Errorf("unmarshal run options: %w", err) } - dockerlessProvider, err := dockerless.NewProvider(ctx, options, log) + dockerlessProvider, err := dockerless.NewProvider(ctx, options) if err != nil { return err } diff --git a/cmd/start.go b/cmd/start.go index cc744969..f383cae0 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -5,7 +5,6 @@ import ( "github.com/devsy-org/devsy-provider-dockerless/pkg/dockerless" "github.com/devsy-org/devsy-provider-dockerless/pkg/options" - "github.com/devsy-org/log" "github.com/spf13/cobra" ) @@ -24,7 +23,7 @@ func NewStartCmd() *cobra.Command { return err } - return cmd.Run(context.Background(), options, log.Default) + return cmd.Run(context.Background(), options) }, } @@ -32,8 +31,8 @@ func NewStartCmd() *cobra.Command { } // Run runs the command logic. -func (cmd *StartCmd) Run(ctx context.Context, options *options.Options, log log.Logger) error { - dockerlessProvider, err := dockerless.NewProvider(ctx, options, log) +func (cmd *StartCmd) Run(ctx context.Context, options *options.Options) error { + dockerlessProvider, err := dockerless.NewProvider(ctx, options) if err != nil { return err } diff --git a/cmd/stop.go b/cmd/stop.go index 9fcaf87d..5bfdda87 100644 --- a/cmd/stop.go +++ b/cmd/stop.go @@ -5,7 +5,6 @@ import ( "github.com/devsy-org/devsy-provider-dockerless/pkg/dockerless" "github.com/devsy-org/devsy-provider-dockerless/pkg/options" - "github.com/devsy-org/log" "github.com/spf13/cobra" ) @@ -24,7 +23,7 @@ func NewStopCmd() *cobra.Command { return err } - return cmd.Run(context.Background(), options, log.Default) + return cmd.Run(context.Background(), options) }, } @@ -32,8 +31,8 @@ func NewStopCmd() *cobra.Command { } // Run runs the command logic. -func (cmd *StopCmd) Run(ctx context.Context, options *options.Options, log log.Logger) error { - dockerlessProvider, err := dockerless.NewProvider(ctx, options, log) +func (cmd *StopCmd) Run(ctx context.Context, options *options.Options) error { + dockerlessProvider, err := dockerless.NewProvider(ctx, options) if err != nil { return err } diff --git a/cmd/target_architecture.go b/cmd/target_architecture.go index c0828872..48282bbc 100644 --- a/cmd/target_architecture.go +++ b/cmd/target_architecture.go @@ -6,7 +6,6 @@ import ( "runtime" "github.com/devsy-org/devsy-provider-dockerless/pkg/options" - "github.com/devsy-org/log" "github.com/spf13/cobra" ) @@ -25,7 +24,7 @@ func NewTargetArchitectureCmd() *cobra.Command { return err } - return cmd.Run(context.Background(), options, log.Default) + return cmd.Run(context.Background(), options) }, } @@ -36,7 +35,6 @@ func NewTargetArchitectureCmd() *cobra.Command { func (cmd *TargetArchitectureCmd) Run( ctx context.Context, options *options.Options, - log log.Logger, ) error { _, err := os.Stdout.WriteString(runtime.GOARCH + "\n") return err diff --git a/go.mod b/go.mod index 14ae60c8..0a2436d7 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,9 @@ module github.com/devsy-org/devsy-provider-dockerless go 1.25.8 require ( - github.com/devsy-org/devsy v0.0.0-20260419030317-b4a7815d3a7c - github.com/devsy-org/log v1.1.0 + github.com/devsy-org/devsy v1.10.0-beta.36.0.20260625223048-32c704a42e7e github.com/goccy/go-yaml v1.19.2 github.com/google/go-containerregistry v0.21.5 - github.com/sirupsen/logrus v1.9.4 github.com/spf13/cobra v1.10.2 ) @@ -23,7 +21,6 @@ require ( github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect - github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/antlr4-go/antlr/v4 v4.13.1 // indirect github.com/aws/aws-sdk-go-v2 v1.41.4 // indirect @@ -73,6 +70,7 @@ require ( github.com/fxamacker/cbor/v2 v2.9.0 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-logr/zapr v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.22.5 // indirect github.com/go-openapi/jsonreference v0.21.5 // indirect github.com/go-openapi/swag v0.25.5 // indirect @@ -98,11 +96,11 @@ require ( github.com/google/go-cmp v0.7.0 // indirect github.com/google/go-containerregistry/pkg/authn/kubernetes v0.0.0-20260414223304-7a662782a11f // indirect github.com/google/uuid v1.6.0 // indirect + github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/klauspost/compress v1.18.5 // indirect github.com/kylelemons/godebug v1.1.0 // indirect @@ -130,6 +128,7 @@ require ( github.com/prometheus/common v0.66.1 // indirect github.com/prometheus/procfs v0.17.0 // indirect github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect + github.com/sirupsen/logrus v1.9.4 // indirect github.com/spf13/pflag v1.0.10 // indirect github.com/stoewer/go-strcase v1.3.1 // indirect github.com/tailscale/hujson v0.0.0-20260302212456-ecc657c15afd // indirect @@ -142,7 +141,7 @@ require ( go.etcd.io/etcd/client/v3 v3.6.5 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect go.opentelemetry.io/otel v1.40.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect @@ -171,7 +170,7 @@ require ( google.golang.org/protobuf v1.36.11 // indirect gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect + gotest.tools/v3 v3.5.2 // indirect k8s.io/api v0.35.3 // indirect k8s.io/apimachinery v0.35.3 // indirect k8s.io/apiserver v0.35.3 // indirect diff --git a/go.sum b/go.sum index 73988580..6cced015 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,6 @@ github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cq github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s= github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w= -github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8= -github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= @@ -110,10 +108,8 @@ github.com/devsy-org/api v1.1.0 h1:l7T9k7RVwatwN4lxeDTF3iN6EYmfGZgR3ZTJMDGha1M= github.com/devsy-org/api v1.1.0/go.mod h1:mAZklKdnywJYiXDReBLte/H+3m69z6G7RHB3n1lI53Q= github.com/devsy-org/apiserver v1.5.0 h1:tAr2tH9QwtNEu8BTbBgHkJD6ae43S5LDdHGphLsELB8= github.com/devsy-org/apiserver v1.5.0/go.mod h1:2jKuqy8XdH/g4bIjmkj3efQgshN/NjMzm17SkvvSR88= -github.com/devsy-org/devsy v0.0.0-20260419030317-b4a7815d3a7c h1:KkIEYj/aIxa/fItoEZGxLoz2v+zv6/HuaTueHwDV9iU= -github.com/devsy-org/devsy v0.0.0-20260419030317-b4a7815d3a7c/go.mod h1:fZJ02vm6kjpBPLvotD9RGFUCd6V6Gg44qcAF3nzUz1U= -github.com/devsy-org/log v1.1.0 h1:LktC2pLnGwaduspO+euTzzj3Fbt4G1S1bDcb4f3xTSE= -github.com/devsy-org/log v1.1.0/go.mod h1:B/D8SOjJ34lQS5O1BupXwXvWsJRK+ul3JvYYahTkCE8= +github.com/devsy-org/devsy v1.10.0-beta.36.0.20260625223048-32c704a42e7e h1:5nTo7K0bP5IHpflzsx9pPA6cKlxG3BZmwdSogvlSKq8= +github.com/devsy-org/devsy v1.10.0-beta.36.0.20260625223048-32c704a42e7e/go.mod h1:rlDNYXcAP+5Fnc+BvvYO2NqAHysUH27BFaM/ObCmGkI= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= @@ -218,8 +214,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= -github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA= -github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU= +github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o= +github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 h1:FbSCl+KggFl+Ocym490i/EyXF4lPgLoUtcSWquBM0Rs= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= @@ -234,8 +230,6 @@ github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbd github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 h1:qGQQKEcAR99REcMpsXCp3lJ03zYT1PkRd3kQGPn9GVg= -github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU= @@ -373,8 +367,8 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 h1:ssfIgGNANqpVFCndZvcuyKbl0g+UAVcbBcqGkG28H0Y= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0/go.mod h1:GQ/474YrbE4Jx8gZ4q5I4hrhUzM6UPzyrqJYV2AqPoQ= go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms= go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 h1:QKdN8ly8zEMrByybbQgv8cWBcdAarwmIPZ6FThrWXJs= @@ -494,8 +488,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= -gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= +gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q= +gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA= k8s.io/api v0.35.3 h1:pA2fiBc6+N9PDf7SAiluKGEBuScsTzd2uYBkA5RzNWQ= k8s.io/api v0.35.3/go.mod h1:9Y9tkBcFwKNq2sxwZTQh1Njh9qHl81D0As56tu42GA4= k8s.io/apiextensions-apiserver v0.35.0 h1:3xHk2rTOdWXXJM+RDQZJvdx0yEOgC0FgQ1PlJatA5T4= diff --git a/pkg/dockerless/create.go b/pkg/dockerless/create.go index 45e5b28b..112b7f21 100644 --- a/pkg/dockerless/create.go +++ b/pkg/dockerless/create.go @@ -10,6 +10,7 @@ import ( "github.com/devsy-org/devsy/pkg/devcontainer/config" "github.com/devsy-org/devsy/pkg/driver" + "github.com/devsy-org/devsy/pkg/log" "github.com/google/go-containerregistry/pkg/legacy" "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" @@ -51,7 +52,7 @@ func (p *DockerlessProvider) Create( return err } - p.Log.Debugf("preparing runoptions") + log.Debugf("preparing runoptions") mergeRunOptions(runOptions, layerConfig) if err := writeJSON(configPath, runOptions); err != nil { @@ -66,7 +67,7 @@ func (p *DockerlessProvider) Create( return err } - p.Log.Info("done") + log.Info("done") return nil } @@ -86,12 +87,12 @@ func (p *DockerlessProvider) unpackLayers( return nil, err } - p.Log.Info("preparing container rootfs") + log.Info("preparing container rootfs") for index, layer := range manifest.Layers { layerDigest := strings.Split(layer.Digest.String(), ":")[1] + ".tar.gz" - p.Log.Debugf("unpacking layer %d of %d", index+1, len(manifest.Layers)) + log.Debugf("unpacking layer %d of %d", index+1, len(manifest.Layers)) if err := UntarFile( workspaceId, @@ -102,7 +103,7 @@ func (p *DockerlessProvider) unpackLayers( } } - p.Log.Info("done") + log.Info("done") return layerConfig, nil } diff --git a/pkg/dockerless/dockerless.go b/pkg/dockerless/dockerless.go index 175bcfbe..3ece591b 100644 --- a/pkg/dockerless/dockerless.go +++ b/pkg/dockerless/dockerless.go @@ -11,23 +11,20 @@ import ( "github.com/devsy-org/devsy-provider-dockerless/pkg/options" "github.com/devsy-org/devsy/pkg/devcontainer/config" - "github.com/devsy-org/log" + "github.com/devsy-org/devsy/pkg/log" ) type DockerlessProvider struct { Config *options.Options - Log log.Logger } func NewProvider( ctx context.Context, options *options.Options, - logs log.Logger, ) (*DockerlessProvider, error) { // create provider provider := &DockerlessProvider{ Config: options, - Log: logs, } return provider, nil @@ -73,14 +70,14 @@ func (p *DockerlessProvider) Find( } func (p *DockerlessProvider) Stop(ctx context.Context, workspaceId string) error { - p.Log.Infof("stopping: %s", workspaceId) + log.Infof("stopping: %s", workspaceId) pid, err := GetPid(workspaceId) if err != nil { return err } - p.Log.Debugf("found parent process: %d", pid) + log.Debugf("found parent process: %d", pid) //nolint:gosec // pid is an integer obtained from our own state dir cmd := exec.Command("kill", "-9", strconv.Itoa(pid)) @@ -88,7 +85,7 @@ func (p *DockerlessProvider) Stop(ctx context.Context, workspaceId string) error } func (p *DockerlessProvider) Delete(ctx context.Context, workspaceId string) error { - p.Log.Infof("deleting: %s", workspaceId) + log.Infof("deleting: %s", workspaceId) _ = p.Stop(ctx, workspaceId) diff --git a/pkg/dockerless/pull.go b/pkg/dockerless/pull.go index 860ff18e..c79cef28 100644 --- a/pkg/dockerless/pull.go +++ b/pkg/dockerless/pull.go @@ -10,6 +10,7 @@ import ( "strings" "github.com/devsy-org/devsy/pkg/driver" + "github.com/devsy-org/devsy/pkg/log" "github.com/google/go-containerregistry/pkg/crane" "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" @@ -30,15 +31,15 @@ func (p *DockerlessProvider) Pull(ctx context.Context, runOptions *driver.RunOpt targetDIR := filepath.Join(p.Config.TargetDir, "images", ref.Name()) - p.Log.Infof("downloading %s", ref.Name()) + log.Infof("downloading %s", ref.Name()) // if we already downloaded the image, exit if _, err := os.Stat(filepath.Join(targetDIR, "manifest.json")); err == nil { - p.Log.Infof("image %s already found", ref.Name()) + log.Infof("image %s already found", ref.Name()) return nil } - p.Log.Debugf("getting info about %s", ref.Name()) + log.Debugf("getting info about %s", ref.Name()) // Pull will just get us the v1.Image struct, from // which we get all the information we need imageManifest, err := crane.Pull(image) @@ -56,7 +57,7 @@ func (p *DockerlessProvider) Pull(ctx context.Context, runOptions *driver.RunOpt // downloadLayers downloads every layer of the image into targetDIR and removes // any stale files left over from previous downloads. func (p *DockerlessProvider) downloadLayers(targetDIR string, imageManifest v1.Image) error { - p.Log.Debugf("preparing to get layers") + log.Debugf("preparing to get layers") layers, err := imageManifest.Layers() if err != nil { return err @@ -69,10 +70,10 @@ func (p *DockerlessProvider) downloadLayers(targetDIR string, imageManifest v1.I } } - p.Log.Infof("downloading layers") + log.Infof("downloading layers") keepFiles := []string{} for index, layer := range layers { - p.Log.Infof("downloading layer %d of %d", index+1, len(layers)) + log.Infof("downloading layer %d of %d", index+1, len(layers)) fileName, err := downloadLayer(targetDIR, layer) if err != nil { @@ -110,7 +111,7 @@ func (p *DockerlessProvider) saveImageMetadata( targetDIR, image string, imageManifest v1.Image, ) error { - p.Log.Debugf("saving manifest.json") + log.Debugf("saving manifest.json") // we save the manifest.json for later use. This contains // the information on how the layers are ordered and // how to unpack them @@ -127,7 +128,7 @@ func (p *DockerlessProvider) saveImageMetadata( return err } - p.Log.Debugf("saving config.json") + log.Debugf("saving config.json") // The config.json file is also saved, indicating lots of information // about the image, like default env, entrypoint and so on rawConfig, err := imageManifest.RawConfigFile() @@ -139,7 +140,7 @@ func (p *DockerlessProvider) saveImageMetadata( return err } - p.Log.Debugf("saving image info") + log.Debugf("saving image info") // We also save the fully qualified name to retrieve it later. return os.WriteFile(filepath.Join(targetDIR, "image_name"), []byte(image), 0o600) } diff --git a/pkg/dockerless/start.go b/pkg/dockerless/start.go index 795cd28a..f95a1d8e 100644 --- a/pkg/dockerless/start.go +++ b/pkg/dockerless/start.go @@ -10,6 +10,7 @@ import ( "strings" "github.com/devsy-org/devsy/pkg/driver" + "github.com/devsy-org/devsy/pkg/log" ) func (p *DockerlessProvider) Start(ctx context.Context, workspaceId string) error { @@ -21,9 +22,9 @@ func (p *DockerlessProvider) Start(ctx context.Context, workspaceId string) erro return nil } - p.Log.Debugf("container %s is not running, starting", workspaceId) + log.Debugf("container %s is not running, starting", workspaceId) - p.Log.Debugf("retrieving runOptions") + log.Debugf("retrieving runOptions") //nolint:gosec // path is derived from provider config, not user input runOptionsBytes, err := os.ReadFile(filepath.Join(statusDIR, "runOptions")) @@ -51,9 +52,9 @@ func (p *DockerlessProvider) Start(ctx context.Context, workspaceId string) erro cmd := exec.Command(command, args...) cmd.Env = os.Environ() - p.Log.Infof("starting the container") + log.Infof("starting the container") - p.Log.Debugf("executing helper command: %s %s", command, strings.Join(args, " ")) + log.Debugf("executing helper command: %s %s", command, strings.Join(args, " ")) err = cmd.Start() if err != nil { @@ -67,11 +68,11 @@ func (p *DockerlessProvider) Start(ctx context.Context, workspaceId string) erro // cannot honor. func (p *DockerlessProvider) warnUnsupportedOptions(runOptions *driver.RunOptions) { if len(runOptions.SecurityOpt) > 0 { - p.Log.Warn("unsupported option by the dockerless driver: SecurityOpt") + log.Warn("unsupported option by the dockerless driver: SecurityOpt") } if len(runOptions.CapAdd) > 0 { - p.Log.Warn("unsupported option by the dockerless driver: CapAdd") + log.Warn("unsupported option by the dockerless driver: CapAdd") } }