Adds and updates mapping for some validation errors (#2565)

* added and updated validation error mappings

* changeset

* appeasing lint

---------

Co-authored-by: Shadowcat567 <[email protected]>

Author: ShadowCat567

.changeset/great-swans-collect.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-deployer': patch
+---
+
+added/updated ValidationError mappings

packages/backend-deployer/src/cdk_error_mapper.test.ts

@@ -400,12 +400,30 @@ const testErrorMappings = [
     expectedDownstreamErrorMessage: `error Command cdk not found. Did you mean cdl?`,
   },
   {
-    errorMessage: `[31m  amplify-some-stack failed: ValidationError: Stack:stack-arn is in UPDATE_ROLLBACK_FAILED state and can not be updated.`,
+    errorMessage: `[31mamplify-some-stack [34m failed: ValidationError: Stack:<stack-arn> is in UPDATE_ROLLBACK_FAILED state and can not be updated.`,
     expectedTopLevelErrorMessage:
       'The CloudFormation deployment failed due to amplify-some-stack being in UPDATE_ROLLBACK_FAILED state.',
     errorName: 'CloudFormationDeploymentError',
     expectedDownstreamErrorMessage: undefined,
   },
+  {
+    // eslint-disable-next-line spellcheck/spell-checker
+    errorMessage: `[31mamplifysomestack [34m failed: ValidationError: Stack:<stack-arn> is in UPDATE_ROLLBACK_FAILED state and can not be updated.`,
+    expectedTopLevelErrorMessage:
+      // eslint-disable-next-line spellcheck/spell-checker
+      'The CloudFormation deployment failed due to amplifysomestack being in UPDATE_ROLLBACK_FAILED state.',
+    errorName: 'CloudFormationDeploymentError',
+    expectedDownstreamErrorMessage: undefined,
+  },
+  {
+    // eslint-disable-next-line spellcheck/spell-checker
+    errorMessage: `[1mamplifysomebranch [22m failed: ValidationError: Stack [amplifysomebranch] cannot be deleted while TerminationProtection is enabled`,
+    expectedTopLevelErrorMessage:
+      // eslint-disable-next-line spellcheck/spell-checker
+      'amplifysomebranch cannot be deleted because it has termination deployment enabled.',
+    errorName: 'CloudFormationDeletionError',
+    expectedDownstreamErrorMessage: undefined,
+  },
   {
     errorMessage: `ENOENT: no such file or directory, open '.amplify/artifacts/cdk.out/manifest.json'`,
     expectedTopLevelErrorMessage:

packages/backend-deployer/src/cdk_error_mapper.ts

@@ -560,14 +560,24 @@ If your circular dependency issue is not resolved with this workaround, please c
     },
     {
       errorRegex:
-        /(?<stackName>amplify-[a-z0-9-]+)(.*) failed: ValidationError: Stack:(.*) is in (?<state>.*) state and can not be updated/,
+        /(?<stackName>amplify[a-z0-9-]+)(.*) failed: ValidationError: Stack:(.*) is in (?<state>.*) state and can not be updated/,
       humanReadableErrorMessage:
         'The CloudFormation deployment failed due to {stackName} being in {state} state.',
       resolutionMessage:
         'Find more information in the CloudFormation AWS Console for this stack.',
       errorName: 'CloudFormationDeploymentError',
       classification: 'ERROR',
     },
+    {
+      errorRegex:
+        /failed: ValidationError: Stack \[(?<stackName>amplify[a-z0-9-]+)(.*)\] cannot be deleted while TerminationProtection is enabled/,
+      humanReadableErrorMessage:
+        '{stackName} cannot be deleted because it has termination deployment enabled.',
+      resolutionMessage:
+        'If you are sure you want to delete {stackName}, you will need to disable TerminationProtection.',
+      errorName: 'CloudFormationDeletionError',
+      classification: 'ERROR',
+    },
     {
       // Note that the order matters, this should be the last as it captures generic CFN error
       errorRegex: new RegExp(