Merge pull request #16444 from rifelpet/aws-sdk-go-v2-aws

Migrate aws-sdk-go/aws to aws-sdk-go-v2/aws
kubernetes · Apr 1, 2024 · f3b2159 · f3b2159
2 parents 1dfc5b5 + 3d4ba32
commit f3b2159
Show file tree

Hide file tree

Showing 63 changed files with 298 additions and 299 deletions.
diff --git a/cmd/kops/create_cluster_integration_test.go b/cmd/kops/create_cluster_integration_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/dnsprovider/pkg/dnsprovider/providers/aws/route53/route53_test.go b/dnsprovider/pkg/dnsprovider/providers/aws/route53/route53_test.go
@@ -27,7 +27,7 @@ import (
 	route53testing "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/aws/route53/stubs"
 	"k8s.io/kops/dnsprovider/pkg/dnsprovider/rrstype"
 
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"k8s.io/kops/dnsprovider/pkg/dnsprovider/tests"
 )

diff --git a/dnsprovider/pkg/dnsprovider/providers/aws/route53/rrchangeset.go b/dnsprovider/pkg/dnsprovider/providers/aws/route53/rrchangeset.go
@@ -21,7 +21,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"k8s.io/klog/v2"
 	"k8s.io/kops/dnsprovider/pkg/dnsprovider"
@@ -142,7 +142,7 @@ func (c *ResourceRecordChangeset) Apply(ctx context.Context) error {
 		if klog.V(8).Enabled() {
 			var sb bytes.Buffer
 			for _, change := range batch {
-				sb.WriteString(fmt.Sprintf("\t%s %s %s\n", aws.StringValue(change.Action), aws.StringValue(change.ResourceRecordSet.Type), aws.StringValue(change.ResourceRecordSet.Name)))
+				sb.WriteString(fmt.Sprintf("\t%s %s %s\n", aws.ToString(change.Action), aws.ToString(change.ResourceRecordSet.Type), aws.ToString(change.ResourceRecordSet.Name)))
 			}
 
 			klog.V(8).Infof("Route53 MaxBatchSize: %v\n", MaxBatchSize)

diff --git a/dnsprovider/pkg/dnsprovider/providers/aws/route53/rrset.go b/dnsprovider/pkg/dnsprovider/providers/aws/route53/rrset.go
@@ -20,7 +20,7 @@ import (
 	"k8s.io/kops/dnsprovider/pkg/dnsprovider"
 	"k8s.io/kops/dnsprovider/pkg/dnsprovider/rrstype"
 
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 )
 
@@ -33,24 +33,24 @@ type ResourceRecordSet struct {
 }
 
 func (rrset ResourceRecordSet) Name() string {
-	return aws.StringValue(rrset.impl.Name)
+	return aws.ToString(rrset.impl.Name)
 }
 
 func (rrset ResourceRecordSet) Rrdatas() []string {
 	// Sigh - need to unpack the strings out of the route53 ResourceRecords
 	result := make([]string, len(rrset.impl.ResourceRecords))
 	for i, record := range rrset.impl.ResourceRecords {
-		result[i] = aws.StringValue(record.Value)
+		result[i] = aws.ToString(record.Value)
 	}
 	return result
 }
 
 func (rrset ResourceRecordSet) Ttl() int64 {
-	return aws.Int64Value(rrset.impl.TTL)
+	return aws.ToInt64(rrset.impl.TTL)
 }
 
 func (rrset ResourceRecordSet) Type() rrstype.RrsType {
-	return rrstype.RrsType(aws.StringValue(rrset.impl.Type))
+	return rrstype.RrsType(aws.ToString(rrset.impl.Type))
 }
 
 // Route53ResourceRecordSet returns the route53 ResourceRecordSet object for the ResourceRecordSet

diff --git a/dnsprovider/pkg/dnsprovider/providers/aws/route53/rrsets.go b/dnsprovider/pkg/dnsprovider/providers/aws/route53/rrsets.go
@@ -17,7 +17,7 @@ limitations under the License.
 package route53
 
 import (
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"k8s.io/kops/dnsprovider/pkg/dnsprovider"
 	"k8s.io/kops/dnsprovider/pkg/dnsprovider/rrstype"
@@ -60,7 +60,7 @@ func (rrsets ResourceRecordSets) Get(name string) ([]dnsprovider.ResourceRecordS
 	var list []dnsprovider.ResourceRecordSet
 	err := rrsets.zone.zones.interface_.service.ListResourceRecordSetsPages(&input, func(page *route53.ListResourceRecordSetsOutput, lastPage bool) bool {
 		for _, rrset := range page.ResourceRecordSets {
-			if aws.StringValue(rrset.Name) != name {
+			if aws.ToString(rrset.Name) != name {
 				return false
 			}
 			list = append(list, &ResourceRecordSet{rrset, &rrsets})

diff --git a/dnsprovider/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go b/dnsprovider/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go
@@ -20,7 +20,7 @@ package stubs
 import (
 	"fmt"
 
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 )
 
@@ -107,7 +107,7 @@ func (r *Route53APIStub) ListHostedZonesPages(input *route53.ListHostedZonesInpu
 }
 
 func (r *Route53APIStub) CreateHostedZone(input *route53.CreateHostedZoneInput) (*route53.CreateHostedZoneOutput, error) {
-	name := aws.StringValue(input.Name)
+	name := aws.ToString(input.Name)
 	id := "/hostedzone/" + name
 	if _, ok := r.zones[id]; ok {
 		return nil, fmt.Errorf("error creating hosted DNS zone: %s already exists", id)

diff --git a/dnsprovider/pkg/dnsprovider/providers/aws/route53/zone.go b/dnsprovider/pkg/dnsprovider/providers/aws/route53/zone.go
@@ -19,7 +19,7 @@ package route53
 import (
 	"strings"
 
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"k8s.io/kops/dnsprovider/pkg/dnsprovider"
 )
@@ -33,11 +33,11 @@ type Zone struct {
 }
 
 func (zone *Zone) Name() string {
-	return aws.StringValue(zone.impl.Name)
+	return aws.ToString(zone.impl.Name)
 }
 
 func (zone *Zone) ID() string {
-	id := aws.StringValue(zone.impl.Id)
+	id := aws.ToString(zone.impl.Id)
 	id = strings.TrimPrefix(id, "/hostedzone/")
 	return id
 }

diff --git a/pkg/apis/kops/validation/aws_test.go b/pkg/apis/kops/validation/aws_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/kops/cloudmock/aws/mockec2"

diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go
@@ -19,7 +19,7 @@ package nodeup
 import (
 	"strings"
 
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/apis/kops/model"
 	"k8s.io/kops/util/pkg/architectures"

diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/klog/v2"