feat: Reverted changes to keep upgrade all command

Marco Franceschi · Marco Franceschi · commit cc95962207a3 · 2022-01-21T16:32:13.000-03:00
diff --git a/package.json b/package.json
@@ -119,11 +119,9 @@
     "run:scan:aws": "cross-env NODE_ENV=development ./bin/run scan aws",
     "run:launch": "cross-env NODE_ENV=development ./bin/run launch",
     "run:teardown": "cross-env NODE_ENV=development ./bin/run teardown",
-    "run:install": "cross-env NODE_ENV=test ./bin/run install",
-    "run:add": "cross-env NODE_ENV=test ./bin/run add",
-    "run:remove": "cross-env NODE_ENV=test ./bin/run remove",
-    "run:list": "cross-env NODE_ENV=test ./bin/run list",
     "run:update": "cross-env NODE_ENV=test ./bin/run update",
+    "run:provider": "cross-env NODE_ENV=test ./bin/run provider",
+    "run:policy": "cross-env NODE_ENV=test ./bin/run policy",
     "test": "cross-env CG_DEBUG=-1 NODE_ENV=test jest --coverage=true --detectOpenHandles --runInBand --forceExit",
     "test:debug": "cross-env CG_DEBUG=5 NODE_ENV=test jest --coverage=false --detectOpenHandles --runInBand --forceExit",
     "version": "oclif-dev readme && git add README.md",
diff --git a/src/commands/base.ts b/src/commands/base.ts
@@ -345,4 +345,16 @@ Run ${chalk.italic.green('npm i -g @cloudgraph/cli')} to install`)
     // or simply return the parent class error handling
     return super.catch(err)
   }
+
+  getLockFile(): any {
+    const lockPath = path.join(this.config.configDir, '.cloud-graph.lock.json')
+    try {
+      const lockFile = cosmiconfigSync('cloud-graph').load(lockPath)
+      return lockFile?.config ?? {}
+    } catch (error: any) {
+      this.logger.info('No lock file found for Cloud Graph')
+      this.logger.debug(error)
+      return {}
+    }
+  }
 }
diff --git a/src/commands/operation.ts b/src/commands/operation.ts
@@ -71,7 +71,7 @@ export default abstract class OperationBaseCommand extends Command {
 
   async installPlugin(type: PluginType): Promise<void> {
     const manager = this.getPluginManager(type)
-    const lockFile = manager.getLockFile()
+    const lockFile = this.getLockFile()
     if (isEmpty(lockFile?.[type])) {
       this.logger.info(
         `No ${messages[type]?.plural} found in lock file, have you added any?`
@@ -94,7 +94,7 @@ export default abstract class OperationBaseCommand extends Command {
     } = this.parse(OperationBaseCommand)
     const allPlugins = argv
     const manager = this.getPluginManager(type)
-    const lockFile = manager.getLockFile()
+    const lockFile = this.getLockFile()
     const plugins = []
 
     if (isEmpty(allPlugins)) {
@@ -139,7 +139,7 @@ export default abstract class OperationBaseCommand extends Command {
     const { argv } = this.parse(OperationBaseCommand)
     const allPlugins = argv
     const manager = this.getPluginManager(type)
-    const lockFile = manager.getLockFile()
+    const lockFile = this.getLockFile()
 
     if (isEmpty(lockFile?.[type])) {
       this.logger.info(
@@ -208,8 +208,7 @@ export default abstract class OperationBaseCommand extends Command {
   async list(type: PluginType): Promise<void> {
     const { argv } = this.parse(OperationBaseCommand)
     const allPlugins = argv
-    const manager = this.getPluginManager(type)
-    const lockFile = manager.getLockFile()
+    const lockFile = this.getLockFile()
     if (isEmpty(lockFile?.[type])) {
       this.logger.info(
         `No ${messages[type]?.plural} found, have you installed any?`
diff --git a/src/commands/policy/add.ts b/src/commands/policy/add.ts
diff --git a/src/commands/policy/index.ts b/src/commands/policy/index.ts
@@ -0,0 +1,20 @@
+import Command from '../base'
+
+export default class PolicyIndex extends Command {
+  static description =
+    'Commands to manage policy pack modules, run $ cg policy for more info.'
+
+  static strict = false
+
+  static hidden = false
+
+  static flags = {
+    ...Command.flags,
+  }
+
+  static args = Command.args
+
+  async run(): Promise<void> {
+    this.logger.info('cg policy is a topic not a command')
+  }
+}
diff --git a/src/commands/policy/install.ts b/src/commands/policy/install.ts
diff --git a/src/commands/policy/list.ts b/src/commands/policy/list.ts
diff --git a/src/commands/policy/remove.ts b/src/commands/policy/remove.ts
diff --git a/src/commands/policy/upgrade.ts b/src/commands/policy/upgrade.ts
@@ -2,15 +2,15 @@ import { PluginType } from '@cloudgraph/sdk'
 
 import OperationBaseCommand from '../operation'
 
-export default class UpdatePolicy extends OperationBaseCommand {
-  static description = 'Update currently installed policy packs'
+export default class UpgradePolicy extends OperationBaseCommand {
+  static description = 'Upgrade currently installed policy packs'
 
   static aliases = ['update:pp']
 
   static examples = [
-    '$ cg update policy',
-    '$ cg update policy aws-cis-1.2.0',
-    '$ cg update policy aws-cis-1.2.0@0.12.0',
+    '$ cg upgrade policy',
+    '$ cg upgrade policy aws-cis-1.2.0',
+    '$ cg upgrade policy aws-cis-1.2.0@0.12.0',
   ]
 
   static strict = false
diff --git a/src/commands/provider/add.ts b/src/commands/provider/add.ts
@@ -5,7 +5,7 @@ import OperationBaseCommand from '../operation'
 export default class AddProvider extends OperationBaseCommand {
   static description = 'Add new providers'
 
-  static aliases = ['add:p']
+  static aliases = ['add']
 
   static examples = ['$ cg add provider aws', '$ cg add provider aws@0.12.0']
 
diff --git a/src/commands/provider/index.ts b/src/commands/provider/index.ts
@@ -0,0 +1,20 @@
+import Command from '../base'
+
+export default class ProviderIndex extends Command {
+  static description =
+    'Commands to manage provider modules, run $ cg provider for more info.'
+
+  static strict = false
+
+  static hidden = false
+
+  static flags = {
+    ...Command.flags,
+  }
+
+  static args = Command.args
+
+  async run(): Promise<void> {
+    this.logger.info('cg provider is a topic not a command')
+  }
+}
diff --git a/src/commands/provider/install.ts b/src/commands/provider/install.ts
@@ -5,7 +5,7 @@ import OperationBaseCommand from '../operation'
 export default class InstallProvider extends OperationBaseCommand {
   static description = 'Install providers based on the lock file'
 
-  static aliases = ['install:p']
+  static aliases = ['install']
 
   static examples = ['$ cg install provider']
 
diff --git a/src/commands/provider/list.ts b/src/commands/provider/list.ts
@@ -5,7 +5,7 @@ import OperationBaseCommand from '../operation'
 export default class ListProvider extends OperationBaseCommand {
   static description = 'List currently installed providers and versions'
 
-  static aliases = ['ls:provider', 'list:p', 'ls:p']
+  static aliases = ['ls', 'list', 'ls']
 
   static examples = ['$ cg list provider', '$ cg list provider aws']
 
diff --git a/src/commands/provider/remove.ts b/src/commands/provider/remove.ts
@@ -5,7 +5,7 @@ import OperationBaseCommand from '../operation'
 export default class RemoveProvider extends OperationBaseCommand {
   static description = 'Remove currently installed provider'
 
-  static aliases = ['remove:p', 'rm:p', 'del:p', 'rm:provider', 'del:provider']
+  static aliases = ['remove', 'rm', 'del', 'rm', 'del']
 
   static examples = [
     '$ cg delete provider',
diff --git a/src/commands/provider/upgrade.ts b/src/commands/provider/upgrade.ts
@@ -2,15 +2,15 @@ import { PluginType } from '@cloudgraph/sdk'
 
 import OperationBaseCommand from '../operation'
 
-export default class UpdateProvider extends OperationBaseCommand {
-  static description = 'Update currently installed providers'
+export default class UpgradeProvider extends OperationBaseCommand {
+  static description = 'Upgrade currently installed providers'
 
-  static aliases = ['update:p']
+  static aliases = []
 
   static examples = [
-    '$ cg update provider',
-    '$ cg update provider aws',
-    '$ cg update provider aws@0.12.0',
+    '$ cg upgrade provider',
+    '$ cg upgrade provider aws',
+    '$ cg upgrade provider aws@0.12.0',
   ]
 
   static strict = false
diff --git a/src/commands/upgrade.ts b/src/commands/upgrade.ts
@@ -0,0 +1,30 @@
+import { PluginType } from '@cloudgraph/sdk'
+
+import OperationCommand from './operation'
+
+export default class Upgrade extends OperationCommand {
+  static description = 'Upgrade currently installed plugins.'
+
+  static examples = ['$ cg upgrade']
+
+  static aliases = []
+
+  static strict = false
+
+  static hidden = false
+
+  async run(): Promise<void> {
+    try {
+      const lockFile = this.getLockFile()
+
+      for (const pluginType in lockFile) {
+        if (pluginType) {
+          await this.update(pluginType as PluginType)
+        }
+      }
+    } catch (error) {
+      this.logger.stopSpinner()
+      this.logger.debug(error)
+    }
+  }
+}
diff --git a/src/manager/index.ts b/src/manager/index.ts
@@ -148,21 +148,6 @@ export class Manager {
     return pluginInfo.version
   }
 
-  getLockFile(): any {
-    const lockPath = path.join(
-      this.cliConfig.configDir,
-      '.cloud-graph.lock.json'
-    )
-    try {
-      const lockFile = cosmiconfigSync('cloud-graph').load(lockPath)
-      return lockFile?.config ?? {}
-    } catch (error: any) {
-      this.logger.info('No lock file found for Cloud Graph')
-      this.logger.debug(error)
-      return {}
-    }
-  }
-
   async checkRequiredVersion(importPath: string): Promise<boolean> {
     const pluginInfo = await import(`${importPath}/package.json`)
     const pluginVersion = pluginInfo?.version
diff --git a/yarn.lock b/yarn.lock
