From 69712253753ffc96cc5d2b6c2fa27dd68f867eb0 Mon Sep 17 00:00:00 2001 From: Miguel Pais Date: Tue, 1 Oct 2024 16:09:19 +0200 Subject: [PATCH] Alignment on Feature and Component names for Azure VM Workload Scanning Managed Containers (#64) * Alignment * Naming change after protorepo changes --- modules/vm-workload-scanning/main.tf | 2 +- src/Main.java | 5 ----- ...d-scanning-aca-aci.tf => workload-scanning-containers.tf} | 2 +- ...d-scanning-aca-aci.tf => workload-scanning-containers.tf} | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 src/Main.java rename test/examples/modular_organization/{vm-workload-scanning-aca-aci.tf => workload-scanning-containers.tf} (93%) rename test/examples/modular_single_subscription/{vm-workload-scanning-aca-aci.tf => workload-scanning-containers.tf} (93%) diff --git a/modules/vm-workload-scanning/main.tf b/modules/vm-workload-scanning/main.tf index 77b46a6..6ec75da 100644 --- a/modules/vm-workload-scanning/main.tf +++ b/modules/vm-workload-scanning/main.tf @@ -109,7 +109,7 @@ resource "azurerm_role_assignment" "sysdig_vm_workload_scanning_acrpull_assignme resource "sysdig_secure_cloud_auth_account_component" "azure_workload_scanning_component" { account_id = var.sysdig_secure_account_id - type = "COMPONENT_VM_WORKLOAD_SCANNING" + type = "COMPONENT_SERVICE_PRINCIPAL" instance = "secure-vm-workload-scanning" service_principal_metadata = jsonencode({ azure = { diff --git a/src/Main.java b/src/Main.java deleted file mode 100644 index 3e59c38..0000000 --- a/src/Main.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file diff --git a/test/examples/modular_organization/vm-workload-scanning-aca-aci.tf b/test/examples/modular_organization/workload-scanning-containers.tf similarity index 93% rename from test/examples/modular_organization/vm-workload-scanning-aca-aci.tf rename to test/examples/modular_organization/workload-scanning-containers.tf index 45366d9..448e06a 100644 --- a/test/examples/modular_organization/vm-workload-scanning-aca-aci.tf +++ b/test/examples/modular_organization/workload-scanning-containers.tf @@ -13,7 +13,7 @@ module "vm-workload-scanning" { resource "sysdig_secure_cloud_auth_account_feature" "vm-workload-scanning-aca-aci" { account_id = module.onboarding.sysdig_secure_account_id - type = "FEATURE_SECURE_VM_WORKLOAD_SCANNING_AZURE_ACA_ACI" + type = "FEATURE_SECURE_WORKLOAD_SCANNING_CONTAINERS" enabled = true components = [module.vm-workload-scanning.service_principal_component_id] depends_on = [ module.vm-workload-scanning ] diff --git a/test/examples/modular_single_subscription/vm-workload-scanning-aca-aci.tf b/test/examples/modular_single_subscription/workload-scanning-containers.tf similarity index 93% rename from test/examples/modular_single_subscription/vm-workload-scanning-aca-aci.tf rename to test/examples/modular_single_subscription/workload-scanning-containers.tf index 45366d9..448e06a 100644 --- a/test/examples/modular_single_subscription/vm-workload-scanning-aca-aci.tf +++ b/test/examples/modular_single_subscription/workload-scanning-containers.tf @@ -13,7 +13,7 @@ module "vm-workload-scanning" { resource "sysdig_secure_cloud_auth_account_feature" "vm-workload-scanning-aca-aci" { account_id = module.onboarding.sysdig_secure_account_id - type = "FEATURE_SECURE_VM_WORKLOAD_SCANNING_AZURE_ACA_ACI" + type = "FEATURE_SECURE_WORKLOAD_SCANNING_CONTAINERS" enabled = true components = [module.vm-workload-scanning.service_principal_component_id] depends_on = [ module.vm-workload-scanning ]