Fixing bugs

Author: miguelpais

modules/vm-workload-scanning/main.tf

@@ -55,11 +55,11 @@ resource "google_project_iam_binding" "controller_binding" {
 }
 
 resource "google_iam_workload_identity_pool" "agentless" {
-  workload_identity_pool_id = "sysdig-wl-${local.suffix}"
+  workload_identity_pool_id = "sysdig-${local.suffix}"
 }
 
 resource "google_iam_workload_identity_pool_provider" "agentless" {
-  count = data.sysdig_secure_agentless_scanning_assets.assets.backend == "aws" ? 1 : 0
+  count = data.sysdig_secure_agentless_scanning_assets.assets.backend.type == "aws" ? 1 : 0
 
   project                            = var.project_id
   workload_identity_pool_id          = google_iam_workload_identity_pool.agentless.workload_identity_pool_id
@@ -83,23 +83,23 @@ resource "google_iam_workload_identity_pool_provider" "agentless" {
 }
 
 resource "google_service_account_iam_member" "controller_binding" {
-  count = data.sysdig_secure_agentless_scanning_assets.assets.backend == "aws" ? 1 : 0
+  count = data.sysdig_secure_agentless_scanning_assets.assets.backend.type == "aws" ? 1 : 0
 
   service_account_id = google_service_account.controller.name
   role               = "roles/iam.workloadIdentityUser"
   member             = "principalSet://iam.googleapis.com/${google_iam_workload_identity_pool.agentless.name}/attribute.aws_account/${data.sysdig_secure_trusted_cloud_identity.trusted_identity.aws_account_id}"
 }
 
 resource "google_iam_workload_identity_pool_provider" "agentless_gcp" {
-  count = data.sysdig_secure_agentless_scanning_assets.assets.backend == "gcp" ? 1 : 0
+  count = data.sysdig_secure_agentless_scanning_assets.assets.backend.type == "gcp" ? 1 : 0
 
   workload_identity_pool_id          = google_iam_workload_identity_pool.agentless.workload_identity_pool_id
-  workload_identity_pool_provider_id = "sysdig-ws-${local.suffix}-gcp"
-  display_name                       = "Sysdig Agentless Workload Controller"
+  workload_identity_pool_provider_id = "sysdig-${local.suffix}"
+  display_name                       = "Sysdig Agentless Workload"
   description                        = "GCP identity pool provider for Sysdig Secure Agentless Workload Scanning"
   disabled                           = false
 
-  attribute_condition = "google.subject == \"${data.sysdig_secure_agentless_scanning_assets.assets.backend.cloudId}\""
+  attribute_condition = "google.subject == \"${data.sysdig_secure_agentless_scanning_assets.assets.backend.cloud_id}\""
 
   attribute_mapping = {
     "google.subject"  = "assertion.sub"
@@ -112,14 +112,13 @@ resource "google_iam_workload_identity_pool_provider" "agentless_gcp" {
 }
 
 resource "google_service_account_iam_member" "controller_binding_gcp" {
-  count = data.sysdig_secure_agentless_scanning_assets.assets.backend == "gcp" ? 1 : 0
+  count = data.sysdig_secure_agentless_scanning_assets.assets.backend.type == "gcp" ? 1 : 0
 
   service_account_id = google_service_account.controller.name
   role               = "roles/iam.workloadIdentityUser"
-  member             = "principalSet://iam.googleapis.com/${google_iam_workload_identity_pool.agentless.name}/attribute.sa_id/${data.sysdig_secure_agentless_scanning_assets.assets.backend.cloudId}"
+  member             = "principalSet://iam.googleapis.com/${google_iam_workload_identity_pool.agentless.name}/attribute.sa_id/${data.sysdig_secure_agentless_scanning_assets.assets.backend.cloud_id}"
 }
 
-
 #--------------------------------------------------------------------------------------------------------------
 # Call Sysdig Backend to add the service-principal integration for VM Workload Scanning to the Sysdig Cloud Account
 #--------------------------------------------------------------------------------------------------------------
@@ -132,7 +131,7 @@ resource "sysdig_secure_cloud_auth_account_component" "google_service_principal"
     gcp = {
       workload_identity_federation = {
         pool_id          = google_iam_workload_identity_pool.agentless.workload_identity_pool_id
-        pool_provider_id = google_iam_workload_identity_pool_provider.agentless.workload_identity_pool_provider_id
+        pool_provider_id = data.sysdig_secure_agentless_scanning_assets.assets.backend == "aws" ? google_iam_workload_identity_pool_provider.agentless[0].workload_identity_pool_provider_id : google_iam_workload_identity_pool_provider.agentless_gcp[0].workload_identity_pool_provider_id
         project_number   = data.google_project.project.number
       }
       email = google_service_account.controller.email