From f9382a43934729316b3afab92d171ee285576cdf Mon Sep 17 00:00:00 2001 From: Taras Postument Date: Thu, 14 Aug 2025 12:55:41 +0100 Subject: [PATCH] Remove deprecated aws-go-sdk-v1 --- apis/v1alpha1/types.go | 2 -- go.mod | 3 +-- go.sum | 5 ----- pkg/resource/access_entry/hooks_test.go | 2 +- pkg/resource/fargate_profile/hook.go | 6 +++--- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go index 44f835b..193b502 100644 --- a/apis/v1alpha1/types.go +++ b/apis/v1alpha1/types.go @@ -17,14 +17,12 @@ package v1alpha1 import ( ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" - "github.com/aws/aws-sdk-go/aws" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // Hack to avoid import errors during build... var ( _ = &metav1.Time{} - _ = &aws.JSONValue{} _ = ackv1alpha1.AWSAccountID("") ) diff --git a/go.mod b/go.mod index 4109ffb..acc1040 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,6 @@ require ( github.com/aws-controllers-k8s/iam-controller v1.3.1 github.com/aws-controllers-k8s/kms-controller v1.0.9 github.com/aws-controllers-k8s/runtime v0.50.0 - github.com/aws/aws-sdk-go v1.55.5 github.com/aws/aws-sdk-go-v2 v1.37.0 github.com/aws/aws-sdk-go-v2/service/eks v1.67.0 github.com/aws/smithy-go v1.22.5 @@ -23,6 +22,7 @@ require ( ) require ( + github.com/aws/aws-sdk-go v1.55.5 // indirect github.com/aws/aws-sdk-go-v2/config v1.28.6 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect @@ -56,7 +56,6 @@ require ( github.com/itchyny/gojq v0.12.6 // indirect github.com/itchyny/timefmt-go v0.1.3 // indirect github.com/jaypipes/envutil v1.0.0 // indirect - github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/mailru/easyjson v0.7.7 // indirect diff --git a/go.sum b/go.sum index 83976ef..11fc752 100644 --- a/go.sum +++ b/go.sum @@ -98,8 +98,6 @@ github.com/jaypipes/envutil v1.0.0 h1:u6Vwy9HwruFihoZrL0bxDLCa/YNadGVwKyPElNmZWo github.com/jaypipes/envutil v1.0.0/go.mod h1:vgIRDly+xgBq0eeZRcflOHMMobMwgC6MkMbxo/Nw65M= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -224,9 +222,6 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/pkg/resource/access_entry/hooks_test.go b/pkg/resource/access_entry/hooks_test.go index 79768a2..a57fc09 100644 --- a/pkg/resource/access_entry/hooks_test.go +++ b/pkg/resource/access_entry/hooks_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/aws-controllers-k8s/eks-controller/apis/v1alpha1" - "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go-v2/aws" ) func Test_computeAccessPoliciesDelta(t *testing.T) { diff --git a/pkg/resource/fargate_profile/hook.go b/pkg/resource/fargate_profile/hook.go index 45ea891..68775ac 100644 --- a/pkg/resource/fargate_profile/hook.go +++ b/pkg/resource/fargate_profile/hook.go @@ -25,7 +25,7 @@ import ( ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go-v2/aws" - svcsdk "github.com/aws/aws-sdk-go/service/eks" + ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" ) var ( @@ -35,7 +35,7 @@ var ( var ( requeueWaitWhileDeleting = ackrequeue.NeededAfter( - fmt.Errorf("profile is in '%s' state, cannot be modified or deleted", svcsdk.FargateProfileStatusDeleting), + fmt.Errorf("profile is in '%s' state, cannot be modified or deleted", ekstypes.FargateProfileStatusDeleting), ackrequeue.DefaultRequeueAfterDuration, ) ) @@ -47,7 +47,7 @@ func profileDeleting(r *resource) bool { return false } ps := *r.ko.Status.Status - return ps == svcsdk.FargateProfileStatusDeleting + return ps == string(ekstypes.FargateProfileStatusDeleting) } // customPreCompare ensures that default values of nil-able types are