feat: headless Init and configure (#371)

* init headless

* add headless for javascript frontend

* setup headless for android frontend

* move publish ignore to a file inside hosting folder

* move publish ignore out of amplifyrc file

Author: UnleashedMind

packages/amplify-category-auth/provider-utils/awscloudformation/service-walkthroughs/auth-questions.js

@@ -12,7 +12,7 @@ async function serviceWalkthrough(
   const { inputs } = serviceMetadata;
   const { amplify } = context;
   const { parseInputs } = require(`${__dirname}/../question-factories/core-questions.js`);
-  const projectType = Object.keys(amplify.getProjectConfig().frontendHandler)[0];
+  const projectType = amplify.getProjectConfig().frontend;
 
 
   let coreAnswers = {};

packages/amplify-category-auth/provider-utils/supported-services.json

@@ -142,7 +142,7 @@
 						"operator": "includes"
 					},
 					{
-						"key": "frontendHandler",
+						"key": "frontend",
 						"value": "ios",
 						"operator": "configMatch"
 					}
@@ -160,7 +160,7 @@
 						"operator": "includes"
 					},
 					{
-						"key": "frontendHandler",
+						"key": "frontend",
 						"value": "android",
 						"operator": "configMatch"
 					}

packages/amplify-category-hosting/lib/S3AndCloudFront/helpers/cloudfront-manager.js

@@ -48,8 +48,8 @@ async function invalidate(context) {
 }
 
 async function getCloudFrontClient(context) {
-  const { projectConfig } = context.exeInfo;
-  const provider = require(projectConfig.providers[providerName]);
+  const providerPlugins = context.amplify.getProviderPlugins(context);
+  const provider = require(providerPlugins[providerName]);
   const aws = await provider.getConfiguredAWSClient(context);
   return new aws.CloudFront();
 }

packages/amplify-category-hosting/lib/S3AndCloudFront/helpers/configure-Publish.js

@@ -3,21 +3,20 @@ const inquirer = require('inquirer');
 const minimatch = require('minimatch');
 const fs = require('fs-extra');
 
-const { PublishIgnoreRCLabel } = require('../../constants');
+const PublishIgnoreFileName = 'amplifyPublishIgnore.json';
 
 async function configure(context) {
-  const amplifyRCFilePath = context.amplify.pathManager.getAmplifyRcFilePath();
-  let amplifyRC;
-  let publishIgnore;
+  const publishIgnoreFilePath = getPublishIgnoreFilePath(context);
+  let publishIgnore = [];
 
-  if (fs.existsSync(amplifyRCFilePath)) {
-    amplifyRC = JSON.parse(fs.readFileSync(amplifyRCFilePath, 'utf8'));
-    publishIgnore = amplifyRC[PublishIgnoreRCLabel];
+  if (fs.existsSync(publishIgnoreFilePath)) {
+    try {
+      publishIgnore = require(publishIgnoreFilePath);
+    } catch (e) {
+      publishIgnore = [];
+    }
   }
 
-  amplifyRC = amplifyRC || {};
-  publishIgnore = publishIgnore || [];
-
   publishIgnore = publishIgnore
     .map(ignore => ignore.trim())
     .filter(ignore => ignore.length > 0)
@@ -27,12 +26,20 @@ async function configure(context) {
   context.print.info('Use glob patterns as in the .gitignore file.');
 
   publishIgnore = await configurePublishIgnore(context, publishIgnore);
-  amplifyRC[PublishIgnoreRCLabel] = publishIgnore;
 
-  const jsonString = JSON.stringify(amplifyRC, null, 4);
-  fs.writeFileSync(amplifyRCFilePath, jsonString, 'utf8');
+  const jsonString = JSON.stringify(publishIgnore, null, 4);
+  fs.writeFileSync(publishIgnoreFilePath, jsonString, 'utf8');
 }
 
+function getPublishIgnoreFilePath(context) {
+  const projectPath = context.amplify.pathManager.searchProjectRootPath();
+  if (projectPath || fs.existsSync(projectPath)) {
+    return path.join(projectPath, PublishIgnoreFileName);
+  }
+  throw new Error('You are not working inside a valid amplify project.\nUse \'amplify init\' in the root of your app directory to initialize your project with Amplify');
+}
+
+
 async function configurePublishIgnore(context, publishIgnore) {
   const DONE = "I'm done.";
   const configActions = ['list', 'add', 'remove', 'remove all', DONE];
@@ -115,13 +122,18 @@ async function removeIgnore(context, publishIgnore) {
 }
 
 function getIgnore(context) {
-  let result;
-  const amplifyRCFilePath = context.amplify.pathManager.getAmplifyRcFilePath();
-  if (fs.existsSync(amplifyRCFilePath)) {
-    const amplifyRC = JSON.parse(fs.readFileSync(amplifyRCFilePath, 'utf8'));
-    result = amplifyRC[PublishIgnoreRCLabel];
+  let publishIgnore;
+  const publishIgnoreFilePath = getPublishIgnoreFilePath(context);
+  if (fs.existsSync(publishIgnoreFilePath)) {
+    try {
+      publishIgnore = require(publishIgnoreFilePath);
+    } catch (e) {
+      publishIgnore = [];
+    }
+  } else {
+    publishIgnore = [];
   }
-  return result;
+  return publishIgnore;
 }
 
 function isIgnored(filePath, publishIgnore, ignoreRoot) {

packages/amplify-category-hosting/lib/S3AndCloudFront/helpers/file-uploader.js

@@ -26,8 +26,8 @@ async function run(context, distributionDirPath) {
 }
 
 async function getS3Client(context) {
-  const { projectConfig } = context.exeInfo;
-  const provider = require(projectConfig.providers[providerName]);
+  const providerPlugins = context.amplify.getProviderPlugins(context);
+  const provider = require(providerPlugins[providerName]);
   const aws = await provider.getConfiguredAWSClient(context);
   return new aws.S3();
 }

packages/amplify-category-hosting/lib/category-manager.js

@@ -7,7 +7,7 @@ function getAvailableServices(context) {
   const availableServices = [];
   const projectConfig = context.amplify.getProjectConfig();
   Object.keys(supportedServices).forEach((service) => {
-    if (Object.keys(projectConfig.providers).includes(supportedServices[service].provider)) {
+    if (projectConfig.providers.includes(supportedServices[service].provider)) {
       availableServices.push(service);
     }
   });

packages/amplify-category-hosting/lib/constants.js

@@ -1,4 +1,3 @@
 module.exports = {
   CategoryName: 'hosting',
-  PublishIgnoreRCLabel: 'publish-ignore',
 };

packages/amplify-category-notifications/lib/auth-helper.js

@@ -79,8 +79,8 @@ async function checkAuth(context) {
 }
 
 async function getIamClient(context) {
-  const { projectConfig } = context.exeInfo;
-  const provider = require(projectConfig.providers[providerName]);
+  const providerPlugins = context.amplify.getProviderPlugins(context);
+  const provider = require(providerPlugins[providerName]);
   const aws = await provider.getConfiguredAWSClient(context);
   return new aws.IAM();
 }

packages/amplify-category-notifications/lib/pinpoint-helper.js

@@ -214,8 +214,8 @@ function console(context) {
 }
 
 async function getPinpointClient(context) {
-  const { projectConfig } = context.exeInfo;
-  const provider = require(projectConfig.providers[providerName]);
+  const providerPlugins = context.amplify.getProviderPlugins(context);
+  const provider = require(providerPlugins[providerName]);
   const aws = await provider.getConfiguredAWSClient(context);
   aws.config.update({ region: 'us-east-1' });
   return new aws.Pinpoint();

packages/amplify-cli/src/commands/configure.js

@@ -1,9 +1,10 @@
 const analyzeProject = require('../lib/config-steps/c0-analyzeProject');
-const configFrontendHandler = require('../lib/config-steps/c1-configFrontendHandler');
+const configFrontendHandler = require('../lib/config-steps/c1-configFrontend');
 const configProviders = require('../lib/config-steps/c2-configProviders');
 const configureNewUser = require('../lib/configure-new-user');
 const onFailure = require('../lib/config-steps/c9-onFailure');
 const onSuccess = require('../lib/config-steps/c9-onSuccess');
+const { normalizeInputParams } = require('../lib/input-params-manager');
 
 module.exports = {
   name: 'configure',
@@ -13,6 +14,7 @@ module.exports = {
     }
 
     if (context.parameters.first === 'project') {
+      constructExeInfo(context);
       return analyzeProject.run(context)
         .then(configFrontendHandler.run)
         .then(configProviders.run)
@@ -22,3 +24,9 @@ module.exports = {
   },
 };
 
+function constructExeInfo(context) {
+  context.exeInfo = {
+    inputParams: normalizeInputParams(context),
+  };
+}
+