Merge branch 'master' into pasa/gcp/add-monitoring-permission

Author: matteopasa

test/examples/organization_api_enablement/cdr_ciem/main.tf

@@ -3,15 +3,17 @@ This terraform file is intended to enable the GCP APIs needed for CDR/CIEM featu
 It will create a google_project_service resource per each service enabled within the GCP project.
 The APIs needed for the CDR/CIEM feature are listed below:
   - Cloud Pub/Sub API
+  - Cloud Logging API
 
 * Note: This do not overwrite any other APIs config that your GCP project has, it will only enabled it if isn't yet.
 */
 
 # Set local local variables for Project ID and API services to enable
 locals {
-  project = "org-child-project-1"
+  project = "<MANAGEMENT_PROJECT_ID>"
   services = [
-    "pubsub.googleapis.com"
+    "pubsub.googleapis.com",
+    "logging.googleapis.com"
   ]
 }
 

test/examples/organization_api_enablement/cspm/main.tf

@@ -2,9 +2,7 @@
 This terraform file is intended to enable the GCP APIs needed for CSPM feature within a single project onboarding.
 It will create a google_project_service resource per each service enabled within the GCP project.
 The APIs needed for the CSPM feature are listed below:
-  - Security Token Service API
   - Cloud Asset API
-  - Cloud Identity API
   - Admin SDK API
 In addition, since CSPM is needed for onboard any GCP project these other APIs are also enabled:
   - Identity and access management API
@@ -16,12 +14,10 @@ In addition, since CSPM is needed for onboard any GCP project these other APIs a
 
 # Set local variables for Project ID and API services to enable
 locals {
-  project = "org-child-project-1"
+  project = "<MANAGEMENT_PROJECT_ID>"
   services = [
     # CSPM specific APIs
-    "sts.googleapis.com",
     "cloudasset.googleapis.com",
-    "cloudidentity.googleapis.com",
     "admin.googleapis.com",
 
     # additional APIs

test/examples/organization_api_enablement/vm/main.tf

@@ -9,7 +9,7 @@ The APIs needed for the VM feature are listed below:
 
 # Set local variables for Project ID and API services to enable
 locals {
-  project = "org-child-project-1"
+  project = "<MANAGEMENT_PROJECT_ID>"
   services = [
     "compute.googleapis.com"
   ]