Merge pull request #6374 from crazy-max/0.26_picks_0.26.2

tonistiigi · web-flow · commit be1f38efe73c · 2025-11-20T11:38:53.000Z
[0.26] cherry-picks for v0.26.2
diff --git a/cache/remotecache/s3/s3.go b/cache/remotecache/s3/s3.go
@@ -404,7 +404,10 @@ type s3Client struct {
 }
 
 func newS3Client(ctx context.Context, config Config) (*s3Client, error) {
-	cfg, err := aws_config.LoadDefaultConfig(ctx, aws_config.WithRegion(config.Region))
+	cfg, err := aws_config.LoadDefaultConfig(ctx,
+		aws_config.WithRegion(config.Region),
+		aws_config.WithRequestChecksumCalculation(aws.RequestChecksumCalculationWhenRequired),
+	)
 	if err != nil {
 		return nil, errors.Errorf("Unable to load AWS SDK config, %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,10 @@ type s3Client struct {`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`func newS3Client(ctx context.Context, config Config) (*s3Client, error) {`
`407`		`- cfg, err := aws_config.LoadDefaultConfig(ctx, aws_config.WithRegion(config.Region))`
	`407`	`+ cfg, err := aws_config.LoadDefaultConfig(ctx,`
	`408`	`+ aws_config.WithRegion(config.Region),`
	`409`	`+ aws_config.WithRequestChecksumCalculation(aws.RequestChecksumCalculationWhenRequired),`
	`410`	`+ )`
`408`	`411`	`if err != nil {`
`409`	`412`	`return nil, errors.Errorf("Unable to load AWS SDK config, %v", err)`
`410`	`413`	`}`