From bdb549788ed104a8e9237c390c302577eadc42dc Mon Sep 17 00:00:00 2001
From: Lars Fronius <lars@fronius.me>
Date: Wed, 5 Oct 2022 11:51:03 +0200
Subject: [PATCH] Updates ignore error code to reflect actual error code and
 gracefully handle the case when a log group policy is being deleted but
 already does not exist, because the cluster was shut down already.

Observed behaviour:
ResourceNotFoundException: Policy with name [ESLogPolicyc83ee46895a093e947614fc60b86c1a65d36a02321] does not exist.
    at Request.extractError (/tmp/node_modules/aws-sdk/lib/protocol/json.js:52:27)
    at Request.callListeners (/tmp/node_modules/aws-sdk/lib/sequential_executor.js:106:20)
    at Request.emit (/tmp/node_modules/aws-sdk/lib/sequential_executor.js:78:10)
    at Request.emit (/tmp/node_modules/aws-sdk/lib/request.js:686:14)
    at Request.transition (/tmp/node_modules/aws-sdk/lib/request.js:22:10)
    at AcceptorStateMachine.runTo (/tmp/node_modules/aws-sdk/lib/state_machine.js:14:12)
    at /tmp/node_modules/aws-sdk/lib/state_machine.js:26:10
    at Request.<anonymous> (/tmp/node_modules/aws-sdk/lib/request.js:38:9)
    at Request.<anonymous> (/tmp/node_modules/aws-sdk/lib/request.js:688:12)
    at Request.callListeners (/tmp/node_modules/aws-sdk/lib/sequential_executor.js:116:18) {
  code: 'ResourceNotFoundException',
  time: 2022-10-04T16:28:57.966Z,
  requestId: '719a967b-bfea-435a-9aeb-ca8b67888e47',
  statusCode: 400,
  retryable: false,
  retryDelay: 38.982884472906434
}

Responding
{
    "Status": "FAILED",
    "Reason": "Policy with name [ESLogPolicyc83ee46895a093e947614fc60b86c1a65d36a02321] does not exist.",
    "PhysicalResourceId": "2022/10/04/[$LATEST]b282f3f11b1142c0afe77f0d62523288",
    "StackId": "arn:aws:cloudformation:eu-central-1:165893140444:stack/ReviewShippingEngineStage-review-feature-dcp-481-test-ShippingEngineSearchStack/06651720-40b5-11ed-887d-0a422088f326",
    "RequestId": "90891990-91c1-43bf-82e3-0d98832fc82c",
    "LogicalResourceId": "OpenSearchDomainESLogGroupPolicyc83ee46895a093e947614fc60b86c1a65d36a02321E1EA3F89",
    "NoEcho": false,
    "Data": {}
}
---
 .../@aws-cdk/aws-elasticsearch/lib/log-group-resource-policy.ts | 2 +-
 .../aws-opensearchservice/lib/log-group-resource-policy.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@aws-cdk/aws-elasticsearch/lib/log-group-resource-policy.ts b/packages/@aws-cdk/aws-elasticsearch/lib/log-group-resource-policy.ts
index 0a88658e1cf42..0fd9c98464335 100644
--- a/packages/@aws-cdk/aws-elasticsearch/lib/log-group-resource-policy.ts
+++ b/packages/@aws-cdk/aws-elasticsearch/lib/log-group-resource-policy.ts
@@ -42,7 +42,7 @@ export class LogGroupResourcePolicy extends cr.AwsCustomResource {
         parameters: {
           policyName: props.policyName,
         },
-        ignoreErrorCodesMatching: '400',
+        ignoreErrorCodesMatching: 'ResourceNotFoundException',
       },
       policy: cr.AwsCustomResourcePolicy.fromSdkCalls({ resources: ['*'] }),
     });
diff --git a/packages/@aws-cdk/aws-opensearchservice/lib/log-group-resource-policy.ts b/packages/@aws-cdk/aws-opensearchservice/lib/log-group-resource-policy.ts
index 0a88658e1cf42..0fd9c98464335 100644
--- a/packages/@aws-cdk/aws-opensearchservice/lib/log-group-resource-policy.ts
+++ b/packages/@aws-cdk/aws-opensearchservice/lib/log-group-resource-policy.ts
@@ -42,7 +42,7 @@ export class LogGroupResourcePolicy extends cr.AwsCustomResource {
         parameters: {
           policyName: props.policyName,
         },
-        ignoreErrorCodesMatching: '400',
+        ignoreErrorCodesMatching: 'ResourceNotFoundException',
       },
       policy: cr.AwsCustomResourcePolicy.fromSdkCalls({ resources: ['*'] }),
     });