Merge remote-tracking branch 'origin/amplify-cli' into temp

Shankar Raju · Shankar Raju · commit 55a56676529e · 2018-08-17T15:27:26.000-07:00
diff --git a/amplifycli_react_tutorial.md b/amplifycli_react_tutorial.md
@@ -36,11 +36,12 @@ Without making any changes to your React application, add web hosting as follows
 amplify add hosting
 ```
 
+You would be prompted next to select the environment setup. Select **DEV (S3 only with HTTP)** for quick prototyping and testing, and once production ready you could run the `amplify update hosting` command to publish your app to Amazon Cloudfront (a CDN service).  
 When you're prompted for information, such as the bucket name or application files, you can use the default values by pressing **Enter**.
 
 **Note** You can use an order alias to add or remove category features. You can also run `amplify hosting add`.
 
-Run `amplify status` to see that status (not deployed). Next, build and deploy your site by running `amplify publish`. After it's complete, your application is available in an S3 hosting bucket for testing. It's also fronted with an Amazon CloudFront distribution.
+Run `amplify status` to see that status (not deployed). Next, build and deploy your site by running `amplify publish` or `amplify publish -invalidate-cache` - for cache invalidation in the distribution network (if Cloudfront is added via the hosting category). After it's complete, your application is available in an S3 hosting bucket for testing. It's also fronted with an Amazon CloudFront distribution. (if it is added via the hosting category in the prior bucket)
 
 # Add User Registration and Sign In
 
@@ -70,7 +71,7 @@ You can now use `amplify publish` to build and publish your app again. This time
 
 # Add Analytics and Storage
 
-Next, we'll add some features, like tracking user behavior analytics and uploading/downloading images in the cloud. Start by running `amplify add analytics` in your project. You can enable analytics for authenticated users only, or for users that aren't authenticated. You've already added authentication to your project so you can choose `No` and then `Yes` to overwrite when you're prompted. Or, you an also try a new project without authentication configured to test this feature.
+Next, we'll add some features, like tracking user behavior analytics and uploading/downloading images in the cloud. Start by running `amplify add analytics` in your project. You can enable analytics for authenticated users only, or for users that aren't authenticated. You've already added authentication to your project so you can choose `No`. Or, you an also try a new project without authentication configured to test this feature.
 
 Run `amplify add storage` and then select the Amazon S3 provider. When complete, run `amplify push` to create the cloud resources.
 
diff --git a/packages/amplify-category-hosting/index.js b/packages/amplify-category-hosting/index.js
@@ -25,9 +25,13 @@ async function add(context) {
     } else if (disabledServices.length === 1) {
       return categoryManager.runServiceAction(context, disabledServices[0], 'enable');
     }
-    throw new Error('Hosting is already fully enabled.');
+    const errorMessage = 'Hosting is already fully enabled.';
+    context.print.error(errorMessage);
+    throw new Error(errorMessage);
   } else {
-    throw new Error('Hosting is not available from enabled providers.');
+    const errorMessage = 'Hosting is not available from enabled providers.';
+    context.print.error(errorMessage);
+    throw new Error(errorMessage);
   }
 }
 
diff --git a/packages/amplify-category-hosting/lib/S3AndCloudFront/index.js b/packages/amplify-category-hosting/lib/S3AndCloudFront/index.js
@@ -1,4 +1,5 @@
 const fs = require('fs-extra');
+const inquirer = require('inquirer');
 const Ora = require('ora');
 const path = require('path');
 const opn = require('opn');
@@ -12,12 +13,20 @@ const serviceName = 'S3AndCloudFront';
 const providerPlugin = 'awscloudformation';
 const templateFileName = 'template.json';
 
+
+const DEV = 'DEV (S3 only with HTTP)';
+const PROD = 'PROD (S3 with CloudFront using HTTPS)';
+const Environments = [
+  DEV,
+  PROD,
+];
+
 async function enable(context) {
   let templateFilePath = path.join(__dirname, 'template.json');
   context.exeInfo.template = JSON.parse(fs.readFileSync(templateFilePath));
 
   // will take this out once cloudformation invoke and wait are separated;
-  checkCDN(context);
+  await checkCDN(context);
 
   await configManager.init(context);
 
@@ -44,16 +53,27 @@ async function enable(context) {
   );
 }
 
-
-function checkCDN(context) {
-  if (context.parameters.options.nocdn) {
-    delete context.exeInfo.template.Resources.CloudFrontDistribution;
-    delete context.exeInfo.template.Outputs.CloudFrontDistributionID;
-    delete context.exeInfo.template.Outputs.CloudFrontDomainName;
-    delete context.exeInfo.template.Outputs.CloudFrontSecureURL;
+async function checkCDN(context) {
+  const selectEnvironment = {
+    type: 'list',
+    name: 'environment',
+    message: 'Select the environment setup:',
+    choices: Environments,
+    default: DEV,
+  };
+  const answer = await inquirer.prompt(selectEnvironment);
+  if (answer.environment === DEV) {
+    removeCDN(context);
   }
 }
 
+function removeCDN(context) {
+  delete context.exeInfo.template.Resources.CloudFrontDistribution;
+  delete context.exeInfo.template.Outputs.CloudFrontDistributionID;
+  delete context.exeInfo.template.Outputs.CloudFrontDomainName;
+  delete context.exeInfo.template.Outputs.CloudFrontSecureURL;
+}
+
 async function configure(context) {
   const projectBackendDirPath = context.amplify.pathManager.getBackendDirPath();
   const serviceDirPath = path.join(projectBackendDirPath, constants.CategoryName, serviceName);
@@ -95,6 +115,7 @@ function console(context) {
         amplifyMeta[constants.CategoryName][serviceName].output;
   const consoleUrl =
         `https://s3.console.aws.amazon.com/s3/buckets/${bucket}/?region=${region}&tab=overview`;
+  context.print.info(chalk.green(consoleUrl));
   opn(consoleUrl, { wait: false });
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,13 @@ async function add(context) {`
`25`	`25`	`} else if (disabledServices.length === 1) {`
`26`	`26`	`return categoryManager.runServiceAction(context, disabledServices[0], 'enable');`
`27`	`27`	`}`
`28`		`- throw new Error('Hosting is already fully enabled.');`
	`28`	`+ const errorMessage = 'Hosting is already fully enabled.';`
	`29`	`+ context.print.error(errorMessage);`
	`30`	`+ throw new Error(errorMessage);`
`29`	`31`	`} else {`
`30`		`- throw new Error('Hosting is not available from enabled providers.');`
	`32`	`+ const errorMessage = 'Hosting is not available from enabled providers.';`
	`33`	`+ context.print.error(errorMessage);`
	`34`	`+ throw new Error(errorMessage);`
`31`	`35`	`}`
`32`	`36`	`}`
`33`	`37`