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(opensearch): log group policies ignore incorrect error code on delete #22364

Merged
merged 5 commits into from Oct 31, 2022
Merged

fix(opensearch): log group policies ignore incorrect error code on delete #22364

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d15219
Updates ignore error code to reflect actual error code and gracefully
LarsFronius Oct 5, 2022
2d0d85c
updates unit tests
LarsFronius Oct 5, 2022
f0d64f9
fix
LarsFronius Oct 5, 2022
cd1b4d8
Merge branch 'main' into opensearch-log-group-resource-policy-delete
mergify[bot] Oct 31, 2022
b9326eb
Merge branch 'main' into opensearch-log-group-resource-policy-delete
mergify[bot] Oct 31, 2022
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
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-elasticsearch/lib/log-group-resource-policy.ts
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@ export class LogGroupResourcePolicy extends cr.AwsCustomResource {
parameters: {
policyName: props.policyName,
},
ignoreErrorCodesMatching: '400',
ignoreErrorCodesMatching: 'ResourceNotFoundException',
},
policy: cr.AwsCustomResourcePolicy.fromSdkCalls({ resources: ['*'] }),
});
Expand Down
2 changes: 1 addition & 1 deletion ...search.custom-kms-key.integ.snapshot/cdk-integ-elasticsearch-custom-kms-key.template.json
View file
Open in desktop
Expand Up @@ -104,7 +104,7 @@
]
]
},
"Delete": "{\"service\":\"CloudWatchLogs\",\"action\":\"deleteResourcePolicy\",\"parameters\":{\"policyName\":\"ESLogPolicyc82ca7bfe2f2589b859ebab89e88da2efd284adfad\"},\"ignoreErrorCodesMatching\":\"400\"}",
"Delete": "{\"service\":\"CloudWatchLogs\",\"action\":\"deleteResourcePolicy\",\"parameters\":{\"policyName\":\"ESLogPolicyc82ca7bfe2f2589b859ebab89e88da2efd284adfad\"},\"ignoreErrorCodesMatching\":\"ResourceNotFoundException\"}",
"InstallLatestAwsSdk": true
},
"DependsOn": [
Expand Down
4 changes: 2 additions & 2 deletions ...aws-elasticsearch/test/elasticsearch.integ.snapshot/cdk-integ-elasticsearch.template.json
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@
]
]
},
"Delete": "{\"service\":\"CloudWatchLogs\",\"action\":\"deleteResourcePolicy\",\"parameters\":{\"policyName\":\"ESLogPolicyc8858d5dba055f677469d76cb6ad538fd732ba69a6\"},\"ignoreErrorCodesMatching\":\"400\"}",
"Delete": "{\"service\":\"CloudWatchLogs\",\"action\":\"deleteResourcePolicy\",\"parameters\":{\"policyName\":\"ESLogPolicyc8858d5dba055f677469d76cb6ad538fd732ba69a6\"},\"ignoreErrorCodesMatching\":\"ResourceNotFoundException\"}",
"InstallLatestAwsSdk": true
},
"DependsOn": [
Expand Down Expand Up @@ -377,7 +377,7 @@
]
]
},
"Delete": "{\"service\":\"CloudWatchLogs\",\"action\":\"deleteResourcePolicy\",\"parameters\":{\"policyName\":\"ESLogPolicyc8405238e455eeabd840cf6933e1814efc51d2de71\"},\"ignoreErrorCodesMatching\":\"400\"}",
"Delete": "{\"service\":\"CloudWatchLogs\",\"action\":\"deleteResourcePolicy\",\"parameters\":{\"policyName\":\"ESLogPolicyc8405238e455eeabd840cf6933e1814efc51d2de71\"},\"ignoreErrorCodesMatching\":\"ResourceNotFoundException\"}",
"InstallLatestAwsSdk": true
},
"DependsOn": [
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-elasticsearch/test/log-group-resource-policy.test.ts
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@ test('minimal example renders correctly', () => {
parameters: {
policyName: 'TestPolicy',
},
ignoreErrorCodesMatching: '400',
ignoreErrorCodesMatching: 'ResourceNotFoundException',
}),
});
});
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-opensearchservice/lib/log-group-resource-policy.ts
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@ export class LogGroupResourcePolicy extends cr.AwsCustomResource {
parameters: {
policyName: props.policyName,
},
ignoreErrorCodesMatching: '400',
ignoreErrorCodesMatching: 'ResourceNotFoundException',
},
policy: cr.AwsCustomResourcePolicy.fromSdkCalls({ resources: ['*'] }),
});
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-opensearchservice/test/log-group-resource-policy.test.ts
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@ test('minimal example renders correctly', () => {
parameters: {
policyName: 'TestPolicy',
},
ignoreErrorCodesMatching: '400',
ignoreErrorCodesMatching: 'ResourceNotFoundException',
}),
});
});
4 changes: 2 additions & 2 deletions ...k/aws-opensearchservice/test/opensearch.integ.snapshot/cdk-integ-opensearch.template.json
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@
]
]
},
"Delete": "{\"service\":\"CloudWatchLogs\",\"action\":\"deleteResourcePolicy\",\"parameters\":{\"policyName\":\"ESLogPolicyc881416c4fcb1ec2b4bf7f47a5cde4097f01ec50fc\"},\"ignoreErrorCodesMatching\":\"400\"}",
"Delete": "{\"service\":\"CloudWatchLogs\",\"action\":\"deleteResourcePolicy\",\"parameters\":{\"policyName\":\"ESLogPolicyc881416c4fcb1ec2b4bf7f47a5cde4097f01ec50fc\"},\"ignoreErrorCodesMatching\":\"ResourceNotFoundException\"}",
"InstallLatestAwsSdk": true
},
"DependsOn": [
Expand Down Expand Up @@ -374,7 +374,7 @@
]
]
},
"Delete": "{\"service\":\"CloudWatchLogs\",\"action\":\"deleteResourcePolicy\",\"parameters\":{\"policyName\":\"ESLogPolicyc80140a7754e9c0dd4e81167ef19e15da5b55dca02\"},\"ignoreErrorCodesMatching\":\"400\"}",
"Delete": "{\"service\":\"CloudWatchLogs\",\"action\":\"deleteResourcePolicy\",\"parameters\":{\"policyName\":\"ESLogPolicyc80140a7754e9c0dd4e81167ef19e15da5b55dca02\"},\"ignoreErrorCodesMatching\":\"ResourceNotFoundException\"}",
"InstallLatestAwsSdk": true
},
"DependsOn": [
Expand Down