Merge pull request #19 from opentorc/staging

Apr 11th: Production <- Staging
opentorc · Apr 12, 2024 · 6b55a31 · 6b55a31
2 parents 170d791 + c87a020
commit 6b55a31
Show file tree

Hide file tree

Showing 9 changed files with 9,394 additions and 1,191 deletions.
diff --git a/.github/workflows/code-backup.yml b/.github/workflows/code-backup.yml
@@ -0,0 +1,18 @@
+name: Mirror repo to S3
+on:
+  push:
+    branches:
+      - master
+jobs:
+  s3Backup:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: S3 Backup
+        uses: peter-evans/s3-backup@v1
+        env:
+          ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_GITHUB_ACTION_CODE_BACKUP }}
+          MIRROR_TARGET: ${{ secrets.AWS_S3_TARGET_GITHUB_ACTION_CODE_BACKUP }}
+          SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_KEY_GITHUB_ACTION_CODE_BACKUP }}
+        with:
+          args: --overwrite --remove
diff --git a/.github/workflows/update-and-release.yml b/.github/workflows/update-and-release.yml
@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Automatic GitHub Release
         uses: justincy/[email protected]
         id: release
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         if: steps.release.outputs.released == 'true'
         with:
           registry-url: 'https://npm.pkg.github.com'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentorc/config-wrapper",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "description": "config management wrapper",
   "main": "./src/index.js",
   "bin": {
@@ -14,20 +14,23 @@
   "license": "ISC",
   "dependencies": {
     "arg": "^5.0.1",
-    "aws-sdk": "^2.1035.0",
     "chalk": "^4.1.2",
     "inquirer": "^8.2.0",
     "line-reader": "^0.4.0"
   },
   "devDependencies": {
     "chai": "^4.3.4",
-    "mocha": "^9.1.3"
+    "mocha": "^9.1.3",
+    "standard": "^17.1.0"
   },
   "engineStrict": true,
   "engines": {
     "node": ">=v16.3.0"
   },
   "publishConfig": {
     "@opentorc:registry": "https://npm.pkg.github.com"
+  },
+  "peerDependencies": {
+    "@aws-sdk/client-ssm": "^3.552.0"
   }
 }
diff --git a/src/cli.js b/src/cli.js
@@ -3,12 +3,10 @@ const arg = require('arg')
 const inquirer = require('inquirer')
 const chalk = require('chalk')
 
-let pkg = require('../package.json');
-const configWrapper = require('./index');
-const { mkdir } = require('fs');
+const pkg = require('../package.json')
+const configWrapper = require('./index')
 
-
-function parseArgumentsIntoOptions(rawArgs) {
+function parseArgumentsIntoOptions (rawArgs) {
   const args = arg({
     '--outfile': String,
     '--infile': String,
@@ -26,11 +24,10 @@ function parseArgumentsIntoOptions(rawArgs) {
     '-f': '--folder',
     '-s': '--service',
     '-h': '--help'
-   },{
+  }, {
     argv: rawArgs.slice(2),
     permissive: true
-   }
-  )
+  })
 
   return {
     outfile: args['--outfile'] || '',
@@ -47,12 +44,12 @@ function parseArgumentsIntoOptions(rawArgs) {
   }
 }
 
-function displayHelp() {
+function displayHelp () {
   console.log(chalk.green.bgRed.bold('HJAAALP!'))
-/*
-{underline.green loadParamsIntoEnv:} load up parameters into the current process environment as env vars
-    {bold.blue * --source:} aws || filename (default: aws)
-*/
+  /*
+  {underline.green loadParamsIntoEnv:} load up parameters into the current process environment as env vars
+      {bold.blue * --source:} aws || filename (default: aws)
+  */
   console.log(chalk`
 {bold.red COMMANDS:}
 {underline.green remapKeysInEnv:} take {italic.red existing env vars} and remap them to {italic.red new env vars}. ie: {italic.blue DEV_AWS_ACCESS_KEY_ID} -> {italic.blue AWS_ACCESS_KEY_ID}
@@ -75,15 +72,15 @@ function displayHelp() {
 `)
 }
 
-async function remapKeysInEnv(config) {
+async function remapKeysInEnv (config) {
   console.log(chalk.green('Remapping keys in env'))
   const params = configWrapper.envLoader.remapKeysInEnv(config.oldprefix, config.newprefix)
   console.log(chalk.green(`Saving ${params.length} parameters to ${config.outfile}`))
   configWrapper.envLoader.paramsToSourceFile(params, config.outfile)
   console.log(chalk.green(`Saved ${params.length} parameters to ${config.outfile}`))
 }
 
-async function saveParamsFile(config) {
+async function saveParamsFile (config) {
   console.log(chalk.green('Saving params file'))
   const path = configWrapper.awsManager.constructParamPath(config.env, config.service)
   console.log(chalk.green(`saving '${path}' out to ${config.outfile}`))
@@ -103,7 +100,7 @@ async function saveParamsFile(config) {
   }
 }
 
-async function putToAWSFromFile(config) {
+async function putToAWSFromFile (config) {
   const { infile, env, service, overwrite, encrypt } = config
   console.log(chalk.green(`Reading params from file: ${infile}`))
   const params = await configWrapper.envLoader.readEnvFile(infile)
@@ -115,7 +112,7 @@ async function putToAWSFromFile(config) {
   const results = await configWrapper.awsManager.setParametersByService(params, env, service)
   console.log(chalk.green(`Saved ${results.length} parameters to AWS for "/torc/${env}/${service}"`))
 }
-async function exportAllParams(config) {
+async function exportAllParams (config) {
   // console.log(config)
   const rootFolder = config?.folder || './params'
   await fs.mkdir(rootFolder, { recursive: true })
@@ -141,7 +138,7 @@ async function exportAllParams(config) {
     await fs.mkdir(`${rootFolder}/${env}`)
     const services = Object.keys(params[env])
 
-    for (let j = 0; j < services.length; ++j) { 
+    for (let j = 0; j < services.length; ++j) {
       const service = services[j]
       const aEnvVars = []
       const vars = Object.keys(params[env][service])
@@ -156,9 +153,9 @@ async function exportAllParams(config) {
       await fs.writeFile(`${rootFolder}/${env}/${service}.env`, aEnvVars.join('\n'))
     }
   }
- }
+}
 
-async function promptForMissingOptions(options) {
+async function promptForMissingOptions (options) {
   let commandFunc = null
 
   const questions = []
@@ -172,7 +169,7 @@ async function promptForMissingOptions(options) {
           type: 'input',
           name: 'outfile',
           message: 'Output file: ',
-          default: '.env',
+          default: '.env'
         })
       }
 
@@ -181,16 +178,16 @@ async function promptForMissingOptions(options) {
           type: 'input',
           name: 'oldprefix',
           message: 'Prefix to replace: ',
-          default: 'DEV_',
+          default: 'DEV_'
         })
       }
 
       if (!options.newprefix) {
         questions.push({
           type: 'input',
           name: 'newprefix',
-          message: 'Replacing previx (can be blank): ',
-          default: '',
+          message: 'Replacing prefix (can be blank): ',
+          default: ''
         })
       }
       break
@@ -202,16 +199,16 @@ async function promptForMissingOptions(options) {
           type: 'input',
           name: 'outfile',
           message: 'Output file: ',
-          default: '.env',
+          default: '.env'
         })
       }
-  
+
       if (!options.env) {
         questions.push({
           type: 'input',
           name: 'env',
           message: 'Environment: ',
-          default: 'dev',
+          default: 'dev'
         })
       }
 
@@ -220,7 +217,7 @@ async function promptForMissingOptions(options) {
           type: 'input',
           name: 'service',
           message: 'Service: ',
-          default: '',
+          default: ''
         })
       }
       break
@@ -232,7 +229,7 @@ async function promptForMissingOptions(options) {
           type: 'input',
           name: 'infile',
           message: 'Input file: ',
-          default: '.env',
+          default: '.env'
         })
       }
 
@@ -241,7 +238,7 @@ async function promptForMissingOptions(options) {
           type: 'input',
           name: 'env',
           message: 'Environment: ',
-          default: 'dev',
+          default: 'dev'
         })
       }
 
@@ -250,7 +247,7 @@ async function promptForMissingOptions(options) {
           type: 'input',
           name: 'service',
           message: 'Service: ',
-          default: '',
+          default: ''
         })
       }
       break
@@ -262,7 +259,7 @@ async function promptForMissingOptions(options) {
           type: 'input',
           name: 'folder',
           message: 'Folder: ',
-          default: './params',
+          default: './params'
         })
       }
       break
@@ -284,10 +281,10 @@ async function promptForMissingOptions(options) {
     service: options.service || answers.service,
     env: options.env || answers.env,
     commandFunc
-  };
+  }
 }
 
-async function cli(args) {
+async function cli (args) {
   console.log(chalk.green(`\n${pkg.name} v${pkg.version}`))
   let options = parseArgumentsIntoOptions(args)
   options = await promptForMissingOptions(options)
@@ -299,4 +296,4 @@ async function cli(args) {
 
 module.exports = {
   cli
-}
+}
diff --git a/src/index.js b/src/index.js
@@ -4,4 +4,4 @@ const awsManager = require('./lib/awsManager')
 module.exports = {
   envLoader,
   awsManager
-}
+}