Skip to content

Retains writeOnlyProperties through reinvocations #284

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
rjlohan merged 1 commit into from
Jul 7, 2020
Merged

Retains writeOnlyProperties through reinvocations #284

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/main/java/software/amazon/cloudformation/LambdaWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ public void handleRequest(final InputStream inputStream, final OutputStream outp
this.lambdaLogger = context.getLogger();
ProgressEvent<ResourceT, CallbackT> handlerResponse = null;
HandlerRequest<ResourceT, CallbackT> request = null;
String bearerToken = null;
scrubFiles();
try {
if (inputStream == null) {
Expand Down Expand Up @@ -374,7 +373,13 @@ private void writeResponse(final OutputStream outputStream, final ProgressEvent<
ResourceT model = response.getResourceModel();
if (model != null) {
JSONObject modelObject = new JSONObject(this.serializer.serialize(model));
ResourceTypeSchema.load(provideResourceSchemaJSONObject()).removeWriteOnlyProperties(modelObject);

// strip write only properties on final results, we will need the intact model
// while provisioning
if (response.getStatus() != OperationStatus.IN_PROGRESS) {
ResourceTypeSchema.load(provideResourceSchemaJSONObject()).removeWriteOnlyProperties(modelObject);
}

ResourceT sanitizedModel = this.serializer.deserializeStrict(modelObject.toString(), getModelTypeReference());

response.setResourceModel(sanitizedModel);
Expand Down
1 change: 0 additions & 1 deletion src/test/java/software/amazon/cloudformation/LambdaWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ public void invokeHandler_CompleteSynchronously_returnsSuccess(final String requ

@Test
public void invokeHandler_DependenciesInitialised_CompleteSynchronously_returnsSuccess() throws IOException {
final Action action = Action.CREATE;
final WrapperOverride wrapper = new WrapperOverride();
final TestModel model = new TestModel();

Expand Down