Merge pull request #19 from cloudgraphdev/fix/CG-1201

tyler-dunkel · web-flow · commit 10c5401c90b6 · 2022-05-18T16:40:20.000-05:00
fix: Review and fix scan errors (issue reported on github)
diff --git a/src/services/virtualMachineScaleSet/format.ts b/src/services/virtualMachineScaleSet/format.ts
@@ -1,9 +1,217 @@
 import cuid from 'cuid'
 import { isEmpty } from 'lodash'
-import { AzureVirtualMachineScaleSet } from '../../types/generated'
+import {
+  VirtualMachineScaleSetOSProfile,
+  VirtualMachineScaleSetStorageProfile,
+  VirtualMachineScaleSetNetworkProfile,
+  VirtualMachineScaleSetExtensionProfile,
+} from '@azure/arm-compute'
+import {
+  AzureVirtualMachineScaleSet,
+  AzureVirtualMachineScaleSetOsProfile,
+  AzureVirtualMachineScaleSetStorageProfile,
+  AzureVirtualMachineScaleSetNetworkProfile,
+  AzureVirtualMachineScaleSetExtension,
+} from '../../types/generated'
 import { formatTagsFromMap } from '../../utils/format'
 import { RawAzureVirtualMachineScaleSet } from './data'
 
+const formatOsProfile = (
+  osProfile?: VirtualMachineScaleSetOSProfile
+): AzureVirtualMachineScaleSetOsProfile => {
+  if (isEmpty(osProfile)) {
+    return {}
+  }
+
+  const {
+    computerNamePrefix,
+    adminUsername,
+    allowExtensionOperations,
+    windowsConfiguration,
+    linuxConfiguration,
+    secrets,
+  } = osProfile
+
+  return {
+    computerNamePrefix,
+    adminUsername,
+    allowExtensionOperations,
+    windowsConfiguration: windowsConfiguration
+      ? {
+          additionalUnattendContent:
+            windowsConfiguration.additionalUnattendContent?.map(auc => ({
+              id: cuid(),
+              ...auc,
+            })) || [],
+          winRM: windowsConfiguration.winRM
+            ? {
+                listeners:
+                  windowsConfiguration.winRM.listeners?.map(l => ({
+                    id: cuid(),
+                    ...l,
+                  })) || [],
+              }
+            : {},
+          ...windowsConfiguration,
+        }
+      : {},
+    linuxConfiguration: linuxConfiguration
+      ? {
+          ssh: linuxConfiguration.ssh
+            ? {
+                publicKeys:
+                  linuxConfiguration.ssh.publicKeys?.map(pk => ({
+                    id: cuid(),
+                    ...pk,
+                  })) || [],
+              }
+            : {},
+        }
+      : {},
+    secrets:
+      secrets?.map(s => ({
+        id: cuid(),
+        sourceVault: {
+          id: s.sourceVault?.id || cuid(),
+        },
+        vaultCertificates:
+          s.vaultCertificates?.map(vc => ({
+            id: cuid(),
+            ...vc,
+          })) || [],
+      })) || [],
+  }
+}
+
+const formatStorageProfile = (
+  storageProfile?: VirtualMachineScaleSetStorageProfile
+): AzureVirtualMachineScaleSetStorageProfile => {
+  if (isEmpty(storageProfile)) {
+    return {}
+  }
+
+  const { imageReference, osDisk } = storageProfile
+
+  return {
+    imageReference: imageReference
+      ? {
+          id: imageReference.id || cuid(),
+          publisher: imageReference.publisher,
+          offer: imageReference.offer,
+          sku: imageReference.sku,
+          version: imageReference.version,
+        }
+      : {},
+    osDisk: osDisk
+      ? {
+          caching: osDisk.caching,
+          createOption: osDisk.createOption,
+          osType: osDisk.osType,
+          diskSizeGB: osDisk.diskSizeGB,
+          writeAcceleratorEnabled: osDisk.writeAcceleratorEnabled,
+          managedDisk: osDisk.managedDisk
+            ? {
+                storageAccountType: osDisk.managedDisk.storageAccountType,
+              }
+            : {},
+        }
+      : {},
+  }
+}
+
+const formatNetworkProfile = (
+  networkProfile?: VirtualMachineScaleSetNetworkProfile
+): AzureVirtualMachineScaleSetNetworkProfile => {
+  if (isEmpty(networkProfile)) {
+    return {}
+  }
+
+  const { networkInterfaceConfigurations = [] } = networkProfile
+
+  return {
+    networkInterfaceConfigurations:
+      networkInterfaceConfigurations?.map(
+        ({
+          id,
+          ipConfigurations = [],
+          networkSecurityGroup,
+          ...networkInterface
+        }) => {
+          return {
+            id: id || cuid(),
+            ...networkInterface,
+            networkSecurityGroup: {
+              id: networkSecurityGroup?.id || cuid(),
+            },
+            ipConfigurations:
+              ipConfigurations?.map(
+                ({
+                  subnet,
+                  publicIPAddressConfiguration,
+                  applicationGatewayBackendAddressPools,
+                  applicationSecurityGroups,
+                  loadBalancerBackendAddressPools,
+                  loadBalancerInboundNatPools,
+                  ...ipConfiguration
+                }) => ({
+                  id: cuid(),
+                  ...ipConfiguration,
+                  subnetId: subnet?.id,
+                  applicationGatewayBackendAddressPools:
+                    applicationGatewayBackendAddressPools?.map(agb => ({
+                      id: agb.id || cuid(),
+                      ...agb,
+                    })) || [],
+                  applicationSecurityGroups:
+                    applicationSecurityGroups?.map(asg => ({
+                      id: asg.id || cuid(),
+                      ...asg,
+                    })) || [],
+                  loadBalancerBackendAddressPools:
+                    loadBalancerBackendAddressPools?.map(lbb => ({
+                      id: lbb.id || cuid(),
+                      ...lbb,
+                    })) || [],
+                  loadBalancerInboundNatPools:
+                    loadBalancerInboundNatPools?.map(lbi => ({
+                      id: lbi.id || cuid(),
+                      ...lbi,
+                    })) || [],
+                })
+              ) || [],
+          }
+        }
+      ) || [],
+  }
+}
+
+const formatExtensionProfile = (
+  extensionProfile?: VirtualMachineScaleSetExtensionProfile
+): AzureVirtualMachineScaleSetExtension[] => {
+  if (isEmpty(extensionProfile)) {
+    return []
+  }
+
+  const { extensions: extensionsList = [] } = extensionProfile
+
+  return (
+    extensionsList?.map(e => ({
+      id: e.id || cuid(),
+      name: e.name,
+      forceUpdateTag: e.forceUpdateTag,
+      type: e.type,
+      typeHandlerVersion: e.typeHandlerVersion,
+      typePropertiesType: e.typePropertiesType,
+      publisher: e.publisher,
+      provisioningState: e.provisioningState,
+      provisionAfterExtensions: e.provisionAfterExtensions,
+      autoUpgradeMinorVersion: e.autoUpgradeMinorVersion,
+      enableAutomaticUpgrade: e.enableAutomaticUpgrade,
+      settings: e.settings ? JSON.stringify(e.settings) : '',
+    })) || []
+  )
+}
+
 export default ({
   service,
   account,
@@ -46,64 +254,27 @@ export default ({
   }
 
   // Setting Extension Profile
-  let extensions = []
+  let extensions: AzureVirtualMachineScaleSetExtension[] = []
   if (!isEmpty(extensionProfile)) {
-    const { extensions: extensionsList = [] } = extensionProfile
-    extensions = extensionsList.map(({ settings, ...extension }) => ({
-      id: cuid(),
-      ...extension,
-      settings: JSON.stringify(settings),
-    }))
+    extensions = formatExtensionProfile(extensionProfile)
   }
 
   // Setting OS Profile
   let os = {}
   if (!isEmpty(osProfile)) {
-    const {
-      computerNamePrefix,
-      adminUsername,
-      linuxConfiguration = {},
-      windowsConfiguration = {},
-      secrets = [],
-    } = osProfile
-    os = {
-      computerNamePrefix,
-      adminUsername,
-      linuxConfiguration,
-      windowsConfiguration,
-      secrets,
-    }
+    os = formatOsProfile(osProfile)
   }
 
   // Setting Network Profile
   let network = {}
   if (!isEmpty(networkProfile)) {
-    const { networkInterfaceConfigurations = [] } = networkProfile
-
-    const networkInterfaces = networkInterfaceConfigurations.map(
-      ({ ipConfigurations = [], ...networkInterface }) => {
-        return {
-          id: cuid(),
-          ...networkInterface,
-          ipConfigurations: ipConfigurations.map(
-            ({ subnet, ...ipConfiguration }) => ({
-              id: cuid(),
-              ...ipConfiguration,
-              subnetId: subnet?.id,
-            })
-          ),
-        }
-      }
-    )
-
-    network = { networkInterfaceConfigurations: networkInterfaces }
+    network = formatNetworkProfile(networkProfile)
   }
 
   // Setting Storage Profile
   let storage = {}
   if (!isEmpty(storageProfile)) {
-    const { imageReference = {}, osDisk = {} } = storageProfile
-    storage = { imageReference, osDisk }
+    storage = formatStorageProfile(storageProfile)
   }
 
   return {
diff --git a/src/services/virtualMachineScaleSet/schema.graphql b/src/services/virtualMachineScaleSet/schema.graphql
@@ -19,7 +19,6 @@ type azureVirtualMachineScaleSetExtension
   name: String @search(by: [hash, regexp])
   forceUpdateTag: String @search(by: [hash, regexp])
   type: String @search(by: [hash, regexp])
-  type1: String @search(by: [hash, regexp])
   typeHandlerVersion: String @search(by: [hash, regexp])
   typePropertiesType: String @search(by: [hash, regexp])
   publisher: String @search(by: [hash, regexp])
@@ -197,7 +196,9 @@ type azureSshPublicKey
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
     subscription: false
-  ) {
+  )
+  @key(fields: "id") {
+  id: String! @id @search(by: [hash, regexp])
   path: String @search(by: [hash, regexp])
   keyData: String @search(by: [hash, regexp])
 }
@@ -239,7 +240,9 @@ type azureVaultCertificate
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
     subscription: false
-  ) {
+  )
+  @key(fields: "id") {
+  id: String! @id @search(by: [hash, regexp])
   certificateUrl: String @search(by: [hash, regexp])
   certificateStore: String @search(by: [hash, regexp])
 }
@@ -249,7 +252,9 @@ type azureVaultSecretGroup
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
     subscription: false
-  ) {
+  )
+  @key(fields: "id") {
+  id: String! @id @search(by: [hash, regexp])
   sourceVault: azureSubResource
   vaultCertificates: [azureVaultCertificate]
 }
@@ -263,7 +268,6 @@ type azureVirtualMachineScaleSetOsProfile
   computerNamePrefix: String @search(by: [hash, regexp])
   adminUsername: String @search(by: [hash, regexp])
   allowExtensionOperations: Boolean @search
-  requireGuestProvisionSignal: Boolean @search
   linuxConfiguration: azureVirtualMachineScaleSetOsProfileLinuxConfiguration
   windowsConfiguration: azureVirtualMachineScaleSetOsProfileWindowsConfiguration
   secrets: [azureVaultSecretGroup]
diff --git a/src/types/generated.ts b/src/types/generated.ts
@@ -4360,6 +4360,7 @@ export type AzureSshConfiguration = {
 };
 
 export type AzureSshPublicKey = {
+  id: Scalars['String'];
   keyData?: Maybe<Scalars['String']>;
   path?: Maybe<Scalars['String']>;
 };
@@ -4945,9 +4946,11 @@ export type AzureTrafficManagerProfileMonitorConfigExpectedStatusCodeRangesItem
 export type AzureVaultCertificate = {
   certificateStore?: Maybe<Scalars['String']>;
   certificateUrl?: Maybe<Scalars['String']>;
+  id: Scalars['String'];
 };
 
 export type AzureVaultSecretGroup = {
+  id: Scalars['String'];
   sourceVault?: Maybe<AzureSubResource>;
   vaultCertificates?: Maybe<Array<Maybe<AzureVaultCertificate>>>;
 };
@@ -5016,7 +5019,6 @@ export type AzureVirtualMachineScaleSetExtension = {
   publisher?: Maybe<Scalars['String']>;
   settings?: Maybe<Scalars['String']>;
   type?: Maybe<Scalars['String']>;
-  type1?: Maybe<Scalars['String']>;
   typeHandlerVersion?: Maybe<Scalars['String']>;
   typePropertiesType?: Maybe<Scalars['String']>;
 };
@@ -5078,7 +5080,6 @@ export type AzureVirtualMachineScaleSetOsProfile = {
   allowExtensionOperations?: Maybe<Scalars['Boolean']>;
   computerNamePrefix?: Maybe<Scalars['String']>;
   linuxConfiguration?: Maybe<AzureVirtualMachineScaleSetOsProfileLinuxConfiguration>;
-  requireGuestProvisionSignal?: Maybe<Scalars['Boolean']>;
   secrets?: Maybe<Array<Maybe<AzureVaultSecretGroup>>>;
   windowsConfiguration?: Maybe<AzureVirtualMachineScaleSetOsProfileWindowsConfiguration>;
 };
