Merge pull request #40 from cloudgraphdev/fix/add-missing-fields

fix(virtualMachine): add more fields to specify plan and size

Author: ckoning

src/services/virtualMachine/format.ts

@@ -18,6 +18,15 @@ export default ({
     id,
     name,
     type,
+    plan: {
+      name: planName,
+      publisher: planPublisher,
+      product: planProduct,
+    } = {},
+    additionalCapabilities: { ultraSSDEnabled, hibernationEnabled } = {},
+    hardwareProfile: { vmSize } = {},
+    priority,
+    billingProfile: { maxPrice } = {},
     vmId,
     diagnosticsProfile: {
       bootDiagnostics: { enabled: bootDiagnostics = false } = {},
@@ -49,7 +58,12 @@ export default ({
     name,
     type,
     region,
+    plan: { name: planName, publisher: planPublisher, product: planProduct },
+    vmSize,
     vmId,
+    priority,
+    billingProfileMaxPrice: maxPrice,
+    additionalCapabilities: { ultraSSDEnabled, hibernationEnabled },
     osProfile: {
       computerName,
       windowsConfiguration: {

src/services/virtualMachine/schema.graphql

@@ -46,13 +46,39 @@ type azureVirtualMachineStorageImageReference
   sharedGalleryImageId: String @search(by: [hash, regexp])
 }
 
+type azureVirtualMachinePlan
+  @generate(
+    query: { get: false, query: true, aggregate: false }
+    mutation: { add: false, delete: false }
+    subscription: false
+  ) {
+  publisher: String @search(by: [hash, regexp])
+  name: String @search(by: [hash, regexp])
+  product: String @search(by: [hash, regexp])
+}
+
+type azureVirtualMachineAdditionalCapabilities
+  @generate(
+    query: { get: false, query: true, aggregate: false }
+    mutation: { add: false, delete: false }
+    subscription: false
+  ) {
+  ultraSSDEnabled: Boolean @search
+  hibernationEnabled: Boolean @search
+}
+
 type azureVirtualMachine implements azureBaseResource
   @key(fields: "id")
   @generate(
     query: { get: true, query: true, aggregate: true }
     mutation: { add: true, delete: false }
   ) {
+  plan: azureVirtualMachinePlan
+  additionalCapabilities: azureVirtualMachineAdditionalCapabilities
+  vmSize: String @search(by: [hash, regexp])
   vmId: String @search(by: [hash, regexp])
+  priority: String @search(by: [hash, regexp])
+  billingProfileMaxPrice: Int @search
   subscriptionId: String @search(by: [hash, regexp])
   region: String @search(by: [hash, regexp])
   resourceGroupId: String @search(by: [hash, regexp])

src/types/generated.ts

@@ -5242,11 +5242,15 @@ export type AzureVaultSecretGroup = {
 };
 
 export type AzureVirtualMachine = AzureBaseResource & {
+  additionalCapabilities?: Maybe<AzureVirtualMachineAdditionalCapabilities>;
+  billingProfileMaxPrice?: Maybe<Scalars['Int']>;
   bootDiagnostics?: Maybe<Scalars['Boolean']>;
   disks?: Maybe<Array<Maybe<AzureDisk>>>;
   licenseType?: Maybe<Scalars['String']>;
   networkInterfaces?: Maybe<Array<Maybe<AzureNetworkInterface>>>;
   osProfile?: Maybe<AzureVirtualMachineOsProfile>;
+  plan?: Maybe<AzureVirtualMachinePlan>;
+  priority?: Maybe<Scalars['String']>;
   region?: Maybe<Scalars['String']>;
   resourceGroup?: Maybe<Array<Maybe<AzureResourceGroup>>>;
   resourceGroupId?: Maybe<Scalars['String']>;
@@ -5256,6 +5260,12 @@ export type AzureVirtualMachine = AzureBaseResource & {
   virtualMachineScaleSets?: Maybe<Array<Maybe<AzureVirtualMachineScaleSet>>>;
   virtualNetworks?: Maybe<Array<Maybe<AzureVirtualNetwork>>>;
   vmId?: Maybe<Scalars['String']>;
+  vmSize?: Maybe<Scalars['String']>;
+};
+
+export type AzureVirtualMachineAdditionalCapabilities = {
+  hibernationEnabled?: Maybe<Scalars['Boolean']>;
+  ultraSSDEnabled?: Maybe<Scalars['Boolean']>;
 };
 
 export type AzureVirtualMachineOsProfile = {
@@ -5277,6 +5287,12 @@ export type AzureVirtualMachineOsProfileWindowsConfiguration = {
   timeZone?: Maybe<Scalars['String']>;
 };
 
+export type AzureVirtualMachinePlan = {
+  name?: Maybe<Scalars['String']>;
+  product?: Maybe<Scalars['String']>;
+  publisher?: Maybe<Scalars['String']>;
+};
+
 export type AzureVirtualMachineScaleSet = AzureResource & {
   doNotRunExtensionsOnOverprovisionedVMs?: Maybe<Scalars['Boolean']>;
   overprovision?: Maybe<Scalars['Boolean']>;