fix: virtualMachine null fields

Author: hjaraujof

src/services/virtualMachine/format.ts

@@ -18,24 +18,29 @@ export default ({
     id,
     name,
     type,
+    vmId,
     diagnosticsProfile: {
       bootDiagnostics: { enabled: bootDiagnostics = false } = {},
     } = {},
-    osProfile: { adminUsername, adminPassword, secrets, ...restOsProfile } = {},
+    osProfile: {
+      computerName,
+      windowsConfiguration: {
+        provisionVMAgent: wProvisionVMAgent,
+        enableAutomaticUpdates,
+        timeZone,
+      } = {},
+      linuxConfiguration: {
+        disablePasswordAuthentication,
+        provisionVMAgent: lProvisionVMAgent,
+      } = {},
+      allowExtensionOperations,
+      requireGuestProvisionSignal,
+    } = {},
     storageProfile: { imageReference } = {},
     licenseType,
     resourceGroupId,
     Tags,
   } = service
-  const {
-    linuxConfiguration: {
-      patchSettings: lps,
-      ssh: lssh,
-      ...linuxConfiguration
-    } = {},
-    windowsConfiguration: { patchSettings: wps, ...windowsConfiguration } = {},
-    ...osProfile
-  } = restOsProfile
   const storageImageReference: AzureVirtualMachineStorageImageReference =
     imageReference || {}
   return {
@@ -44,7 +49,21 @@ export default ({
     name,
     type,
     region,
-    osProfile: { linuxConfiguration, windowsConfiguration, ...osProfile },
+    vmId,
+    osProfile: {
+      computerName,
+      windowsConfiguration: {
+        provisionVMAgent: wProvisionVMAgent,
+        enableAutomaticUpdates,
+        timeZone,
+      },
+      linuxConfiguration: {
+        disablePasswordAuthentication,
+        provisionVMAgent: lProvisionVMAgent,
+      },
+      allowExtensionOperations,
+      requireGuestProvisionSignal,
+    },
     storageImageReference,
     bootDiagnostics,
     licenseType,

src/services/virtualMachine/schema.graphql

@@ -46,19 +46,21 @@ type azureVirtualMachineStorageImageReference
   sharedGalleryImageId: String @search(by: [hash, regexp])
 }
 
-type azureVirtualMachine implements azureResource
+type azureVirtualMachine implements azureBaseResource
   @key(fields: "id")
   @generate(
     query: { get: true, query: true, aggregate: true }
     mutation: { add: true, delete: false }
   ) {
-  managedBy: String @search(by: [hash, regexp])
-  vmSize: String @search(by: [hash, regexp])
+  vmId: String @search(by: [hash, regexp])
+  subscriptionId: String @search(by: [hash, regexp])
+  region: String @search(by: [hash, regexp])
+  resourceGroupId: String @search(by: [hash, regexp])
   osProfile: azureVirtualMachineOSProfile
-  osType: String @search(by: [hash, regexp])
   storageImageReference: azureVirtualMachineStorageImageReference
   bootDiagnostics: Boolean @search
   licenseType: String @search(by: [hash, regexp])
+  tags: [azureRawTag]
   disks: [azureDisk] @hasInverse(field: virtualMachine)
   networkInterfaces: [azureNetworkInterface] @hasInverse(field: virtualMachines)
   virtualNetworks: [azureVirtualNetwork] @hasInverse(field: virtualMachines)

src/types/generated.ts

@@ -5113,18 +5113,20 @@ export type AzureVaultSecretGroup = {
   vaultCertificates?: Maybe<Array<Maybe<AzureVaultCertificate>>>;
 };
 
-export type AzureVirtualMachine = AzureResource & {
+export type AzureVirtualMachine = AzureBaseResource & {
   bootDiagnostics?: Maybe<Scalars['Boolean']>;
   disks?: Maybe<Array<Maybe<AzureDisk>>>;
   licenseType?: Maybe<Scalars['String']>;
-  managedBy?: Maybe<Scalars['String']>;
   networkInterfaces?: Maybe<Array<Maybe<AzureNetworkInterface>>>;
   osProfile?: Maybe<AzureVirtualMachineOsProfile>;
-  osType?: Maybe<Scalars['String']>;
+  region?: Maybe<Scalars['String']>;
   resourceGroup?: Maybe<Array<Maybe<AzureResourceGroup>>>;
+  resourceGroupId?: Maybe<Scalars['String']>;
   storageImageReference?: Maybe<AzureVirtualMachineStorageImageReference>;
+  subscriptionId?: Maybe<Scalars['String']>;
+  tags?: Maybe<Array<Maybe<AzureRawTag>>>;
   virtualNetworks?: Maybe<Array<Maybe<AzureVirtualNetwork>>>;
-  vmSize?: Maybe<Scalars['String']>;
+  vmId?: Maybe<Scalars['String']>;
 };
 
 export type AzureVirtualMachineOsProfile = {