From 9ff63ea53e5ede100ac272c1834ee53a9e39c146 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 16:36:23 +0000 Subject: [PATCH] build(deps): bump the aws-sdk-go-v2 group in /ecr-login with 2 updates Bumps the aws-sdk-go-v2 group in /ecr-login with 2 updates: [github.com/aws/aws-sdk-go-v2/service/ecr](https://github.com/aws/aws-sdk-go-v2) and [github.com/aws/aws-sdk-go-v2/service/ecrpublic](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/service/ecr` from 1.38.7 to 1.39.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecr/v1.38.7...service/s3/v1.39.0) Updates `github.com/aws/aws-sdk-go-v2/service/ecrpublic` from 1.29.5 to 1.30.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/pi/v1.29.5...v1.30.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecr dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecrpublic dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] --- ecr-login/go.mod | 4 +- ecr-login/go.sum | 8 +- .../aws-sdk-go-v2/service/ecr/CHANGELOG.md | 4 + .../aws-sdk-go-v2/service/ecr/endpoints.go | 95 +++++++++++++++++++ .../service/ecr/go_module_metadata.go | 2 +- .../service/ecrpublic/CHANGELOG.md | 4 + .../service/ecrpublic/endpoints.go | 19 ++++ .../service/ecrpublic/go_module_metadata.go | 2 +- ecr-login/vendor/modules.txt | 4 +- 9 files changed, 132 insertions(+), 10 deletions(-) diff --git a/ecr-login/go.mod b/ecr-login/go.mod index 973d169f..ff916ab4 100644 --- a/ecr-login/go.mod +++ b/ecr-login/go.mod @@ -6,8 +6,8 @@ require ( github.com/aws/aws-sdk-go-v2 v1.34.0 github.com/aws/aws-sdk-go-v2/config v1.29.2 github.com/aws/aws-sdk-go-v2/credentials v1.17.55 - github.com/aws/aws-sdk-go-v2/service/ecr v1.38.7 - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.29.5 + github.com/aws/aws-sdk-go-v2/service/ecr v1.39.0 + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.30.0 github.com/aws/smithy-go v1.22.2 github.com/docker/docker-credential-helpers v0.8.2 github.com/mitchellh/go-homedir v1.1.0 diff --git a/ecr-login/go.sum b/ecr-login/go.sum index ee668047..8009f37e 100644 --- a/ecr-login/go.sum +++ b/ecr-login/go.sum @@ -12,10 +12,10 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.29 h1:6e8a71X+9GfghragVe github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.29/go.mod h1:c4jkZiQ+BWpNqq7VtrxjwISrLrt/VvPq3XiopkUIolI= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 h1:Pg9URiobXy85kgFev3og2CuOZ8JZUBENF+dcgWBaYNk= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= -github.com/aws/aws-sdk-go-v2/service/ecr v1.38.7 h1:3fxpNAXVQV7J3dymLoQjoI5AxbrI4/FDYlfk+wPoB3s= -github.com/aws/aws-sdk-go-v2/service/ecr v1.38.7/go.mod h1:vj6+DOvmrbZgqmZvyrbMienKS3PQTHJpqa+BRBKR6Xc= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.29.5 h1:OIVRRBeqOvqNVyA9urTt5MeC2EVUbgJ5zHDMfnhS0lw= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.29.5/go.mod h1:tkRlT/ZIwMS74oI5ZhZBLPskoXD3CByg1Nvfjmp4R90= +github.com/aws/aws-sdk-go-v2/service/ecr v1.39.0 h1:TWxTq8jGjFGMRoc/rcD5FB+KjP8a1id4VP91RMncrZI= +github.com/aws/aws-sdk-go-v2/service/ecr v1.39.0/go.mod h1:vj6+DOvmrbZgqmZvyrbMienKS3PQTHJpqa+BRBKR6Xc= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.30.0 h1:t/VoEzjSbq2SNNY90mwQ61N1ESaQMFh0TbN2Pkyd0lQ= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.30.0/go.mod h1:tkRlT/ZIwMS74oI5ZhZBLPskoXD3CByg1Nvfjmp4R90= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 h1:D4oz8/CzT9bAEYtVhSBmFj2dNOtaHOtMKc2vHBwYizA= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2/go.mod h1:Za3IHqTQ+yNcRHxu1OFucBh0ACZT4j4VQFF0BqpZcLY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.10 h1:hN4yJBGswmFTOVYqmbz1GBs9ZMtQe8SrYxPwrkrlRv8= diff --git a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/CHANGELOG.md b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/CHANGELOG.md index 245460b2..555791eb 100644 --- a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/CHANGELOG.md +++ b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.39.0 (2025-01-29) + +* **Feature**: Add support for Dualstack and Dualstack-with-FIPS Endpoints + # v1.38.7 (2025-01-24) * **Dependency Update**: Updated to the latest SDK module versions diff --git a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/endpoints.go b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/endpoints.go index c593447c..e61e5469 100644 --- a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/endpoints.go +++ b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/endpoints.go @@ -361,6 +361,44 @@ func (r *resolver) ResolveEndpoint( if _UseDualStack == true { if true == _PartitionResult.SupportsFIPS { if true == _PartitionResult.SupportsDualStack { + if "aws" == _PartitionResult.Name { + uriString := func() string { + var out strings.Builder + out.WriteString("https://ecr-fips.") + out.WriteString(_Region) + out.WriteString(".api.aws") + return out.String() + }() + + uri, err := url.Parse(uriString) + if err != nil { + return endpoint, fmt.Errorf("Failed to parse uri: %s", uriString) + } + + return smithyendpoints.Endpoint{ + URI: *uri, + Headers: http.Header{}, + }, nil + } + if "aws-us-gov" == _PartitionResult.Name { + uriString := func() string { + var out strings.Builder + out.WriteString("https://ecr-fips.") + out.WriteString(_Region) + out.WriteString(".api.aws") + return out.String() + }() + + uri, err := url.Parse(uriString) + if err != nil { + return endpoint, fmt.Errorf("Failed to parse uri: %s", uriString) + } + + return smithyendpoints.Endpoint{ + URI: *uri, + Headers: http.Header{}, + }, nil + } uriString := func() string { var out strings.Builder out.WriteString("https://api.ecr-fips.") @@ -447,6 +485,63 @@ func (r *resolver) ResolveEndpoint( } if _UseDualStack == true { if true == _PartitionResult.SupportsDualStack { + if "aws" == _PartitionResult.Name { + uriString := func() string { + var out strings.Builder + out.WriteString("https://ecr.") + out.WriteString(_Region) + out.WriteString(".api.aws") + return out.String() + }() + + uri, err := url.Parse(uriString) + if err != nil { + return endpoint, fmt.Errorf("Failed to parse uri: %s", uriString) + } + + return smithyendpoints.Endpoint{ + URI: *uri, + Headers: http.Header{}, + }, nil + } + if "aws-cn" == _PartitionResult.Name { + uriString := func() string { + var out strings.Builder + out.WriteString("https://ecr.") + out.WriteString(_Region) + out.WriteString(".api.amazonwebservices.com.cn") + return out.String() + }() + + uri, err := url.Parse(uriString) + if err != nil { + return endpoint, fmt.Errorf("Failed to parse uri: %s", uriString) + } + + return smithyendpoints.Endpoint{ + URI: *uri, + Headers: http.Header{}, + }, nil + } + if "aws-us-gov" == _PartitionResult.Name { + uriString := func() string { + var out strings.Builder + out.WriteString("https://ecr.") + out.WriteString(_Region) + out.WriteString(".api.aws") + return out.String() + }() + + uri, err := url.Parse(uriString) + if err != nil { + return endpoint, fmt.Errorf("Failed to parse uri: %s", uriString) + } + + return smithyendpoints.Endpoint{ + URI: *uri, + Headers: http.Header{}, + }, nil + } uriString := func() string { var out strings.Builder out.WriteString("https://api.ecr.") diff --git a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/go_module_metadata.go b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/go_module_metadata.go index c88b0600..d407037b 100644 --- a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/go_module_metadata.go +++ b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecr/go_module_metadata.go @@ -3,4 +3,4 @@ package ecr // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.38.7" +const goModuleVersion = "1.39.0" diff --git a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/CHANGELOG.md b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/CHANGELOG.md index ea6c216c..9d75a3c7 100644 --- a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/CHANGELOG.md +++ b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.30.0 (2025-01-29) + +* **Feature**: Add support for Dualstack Endpoints + # v1.29.5 (2025-01-24) * **Dependency Update**: Updated to the latest SDK module versions diff --git a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/endpoints.go b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/endpoints.go index 39d80056..4af6f113 100644 --- a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/endpoints.go +++ b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/endpoints.go @@ -409,6 +409,25 @@ func (r *resolver) ResolveEndpoint( } if _UseDualStack == true { if true == _PartitionResult.SupportsDualStack { + if "aws" == _PartitionResult.Name { + uriString := func() string { + var out strings.Builder + out.WriteString("https://ecr-public.") + out.WriteString(_Region) + out.WriteString(".api.aws") + return out.String() + }() + + uri, err := url.Parse(uriString) + if err != nil { + return endpoint, fmt.Errorf("Failed to parse uri: %s", uriString) + } + + return smithyendpoints.Endpoint{ + URI: *uri, + Headers: http.Header{}, + }, nil + } uriString := func() string { var out strings.Builder out.WriteString("https://api.ecr-public.") diff --git a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/go_module_metadata.go b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/go_module_metadata.go index 39ee8258..fa4a03ea 100644 --- a/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/go_module_metadata.go +++ b/ecr-login/vendor/github.com/aws/aws-sdk-go-v2/service/ecrpublic/go_module_metadata.go @@ -3,4 +3,4 @@ package ecrpublic // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.29.5" +const goModuleVersion = "1.30.0" diff --git a/ecr-login/vendor/modules.txt b/ecr-login/vendor/modules.txt index af315dc8..0527e1d0 100644 --- a/ecr-login/vendor/modules.txt +++ b/ecr-login/vendor/modules.txt @@ -49,12 +49,12 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 # github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/internal/ini -# github.com/aws/aws-sdk-go-v2/service/ecr v1.38.7 +# github.com/aws/aws-sdk-go-v2/service/ecr v1.39.0 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/ecr github.com/aws/aws-sdk-go-v2/service/ecr/internal/endpoints github.com/aws/aws-sdk-go-v2/service/ecr/types -# github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.29.5 +# github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.30.0 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/ecrpublic github.com/aws/aws-sdk-go-v2/service/ecrpublic/internal/endpoints