feat: Updated policy commands to support new plugin structure

Author: Marco Franceschi

src/commands/policy/add.ts

@@ -1,4 +1,5 @@
 import { PluginType } from '@cloudgraph/sdk'
+import { isEmpty, uniqBy } from 'lodash'
 
 import OperationBaseCommand from '../operation'
 
@@ -28,10 +29,32 @@ export default class AddPolicy extends OperationBaseCommand {
 
         // Save policy to CG config file
         const config = this.getCGConfig()
-        if (config && config[provider]) {
-          config[provider].policies = config[provider].policies
-            ? [...new Set([...config[provider].policies, key])]
-            : [key]
+        if (config) {
+          let configuredPolicies =
+            config.cloudGraph.plugins[PluginType.PolicyPack] || []
+
+          if (isEmpty(configuredPolicies)) {
+            // Set new Policy Pack Plugin array
+            configuredPolicies = [
+              {
+                name: key,
+                providers: [provider],
+              },
+            ]
+          } else {
+            // Add policy to Policy Pack Plugin array
+            configuredPolicies = [
+              ...configuredPolicies,
+              {
+                name: key,
+                providers: [provider],
+              },
+            ]
+          }
+          config.cloudGraph.plugins[PluginType.PolicyPack] = uniqBy(
+            configuredPolicies,
+            'name'
+          )
           this.saveCloudGraphConfigFile(config)
         }
       }

src/commands/policy/remove.ts

@@ -1,4 +1,5 @@
-import { PluginType } from '@cloudgraph/sdk'
+import { ConfiguredPlugin, PluginType } from '@cloudgraph/sdk'
+import isEmpty from 'lodash/isEmpty'
 
 import OperationBaseCommand from '../operation'
 
@@ -36,16 +37,20 @@ export default class RemovePolicy extends OperationBaseCommand {
         if (manager && !noSave) {
           manager.removeFromLockFile(key)
 
-          const [provider] = key.split('-')
           const config = this.getCGConfig()
-
-          if (config[provider]) {
-            config[provider].policies = [
-              ...config[provider].policies.filter(
-                (policy: string) => policy !== key
-              ),
-            ]
-            this.saveCloudGraphConfigFile(config)
+          if (config) {
+            const configuredPolicies =
+              config.cloudGraph.plugins[PluginType.PolicyPack] || []
+
+            if (!isEmpty(configuredPolicies)) {
+              // Remove policy from Policy Pack Plugin array
+              config.cloudGraph.plugins[PluginType.PolicyPack] =
+                configuredPolicies.filter(
+                  (p: ConfiguredPlugin) => p.name !== key
+                )
+
+              this.saveCloudGraphConfigFile(config)
+            }
           }
         }
       }