Merge pull request #2423 from heliubj18/fix-s3-acl-policy-change

openshift-merge-robot · web-flow · commit 80205d26e8f5 · 2023-04-20T02:02:21.000-04:00
OCPBUGS-11773: remove ACL for aws bucket
diff --git a/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go b/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
@@ -4116,7 +4116,6 @@ func (r *HostedClusterReconciler) reconcileAWSOIDCDocuments(ctx context.Context,
 			return fmt.Errorf("failed to generate OIDC document %s: %w", path, err)
 		}
 		_, err = r.S3Client.PutObject(&s3.PutObjectInput{
-			ACL:    aws.String("public-read"),
 			Body:   bodyReader,
 			Bucket: aws.String(r.OIDCStorageProviderS3BucketName),
 			Key:    aws.String(hcluster.Spec.InfraID + path),
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -201,7 +201,6 @@ func setupSharedOIDCProvider() error {
 			return fmt.Errorf("failed to generate OIDC document %s: %w", path, err)
 		}
 		_, err = s3Client.PutObject(&s3.PutObjectInput{
-			ACL:    aws.String("public-read"),
 			Body:   bodyReader,
 			Bucket: aws.String(oidcBucketName),
 			Key:    aws.String(providerID + path),

Original file line number	Diff line number	Diff line change
`@@ -4116,7 +4116,6 @@ func (r *HostedClusterReconciler) reconcileAWSOIDCDocuments(ctx context.Context,`
`4116`	`4116`	`return fmt.Errorf("failed to generate OIDC document %s: %w", path, err)`
`4117`	`4117`	`}`
`4118`	`4118`	`_, err = r.S3Client.PutObject(&s3.PutObjectInput{`
`4119`		`- ACL: aws.String("public-read"),`
`4120`	`4119`	`Body: bodyReader,`
`4121`	`4120`	`Bucket: aws.String(r.OIDCStorageProviderS3BucketName),`
`4122`	`4121`	`Key: aws.String(hcluster.Spec.InfraID + path),`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,6 @@ func setupSharedOIDCProvider() error {`
`201`	`201`	`return fmt.Errorf("failed to generate OIDC document %s: %w", path, err)`
`202`	`202`	`}`
`203`	`203`	`_, err = s3Client.PutObject(&s3.PutObjectInput{`
`204`		`- ACL: aws.String("public-read"),`
`205`	`204`	`Body: bodyReader,`
`206`	`205`	`Bucket: aws.String(oidcBucketName),`
`207`	`206`	`Key: aws.String(providerID + path),`