chore: Updated SDK to latest version

Author: Marco Franceschi

package.json

@@ -32,7 +32,7 @@
     "terraform:cleanup": "rimraf ./tests/terraform/{.terraform,.terraform.lock.hcl,tfplan} ./tests/terraform/*.{tfstate,tfplan,backup}"
   },
   "dependencies": {
-    "@cloudgraph/sdk": "0.10.7",
+    "@cloudgraph/sdk": "0.14.2",
     "@fast-csv/parse": "^4.3.6",
     "@graphql-tools/load-files": "6.3.2",
     "@graphql-tools/merge": "8.0.1",

src/services/account/schema.graphql

@@ -8,7 +8,6 @@ type awsAccount @key(fields: "id") {
   appSync: [awsAppSync]
   asgs: [awsAsg]
   athenaDataCatalogs: [awsAthenaDataCatalog]
-
   billing: [awsBilling]
   clientVpnEndpoint: [awsClientVpnEndpoint]
   cloud9Environments: [awsCloud9Environment]

src/services/index.ts

@@ -1,4 +1,9 @@
-import CloudGraph, { Service, Opts, ProviderData } from '@cloudgraph/sdk'
+import CloudGraph, {
+  Service,
+  Opts,
+  ProviderData,
+  sortResourcesDependencies,
+} from '@cloudgraph/sdk'
 import { loadFilesSync } from '@graphql-tools/load-files'
 import { mergeTypeDefs } from '@graphql-tools/merge'
 import AWS, { Config } from 'aws-sdk'
@@ -13,9 +18,10 @@ import resources from '../enums/resources'
 import services from '../enums/services'
 import serviceMap from '../enums/serviceMap'
 import schemasMap from '../enums/schemasMap'
+import relations from '../enums/relations'
 import { Credentials } from '../types'
 import { obfuscateSensitiveString } from '../utils/format'
-import { checkAndMergeConnections, sortResourcesDependencies } from '../utils'
+import { checkAndMergeConnections } from '../utils'
 import { Account, rawDataInterface } from './base'
 import enhancers, { EnhancerConfig } from './base/enhancers'
 
@@ -557,7 +563,7 @@ export default class Provider extends CloudGraph.Client {
     if (!configuredResources) {
       configuredResources = Object.values(this.properties.services).join(',')
     }
-    const resourceNames: string[] = sortResourcesDependencies([
+    const resourceNames: string[] = sortResourcesDependencies(relations, [
       ...new Set<string>(configuredResources.split(',')),
     ])
 

src/services/securityGroup/format.ts

@@ -1,8 +1,9 @@
+import { toCamel } from '@cloudgraph/sdk'
 import cuid from 'cuid'
+
 import t from '../../properties/translations'
 import { AwsSecurityGroup } from './data'
 import { AwsSecurityGroup as AwsSgType } from '../../types/generated'
-import { toCamel } from '../../utils'
 import { formatTagsFromMap } from '../../utils/format'
 import { securityGroupArn } from '../../utils/generateArns'
 

src/services/vpc/connections.ts

@@ -1,4 +1,4 @@
-import { ServiceConnection } from '@cloudgraph/sdk'
+import { intersectStringArrays, ServiceConnection } from '@cloudgraph/sdk'
 
 import {
   Address,
@@ -18,7 +18,6 @@ import { FunctionConfiguration } from 'aws-sdk/clients/lambda'
 // import { LoadBalancerDescription } from 'aws-sdk/clients/elb' // TODO: Uncomment when adding ELB
 
 import services from '../../enums/services'
-import { intersectStringArrays } from '../../utils/index'
 import { RawAwsSubnet } from '../subnet/data'
 import { RawFlowLog } from '../flowLogs/data'
 import { RawAwsEcsService } from '../ecsService/data'

src/utils/index.ts

@@ -2,71 +2,19 @@ import AWS, { ConfigurationOptions } from 'aws-sdk'
 import { APIVersions } from 'aws-sdk/lib/config'
 import CloudGraph, { Opts } from '@cloudgraph/sdk'
 import STS from 'aws-sdk/clients/sts'
-import camelCase from 'lodash/camelCase'
 import isEmpty from 'lodash/isEmpty'
 import isEqual from 'lodash/isEqual'
 import unionWith from 'lodash/unionWith'
+
 import environment from '../config/environment'
 import { Credentials } from '../types'
 import {
   BASE_CUSTOM_RETRY_DELAY,
   MAX_FAILED_AWS_REQUEST_RETRIES,
 } from '../config/constants'
-import relations from '../enums/relations'
-
-
 
 const { logger } = CloudGraph
 
-export const toCamel = (o: any): any => {
-  let origKey
-  let newKey
-  let value
-
-  if (o instanceof Array) {
-    return o.map(value => {
-      if (typeof value === 'object') {
-        value = toCamel(value)
-      }
-      return value
-    })
-  }
-
-  const newObject = {}
-  for (origKey in o) {
-    if (o.hasOwnProperty(origKey)) {
-      newKey = camelCase(origKey)
-      value = o[origKey]
-      if (
-        value instanceof Array ||
-        (value !== null && value !== undefined && value.constructor === Object)
-      ) {
-        value = toCamel(value)
-      }
-      newObject[newKey] = value
-    }
-  }
-
-  return newObject
-}
-
-export const getKeyByValue = (
-  object: Record<string, unknown>,
-  value: any
-): string | undefined => {
-  return Object.keys(object).find(key => object[key] === value)
-}
-
-export const intersectStringArrays = (
-  a: Array<string>,
-  b: Array<string>
-): Array<string> => {
-  const setA = new Set(a)
-  const setB = new Set(b)
-  const intersection = new Set([...setA].filter(x => setB.has(x)))
-  return Array.from(intersection)
-}
-
 export async function getAccountId({
   credentials,
 }: // opts,
@@ -160,21 +108,6 @@ export const settleAllPromises = async (
     i => (i as PromiseFulfilledResult<any>).value
   )
 
-/**
- * Sorts a services list depending on his dependencies
- * @param resourceNames services to sort
- * @returns sorted list of services
- */
-export const sortResourcesDependencies = (resourceNames: string[]): string[] =>
-  resourceNames.sort((prevResource, nextResource) => {
-    const dependecies = relations[prevResource]
-
-    if (dependecies && dependecies.includes(nextResource)) {
-      return -1
-    }
-    return 0
-  })
-
 export const checkAndMergeConnections = (
   serviceConnections: any,
   connectionsToMerge: any

yarn.lock

@@ -564,10 +564,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cloudgraph/sdk@0.10.7":
-  version "0.10.7"
-  resolved "https://registry.yarnpkg.com/@cloudgraph/sdk/-/sdk-0.10.7.tgz#f5454a0124c55e7684d536d51b9accc3b3446fa2"
-  integrity sha512-gOkDj9CWFsbt5LZnsuq4zTBRBRztjkj40azOknNBvwu90jF93R91Sy8USyKTw6/rAbMhc+uA92H5JBKqOxDEVg==
+"@cloudgraph/sdk@0.14.2":
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/@cloudgraph/sdk/-/sdk-0.14.2.tgz#0594cd7c9c1a893a259ad137400a9b29d48079b5"
+  integrity sha512-cpPqg/vbwbhUNxWWAXXUz8ZtNyrNwXCHxU4nBiEEgHtewQV7lmVjx5OgThspPZcZjb+bsYIR+Q19euY7oGFQkQ==
   dependencies:
     "@graphql-tools/load-files" "^6.5.3"
     "@graphql-tools/merge" "^8.2.1"