Remove unnecessary WorkloadIdentity role from CSPM Org member

.github/git-chglog/CHANGELOG.tpl.md

@@ -25,4 +25,4 @@
 {{ end }}
 {{ end -}}
 {{ end -}}
-{{ end -}}
+{{ end -}}

.github/git-chglog/config.yml

@@ -29,4 +29,4 @@ options:
       - Subject
   notes:
     keywords:
-      - BREAKING CHANGE
+      - BREAKING CHANGE

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict
       - id: end-of-file-fixer
@@ -11,22 +11,22 @@ repos:
     rev: v1.86.0
     hooks:
       - id: terraform_fmt
-      - id: terraform_docs
-        args:
-          - '--args=--sort-by required'
-      - id: terraform_tflint
-        args:
-          - '--args=--only=terraform_deprecated_interpolation'
-          - '--args=--only=terraform_deprecated_index'
-          - '--args=--only=terraform_unused_declarations'
-          - '--args=--only=terraform_comment_syntax'
-          - '--args=--only=terraform_documented_outputs'
-          - '--args=--only=terraform_documented_variables'
-          - '--args=--only=terraform_typed_variables'
-          - '--args=--only=terraform_module_pinned_source'
-          - '--args=--only=terraform_naming_convention'
-          - '--args=--only=terraform_required_version'
-          - '--args=--only=terraform_required_providers'
-          - '--args=--only=terraform_standard_module_structure'
-          - '--args=--only=terraform_workspace_remote'
-      - id: terrascan
+      # - id: terraform_docs
+      #   args:
+      #     - '--args=--sort-by required'
+      # - id: terraform_tflint
+      #   args:
+      #     - '--args=--only=terraform_deprecated_interpolation'
+      #     - '--args=--only=terraform_deprecated_index'
+      #     - '--args=--only=terraform_unused_declarations'
+      #     - '--args=--only=terraform_comment_syntax'
+      #     - '--args=--only=terraform_documented_outputs'
+      #     - '--args=--only=terraform_documented_variables'
+      #     - '--args=--only=terraform_typed_variables'
+      #     - '--args=--only=terraform_module_pinned_source'
+      #     - '--args=--only=terraform_naming_convention'
+      #     - '--args=--only=terraform_required_version'
+      #     - '--args=--only=terraform_required_providers'
+      #     - '--args=--only=terraform_standard_module_structure'
+      #     - '--args=--only=terraform_workspace_remote'
+      # - id: terrascan

CONTRIBUTING.md

@@ -32,5 +32,3 @@ It's recommended to use an .envrc file to keep environment variables under contr
 ## Release
 
 - push a new tag and the Github Action will draft a release (with notes)
-
-

README.md

@@ -2,13 +2,97 @@
 
 Terraform module that deploys the Sysdig Secure for Cloud stack in GCP.
 
+With Modular Onboarding, introducing the following design and install structure for `terraform-google-secure`:
+
+* **[Onboarding]**: It onboards a GCP Project or Organization for the first time to Sysdig Secure for Cloud, and collects
+inventory and organizational hierarchy in the given GCP Organization. Managed through `onboarding` module. <br/>
+
 Provides unified threat-detection, compliance, forensics and analysis through these major components:
 
-* **[CSPM](https://docs.sysdig.com/en/docs/sysdig-secure/posture/)**: It evaluates periodically your cloud configuration, using Cloud Custodian, against some benchmarks and returns the results and remediation you need to fix. Managed through `service-principal` module. <br/>
+* **[CSPM](https://docs.sysdig.com/en/docs/sysdig-secure/posture/)**: It evaluates periodically your cloud configuration, using Cloud Custodian, against some benchmarks and returns the results and remediation you need to fix. Managed through `config-posture` module. <br/>
+
+* **[CIEM](https://docs.sysdig.com/en/docs/sysdig-secure/posture/identity-and-access/)**: Permissions and Entitlements management. Managed through `config-posture` module. <br/>
+
+* **[CDR (Cloud Detection and Response)]((https://docs.sysdig.com/en/docs/sysdig-secure/threats/activity/events-feed/))**: It sends periodically the Audit Logs collected from a GCP project/organization to Sysdig's systems, this by collecting them in a PubSub topic through a Sink and then sending them through a `PUSH` integration. Managed through `pub-sub` integrations module. <br/>
+
+For other Cloud providers check: [AWS](https://github.com/sysdiglabs/terraform-aws-secure)
+
+<br/>
+
+## Modules
+
+### Feature modules
+
+These are independent feature modules which deploy and manage all the required Cloud resources and Sysdig resources
+for the respective Sysdig features. They manage both, onboarding a single GCP Project or a GCP Organization to Sysdig Secure for Cloud.
+
+`onboarding`, `config-posture`, `agentless-scan` and `vm-workload-scanning` are independent feature modules.
+
+### Integrations
+
+The modules under `integrations` are feature agnostic modules which deploy and manage all the required Cloud resources and Sysdig resources for shared Sysdig integrations. That is to say, one or more Sysdig features can be enabled by installing an integration.
+
+These modules manage both, onboarding a single GCP Project or a GCP Organization to Sysdig Secure for Cloud.
+
+`pub-sub` is an integration module.
+
+## Examples and usage
+
+The modules in this repository can be installed on a single GCP project, or on an entire GCP Organization, or organizational folders within the org.
+
+The `test` directory has sample `examples` for all these module deployments i.e under `modular_single_project`,  or `modular_organization` sub-folders.
+
+For example, to onboard a single GCP project, with CSPM and Basic CIEM enabled, with modular installation :-
+1. Run the terraform snippet under `test/examples/modular_single_project/onboarding_with_posture.tf` with
+   the appropriate attribute values populated.
+2. This will install the `onboarding` module, which will also create a Cloud Account on Sysdig side.
+3. It will also install the `config-posture` module, which will also install cloud resources as well as Sysdig resources
+   for successfully running CSPM and Basic Identity scans.
+4. On Sysdig side, you will be able to see the Cloud account onboarded with required components, and CSPM & Basic CIEM features installed and enabled.
+
+To run this example you need have your GCP auth login via gcloud CLI and execute:
+```terraform
+$ terraform init
+$ terraform plan
+$ terraform apply
+```
+
+Notice that:
+* This example will create resources that cost money.<br/>Run `terraform destroy` when you don't need them anymore
+* All created resources will be created within the tags `product:sysdig-secure-for-cloud`, within the resource-group `sysdig-secure-for-cloud`
+
+<br/>
+
+## Organizational Install Configurations
+
+There are four new parameters to configure organizational deployments on the cloud for Sysdig Secure for Cloud :-
+1. `include_folders` - List of GCP Organizational Folders to deploy the Sysdig Secure for Cloud resources in.
+2. `exclude_folders` - List of GCP Organizational Folders to exclude deploying the Sysdig Secure for Cloud resources in.
+3. `include_projects` - List of GCP Projects to deploy the Sysdig Secure for Cloud resources in.
+4. `exclude_projects` - List of GCP Projects to exclude deploying the Sysdig Secure for Cloud resources in.
+
+**WARNING**: module variable `management_group_ids` will be DEPRECATED on 30th November, 2025. Please work with Sysdig to migrate your Terraform installs to use `include_folders` instead to achieve the same deployment outcome.
+
+**Note**: The modules under `modules/services/` folder are legacy installs and soon to be deprecated. Those modules are no longer used for Onboarding. Please use the corresponding feature modules as mentioned in `## Modules` section above for Modular Onboarding. It is the recommended form of Onboarding.
+
+<br/>
+
+## Best practices
+
+For contributing to existing modules or adding new modules, below are some of the best practices recommended :-
+* Module names referred and used in deployment snippets should be consistent with those in their source path.
+* A module can fall into one of two categories - feature module or an integrations module.
+* Every user-facing deployment snippet will,
+  - at the top level first call the feature module or integrations module from this repo. These modules deploy corresponding cloud resources and Sysdig component resources.
+  - the corresponding feature resource will be added as the last block and enabled from the module installed component resource reference.
+  See sample deployment snippets in `test/examples` for more.
+* integrations modules are shared and could enable multiple features. Hence, one should be careful with changes to them.
+* Module naming follows the pattern with "-" , resource and variable naming follows the pattern with "_".
 
-* **[CIEM](https://docs.sysdig.com/en/docs/sysdig-secure/posture/identity-and-access/)**: Permissions and Entitlements management. Managed through `service-principal` module. <br/>
+## Authors
 
-* **[CDR (Cloud Detection and Response)]((https://docs.sysdig.com/en/docs/sysdig-secure/threats/activity/events-feed/))**: It sends periodically the Audit Logs collected from a GCP project/organization to Sysdig's systems, this by collecting them in a PubSub topic through a Sink and then sending them through a `PUSH` integration. Managed through `webhook-datasource` module. <br/>
+Module is maintained and supported by [Sysdig](https://sysdig.com).
 
-For other Cloud providers check: [AWS](https://github.com/draios/terraform-aws-secure-for-cloud)
+## License
 
+Apache 2 Licensed. See LICENSE for full details.

modules/agentless-scan/README.md

@@ -1,6 +1,6 @@
 # GCP Agentless Scanning Module
 
-This Module creates the resources required to scan hosts on Google Cloud Projects. Before applying the changes defined 
+This Module creates the resources required to scan hosts on Google Cloud Projects. Before applying the changes defined
 in this module, the following operations need to be performed on the target GCP environment:
 
 - The APIs needed for the VM feature are listed below:

modules/agentless-scan/outputs.tf

@@ -2,4 +2,4 @@ output "agentless_scan_component_id" {
   value       = "${sysdig_secure_cloud_auth_account_component.gcp_agentless_scan.type}/${sysdig_secure_cloud_auth_account_component.gcp_agentless_scan.instance}"
   description = "Component identifier of Agentless Scan integration created in Sysdig Backend for VM"
   depends_on  = [sysdig_secure_cloud_auth_account_component.gcp_agentless_scan]
-}
+}

modules/agentless-scan/versions.tf

@@ -15,4 +15,4 @@ terraform {
       version = ">= 3.1"
     }
   }
-}
+}

modules/config-posture/README.md

@@ -76,4 +76,4 @@ Module is maintained by [Sysdig](https://sysdig.com).
 
 ## License
 
-Apache 2 Licensed. See LICENSE for full details.
+Apache 2 Licensed. See LICENSE for full details.

modules/config-posture/organizational.tf

@@ -16,9 +16,9 @@ data "google_organization" "org" {
 #---------------------------------------------------------------------------------------------
 resource "google_organization_iam_member" "cspm" {
   # adding ciem role with permissions to the service account alongside cspm roles
-  for_each = var.is_organizational ? toset(["roles/cloudasset.viewer", "roles/iam.workloadIdentityUser", "roles/logging.viewer", "roles/cloudfunctions.viewer", "roles/cloudbuild.builds.viewer", "roles/orgpolicy.policyViewer", "roles/recommender.viewer", "roles/iam.serviceAccountViewer", "roles/iam.organizationRoleViewer", "roles/container.clusterViewer", "roles/compute.viewer"]) : []
+  for_each = var.is_organizational ? toset(["roles/cloudasset.viewer", "roles/logging.viewer", "roles/cloudfunctions.viewer", "roles/cloudbuild.builds.viewer", "roles/orgpolicy.policyViewer", "roles/recommender.viewer", "roles/iam.serviceAccountViewer", "roles/iam.organizationRoleViewer", "roles/container.clusterViewer", "roles/compute.viewer"]) : []
 
   org_id = data.google_organization.org[0].org_id
   role   = each.key
   member = "serviceAccount:${google_service_account.posture_auth.email}"
-}
+}

modules/config-posture/outputs.tf

@@ -2,4 +2,4 @@ output "service_principal_component_id" {
   value       = "${sysdig_secure_cloud_auth_account_component.google_service_principal.type}/${sysdig_secure_cloud_auth_account_component.google_service_principal.instance}"
   description = "Component identifier of Service Principal created in Sysdig Backend for Config Posture"
   depends_on  = [sysdig_secure_cloud_auth_account_component.google_service_principal]
-}
+}

modules/config-posture/versions.tf

@@ -15,4 +15,4 @@ terraform {
       version = ">= 3.1"
     }
   }
-}
+}

modules/integrations/pub-sub/organizational.tf

@@ -84,4 +84,4 @@ resource "google_organization_iam_member" "custom" {
   org_id = data.google_organization.org[0].org_id
   role   = google_organization_iam_custom_role.custom_ingestion_auth_role[0].id
   member = "serviceAccount:${google_service_account.push_auth.email}"
-}
+}

modules/integrations/pub-sub/outputs.tf

@@ -2,4 +2,4 @@ output "pubsub_datasource_component_id" {
   value       = "${sysdig_secure_cloud_auth_account_component.gcp_pubsub_datasource.type}/${sysdig_secure_cloud_auth_account_component.gcp_pubsub_datasource.instance}"
   description = "Component identifier of Webhook Datasource integration created in Sysdig Backend for Log Ingestion"
   depends_on  = [sysdig_secure_cloud_auth_account_component.gcp_pubsub_datasource]
-}
+}

modules/integrations/pub-sub/versions.tf

@@ -19,4 +19,4 @@ terraform {
       version = "0.13.1"
     }
   }
-}
+}

modules/onboarding/README.md

@@ -109,4 +109,4 @@ Module is maintained by [Sysdig](https://sysdig.com).
 
 ## License
 
-Apache 2 Licensed. See LICENSE for full details.
+Apache 2 Licensed. See LICENSE for full details.

modules/onboarding/locals.tf

@@ -35,4 +35,4 @@ check "validate_org_configuration_params" {
     Note: management_group_ids is going to be DEPRECATED 'management_group_ids' on 30th November, 2025. Please work with Sysdig to migrate your Terraform installs.
     EOT
   }
-}
+}

modules/onboarding/main.tf

@@ -139,4 +139,4 @@ resource "sysdig_secure_cloud_auth_account_component" "onboarding_service_princi
     google_service_account_iam_member.custom_onboarding_auth,
     time_sleep.wait_for_apply_google_permissions
   ]
-}
+}

modules/onboarding/organizational.tf

@@ -45,4 +45,4 @@ resource "sysdig_secure_organization" "google_organization" {
   lifecycle {
     ignore_changes = [automatic_onboarding]
   }
-}
+}

modules/onboarding/outputs.tf

@@ -36,4 +36,4 @@ output "include_projects" {
 output "exclude_projects" {
   description = "projects to exclude for organization"
   value       = var.exclude_projects
-}
+}

modules/onboarding/versions.tf

@@ -19,4 +19,4 @@ terraform {
       version = "0.13.1"
     }
   }
-}
+}

modules/services/service-principal/README.md

@@ -4,9 +4,9 @@ This module will deploy a Service Principal (GCP Service Account) for a single G
 
 The following resources will be created in each instrumented project:
 - A Service Account with associated role permissions to grant Sysdig read only permissions to secure your GCP Project.
-    - A Service Account Key attached to this service account using its name. 
+    - A Service Account Key attached to this service account using its name.
 
-If instrumenting a GCP Organization, the service account will be created in the Management Account (provided via the project ID), with appropriate organizational level permissions. 
+If instrumenting a GCP Organization, the service account will be created in the Management Account (provided via the project ID), with appropriate organizational level permissions.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements

modules/services/service-principal/main.tf

@@ -46,4 +46,4 @@ resource "google_project_iam_member" "identity_mgmt" {
 #--------------------------------
 resource "google_service_account_key" "secure_service_account_key" {
   service_account_id = google_service_account.sa.name
-}
+}

modules/services/service-principal/organizational.tf

@@ -42,4 +42,4 @@ resource "google_organization_iam_member" "identity_mgmt" {
   org_id = data.google_organization.org[0].org_id
   role   = each.key
   member = "serviceAccount:${google_service_account.sa.email}"
-}
+}

modules/services/service-principal/outputs.tf

@@ -7,4 +7,4 @@ output "service_account_key" {
   value       = google_service_account_key.secure_service_account_key.private_key
   description = "Private Key of the Service Account created"
   sensitive   = true
-}
+}

modules/services/service-principal/variables.tf

@@ -19,4 +19,4 @@ variable "organization_domain" {
   type        = string
   description = "Organization domain. e.g. sysdig.com"
   default     = ""
-}
+}

modules/services/service-principal/versions.tf

@@ -7,4 +7,4 @@ terraform {
       version = ">= 4.21.0"
     }
   }
-}
+}

modules/services/workload-scan/provider.tf

@@ -15,4 +15,4 @@ terraform {
       version = "~> 1.37"
     }
   }
-}
+}

modules/vm-workload-scanning/versions.tf

@@ -15,4 +15,4 @@ terraform {
       version = "~> 1.37"
     }
   }
-}
+}

project/README.md

@@ -1 +0,0 @@
-

project/main.tf

@@ -1 +0,0 @@
-

project/outputs.tf

@@ -1 +0,0 @@
-

project/variables.tf

@@ -1 +0,0 @@
-

test/Makefile

@@ -1,2 +1,2 @@
 test:
-	./functional.sh
+	./functional.sh

test/examples/modular_organization/agentless-scan.tf

@@ -17,4 +17,4 @@ resource "sysdig_secure_cloud_auth_account_feature" "agentless_scanning" {
   enabled    = true
   components = [module.agentless-scan.agentless_scan_component_id]
   depends_on = [module.agentless-scan]
-}
+}

test/examples/modular_organization/onboarding_with_posture.tf

@@ -27,8 +27,8 @@ module "onboarding" {
   # management_group_ids = ["folders/123456789012"]
 
   # include/exclude parameters
-  include_folders = ["123456789012", "12345678911"]
-  exclude_folders = []
+  include_folders  = ["123456789012", "12345678911"]
+  exclude_folders  = []
   include_projects = ["<project-id-1>", "<project-id-2>"]
   exclude_projects = ["<project-id-3>", "<project-id-4>"]