skip: update CI 244

epam · Sep 3, 2024 · 8619e09 · 8619e09
1 parent 6191b25
commit 8619e09
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 76 deletions.
diff --git a/auto_policy_testing/green/vm/extension_linux.tf b/auto_policy_testing/green/vm/extension_linux.tf
@@ -43,29 +43,6 @@ resource "azurerm_virtual_machine_extension" "lin3" {
   depends_on = [azurerm_virtual_machine_extension.lin2]
 }
 
-resource "azurerm_virtual_machine_extension" "lin4" {
-    name                              =     "AzureDiskEncryption"
-    virtual_machine_id                =     azurerm_linux_virtual_machine.this1.id
-    publisher                         =     "Microsoft.Azure.Security"
-    type                              =     "AzureDiskEncryptionForLinux"
-    type_handler_version              =     "1.1"
-    auto_upgrade_minor_version        =     true
-
-    settings = <<SETTINGS
-    {
-        "EncryptionOperation"         :     "EnableEncryption",
-        "KeyVaultURL"                 :     "${data.terraform_remote_state.common.outputs.key_vault_url}",
-        "KeyVaultResourceId"          :     "${data.terraform_remote_state.common.outputs.key_vault_id}",
-        "KeyEncryptionKeyURL"         :     "${data.terraform_remote_state.common.outputs.key_id}",
-        "KekVaultResourceId"          :     "${data.terraform_remote_state.common.outputs.key_vault_id}",
-        "KeyEncryptionAlgorithm"      :     "RSA-OAEP",
-        "VolumeType"                  :     "All"
-    }
-    SETTINGS
-
-    depends_on = [azurerm_linux_virtual_machine.this1]
-}
-
 resource "azurerm_virtual_machine_scale_set_extension" "linvmss1" {
   name                         = "lvmssdiagext"
   virtual_machine_scale_set_id = azurerm_linux_virtual_machine_scale_set.this.id

diff --git a/auto_policy_testing/green/vm/outputs.tf b/auto_policy_testing/green/vm/outputs.tf
@@ -2,7 +2,7 @@ output "vm" {
   value = {
     ecc-azure-116-cis_vm_endpoint_protection = azurerm_windows_virtual_machine.this.id,
     ecc-azure-132-vm_wo_del_lock = azurerm_linux_virtual_machine.this.id,
-    ecc-azure-197-asb_vm_disk_encryption_on = azurerm_linux_virtual_machine.this1.id,
+    ecc-azure-197-asb_vm_disk_encryption_on = azurerm_windows_virtual_machine.this.id,
     ecc-azure-275-asb_vm_backup = azurerm_windows_virtual_machine.this.id,
     ecc-azure-337-vm_antimalware_auto_updates = azurerm_windows_virtual_machine.this.id,
     ecc-azure-353-vmss_auto_image_patching = azurerm_linux_virtual_machine_scale_set.this.id,

diff --git a/auto_policy_testing/green/vm/vm_encrypted.tf b/auto_policy_testing/green/vm/vm_encrypted.tf
diff --git a/auto_policy_testing/green/vm/vnet.tf b/auto_policy_testing/green/vm/vnet.tf
@@ -39,17 +39,3 @@ resource "azurerm_network_interface" "nic3" {
 
   tags = module.naming.default_tags
 }
-
-resource "azurerm_network_interface" "nic4" {
-  name                = "${module.naming.resource_prefix.networkinterface}-vm4"
-  location            = data.terraform_remote_state.common.outputs.location
-  resource_group_name = data.terraform_remote_state.common.outputs.resource_group
-
-  ip_configuration {
-    name                          = "conf4-vm-green"
-    subnet_id                     = data.terraform_remote_state.common.outputs.subnet_id
-    private_ip_address_allocation = "Dynamic"
-  }
-
-  tags = module.naming.default_tags
-}