Upgrade to deploy to use AWS SDK V2

diff --git a/deploy/cloudfront.go b/deploy/cloudfront.go
index 8ed9b858d91f424275cf47a01bb1bea74e7f736d..a91126c5dc70a0080f60586ec21dbb73bacafd61 100644 (file)
--- a/deploy/cloudfront.go
+++ b/deploy/cloudfront.go
@@ -21,8 +21,9 @@ import (
        "net/url"
        "time"
 
-       "github.com/aws/aws-sdk-go/aws"
-       "github.com/aws/aws-sdk-go/service/cloudfront"
+       "github.com/aws/aws-sdk-go-v2/aws"
+       "github.com/aws/aws-sdk-go-v2/service/cloudfront"
+       "github.com/aws/aws-sdk-go-v2/service/cloudfront/types"
        gcaws "gocloud.dev/aws"
 )
 
@@ -33,20 +34,21 @@ func InvalidateCloudFront(ctx context.Context, target *Target) error {
        if err != nil {
                return err
        }
-       sess, _, err := gcaws.NewSessionFromURLParams(u.Query())
+       cfg, err := gcaws.V2ConfigFromURLParams(ctx, u.Query())
        if err != nil {
                return err
        }
+       cf := cloudfront.NewFromConfig(cfg)
        req := &cloudfront.CreateInvalidationInput{
                DistributionId: aws.String(target.CloudFrontDistributionID),
-               InvalidationBatch: &cloudfront.InvalidationBatch{
+               InvalidationBatch: &types.InvalidationBatch{
                        CallerReference: aws.String(time.Now().Format("20060102150405")),
-                       Paths: &cloudfront.Paths{
-                               Items:    []*string{aws.String("/*")},
-                               Quantity: aws.Int64(1),
+                       Paths: &types.Paths{
+                               Items:    []string{"/*"},
+                               Quantity: aws.Int32(1),
                        },
                },
        }
-       _, err = cloudfront.New(sess).CreateInvalidationWithContext(ctx, req)
+       _, err = cf.CreateInvalidation(ctx, req)
        return err
 }

diff --git a/go.mod b/go.mod
index 6037edc066dfbc649524e5192f297b9fce5757f8..52ee16799845946b551e7bbfac53a3bfcf68d7eb 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,8 @@ require (
        github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69
        github.com/alecthomas/chroma/v2 v2.12.0
        github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c
-       github.com/aws/aws-sdk-go v1.50.7
+       github.com/aws/aws-sdk-go-v2 v1.24.1
+       github.com/aws/aws-sdk-go-v2/service/cloudfront v1.32.6
        github.com/bep/clocks v0.5.0
        github.com/bep/debounce v1.2.0
        github.com/bep/gitmap v1.1.2
@@ -92,14 +93,14 @@ require (
        github.com/Azure/go-autorest v14.2.0+incompatible // indirect
        github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
        github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
-       github.com/aws/aws-sdk-go-v2 v1.20.0 // indirect
+       github.com/aws/aws-sdk-go v1.50.7 // indirect
        github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.11 // indirect
        github.com/aws/aws-sdk-go-v2/config v1.18.32 // indirect
        github.com/aws/aws-sdk-go-v2/credentials v1.13.31 // indirect
        github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.7 // indirect
        github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.76 // indirect
-       github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.37 // indirect
-       github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.31 // indirect
+       github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
+       github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
        github.com/aws/aws-sdk-go-v2/internal/ini v1.3.38 // indirect
        github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.0 // indirect
        github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.12 // indirect
@@ -110,7 +111,7 @@ require (
        github.com/aws/aws-sdk-go-v2/service/sso v1.13.1 // indirect
        github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.1 // indirect
        github.com/aws/aws-sdk-go-v2/service/sts v1.21.1 // indirect
-       github.com/aws/smithy-go v1.14.0 // indirect
+       github.com/aws/smithy-go v1.19.0 // indirect
        github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
        github.com/dlclark/regexp2 v1.10.0 // indirect
        github.com/go-openapi/jsonpointer v0.19.6 // indirect

diff --git a/go.sum b/go.sum
index 5c16ea819d8e1f78aeaee1cfae435198ebab256a..ecdba646773ec8d8c8d46a2f24bf7e01f9854f1e 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -74,8 +74,9 @@ github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c h1:651/eoCRnQ7YtS
 github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/aws/aws-sdk-go v1.50.7 h1:odKb+uneeGgF2jgAerKjFzpljiyZxleV4SHB7oBK+YA=
 github.com/aws/aws-sdk-go v1.50.7/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
-github.com/aws/aws-sdk-go-v2 v1.20.0 h1:INUDpYLt4oiPOJl0XwZDK2OVAVf0Rzo+MGVTv9f+gy8=
 github.com/aws/aws-sdk-go-v2 v1.20.0/go.mod h1:uWOr0m0jDsiWw8nnXiqZ+YG6LdvAlGYDLLf2NmHZoy4=
+github.com/aws/aws-sdk-go-v2 v1.24.1 h1:xAojnj+ktS95YZlDf0zxWBkbFtymPeDP+rvUQIH3uAU=
+github.com/aws/aws-sdk-go-v2 v1.24.1/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.11 h1:/MS8AzqYNAhhRNalOmxUvYs8VEbNGifTnzhPFdcRQkQ=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.11/go.mod h1:va22++AdXht4ccO3kH2SHkHHYvZ2G9Utz+CXKmm2CaU=
 github.com/aws/aws-sdk-go-v2/config v1.18.32 h1:tqEOvkbTxwEV7hToRcJ1xZRjcATqwDVsWbAscgRKyNI=
@@ -86,14 +87,18 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.7 h1:X3H6+SU21x+76LRglk21dFR
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.7/go.mod h1:3we0V09SwcJBzNlnyovrR2wWJhWmVdqAsmVs4uronv8=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.76 h1:DJ1kHj0GI9BbX+XhF0kHxlzOVjcncmDUXmCvXdbfdAE=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.76/go.mod h1:/AZCdswMSgwpB2yMSFfY5H4pVeBLnCuPehdmO/r3xSM=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.37 h1:zr/gxAZkMcvP71ZhQOcvdm8ReLjFgIXnIn0fw5AM7mo=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.37/go.mod h1:Pdn4j43v49Kk6+82spO3Tu5gSeQXRsxo56ePPQAvFiA=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.31 h1:0HCMIkAkVY9KMgueD8tf4bRTUanzEYvhw7KkPXIMpO0=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 h1:vF+Zgd9s+H4vOXd5BMaPWykta2a6Ih0AKLq/X6NYKn4=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10/go.mod h1:6BkRjejp/GR4411UGqkX8+wFMbFbqsUIimfK4XjOKR4=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.31/go.mod h1:fTJDMe8LOFYtqiFFFeHA+SVMAwqLhoq0kcInYoLa9Js=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 h1:nYPe006ktcqUji8S2mqXf9c/7NdiKriOwMvWQHgYztw=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10/go.mod h1:6UV4SZkVvmODfXKql4LCbaZUpF7HO2BX38FgBf9ZOLw=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.3.38 h1:+i1DOFrW3YZ3apE45tCal9+aDKK6kNEbW6Ib7e1nFxE=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.3.38/go.mod h1:1/jLp0OgOaWIetycOmycW+vYTYgTZFPttJQRgsI1PoU=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.0 h1:U5yySdwt2HPo/pnQec04DImLzWORbeWML1fJiLkKruI=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.0/go.mod h1:EhC/83j8/hL/UB1WmExo3gkElaja/KlmZM/gl1rTfjM=
+github.com/aws/aws-sdk-go-v2/service/cloudfront v1.32.6 h1:xKbFXea2CIF/Wskauz1TMr//wZ6FyzEafMdSBIQqn80=
+github.com/aws/aws-sdk-go-v2/service/cloudfront v1.32.6/go.mod h1:iB6PQSb3ULRrrlEiuFfVE318JiBOdk4k46BbuzrrgXc=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.12 h1:uAiiHnWihGP2rVp64fHwzLDrswGjEjsPszwRYMiYQPU=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.12/go.mod h1:fUTHpOXqRQpXvEpDPSa3zxCc2fnpW6YnBoba+eQr+Bg=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.32 h1:kvN1jPHr9UffqqG3bSgZ8tx4+1zKVHz/Ktw/BwW6hX8=
@@ -110,8 +115,9 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.1 h1:hd0SKLMdOL/Sl6Z0np1PX9Le
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.1/go.mod h1:XO/VcyoQ8nKyKfFW/3DMsRQXsfh/052tHTWmg3xBXRg=
 github.com/aws/aws-sdk-go-v2/service/sts v1.21.1 h1:pAOJj+80tC8sPVgSDHzMYD6KLWsaLQ1kZw31PTeORbs=
 github.com/aws/aws-sdk-go-v2/service/sts v1.21.1/go.mod h1:G8SbvL0rFk4WOJroU8tKBczhsbhj2p/YY7qeJezJ3CI=
-github.com/aws/smithy-go v1.14.0 h1:+X90sB94fizKjDmwb4vyl2cTTPXTE5E2G/1mjByb0io=
 github.com/aws/smithy-go v1.14.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
+github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM=
+github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE=
 github.com/bep/clocks v0.5.0 h1:hhvKVGLPQWRVsBP/UB7ErrHYIO42gINVbvqxvYTPVps=
 github.com/bep/clocks v0.5.0/go.mod h1:SUq3q+OOq41y2lRQqH5fsOoxN8GbxSiT6jvoVVLCVhU=
 github.com/bep/debounce v1.2.0 h1:wXds8Kq8qRfwAOpAxHrJDbCXgC5aHSzgQb/0gKsHQqo=