From 5a7b8fe50870895f16fa4aae3ff60797f2ea10ee Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Tue, 3 Sep 2024 15:47:46 -0400 Subject: [PATCH 1/5] bump go to 1.23.0 --- go.mod | 2 +- go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 99bd5a32f..d338fe995 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/replicatedhq/embedded-cluster -go 1.22.5 +go 1.23.0 require ( github.com/AlecAivazis/survey/v2 v2.3.7 diff --git a/go.sum b/go.sum index 7ba873b57..9e3fca990 100644 --- a/go.sum +++ b/go.sum @@ -534,6 +534,7 @@ github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgY github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= @@ -561,6 +562,7 @@ github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -784,6 +786,7 @@ google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWn gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From 7ed4dd33582cd8821e59b62d3df56230abd4e7c8 Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Tue, 3 Sep 2024 15:59:40 -0400 Subject: [PATCH 2/5] bump lint version --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6ae9fa508..a8f7be106 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,7 +41,7 @@ jobs: - name: Lint uses: golangci/golangci-lint-action@v6 with: - version: v1.54 + version: v1.60.3 test: name: Unit tests From 8b308586dd0e10bae1f276739b2760299e7ab35b Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Tue, 3 Sep 2024 16:07:37 -0400 Subject: [PATCH 3/5] remove nonconstant format string --- cmd/embedded-cluster/install.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/embedded-cluster/install.go b/cmd/embedded-cluster/install.go index c4877c83a..cb40e15d3 100644 --- a/cmd/embedded-cluster/install.go +++ b/cmd/embedded-cluster/install.go @@ -140,12 +140,12 @@ func runHostPreflights(c *cli.Context, hpf *v1beta2.HostPreflightSpec, proxy *ec if len(output.Fail) == 1 { s = "preflight" } - msg := fmt.Sprintf("%d host %s failed", len(output.Fail), s) if output.HasWarn() { - msg += fmt.Sprintf(" and %d warned", len(output.Warn)) + pb.Errorf("%d host %s failed and %d warned", len(output.Fail), s, len(output.Warn)) + } else { + pb.Errorf("%d host %s failed", len(output.Fail), s) } - pb.Errorf(msg) pb.CloseWithError() output.PrintTableWithoutInfo() return fmt.Errorf("host preflight failures detected") From a8657c921f54f4412eb32f661436b8d7adfddfde Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Tue, 3 Sep 2024 16:14:41 -0400 Subject: [PATCH 4/5] another non-constant format string --- pkg/logging/logging.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go index f705dc08d..13ce6bce0 100644 --- a/pkg/logging/logging.go +++ b/pkg/logging/logging.go @@ -48,7 +48,7 @@ func (hook *StdoutLogger) Fire(entry *logrus.Entry) error { default: writer = color.New(color.FgWhite) } - writer.Fprintf(output, message) + writer.Fprint(output, message) return nil } From c3194fb282860f58d76e1272e043c1425cf8c4f8 Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Tue, 3 Sep 2024 16:21:50 -0400 Subject: [PATCH 5/5] update kinds/go.mod version too --- kinds/go.mod | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kinds/go.mod b/kinds/go.mod index 72e957012..d88086cb7 100644 --- a/kinds/go.mod +++ b/kinds/go.mod @@ -1,8 +1,6 @@ module github.com/replicatedhq/embedded-cluster/kinds -go 1.22.0 - -toolchain go1.22.2 +go 1.23.0 require ( github.com/evanphx/json-patch v5.9.0+incompatible