fix: allow pinpoint category removal after manual deletion (#9691)

aws-amplify · Feb 3, 2022 · dc218d4 · dc218d4
1 parent 5b24455
commit dc218d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/packages/amplify-category-notifications/lib/channel-Email.js b/packages/amplify-category-notifications/lib/channel-Email.js
@@ -77,7 +77,12 @@ async function enable(context, successMessage) {
   spinner.start('Updating Email Channel.');
   return new Promise((resolve, reject) => {
     context.exeInfo.pinpointClient.updateEmailChannel(params, (err, data) => {
-      if (err) {
+      if (err && err.code === 'NotFoundException') {
+        spinner.succeed(`Project with ID '${params.ApplicationId}' was already deleted from the cloud.`);
+        resolve({
+          id: params.ApplicationId,
+        });
+      } else if (err) {
         spinner.fail('update channel error');
         reject(err);
       } else {
@@ -112,7 +117,12 @@ async function disable(context) {
   spinner.start('Updating Email Channel.');
   return new Promise((resolve, reject) => {
     context.exeInfo.pinpointClient.updateEmailChannel(params, (err, data) => {
-      if (err) {
+      if (err && err.code === 'NotFoundException') {
+        spinner.succeed(`Project with ID '${params.ApplicationId}' was already deleted from the cloud.`);
+        resolve({
+          id: params.ApplicationId,
+        });
+      } else if (err) {
         spinner.fail('update channel error');
         reject(err);
       } else {

diff --git a/packages/amplify-category-notifications/lib/pinpoint-helper.js b/packages/amplify-category-notifications/lib/pinpoint-helper.js
@@ -220,7 +220,12 @@ async function deleteApp(context, pinpointAppId) {
   spinner.start('Deleting Pinpoint app.');
   return new Promise((resolve, reject) => {
     pinpointClient.deleteApp(params, (err, data) => {
-      if (err) {
+      if (err && err.code === 'NotFoundException') {
+        spinner.succeed(`Project with ID '${params.ApplicationId}' was already deleted from the cloud.`);
+        resolve({
+          Id: params.ApplicationId,
+        });
+      } else if (err) {
         spinner.fail('Pinpoint project deletion error');
         reject(err);
       } else {