skip: update CI 234

epam · Sep 2, 2024 · c2ee306 · c2ee306
1 parent c9ec83b
commit c2ee306
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 1 deletion.
diff --git a/auto_policy_testing/green/vm/extension.tf b/auto_policy_testing/green/vm/extension.tf
@@ -132,3 +132,19 @@ resource "azurerm_virtual_machine_scale_set_extension" "vmsswin3" {
   depends_on = [azurerm_virtual_machine_scale_set_extension.vmsswin2]
 }
 
+resource "azurerm_virtual_machine_scale_set_extension" "vmsswin11" {
+  name                         = "wvmssdiagext"
+  virtual_machine_scale_set_id = azurerm_windows_virtual_machine_scale_set.this1.id
+  publisher                    = "Microsoft.Azure.Diagnostics"
+  type                         = "IaaSDiagnostics"
+  type_handler_version         = "1.1"
+}
+
+resource "azurerm_virtual_machine_scale_set_extension" "vmsswin12" {
+  name                         = "IaaSAntimalware"
+  virtual_machine_scale_set_id = azurerm_windows_virtual_machine_scale_set.this1.id
+  publisher                    = "Microsoft.Azure.Security"
+  type                         = "IaaSAntimalware"
+  type_handler_version         = "1.5"
+  depends_on = [azurerm_virtual_machine_scale_set_extension.vmsswin11]
+}
diff --git a/auto_policy_testing/green/vm/extension_linux.tf b/auto_policy_testing/green/vm/extension_linux.tf
@@ -54,7 +54,7 @@ resource "azurerm_virtual_machine_scale_set_extension" "linvmss1" {
 
 resource "azurerm_virtual_machine_scale_set_extension" "linvmss2" {
   name                         = "OmsAgentForLinux"
-  virtual_machine_scale_set_id = azurerm_linux_virtual_machine_scale_set.this.id
+  virtual_machine_scale_set_id = azurerm_linux_virtual_machine_scale_set.this1.id
   publisher                    = "Microsoft.EnterpriseCloud.Monitoring"
   type                         = "OmsAgentForLinux"
   type_handler_version         = "1.14"

diff --git a/auto_policy_testing/green/vm/outputs.tf b/auto_policy_testing/green/vm/outputs.tf
@@ -8,6 +8,9 @@ output "vm" {
     ecc-azure-353-vmss_auto_image_patching = azurerm_linux_virtual_machine_scale_set.this.id,
     ecc-azure-367-vm_omi_vulnerability = azurerm_windows_virtual_machine.this.id,
     ecc-azure-412-cis_tpm_and_secure_boot = azurerm_windows_virtual_machine.this.id,
+    ecc-azure-227-asb_reslogs_vmss = azurerm_windows_virtual_machine_scale_set.this1.id,
+    ecc-azure-368-vmss_omi_vulnerability = azurerm_linux_virtual_machine_scale_set.this1.id,
+    ecc-azure-272-asb_scaleset = azurerm_windows_virtual_machine_scale_set.this1.id,
     vm = [azurerm_windows_virtual_machine.this.id, azurerm_linux_virtual_machine.this.id],
     vmss = [azurerm_windows_virtual_machine_scale_set.this.id, azurerm_linux_virtual_machine_scale_set.this.id]
   }

diff --git a/auto_policy_testing/green/vm/vmss.tf b/auto_policy_testing/green/vm/vmss.tf
@@ -31,4 +31,39 @@ resource "azurerm_windows_virtual_machine_scale_set" "this" {
     }
   }
   tags = module.naming.default_tags
+}
+
+resource "azurerm_windows_virtual_machine_scale_set" "this1" {
+  name                            = "${module.naming.resource_prefix.vmss}gr1win"
+  location                        = data.terraform_remote_state.common.outputs.location
+  resource_group_name             = data.terraform_remote_state.common.outputs.resource_group
+  sku                             = "Standard_DS2_v2"
+  instances                       = 1
+  admin_username                  = random_string.this.result
+  admin_password                  = random_password.this.result
+  encryption_at_host_enabled      = true
+
+  source_image_reference {
+    publisher = "MicrosoftWindowsServer"
+    offer     = "WindowsServer"
+    sku       = "2016-Datacenter-Server-Core"
+    version   = "latest"
+  }
+
+  os_disk {
+    storage_account_type = "Standard_LRS"
+    caching              = "ReadWrite"
+  }
+
+  network_interface {
+    name    = "nic-vm6-green"
+    primary = true
+
+    ip_configuration {
+      name      = "conf4-vm-green"
+      primary   = true
+      subnet_id = data.terraform_remote_state.common.outputs.subnet_id
+    }
+  }
+  tags = module.naming.default_tags
 }
diff --git a/auto_policy_testing/green/vm/vmss_linux.tf b/auto_policy_testing/green/vm/vmss_linux.tf
@@ -53,3 +53,45 @@ resource "azurerm_linux_virtual_machine_scale_set" "this" {
   depends_on = [ azurerm_lb_rule.this, azurerm_lb_probe.this ]
 }
 
+resource "azurerm_linux_virtual_machine_scale_set" "this1" {
+  name                            = "${module.naming.resource_prefix.vmss}gr1lin"
+  location                        = data.terraform_remote_state.common.outputs.location
+  resource_group_name             = data.terraform_remote_state.common.outputs.resource_group
+  sku                             = "Standard_DS2_v2"
+  disable_password_authentication = true
+  admin_username                  = random_string.this.result
+  instances                       = 1  
+
+
+  admin_ssh_key {
+    username   = random_string.this.result
+    public_key = tls_private_key.this.public_key_openssh
+  }
+
+  source_image_reference {
+    publisher = "Canonical"
+    offer     = "UbuntuServer"
+    sku       = "16.04-LTS"
+    version   = "latest"
+  }
+
+  os_disk {
+    storage_account_type = "Standard_LRS"
+    caching              = "ReadWrite"
+  }
+
+  network_interface {
+    name    = "nic-vm7-green"
+    primary = true
+
+    ip_configuration {
+      name      = "conf7-vm-green"
+      primary   = true
+      subnet_id = data.terraform_remote_state.common.outputs.subnet_id
+    }
+  }
+
+  tags = module.naming.default_tags
+}
+
+