Skip to content

adding snapshot support #316

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

Merged
ammokhov merged 4 commits into from
Oct 13, 2020
Merged

adding snapshot support #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06ff3e2
adding snapshot support
ammokhov Sep 11, 2020
f0441e2
Merge remote-tracking branch 'upstream/master' into snapshot-requested
ammokhov Oct 1, 2020
7770647
Merge remote-tracking branch 'upstream/master' into snapshot-requested
ammokhov Oct 13, 2020
80fe353
removed snapshot assignment from codegen
ammokhov Oct 13, 2020
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
1 change: 1 addition & 0 deletions src/main/java/software/amazon/cloudformation/AbstractWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ public void processRequest(final InputStream inputStream, final OutputStream out
if (resourceHandlerRequest != null) {
resourceHandlerRequest.setPreviousResourceTags(getPreviousResourceTags(request));
resourceHandlerRequest.setStackId(getStackId(request));
resourceHandlerRequest.setSnapshotRequested(request.getSnapshotRequested());
}

this.metricsPublisherProxy.publishInvocationMetric(Instant.now(), request.getAction());
Expand Down
1 change: 1 addition & 0 deletions src/main/java/software/amazon/cloudformation/proxy/HandlerRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ public class HandlerRequest<ResourceT, CallbackT> {
private RequestData<ResourceT> requestData;
Copy link
Contributor

@johnttompkins johnttompkins Oct 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: should this be in request data instead? seems relatedto the actual request and not cloudformation metadata related info

Copy link
Contributor

@aygold92 aygold92 Oct 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, but TBH I don't really understand the distinction here anyways. Like, why are providerCredentials, providerLogGroupName, and logicalResourceId part of requestData while callbackContext, accountId, bearerToken, and action are not?

private String stackId;
private CallbackT callbackContext;
private Boolean snapshotRequested;
private RequestContext<CallbackT> requestContext;
}
1 change: 1 addition & 0 deletions src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public class ResourceHandlerRequest<T> {
private String awsPartition;
private String logicalResourceIdentifier;
private String nextToken;
private Boolean snapshotRequested;
private String region;
private String stackId;
}
2 changes: 1 addition & 1 deletion src/test/java/software/amazon/cloudformation/proxy/handler/ServiceHandlerWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected ResourceHandlerRequest<Model> transform(final HandlerRequest<Model, St
return ResourceHandlerRequest.<Model>builder().desiredResourceState(desiredResourceState)
.previousResourceState(previousResourceState).desiredResourceTags(getDesiredResourceTags(request))
.systemTags(systemTags).logicalResourceIdentifier(request.getRequestData().getLogicalResourceId())
.nextToken(request.getNextToken()).build();
.nextToken(request.getNextToken()).snapshotRequested(request.getSnapshotRequested()).build();
}

@Override
Expand Down