Skip to content

OCPBUGS-70255: backwards compact for S3 API call #10196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tthvo wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −2
Open

OCPBUGS-70255: backwards compact for S3 API call #10196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pkg/clusterapi/system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,11 @@ func (c *system) Run(ctx context.Context) error { //nolint:gocyclo
"--webhook-cert-dir={{.WebhookCertDir}}",
"--feature-gates=BootstrapFormatIgnition=true,ExternalResourceGC=true,TagUnmanagedNetworkResources=false,EKS=false,MachinePool=false",
},
map[string]string{},
map[string]string{
// We disable checksum for PUT and GET calls (i.e. checksum is optional).
"AWS_REQUEST_CHECKSUM_CALCULATION": "WHEN_REQUIRED",
"AWS_RESPONSE_CHECKSUM_VALIDATION": "WHEN_REQUIRED",
},
)
if cfg := metadata.AWS; cfg != nil && len(cfg.ServiceEndpoints) > 0 {
endpoints := make([]string, 0, len(cfg.ServiceEndpoints))
Expand Down
24 changes: 23 additions & 1 deletion pkg/infrastructure/aws/clusterapi/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import (
"github.com/aws/aws-sdk-go-v2/service/s3"
s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/smithy-go/middleware"
smithyhttp "github.com/aws/smithy-go/transport/http"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -454,6 +456,23 @@ func (p *Provider) PostDestroy(ctx context.Context, in clusterapi.PostDestroyerI
return nil
}

// withContentMD5 removes all flexible checksum procecdures from an operation,
// instead computing an MD5 checksum for the request payload.
// Since AWS SDK v2, the SDK will compute and send a CRC32 checksum by default, which is a
// breaking change in behaviour. This we need this setup to restore backwards compact.
// Reference: https://github.com/aws/aws-sdk-go-v2/discussions/2960#discussion-7829557
//
//nolint:errcheck
func withContentMD5(o *s3.Options) {
o.APIOptions = append(o.APIOptions, func(stack *middleware.Stack) error {
stack.Initialize.Remove("AWSChecksum:SetupInputContext")
stack.Build.Remove("AWSChecksum:RequestMetricsTracking")
stack.Finalize.Remove("AWSChecksum:ComputeInputPayloadChecksum")
stack.Finalize.Remove("addInputChecksumTrailer")
return smithyhttp.AddContentChecksumMiddleware(stack)
})
}

// removeS3Bucket deletes an s3 bucket given its name.
func removeS3Bucket(ctx context.Context, region string, bucketName string, endpoints []awstypes.ServiceEndpoint) error {
cfg, err := configv2.LoadDefaultConfig(ctx, configv2.WithRegion(region))
Expand All @@ -468,6 +487,9 @@ func removeS3Bucket(ctx context.Context, region string, bucketName string, endpo
options.BaseEndpoint = aws.String(endpoint.URL)
}
}
// We disable checksum for PUT and GET calls (i.e. checksum is optional).
options.RequestChecksumCalculation = aws.RequestChecksumCalculationWhenRequired
options.ResponseChecksumValidation = aws.ResponseChecksumValidationWhenRequired
})

paginator := s3.NewListObjectsV2Paginator(client, &s3.ListObjectsV2Input{Bucket: aws.String(bucketName)})
Expand All @@ -490,7 +512,7 @@ func removeS3Bucket(ctx context.Context, region string, bucketName string, endpo
Delete: &s3types.Delete{
Objects: objects,
},
}); err != nil {
}, withContentMD5); err != nil {
return fmt.Errorf("failed to delete objects in bucket %s: %w", bucketName, err)
}
}
Expand Down