Merge pull request #11 from cxcloud/preset-env-secrets

Run with preset AWS environment secrets

Author: jarl-tornroos

lib/utils/aws.js

@@ -1,14 +1,10 @@
-const execa = require('execa');
 const path = require('path');
 const awsRegions = require('aws-regions');
-const { getBinPath } = require('./env');
+const { getBinPath, runCommandWithAWSCredentials } = require('./env');
 const { logOperation } = require('./');
 
 function runAWSCommand(cmd, args) {
-  return execa(getBinPath('awsudo'), [
-    '-u',
-    process.env.AWS_PROFILE,
-    getBinPath('aws'),
+  return runCommandWithAWSCredentials('aws', [
     cmd,
     ...args
   ]);

lib/utils/env.js

@@ -6,9 +6,15 @@ const chalk = require('chalk');
 const { runCommand, logOperation, showError } = require('./');
 const { deploymentManifestSchema } = require('./schemas');
 const { checkForUpdates } = require('./update');
+const execa = require('execa');
 
 const getBinPath = bin => path.join(__dirname, '../../.env/bin', bin);
 
+const envAWSKeysExist = function() {
+  const { AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY } = process.env;
+  return AWS_ACCESS_KEY_ID && AWS_SECRET_ACCESS_KEY;
+}
+
 const installEnvironment = async () => {
   if (await fs.pathExists(path.join(__dirname, '../../.env'))) {
     logOperation('Environment already exists, skipping installation.');
@@ -23,6 +29,10 @@ const installEnvironment = async () => {
 };
 
 const installRequirements = async () => {
+  if (envAWSKeysExist()) {
+    logOperation('AWS API key environment variables is set, `awsudo` not needed.');
+    return;
+  }
   if (await fs.pathExists(getBinPath('awsudo'))) {
     logOperation('`awsudo` exists, skipping installation.');
     return;
@@ -37,9 +47,9 @@ const installRequirements = async () => {
 };
 
 exports.checkEnvironment = async () => {
-  if (!process.env.AWS_PROFILE) {
+  if (!process.env.AWS_PROFILE && !envAWSKeysExist()) {
     return showError(
-      'You have to set `AWS_PROFILE` environment variable before continuing. Visit https://docs.cxcloud.com for help.'
+      'Some environment variables has to be set before running cxcloud. Visit https://docs.cxcloud.com for help.'
     );
   }
 
@@ -48,6 +58,21 @@ exports.checkEnvironment = async () => {
   await installRequirements();
 };
 
+exports.runCommandWithAWSCredentials = (cmd, args) => {
+  if (envAWSKeysExist()) {
+    return execa(getBinPath(cmd), [
+      ...args
+    ]);
+  } else {
+    return execa(getBinPath('awsudo'), [
+      '-u',
+      process.env.AWS_PROFILE,
+      getBinPath(cmd),
+      ...args
+    ]);
+  }
+}
+
 exports.getBinPath = getBinPath;
 
 exports.ensureDeployEnvironment = async () => {

lib/utils/kops.js

@@ -1,15 +1,11 @@
-const execa = require('execa');
 const ora = require('ora');
 const fs = require('fs-extra');
 const path = require('path');
-const { getBinPath } = require('./env');
+const { getBinPath, runCommandWithAWSCredentials } = require('./env');
 const { logOperation, sleep } = require('./');
 
 function runKopsCommand(cmd, args) {
-  return execa(getBinPath('awsudo'), [
-    '-u',
-    process.env.AWS_PROFILE,
-    'kops',
+  return runCommandWithAWSCredentials('kops', [
     cmd,
     ...args
   ]);

lib/utils/terraform.js

@@ -1,14 +1,10 @@
 const path = require('path');
-const execa = require('execa');
-const { getBinPath } = require('./env');
+const { getBinPath, runCommandWithAWSCredentials } = require('./env');
 const { copyTpl } = require('./fs');
 const { logOperation } = require('./');
 
 function runTerraformCommand(cmd, args = []) {
-  const child = execa(getBinPath('awsudo'), [
-    '-u',
-    process.env.AWS_PROFILE,
-    'terraform',
+  child = runCommandWithAWSCredentials('terraform', [
     cmd,
     ...args
   ]);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cxcloud",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "CXCloud command line tools",
   "license": "MIT",
   "repository": "cxcloud/cxcloud-cli",