Merge pull request #12 from aquasecurity/fix_cspm_service_account_condition

fix: `cspm_service_account` condition

Author: Noamstrauss

examples/organization-same-project-list/main.tf

@@ -97,7 +97,7 @@ module "aqua_gcp_projects_attachment" {
   onboarding_workload_identity_pool_provider_id = module.aqua_gcp_onboarding[each.value].workload_identity_pool_provider_id # Referencing outputs from the onboarding module
   onboarding_project_number                     = module.aqua_gcp_onboarding[each.value].project_number                     # Referencing outputs from the onboarding module
   onboarding_project_id                         = local.project_id
-  depends_on                                    = [module.aqua_gcp_onboarding]
+  depends_on                                    = [module.aqua_gcp_onboarding, module.aqua_gcp_cspm_iam]
 }
 
 output "onboarding_status" {

examples/organization-same-project/main.tf

@@ -113,7 +113,7 @@ module "aqua_gcp_projects_attachment" {
   onboarding_workload_identity_pool_provider_id = module.aqua_gcp_onboarding[each.value].workload_identity_pool_provider_id # Referencing outputs from the onboarding module
   onboarding_project_number                     = module.aqua_gcp_onboarding[each.value].project_number                     # Referencing outputs from the onboarding module
   onboarding_project_id                         = local.project_id
-  depends_on                                    = [module.aqua_gcp_onboarding]
+  depends_on                                    = [module.aqua_gcp_onboarding, module.aqua_gcp_cspm_iam]
 }
 
 output "onboarding_status" {

modules/project_attachment/README.md

@@ -73,5 +73,5 @@ No modules.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_onboarding_status"></a> [onboarding\_status](#output\_onboarding\_status) | Onboarding API call output |
+| <a name="output_onboarding_status"></a> [onboarding\_status](#output\_onboarding\_status) | Onboarding API Status Result |
 <!-- END_TF_DOCS -->

modules/project_attachment/data.tf

@@ -8,7 +8,7 @@ data "http" "autoconnect_cspm_role_yaml" {
 
 # Retrieve the CSPM service account information if create service account toggle is disabled
 data "google_service_account" "cspm_service_account" {
-  count      = var.create_service_account ? 0 : 1
+  count      = var.type == "single" && var.create_service_account ? 0 : 1
   account_id = local.cspm_service_account_name
   project    = var.onboarding_project_id
 }

modules/project_attachment/outputs.tf

@@ -2,5 +2,6 @@
 
 # Onboarding API call output
 output "onboarding_status" {
-  value = data.external.gcp_onboarding.result.status
+  description = "Onboarding API Status Result"
+  value       = data.external.gcp_onboarding.result.status
 }