Bump github.com/blang/semver to v4.0.0 (#8244)

eksctl-io · Feb 25, 2025 · 1a596f9 · 1a596f9
1 parent f3dcfa0
commit 1a596f9
Show file tree

Hide file tree

Showing 15 changed files with 110 additions and 115 deletions.
diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md
diff --git a/go.mod b/go.mod
@@ -29,7 +29,7 @@ require (
 	github.com/aws/smithy-go v1.22.3
 	github.com/awslabs/amazon-eks-ami/nodeadm v0.0.0-20250219002025-c3b5cd3d2fd9
 	github.com/benjamintf1/unmarshalledmatchers v1.0.0
-	github.com/blang/semver v3.5.1+incompatible
+	github.com/blang/semver/v4 v4.0.0
 	github.com/cenk/backoff v2.2.1+incompatible
 	github.com/cloudflare/cfssl v1.6.5
 	github.com/dave/jennifer v1.7.1
@@ -145,7 +145,6 @@ require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bkielbasa/cyclop v1.2.3 // indirect
-	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/blizzy78/varnamelen v0.8.0 // indirect
 	github.com/bombsimon/wsl/v4 v4.5.0 // indirect
 	github.com/breml/bidichk v0.3.2 // indirect

diff --git a/go.sum b/go.sum
@@ -190,8 +190,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bkielbasa/cyclop v1.2.3 h1:faIVMIGDIANuGPWH031CZJTi2ymOQBULs9H21HSMa5w=
 github.com/bkielbasa/cyclop v1.2.3/go.mod h1:kHTwA9Q0uZqOADdupvcFJQtp/ksSnytRMe8ztxG8Fuo=
-github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
-github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M=

diff --git a/pkg/actions/addon/get.go b/pkg/actions/addon/get.go
@@ -8,7 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/eks"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/kris-nova/logger"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"

diff --git a/pkg/actions/nodegroup/ami.go b/pkg/actions/nodegroup/ami.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // ParseReleaseVersion parses an AMI release version string that's in the format `1.18.8-20201007`

diff --git a/pkg/actions/nodegroup/upgrade.go b/pkg/actions/nodegroup/upgrade.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/eks"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/kris-nova/logger"
 	"github.com/pkg/errors"
 

diff --git a/pkg/addons/default/aws_node.go b/pkg/addons/default/aws_node.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/kris-nova/logger"
 
 	appsv1 "k8s.io/api/apps/v1"

diff --git a/pkg/addons/default/scripts/update_coredns_assets.go b/pkg/addons/default/scripts/update_coredns_assets.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	awseks "github.com/aws/aws-sdk-go-v2/service/eks"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/eks"

diff --git a/pkg/cfn/manager/nodegroup.go b/pkg/cfn/manager/nodegroup.go
@@ -14,7 +14,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 	"github.com/aws/aws-sdk-go-v2/service/eks"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/kris-nova/logger"
 	"github.com/pkg/errors"
 

diff --git a/pkg/kubernetes/client.go b/pkg/kubernetes/client.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	jsonpatch "github.com/evanphx/json-patch/v5"
 	"github.com/kris-nova/logger"
 	"github.com/pkg/errors"

diff --git a/pkg/utils/kubectl/kubectl.go b/pkg/utils/kubectl/kubectl.go
@@ -7,7 +7,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/pkg/errors"
 )
 

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/pkg/errors"
 )
 

diff --git a/pkg/version/generate/release_generate.go b/pkg/version/generate/release_generate.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/dave/jennifer/jen"
 
 	"github.com/weaveworks/eksctl/pkg/version"

diff --git a/pkg/version/parse.go b/pkg/version/parse.go
@@ -3,7 +3,7 @@ package version
 import (
 	"strings"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/pkg/errors"
 )
 

diff --git a/pkg/version/parse_test.go b/pkg/version/parse_test.go
@@ -1,7 +1,7 @@
 package version
 
 import (
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )