From f139617ae95c100b8b5b732d74cc293f0c60fdbc Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Wed, 4 Sep 2024 22:58:08 -0500 Subject: [PATCH] Fix ipv6 prefix detection with aws-sdk-go-v2 --- upup/pkg/fi/nodeup/nodetasks/prefix.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upup/pkg/fi/nodeup/nodetasks/prefix.go b/upup/pkg/fi/nodeup/nodetasks/prefix.go index bfb0810e25a87..98c24f43378e1 100644 --- a/upup/pkg/fi/nodeup/nodetasks/prefix.go +++ b/upup/pkg/fi/nodeup/nodetasks/prefix.go @@ -25,10 +25,10 @@ import ( "path" "strings" - awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" awsconfig "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/feature/ec2/imds" "github.com/aws/aws-sdk-go-v2/service/ec2" + smithyhttp "github.com/aws/smithy-go/transport/http" "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" @@ -128,7 +128,7 @@ func getInstanceMetadataList(ctx context.Context, category string) ([]string, er metadata := imds.NewFromConfig(cfg) resp, err := metadata.GetMetadata(ctx, &imds.GetMetadataInput{Path: category}) if err != nil { - var awsErr *awshttp.ResponseError + var awsErr *smithyhttp.ResponseError if errors.As(err, &awsErr) && awsErr.HTTPStatusCode() == http.StatusNotFound { return nil, nil } else {