Azure rendering solution deployment framework

src/terraform/examples/e2e/6.compute.scheduler/main.tf

@@ -39,19 +39,8 @@ variable "resourceGroupName" {
 variable "virtualMachines" {
   type = list(object(
     {
-      name = string
-      image = object(
-        {
-          id = string
-          plan = object(
-            {
-              name      = string
-              product   = string
-              publisher = string
-            }
-          )
-        }
-      )
+      name        = string
+      imageId     = string
       machineSize = string
       operatingSystem = object(
         {
@@ -264,7 +253,7 @@ resource "azurerm_linux_virtual_machine" "scheduler" {
   name                            = each.value.name
   resource_group_name             = azurerm_resource_group.scheduler.name
   location                        = azurerm_resource_group.scheduler.location
-  source_image_id                 = each.value.image.id
+  source_image_id                 = each.value.imageId
   size                            = each.value.machineSize
   admin_username                  = each.value.adminLogin.userName
   admin_password                  = data.azurerm_key_vault_secret.admin_password.value
@@ -360,7 +349,7 @@ resource "azurerm_windows_virtual_machine" "scheduler" {
   name                = each.value.name
   resource_group_name = azurerm_resource_group.scheduler.name
   location            = azurerm_resource_group.scheduler.location
-  source_image_id     = each.value.image.id
+  source_image_id     = each.value.imageId
   size                = each.value.machineSize
   admin_username      = each.value.adminLogin.userName
   admin_password      = data.azurerm_key_vault_secret.admin_password.value

src/terraform/examples/e2e/7.compute.farm/main.tf

@@ -35,19 +35,8 @@ variable "resourceGroupName" {
 variable "virtualMachineScaleSets" {
   type = list(object(
     {
-      name = string
-      image = object(
-        {
-          id = string
-          plan = object(
-            {
-              name      = string
-              product   = string
-              publisher = string
-            }
-          )
-        }
-      )
+      name    = string
+      imageId = string
       machine = object (
         {
           size  = string
@@ -204,7 +193,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "farm" {
   name                            = each.value.name
   resource_group_name             = azurerm_resource_group.farm.name
   location                        = azurerm_resource_group.farm.location
-  source_image_id                 = each.value.image.id
+  source_image_id                 = each.value.imageId
   sku                             = each.value.machine.size
   instances                       = each.value.machine.count
   admin_username                  = each.value.adminLogin.userName
@@ -314,7 +303,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "farm" {
   name                   = each.value.name
   resource_group_name    = azurerm_resource_group.farm.name
   location               = azurerm_resource_group.farm.location
-  source_image_id        = each.value.image.id
+  source_image_id        = each.value.imageId
   sku                    = each.value.machine.size
   instances              = each.value.machine.count
   admin_username         = each.value.adminLogin.userName

src/terraform/examples/e2e/8.compute.workstation/main.tf

@@ -35,19 +35,8 @@ variable "resourceGroupName" {
 variable "virtualMachines" {
   type = list(object(
     {
-      name = string
-      image = object(
-        {
-          id = string
-          plan = object(
-            {
-              name      = string
-              product   = string
-              publisher = string
-            }
-          )
-        }
-      )
+      name        = string
+      imageId     = string
       machineSize = string
       operatingSystem = object(
         {
@@ -181,7 +170,7 @@ resource "azurerm_linux_virtual_machine" "workstation" {
   name                            = each.value.name
   resource_group_name             = azurerm_resource_group.workstation.name
   location                        = azurerm_resource_group.workstation.location
-  source_image_id                 = each.value.image.id
+  source_image_id                 = each.value.imageId
   size                            = each.value.machineSize
   admin_username                  = each.value.adminLogin.userName
   admin_password                  = data.azurerm_key_vault_secret.admin_password.value
@@ -262,7 +251,7 @@ resource "azurerm_windows_virtual_machine" "workstation" {
   name                = each.value.name
   resource_group_name = azurerm_resource_group.workstation.name
   location            = azurerm_resource_group.workstation.location
-  source_image_id     = each.value.image.id
+  source_image_id     = each.value.imageId
   size                = each.value.machineSize
   admin_username      = each.value.adminLogin.userName
   admin_password      = data.azurerm_key_vault_secret.admin_password.value