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.
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
feat(s3): bucketKeyEnabled implemented #1158
Merged
chlunde
merged 2 commits into
crossplane-contrib:master
from
haarchri:feature/s3-bucket-key-enabled
Mar 8, 2022
Merged
feat(s3): bucketKeyEnabled implemented #1158
chlunde
merged 2 commits into
crossplane-contrib:master
from
haarchri:feature/s3-bucket-key-enabled
Mar 8, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkg/controller/s3/bucket/sseConfig.go b/pkg/controller/s3/bucket/sseConfig.go
index 93772cca..616e4105 100644
--- a/pkg/controller/s3/bucket/sseConfig.go
+++ b/pkg/controller/s3/bucket/sseConfig.go
@@ -75,6 +75,9 @@ func (in *SSEConfigurationClient) Observe(ctx context.Context, bucket *v1beta1.B
if string(outputRule.SSEAlgorithm) != Rule.ApplyServerSideEncryptionByDefault.SSEAlgorithm {
return NeedsUpdate, nil
}
+ if external.ServerSideEncryptionConfiguration.Rules[i].BucketKeyEnabled != Rule.BucketKeyEnabled {
+ return NeedsUpdate, nil
+ }
}
return Updated, nil perhaps also a test for this: + "NeedsUpdateEnableBucketKey": {
+ args: args{
+ b: s3testing.Bucket(s3testing.WithSSEConfig(generateSSEConfigWithBucketEncryption())),
+ cl: NewSSEConfigurationClient(fake.MockBucketClient{
+ MockGetBucketEncryption: func(ctx context.Context, input *s3.GetBucketEncryptionInput, opts []func(*s3.Options)) (*s3.GetBucketEncryptionOutput, error) {
+ return &s3.GetBucketEncryptionOutput{ServerSideEncryptionConfiguration: generateAWSSSE()}, nil
+ },
+ }),
+ },
+ want: want{
+ status: NeedsUpdate,
+ err: nil,
+ },
+ }, |
e2e-tests are failing since we merged crossplane/crossplane#2932
tested locally with crossplane 1.6.3 without issues |
Signed-off-by: haarchri <chhaar30@googlemail.com>
Signed-off-by: haarchri <chhaar30@googlemail.com>
haarchri
force-pushed
the
feature/s3-bucket-key-enabled
branch
from
March 7, 2022 16:09
c36e6ab
to
97b8168
Compare
@chlunde rebased after sdk bump |
chlunde
approved these changes
Mar 8, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tested toggling on/off, reviewed, thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: haarchri chhaar30@googlemail.com
Description of your changes
implemented bucketKeyEnabled in sseConfig
Fixes #1154
I have:
make reviewable test
to ensure this PR is ready for review.How has this code been tested
t.b.d