Merge pull request #2126 from andreadecorte/OCM-8435

OCM-8435 | chore: bump gci version to correctly handle newer golang versions
openshift · May 31, 2024 · f8cd646 · f8cd646
2 parents 0bcdb86 + b9d20a9
commit f8cd646
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 21 deletions.
diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
@@ -23,11 +23,11 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
 	@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
 
-GCI := $(GOBIN)/gci-v0.10.1
+GCI := $(GOBIN)/gci-v0.13.4
 $(GCI): $(BINGO_DIR)/gci.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/gci-v0.10.1"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gci.mod -o=$(GOBIN)/gci-v0.10.1 "github.com/daixiang0/gci"
+	@echo "(re)installing $(GOBIN)/gci-v0.13.4"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gci.mod -o=$(GOBIN)/gci-v0.13.4 "github.com/daixiang0/gci"
 
 GO_BINDATA := $(GOBIN)/go-bindata-v3.1.2+incompatible
 $(GO_BINDATA): $(BINGO_DIR)/go-bindata.mod

diff --git a/.bingo/gci.mod b/.bingo/gci.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.21.3
 
-require github.com/daixiang0/gci v0.10.1
+require github.com/daixiang0/gci v0.13.4
diff --git a/.bingo/gci.sum b/.bingo/gci.sum
@@ -1,6 +1,8 @@
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/daixiang0/gci v0.10.1 h1:eheNA3ljF6SxnPD/vE4lCBusVHmV3Rs3dkKvFrJ7MR0=
 github.com/daixiang0/gci v0.10.1/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI=
+github.com/daixiang0/gci v0.13.4 h1:61UGkmpoAcxHM2hhNkZEf5SzwQtWJXTSws7jaPyqwlw=
+github.com/daixiang0/gci v0.13.4/go.mod h1:12etP2OniiIdP4q+kjUGrC/rUagga7ODbqsom5Eo5Yk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
@@ -21,8 +23,12 @@ go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
+golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
+golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/.bingo/variables.env b/.bingo/variables.env
@@ -10,7 +10,7 @@ fi
 
 BINGO="${GOBIN}/bingo-v0.9.0"
 
-GCI="${GOBIN}/gci-v0.10.1"
+GCI="${GOBIN}/gci-v0.13.4"
 
 GO_BINDATA="${GOBIN}/go-bindata-v3.1.2+incompatible"
 

diff --git a/cmd/attach/policy/cmd.go b/cmd/attach/policy/cmd.go
@@ -19,9 +19,8 @@ package policy
 import (
 	"context"
 	"fmt"
-	"strings"
-
 	"slices"
+	"strings"
 
 	"github.com/spf13/cobra"
 

diff --git a/cmd/detach/policy/cmd.go b/cmd/detach/policy/cmd.go
@@ -19,9 +19,8 @@ package policy
 import (
 	"context"
 	"fmt"
-	"strings"
-
 	"slices"
+	"strings"
 
 	"github.com/spf13/cobra"
 

diff --git a/cmd/edit/machinepool/nodepool.go b/cmd/edit/machinepool/nodepool.go
@@ -3,9 +3,8 @@ package machinepool
 import (
 	"fmt"
 	"os"
-	"strings"
-
 	"slices"
+	"strings"
 
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	"github.com/spf13/cobra"

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -25,11 +25,10 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"slices"
 	"strings"
 	"time"
 
-	"slices"
-
 	"github.com/golang-jwt/jwt/v4"
 	"github.com/golang/glog"
 	sdk "github.com/openshift-online/ocm-sdk-go"

diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -4,9 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"testing"
-
 	"slices"
+	"testing"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

diff --git a/pkg/helper/rolepolicybindings/helpers.go b/pkg/helper/rolepolicybindings/helpers.go
@@ -18,9 +18,8 @@ package rolepolicybindings
 
 import (
 	"fmt"
-	"strings"
-
 	"slices"
+	"strings"
 
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 

diff --git a/pkg/ocm/kubeletconfig_test.go b/pkg/ocm/kubeletconfig_test.go
@@ -5,9 +5,8 @@ import (
 	"context"
 	"fmt"
 	"net/http"
-	"time"
-
 	"slices"
+	"time"
 
 	. "github.com/onsi/ginkgo/v2/dsl/core"
 	. "github.com/onsi/ginkgo/v2/dsl/decorators"

diff --git a/pkg/policy/policy_service.go b/pkg/policy/policy_service.go
@@ -18,7 +18,6 @@ package policy
 
 import (
 	"fmt"
-
 	"slices"
 
 	awsutil "github.com/aws/aws-sdk-go-v2/aws"

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -3,7 +3,6 @@ package version
 import (
 	"fmt"
 	"net/http"
-
 	"slices"
 
 	goVer "github.com/hashicorp/go-version"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

		go 1.21.3

		require github.com/daixiang0/gci v0.10.1
		require github.com/daixiang0/gci v0.13.4
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,6 @@ package policy @@
     import (
     	"fmt"
     	"slices"
     	awsutil "github.com/aws/aws-sdk-go-v2/aws"
@@ Expand Down @@