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

fix(custom-resources): missing physical resource id for delete calls #5805

Merged
merged 2 commits into from
Jan 15, 2020
Merged

fix(custom-resources): missing physical resource id for delete calls #5805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ee0f14
fix(custom-resources): missing physical resource id for delete calls
jogold Jan 15, 2020
14abb3f
Merge branch 'master' into aws-custom-del-physical-id
jogold Jan 15, 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
2 changes: 1 addition & 1 deletion packages/@aws-cdk/custom-resources/lib/aws-custom-resource/runtime/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent

physicalResourceId = call.physicalResourceIdPath
? flatData[call.physicalResourceIdPath]
: call.physicalResourceId;
: call.physicalResourceId || (event as any).PhysicalResourceId;
}

await respond('SUCCESS', 'OK', physicalResourceId, data);
Expand Down
35 changes: 35 additions & 0 deletions ...s/@aws-cdk/custom-resources/test/aws-custom-resource/aws-custom-resource-provider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,41 @@ test('delete event', async () => {
expect(request.isDone()).toBeTruthy();
});

test('delete event with Delete call and no physical resource id in call', async () => {
const deleteParameterFake = sinon.fake.resolves({});

AWS.mock('SSM', 'deleteParameter', deleteParameterFake);

const event: AWSLambda.CloudFormationCustomResourceDeleteEvent = {
...eventCommon,
RequestType: 'Delete',
PhysicalResourceId: 'physicalResourceId',
ResourceProperties: {
ServiceToken: 'token',
Delete: {
service: 'SSM',
action: 'deleteParameter',
parameters: {
Name: 'my-param'
},
} as AwsSdkCall
}
};

const request = createRequest(body =>
body.Status === 'SUCCESS' &&
body.PhysicalResourceId === 'physicalResourceId'
);

await handler(event, {} as AWSLambda.Context);

sinon.assert.calledWith(deleteParameterFake, {
Name: 'my-param'
});

expect(request.isDone()).toBeTruthy();
});

test('catch errors', async () => {
const error: NodeJS.ErrnoException = new Error();
error.code = 'NoSuchBucket';
Expand Down
18 changes: 9 additions & 9 deletions ...aws-cdk/custom-resources/test/aws-custom-resource/integ.aws-custom-resource.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"Properties": {
"Code": {
"S3Bucket": {
"Ref": "AssetParameters1e957dd8cdd272089cd3aab5aa7cf195406aa84f4234b0cdab8553fe0268a3c2S3Bucket8CF060C1"
"Ref": "AssetParametersc6841f16fc6689f1b3a9ae6e91f18d4e6cc06c23c2b1e7b7155625c258cb8999S3Bucket38F49C79"
},
"S3Key": {
"Fn::Join": [
Expand All @@ -122,7 +122,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters1e957dd8cdd272089cd3aab5aa7cf195406aa84f4234b0cdab8553fe0268a3c2S3VersionKey2F6385AE"
"Ref": "AssetParametersc6841f16fc6689f1b3a9ae6e91f18d4e6cc06c23c2b1e7b7155625c258cb8999S3VersionKey9906BC0C"
}
]
}
Expand All @@ -135,7 +135,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParameters1e957dd8cdd272089cd3aab5aa7cf195406aa84f4234b0cdab8553fe0268a3c2S3VersionKey2F6385AE"
"Ref": "AssetParametersc6841f16fc6689f1b3a9ae6e91f18d4e6cc06c23c2b1e7b7155625c258cb8999S3VersionKey9906BC0C"
}
]
}
Expand Down Expand Up @@ -230,17 +230,17 @@
}
},
"Parameters": {
"AssetParameters1e957dd8cdd272089cd3aab5aa7cf195406aa84f4234b0cdab8553fe0268a3c2S3Bucket8CF060C1": {
"AssetParametersc6841f16fc6689f1b3a9ae6e91f18d4e6cc06c23c2b1e7b7155625c258cb8999S3Bucket38F49C79": {
"Type": "String",
"Description": "S3 bucket for asset \"1e957dd8cdd272089cd3aab5aa7cf195406aa84f4234b0cdab8553fe0268a3c2\""
"Description": "S3 bucket for asset \"c6841f16fc6689f1b3a9ae6e91f18d4e6cc06c23c2b1e7b7155625c258cb8999\""
},
"AssetParameters1e957dd8cdd272089cd3aab5aa7cf195406aa84f4234b0cdab8553fe0268a3c2S3VersionKey2F6385AE": {
"AssetParametersc6841f16fc6689f1b3a9ae6e91f18d4e6cc06c23c2b1e7b7155625c258cb8999S3VersionKey9906BC0C": {
"Type": "String",
"Description": "S3 key for asset version \"1e957dd8cdd272089cd3aab5aa7cf195406aa84f4234b0cdab8553fe0268a3c2\""
"Description": "S3 key for asset version \"c6841f16fc6689f1b3a9ae6e91f18d4e6cc06c23c2b1e7b7155625c258cb8999\""
},
"AssetParameters1e957dd8cdd272089cd3aab5aa7cf195406aa84f4234b0cdab8553fe0268a3c2ArtifactHash2B344D8E": {
"AssetParametersc6841f16fc6689f1b3a9ae6e91f18d4e6cc06c23c2b1e7b7155625c258cb8999ArtifactHash5595423D": {
"Type": "String",
"Description": "Artifact hash for asset \"1e957dd8cdd272089cd3aab5aa7cf195406aa84f4234b0cdab8553fe0268a3c2\""
"Description": "Artifact hash for asset \"c6841f16fc6689f1b3a9ae6e91f18d4e6cc06c23c2b1e7b7155625c258cb8999\""
}
},
"Outputs": {
Expand Down