feat(cli): usage measurement (#3641)

.circleci/config.base.yml

@@ -2,7 +2,6 @@ version: 2.1
 machine:
   environment:
     PATH: '${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin'
-
 defaults: &defaults
   working_directory: ~/repo
   docker:

packages/amplify-appsync-simulator/src/index.ts

@@ -52,6 +52,7 @@ export class AmplifyAppSyncSimulator {
     } catch (e) {
       console.log('Could not start AppSync mock endpoint');
       console.log(e);
+      throw e;
     }
   }
 

packages/amplify-category-analytics/commands/analytics/add.js

@@ -30,13 +30,14 @@ module.exports = {
         print.success('Some next steps:');
         print.info('"amplify push" builds all of your local backend resources and provisions them in the cloud');
         print.info(
-          '"amplify publish" builds all your local backend and front-end resources (if you have hosting category added) and provisions them in the cloud'
+          '"amplify publish" builds all your local backend and front-end resources (if you have hosting category added) and provisions them in the cloud',
         );
         print.info('');
       })
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('There was an error adding the analytics resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-analytics/commands/analytics/push.js

@@ -10,6 +10,7 @@ module.exports = {
     return amplify.pushResources(context, category, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('An error occurred when pushing the analytics resource');
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-analytics/commands/analytics/remove.js

@@ -10,6 +10,7 @@ module.exports = {
     return amplify.removeResource(context, category, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('An error occurred when removing the analytics resource');
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-analytics/commands/analytics/update.js

@@ -38,6 +38,7 @@ module.exports = {
       .catch(err => {
         context.print.info(err.stack);
         context.print.error(`There was an error updating the ${category} resource`);
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-api/commands/api/add-graphql-datasource.js

@@ -86,7 +86,7 @@ module.exports = {
           answers.secretStoreArn,
           answers.dbClusterArn,
           answers.databaseName,
-          AWS
+          AWS,
         );
 
         /**
@@ -148,13 +148,14 @@ module.exports = {
         print.success('Some next steps:');
         print.info('"amplify push" will build all your local backend resources and provision it in the cloud');
         print.info(
-          '"amplify publish" will build all your local backend and frontend resources (if you have hosting category added) and provision it in the cloud'
+          '"amplify publish" will build all your local backend and frontend resources (if you have hosting category added) and provision it in the cloud',
         );
         print.info('');
       })
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('There was an error adding the datasource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-api/commands/api/add.js

@@ -30,13 +30,14 @@ module.exports = {
         print.success('Some next steps:');
         print.info('"amplify push" will build all your local backend resources and provision it in the cloud');
         print.info(
-          '"amplify publish" will build all your local backend and frontend resources (if you have hosting category added) and provision it in the cloud'
+          '"amplify publish" will build all your local backend and frontend resources (if you have hosting category added) and provision it in the cloud',
         );
         print.info('');
       })
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('There was an error adding the API resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-api/commands/api/console.js

@@ -20,6 +20,7 @@ module.exports = {
       .catch(err => {
         context.print.error('Error opening console.');
         context.print.info(err.message);
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-api/commands/api/gql-compile.js

@@ -13,6 +13,7 @@ module.exports = {
       });
     } catch (err) {
       context.print.error(err.toString());
+      context.telemetry.emitError(err);
     }
   },
 };

packages/amplify-category-api/commands/api/push.js

@@ -10,6 +10,7 @@ module.exports = {
     return amplify.pushResources(context, category, resourceName).catch(err => {
       context.print.error('There was an error pushing the API resource');
       context.print.error(err.toString());
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-api/commands/api/remove.js

@@ -23,6 +23,7 @@ module.exports = {
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('There was an error removing the api resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-api/commands/api/update.js

@@ -22,6 +22,7 @@ module.exports = {
       .catch(err => {
         context.print.error(err.message);
         console.log(err.stack);
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-auth/commands/auth/enable.js

@@ -83,6 +83,7 @@ module.exports = {
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('There was an error adding the auth resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-auth/commands/auth/push.js

@@ -16,6 +16,7 @@ module.exports = {
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('There was an error pushing the auth resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-auth/commands/auth/remove.js

@@ -21,6 +21,7 @@ module.exports = {
     return amplify.removeResource(context, category, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('There was an error removing the auth resource');
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-auth/commands/auth/update.js

@@ -103,6 +103,7 @@ module.exports = {
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('There was an error adding the auth resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-auth/index.js

@@ -60,6 +60,7 @@ async function add(context) {
     .catch(err => {
       context.print.info(err.stack);
       context.print.error('There was an error adding the auth resource');
+      context.telemetry.emitError(err);
     });
 }
 
@@ -261,6 +262,7 @@ async function console(context) {
     .catch(err => {
       context.print.info(err.stack);
       context.print.error('There was an error trying to open the auth web console.');
+      throw err;
     });
 }
 

packages/amplify-category-auth/provider-utils/awscloudformation/utils/trigger-file-uploader.js

@@ -66,6 +66,7 @@ async function uploadFile(s3Client, hostingBucketName, filePath, file) {
     .promise()
     .catch(e => {
       console.log('e', e);
+      throw e;
     });
 
   return data;

packages/amplify-category-auth/tests/commands/enable.test.js

@@ -19,6 +19,9 @@ describe('auth enable: ', () => {
       info: jest.fn(),
       error: jest.fn(),
     },
+    telemetry: {
+      emitError: jest.fn(),
+    },
   };
 
   it('enable run method should exist', () => {

packages/amplify-category-auth/tests/commands/update.test.js

@@ -34,6 +34,9 @@ describe('auth update: ', () => {
       info: jest.fn(),
       error: jest.fn(),
     },
+    telemetry: {
+      emitError: jest.fn(),
+    },
   };
   const dependencies = ['analytics', 'api', 'function', 'storage'];
 

packages/amplify-category-function/src/commands/function/add.ts

@@ -42,6 +42,7 @@ module.exports = {
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('There was an error adding the function resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-function/src/commands/function/build.ts

@@ -11,6 +11,7 @@ module.exports = {
     return amplify.buildResources(context, categoryName, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('There was an error building the function resources');
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-function/src/commands/function/push.ts

@@ -11,6 +11,7 @@ module.exports = {
     return amplify.pushResources(context, categoryName, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('An error occurred when pushing the function resource');
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-function/src/commands/function/remove.ts

@@ -11,6 +11,7 @@ module.exports = {
     return amplify.removeResource(context, categoryName, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('An error occurred when removing the function resource');
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-function/src/commands/function/update.ts

@@ -22,6 +22,7 @@ module.exports = {
       .then(() => context.print.success('Successfully updated resource'))
       .catch(err => {
         context.print.error(err.stack);
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-function/src/provider-utils/awscloudformation/service-walkthroughs/execPermissionsWalkthrough.ts

@@ -185,6 +185,7 @@ export async function askExecRolePermissionsQuestions(context, allDefaultValues,
     } catch (e) {
       context.print.warning(`Policies cannot be added for ${category}`);
       context.print.info(e.stack);
+      context.telemetry.emitError(e);
     }
   }
 

packages/amplify-category-hosting/commands/hosting/push.js

@@ -10,6 +10,7 @@ module.exports = {
     return amplify.pushResources(context, category, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('There was an error pushing the hosting resource');
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-hosting/commands/hosting/remove.js

@@ -21,6 +21,7 @@ module.exports = {
       } catch (err) {
         context.print.info(err.stack);
         context.print.error('There was an error removing the hosting resource');
+        context.telemetry.emitError(err);
       }
     } else {
       process.exit(1);

packages/amplify-category-interactions/commands/interactions/add.js

@@ -28,6 +28,7 @@ module.exports = {
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('There was an error adding the interactions resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-interactions/commands/interactions/push.js

@@ -10,6 +10,7 @@ module.exports = {
     return amplify.pushResources(context, category, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('There was an error pushing the interactions resource');
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-interactions/commands/interactions/remove.js

@@ -10,6 +10,7 @@ module.exports = {
     return amplify.removeResource(context, category, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('There was an error removing the interactions resource');
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-interactions/commands/interactions/update.js

@@ -22,6 +22,7 @@ module.exports = {
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('There was an error updating the interactions resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-predictions/commands/predictions/add.js

@@ -27,12 +27,13 @@ module.exports = {
         print.success('Some next steps:');
         print.info('"amplify push" builds all of your local backend resources and provisions them in the cloud');
         print.info(
-          '"amplify publish" builds all of your local backend and front-end resources (if you added hosting category) and provisions them in the cloud'
+          '"amplify publish" builds all of your local backend and front-end resources (if you added hosting category) and provisions them in the cloud',
         );
         print.info('');
       })
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('An error occurred when adding the predictions resource');
+        context.telemetry.emitError(err);
       }),
 };

packages/amplify-category-predictions/commands/predictions/remove.js

@@ -70,6 +70,7 @@ module.exports = {
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('An error occurred when removing the predictions resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-predictions/commands/predictions/update.js

@@ -22,5 +22,6 @@ module.exports = {
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('An error occurred when updating predictions resource!');
+        context.telemetry.emitError(err);
       }),
 };

packages/amplify-category-predictions/index.js

@@ -51,6 +51,7 @@ async function console(context) {
     .catch(err => {
       context.print.error('Error opening console.');
       context.print.info(err.message);
+      context.telemetry.emitError(err);
     });
 }
 

packages/amplify-category-storage/commands/storage/add.js

@@ -29,13 +29,14 @@ module.exports = {
         print.success('Some next steps:');
         print.info('"amplify push" builds all of your local backend resources and provisions them in the cloud');
         print.info(
-          '"amplify publish" builds all of your local backend and front-end resources (if you added hosting category) and provisions them in the cloud'
+          '"amplify publish" builds all of your local backend and front-end resources (if you added hosting category) and provisions them in the cloud',
         );
         print.info('');
       })
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('An error occurred when adding the storage resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-storage/commands/storage/push.js

@@ -10,6 +10,7 @@ module.exports = {
     return amplify.pushResources(context, category, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('An error occurred when pushing the storage resource');
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-storage/commands/storage/remove.js

@@ -10,6 +10,7 @@ module.exports = {
     return amplify.removeResource(context, category, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('An error occurred when removing the storage resource');
+      context.telemetry.emitError(err);
     });
   },
 };

packages/amplify-category-storage/commands/storage/update.js

@@ -22,6 +22,7 @@ module.exports = {
       .catch(err => {
         context.print.info(err.stack);
         context.print.error('An error occurred when updating the storage resource');
+        context.telemetry.emitError(err);
       });
   },
 };

packages/amplify-category-xr/commands/xr/push.js

@@ -9,6 +9,7 @@ module.exports = {
     return context.amplify.pushResources(context, category, resourceName).catch(err => {
       context.print.info(err.stack);
       context.print.error('There was an error pushing the XR resource');
+      context.telemetry.emitError(err);
     });
   },
 };