feat: add additional connections mutation to insert edges between existing entities

Author: hjaraujof

package.json

@@ -15,7 +15,7 @@
   },
   "bugs": "https://github.com/cloudgraphdev/cli/issues",
   "dependencies": {
-    "@cloudgraph/sdk": "0.10.4",
+    "@cloudgraph/sdk": "^0.10.6",
     "@graphql-tools/load-files": "^6.3.2",
     "@graphql-tools/merge": "^8.2.0",
     "@oclif/command": "^1",

src/commands/load.ts

@@ -6,7 +6,7 @@ import { isEmpty } from 'lodash'
 
 import Command from './base'
 import { fileUtils } from '../utils'
-import { processConnectionsBetweenEntities } from '../utils/data'
+import { loadAllData } from '../utils/data'
 
 export default class Load extends Command {
   static description = 'Load a specific version of your CloudGraph data'
@@ -81,8 +81,9 @@ export default class Load extends Command {
       this.logger.info(
         `Beginning ${chalk.italic.green('LOAD')} for ${provider}`
       )
-      const { client, schemasMap } = await this.getProviderClient(provider)
-      if (!client) {
+      const { client: providerClient, schemasMap: schemaMap } =
+        await this.getProviderClient(provider)
+      if (!providerClient) {
         continue // eslint-disable-line no-continue
       }
 
@@ -186,26 +187,16 @@ export default class Load extends Command {
         )} loaded successfully for ${chalk.italic.green(provider)}`
       )
 
-      /**
-       * Loop through the providerData entities and for each entity:
-       * Look in providerData.connections for [key = entity.id]
-       * Loop through the connections for entity and determine its resource type
-       * Find entity in providerData.entities that matches the id found in connections
-       * Build connectedEntity by pushing the matched entity into the field corresponding to that entity (alb.ec2Instance => [ec2Instance])
-       * Push connected entity into dgraph
-       */
-      this.logger.startSpinner(
-        `Making service connections for ${chalk.italic.green(provider)}`
-      )
-      processConnectionsBetweenEntities({
-        provider,
-        providerData,
-        storageEngine,
-        storageRunning,
-        schemaMap: schemasMap,
-      })
-      this.logger.successSpinner(
-        `Connections made successfully for ${chalk.italic.green(provider)}`
+      loadAllData(
+        providerClient,
+        {
+          provider,
+          providerData,
+          storageEngine,
+          storageRunning,
+          schemaMap,
+        },
+        this.logger
       )
     }
 

src/commands/scan.ts

@@ -6,9 +6,9 @@ import { range } from 'lodash'
 
 import Command from './base'
 import { fileUtils } from '../utils'
-import { processConnectionsBetweenEntities } from '../utils/data'
 import DgraphEngine from '../storage/dgraph'
 import { scanReport } from '../reports'
+import { loadAllData, processConnectionsBetweenEntities } from '../utils/data'
 
 export default class Scan extends Command {
   static description =
@@ -112,10 +112,9 @@ export default class Scan extends Command {
       this.logger.info(
         `Beginning ${chalk.italic.green('SCAN')} for ${provider}`
       )
-      const { client, schemasMap, serviceKey } = await this.getProviderClient(
-        provider
-      )
-      if (!client) {
+      const { client: providerClient, schemasMap, serviceKey } =
+        await this.getProviderClient(provider)
+      if (!providerClient) {
         failedProviderList.push(provider)
         this.logger.warn(`No valid client found for ${provider}, skipping...`)
         continue // eslint-disable-line no-continue
@@ -142,7 +141,9 @@ export default class Scan extends Command {
             })
 
             // Get the Plugin Manager
-            const pluginManager = this.getPluginManager(cloudGraphPlugin[key])
+            const pluginManager = this.getPluginManager(
+              cloudGraphPlugin[key]
+            )
 
             // Configure
             await PluginInstance.configure(pluginManager)
@@ -167,7 +168,7 @@ export default class Scan extends Command {
           provider
         )}`
       )
-      const providerData = await client.getData({
+      const providerData = await providerClient.getData({
         opts,
       })
       this.logger.successSpinner(
@@ -180,7 +181,7 @@ export default class Scan extends Command {
           provider
         )}`
       )
-      const providerSchema: string = client.getSchema()
+      const providerSchema: string = providerClient.getSchema()
       if (!providerSchema) {
         this.logger.warn(`No schema found for ${provider}, moving on`)
         continue // eslint-disable-line no-continue
@@ -231,18 +232,16 @@ export default class Scan extends Command {
         this.exit()
       }
 
-      this.logger.startSpinner(
-        `Making service connections for ${chalk.italic.green(provider)}`
-      )
-      processConnectionsBetweenEntities({
-        provider,
-        providerData,
-        storageEngine,
-        storageRunning,
-        schemaMap: schemasMap,
-      })
-      this.logger.successSpinner(
-        `Connections made successfully for ${chalk.italic.green(provider)}`
+      loadAllData(
+        providerClient,
+        {
+          provider,
+          providerData,
+          storageEngine,
+          storageRunning,
+          schemaMap: schemasMap,
+        },
+        this.logger
       )
     }
 

src/storage/dgraph/index.ts

@@ -3,6 +3,7 @@ import {
   StorageEngineConfig,
   StorageEngine,
   GraphQLInputData,
+  GraphQLQueryData
 } from '@cloudgraph/sdk'
 
 import DGraphClientWrapper from './base'
@@ -151,11 +152,12 @@ export default class DgraphEngine
    * Add Service Mutation to axiosPromises Array
    */
   push(data: GraphQLInputData): void {
-    const { query, connectedData } = data
-    const queryData = {
+    const { query, input, patch } = data
+    const queryData: GraphQLQueryData = {
       query,
       variables: {
-        input: connectedData,
+        input,
+        patch,
       },
     }
     this.axiosPromises.push(() =>

src/storage/dgraph/utils.ts

@@ -95,17 +95,35 @@ export function processGQLExecutionResult({
     let executedMutationNames: string[] = []
     if (!isEmpty(mutationResultData)) {
       executedMutationNames = Object.keys(mutationResultData) || []
-      executedMutationNames.forEach(mutationName => {
-        if (mutationResultData[mutationName]) {
-          const { numUids } = mutationResultData[mutationName]
-          const numUidsString = numUids ? `numUids affected: ${numUids}` : ''
-          logger.debug(
-            `mutation ${chalk.green(
-              mutationName
-            )} completed successfully. ${numUidsString}`
-          )
-        }
-      })
+      if (
+        !isEmpty(executedMutationNames) &&
+        executedMutationNames[0].includes('add')
+      ) {
+        executedMutationNames.forEach(mutationName => {
+          if (mutationResultData[mutationName]) {
+            const { numUids } = mutationResultData[mutationName]
+            const numUidsString = numUids ? `numUids affected: ${numUids}` : ''
+            logger.debug(
+              `mutation ${chalk.green(
+                mutationName
+              )} completed successfully. ${numUidsString}`
+            )
+          }
+        })
+      }
+      // Leaving this block here in case we need/want
+      // to print the output the result of the patch mutations
+      //
+      // if (executedMutationNames[0].includes('update')) {
+      //   executedMutationNames.forEach(mutation => {
+      //     const serviceName = mutation.split('update')[1]
+      //     const filter = mutationResultData[mutation][serviceName]
+      //     if (filter && filter[0]) {
+      //       const { id } = filter[0]
+      //       logger.debug(`Connections added for id ${chalk.green(id)}.`)
+      //     }
+      //   })
+      // }
     }
     processErrorArrayIfExists({
       errors: dataErrors,

src/types/index.ts

@@ -1,7 +1,17 @@
+import { ProviderData, StorageEngine } from '@cloudgraph/sdk'
+
 export interface CloudGraphConfig {
   [key: string]: unknown | Record<NonNullable<string | number>, unknown>
 }
 
 export type SchemaMap = {
   [schemaName: string]: string
 }
+
+export interface DataToLoad {
+  provider: string
+  providerData: ProviderData
+  storageEngine: StorageEngine
+  storageRunning: boolean
+  schemaMap: SchemaMap | undefined
+}