Skip to content
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

Jump to bottom

fix(bucket): Reset notification configuration #1974

Merged
merged 1 commit into from
Dec 18, 2023
Merged

fix(bucket): Reset notification configuration #1974

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 13 additions & 3 deletions pkg/controller/s3/bucket/notificationConfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/meta"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"k8s.io/utils/ptr"

"github.com/crossplane-contrib/provider-aws/apis/s3/v1beta1"
"github.com/crossplane-contrib/provider-aws/pkg/clients/s3"
Expand Down Expand Up @@ -285,9 +286,18 @@ func (in *NotificationConfigurationClient) CreateOrUpdate(ctx context.Context, b
return errorutils.Wrap(err, notificationPutFailed)
}

// Delete does nothing because there is no corresponding deletion call in awsclient.
func (*NotificationConfigurationClient) Delete(_ context.Context, _ *v1beta1.Bucket) error {
return nil
// Delete resets the buckets notification configuration to empty.
func (in *NotificationConfigurationClient) Delete(ctx context.Context, bucket *v1beta1.Bucket) error {
_, err := in.client.PutBucketNotificationConfiguration(ctx, &awss3.PutBucketNotificationConfigurationInput{
Bucket: ptr.To(meta.GetExternalName(bucket)),
NotificationConfiguration: &types.NotificationConfiguration{
EventBridgeConfiguration: &types.EventBridgeConfiguration{},
LambdaFunctionConfigurations: []types.LambdaFunctionConfiguration{},
QueueConfigurations: []types.QueueConfiguration{},
TopicConfigurations: []types.TopicConfiguration{},
},
})
return errorutils.Wrap(err, notificationPutFailed)
}

// LateInitialize is responsible for initializing the resource based on the external value
Expand Down