Updated SNS Subscription handlers for resource migration. #78
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
**Modified** - aws-sns-subscription/src/main/*: Updated CRUDL handlers for migration, - aws-sns-subscription/src/test/*: Updated unit tests.
| request.getClientRequestToken())); | ||
|
|
||
| return proxy.initiate("AWS-SNS-Subscription::Create", proxyClient, resourceModel, callbackContext) | ||
| .translateToServiceRequest(Translator::translateToCreateRequest) |
There was a problem hiding this comment.
| .handleError((awsRequest, exception, client, model, context) -> handleError(awsRequest, exception, client, model, context)) | ||
| .done((getSubscriptionsRequest, getSubscriptionsResponse, client, resourceModel1, context) -> | ||
| ProgressEvent.<ResourceModel, CallbackContext>builder() | ||
| .resourceModels(Translator.translateFromListRequest(getSubscriptionsResponse)) |
There was a problem hiding this comment.
List handler should only return the primaryIds I see topicArn & protocol properties in your translateFromListRequest model
| .topicArn(attributes.get(Definitions.topicArn)) | ||
| .endpoint(attributes.get(Definitions.endpoint)) | ||
| .protocol(attributes.get(Definitions.protocol)) | ||
| .filterPolicy(attributes.get(Definitions.filterPolicy) != null ? SnsSubscriptionUtils.convertToJson(attributes.get(Definitions.filterPolicy)) : null) | ||
| .redrivePolicy(attributes.get(Definitions.redrivePolicy) != null ? SnsSubscriptionUtils.convertToJson(attributes.get(Definitions.redrivePolicy)) : null) | ||
| .deliveryPolicy(attributes.get(Definitions.deliveryPolicy) != null ? SnsSubscriptionUtils.convertToJson(attributes.get(Definitions.deliveryPolicy)) : null) | ||
| .rawMessageDelivery(rawMessageDelivery) | ||
| .rawMessageDelivery(attributes.get(Definitions.rawMessageDelivery) != null ? Boolean.valueOf(attributes.get(Definitions.rawMessageDelivery)) : null) |
There was a problem hiding this comment.
will this always be null if it isn't entered? could it be empty? asking if it would be better to do a NotNullOrEmpty() check instead of only checking for null
| if (!StringUtils.equals( | ||
| prevRegion == null ? currentRequestRegion : prevRegion, | ||
| curRegion == null ? currentRequestRegion : curRegion)) { | ||
| throw new CfnNotUpdatableException(ResourceModel.TYPE_NAME, currentModel.getRegion()); |
There was a problem hiding this comment.
is this the same as throwing a Terminal Exception?
You can check by attempting it in native then attempt in Uluru and see how you should handle the error
| @@ -4,6 +4,7 @@ | |||
| import software.amazon.cloudformation.LambdaWrapper; | |||
| import software.amazon.awssdk.regions.Region; | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
| .translateToServiceRequest((resouceModel) -> Translator.translateToUpdateRequest(subscriptionAttribute, resouceModel, previousRawMessageDelivery, desiredRawMessageDelivery)) | ||
| .makeServiceCall(this::updateSubscription) | ||
| .stabilize(this::stabilizeSnsSubscription) | ||
| return proxy.initiate("AWS-SNS-Subscription::Update-"+subscriptionAttribute.name(), proxyClient, model, progress.getCallbackContext()) |
There was a problem hiding this comment.
| request.getClientRequestToken())); | ||
|
|
||
| return ProgressEvent.progress(request.getDesiredResourceState(), callbackContext) | ||
| .then(progress -> checkSubscriptionExistsAndSetSubscriptionArn(proxy, proxyClient, request, progress, callbackContext, true, logger)) |
There was a problem hiding this comment.
since as you said we are asking to use read permissions for the delete handler will this need a soft failure?
| .then(progress -> proxy.initiate("AWS-SNS-Subscription::Delete", proxyClient, resourceModel, callbackContext) | ||
| .translateToServiceRequest(Translator::translateToDeleteRequest) | ||
| .makeServiceCall((unsubscribeRequest, client) -> client.injectCredentialsAndInvokeV2(unsubscribeRequest, proxyClient.client()::unsubscribe)) | ||
| .handleError((awsRequest, exception, client, model, context) -> handleError(awsRequest, exception, client, model, context)) |
There was a problem hiding this comment.
| .handleError((awsRequest, exception, client, model, context) -> handleError(awsRequest, exception, client, model, context)) | ||
| .progress()) | ||
| .then(progress -> { | ||
| if (progress.getCallbackContext().isPropagationDelay()) { |
There was a problem hiding this comment.
can you point out in the native code where a propagation delay occurs for a delete?
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.
Modified
Issue #, if available:
CFN-47468
Description of changes:
Updated SNS Subscription handlers for resource migration.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.