chore(deps): bump github.com/aws/aws-sdk-go-v2/feature/s3/manager (#2874)

Bumps [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://github.com/aws/aws-sdk-go-v2) from 1.14.0 to 1.14.3. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/mq/v1.14.3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.14.0...service/mq/v1.14.3) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/feature/s3/manager dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-10-19 13:41:08 +02:00 · 2023-11-28 12:49:52 -08:00
parent 143e69492d
commit 2b3d3c7eff
38 changed files with 174 additions and 53 deletions
@@ -1,3 +1,11 @@
+# v1.25.5 (2023-11-21)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
+# v1.25.4 (2023-11-20)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.3 (2023-11-17)

 * **Dependency Update**: Updated to the latest SDK module versions
@@ -3,4 +3,4 @@
 package config

 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.3"
+const goModuleVersion = "1.25.5"
@@ -1,3 +1,11 @@
+# v1.16.4 (2023-11-21)
+
+* **Bug Fix**: Don't expect error responses to have a JSON payload in the endpointcreds provider.
+
+# v1.16.3 (2023-11-20)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.16.2 (2023-11-17)

 * **Dependency Update**: Updated to the latest SDK module versions
@@ -62,7 +62,16 @@ func New(options Options, optFns ...func(*Options)) *Client {
 	}

 	if options.Retryer == nil {
-		options.Retryer = retry.NewStandard()
+		// Amazon-owned implementations of this endpoint are known to sometimes
+		// return plaintext responses (i.e. no Code) like normal, add a few
+		// additional status codes
+		options.Retryer = retry.NewStandard(func(o *retry.StandardOptions) {
+			o.Retryables = append(o.Retryables, retry.RetryableHTTPStatusCode{
+				Codes: map[int]struct{}{
+					http.StatusTooManyRequests: {},
+				},
+			})
+		})
 	}

 	for _, fn := range optFns {
@@ -122,9 +131,10 @@ type GetCredentialsOutput struct {

 // EndpointError is an error returned from the endpoint service
 type EndpointError struct {
-	Code    string            `json:"code"`
-	Message string            `json:"message"`
-	Fault   smithy.ErrorFault `json:"-"`
+	Code       string            `json:"code"`
+	Message    string            `json:"message"`
+	Fault      smithy.ErrorFault `json:"-"`
+	statusCode int               `json:"-"`
 }

 // Error is the error mesage string
@@ -146,3 +156,8 @@ func (e *EndpointError) ErrorMessage() string {
 func (e *EndpointError) ErrorFault() smithy.ErrorFault {
 	return e.Fault
 }
+
+// HTTPStatusCode implements retry.HTTPStatusCode.
+func (e *EndpointError) HTTPStatusCode() int {
+	return e.statusCode
+}
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/url"

 	"github.com/aws/smithy-go"
@@ -104,17 +105,44 @@ func (d *deserializeOpGetCredential) HandleDeserialize(ctx context.Context, in s
 }

 func deserializeError(response *smithyhttp.Response) error {
-	var errShape *EndpointError
-	err := json.NewDecoder(response.Body).Decode(&errShape)
+	// we could be talking to anything, json isn't guaranteed
+	// see https://github.com/aws/aws-sdk-go-v2/issues/2316
+	if response.Header.Get("Content-Type") == "application/json" {
+		return deserializeJSONError(response)
+	}
+
+	msg, err := io.ReadAll(response.Body)
 	if err != nil {
-		return &smithy.DeserializationError{Err: fmt.Errorf("failed to decode error message, %w", err)}
+		return &smithy.DeserializationError{
+			Err: fmt.Errorf("read response, %w", err),
+		}
 	}

-	if response.StatusCode >= 500 {
-		errShape.Fault = smithy.FaultServer
-	} else {
-		errShape.Fault = smithy.FaultClient
+	return &EndpointError{
+		// no sensible value for Code
+		Message:    string(msg),
+		Fault:      stof(response.StatusCode),
+		statusCode: response.StatusCode,
+	}
+}
+
+func deserializeJSONError(response *smithyhttp.Response) error {
+	var errShape *EndpointError
+	if err := json.NewDecoder(response.Body).Decode(&errShape); err != nil {
+		return &smithy.DeserializationError{
+			Err: fmt.Errorf("failed to decode error message, %w", err),
+		}
 	}

+	errShape.Fault = stof(response.StatusCode)
+	errShape.statusCode = response.StatusCode
 	return errShape
 }
+
+// maps HTTP status code to smithy ErrorFault
+func stof(code int) smithy.ErrorFault {
+	if code >= 500 {
+		return smithy.FaultServer
+	}
+	return smithy.FaultClient
+}
@@ -3,4 +3,4 @@
 package credentials

 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.16.2"
+const goModuleVersion = "1.16.4"
@@ -1,3 +1,7 @@
+# v1.14.5 (2023-11-20)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.14.4 (2023-11-15)

 * **Dependency Update**: Updated to the latest SDK module versions
@@ -3,4 +3,4 @@
 package imds

 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.14.4"
+const goModuleVersion = "1.14.5"
@@ -1,3 +1,15 @@
+# v1.14.3 (2023-11-27)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
+# v1.14.2 (2023-11-21)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
+# v1.14.1 (2023-11-20)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.14.0 (2023-11-17)

 * **Feature**: **BREAKING CHANGE** Correct nullability of a large number of S3 structure fields. See https://github.com/aws/aws-sdk-go-v2/issues/2162.
@@ -3,4 +3,4 @@
 package manager

 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.14.0"
+const goModuleVersion = "1.14.3"
@@ -1,3 +1,7 @@
+# v1.45.0 (2023-11-27)
+
+* **Feature**: Adding new params - Key and Prefix, to S3 API operations for supporting S3 Access Grants. Note - These updates will not change any of the existing S3 API functionality.
+
 # v1.44.0 (2023-11-21)

 * **Feature**: Add support for automatic date based partitioning in S3 Server Access Logs.
@@ -95,6 +95,7 @@ type AbortMultipartUploadInput struct {

 func (in *AbortMultipartUploadInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Key = in.Key

 }

@@ -183,6 +183,7 @@ type CompleteMultipartUploadInput struct {

 func (in *CompleteMultipartUploadInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Key = in.Key

 }

@@ -348,6 +348,7 @@ type CreateMultipartUploadInput struct {

 func (in *CreateMultipartUploadInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Key = in.Key

 }

@@ -106,6 +106,7 @@ type DeleteObjectInput struct {

 func (in *DeleteObjectInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Key = in.Key

 }

@@ -238,6 +238,7 @@ type GetObjectInput struct {

 func (in *GetObjectInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Key = in.Key

 }

@@ -86,6 +86,7 @@ type GetObjectAclInput struct {

 func (in *GetObjectAclInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Key = in.Key

 }

@@ -191,6 +191,7 @@ type HeadObjectInput struct {

 func (in *HeadObjectInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Key = in.Key

 }

@@ -134,6 +134,7 @@ type ListMultipartUploadsInput struct {

 func (in *ListMultipartUploadsInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Prefix = in.Prefix

 }

@@ -105,6 +105,7 @@ type ListObjectVersionsInput struct {

 func (in *ListObjectVersionsInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Prefix = in.Prefix

 }

@@ -104,6 +104,7 @@ type ListObjectsInput struct {

 func (in *ListObjectsInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Prefix = in.Prefix

 }

@@ -117,6 +117,7 @@ type ListObjectsV2Input struct {

 func (in *ListObjectsV2Input) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Prefix = in.Prefix

 }

@@ -126,6 +126,7 @@ type ListPartsInput struct {

 func (in *ListPartsInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Key = in.Key

 }

@@ -337,6 +337,7 @@ type PutObjectInput struct {

 func (in *PutObjectInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Key = in.Key

 }

@@ -210,6 +210,7 @@ type PutObjectAclInput struct {

 func (in *PutObjectAclInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Key = in.Key

 }

@@ -21,8 +21,9 @@ import (
 //   - The DefaultRetention settings require both a mode and a period.
 //   - The DefaultRetention period can be either Days or Years but you must select
 //     one. You cannot specify Days and Years at the same time.
-//   - You can only enable Object Lock for new buckets. If you want to turn on
-//     Object Lock for an existing bucket, contact Amazon Web Services Support.
+//   - You can enable Object Lock for new or existing buckets. For more
+//     information, see Configuring Object Lock (https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-lock-configure.html)
+//     .
 func (c *Client) PutObjectLockConfiguration(ctx context.Context, params *PutObjectLockConfigurationInput, optFns ...func(*Options)) (*PutObjectLockConfigurationOutput, error) {
 	if params == nil {
 		params = &PutObjectLockConfigurationInput{}
@@ -227,6 +227,7 @@ type UploadPartInput struct {

 func (in *UploadPartInput) bindEndpointParams(p *EndpointParameters) {
 	p.Bucket = in.Bucket
+	p.Key = in.Key

 }

@@ -303,6 +303,20 @@ type EndpointParameters struct {
 	// Parameter is required.
 	UseObjectLambdaEndpoint *bool

+	// The S3 Key used to send the request. This is an optional parameter that will be
+	// set automatically for operations that are scoped to an S3 Key.
+	//
+	// Parameter is
+	// required.
+	Key *string
+
+	// The S3 Prefix used to send the request. This is an optional parameter that will
+	// be set automatically for operations that are scoped to an S3 Prefix.
+	//
+	// Parameter
+	// is required.
+	Prefix *string
+
 	// Internal parameter to disable Access Point Buckets
 	//
 	// Parameter is required.
@@ -3,4 +3,4 @@
 package s3

 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.44.0"
+const goModuleVersion = "1.45.0"
@@ -1,3 +1,7 @@
+# v1.17.3 (2023-11-20)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.17.2 (2023-11-15)

 * **Dependency Update**: Updated to the latest SDK module versions
@@ -3,4 +3,4 @@
 package sso

 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.17.2"
+const goModuleVersion = "1.17.3"
@@ -1,3 +1,7 @@
+# v1.20.1 (2023-11-20)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.20.0 (2023-11-17)

 * **Feature**: Adding support for `sso-oauth:CreateTokenWithIAM`.
@@ -3,4 +3,4 @@
 package ssooidc

 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.20.0"
+const goModuleVersion = "1.20.1"
@@ -1,3 +1,7 @@
+# v1.25.4 (2023-11-20)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.3 (2023-11-17)

 * **Documentation**: API updates for the AWS Security Token Service
@@ -3,4 +3,4 @@
 package sts

 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.3"
+const goModuleVersion = "1.25.4"