fix(bench): fix alias and providers (#60)

* fix(bench) Fix alias and provider

Author: nkraemer-sysdig

examples/organization/main.tf

@@ -8,14 +8,25 @@ EOT
 EOT
 }
 
+# This provider is project specific, and can only be used to provision resources in the
+# specified project. Primarily used for Cloud Connector and Cloud Scanning
 provider "google" {
   project = var.project_id
   region  = var.location
 }
 
+# This provider is project agnostic, and can be used to provision resources in any project,
+# provided the project is specified on the resource. Primarily used for Benchmarks
+provider "google" {
+  alias  = "multiproject"
+  region = var.location
+}
+
+# This provider is project agnostic, and can be used to provision resources in any project,
+# provided the project is specified on the resource. Primarily used for Benchmarks
 provider "google-beta" {
-  project = var.project_id
-  region  = var.location
+  alias  = "multiproject"
+  region = var.location
 }
 
 provider "sysdig" {
@@ -134,6 +145,11 @@ locals {
 }
 
 module "cloud_bench" {
+  providers = {
+    google      = google.multiproject
+    google-beta = google-beta.multiproject
+  }
+
   count  = var.deploy_bench ? 1 : 0
   source = "../../modules/services/cloud-bench"
 

modules/services/cloud-bench/README.md

@@ -18,6 +18,8 @@ module "cloud_benchmark_gcp" {
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.0 |
 | <a name="requirement_google"></a> [google](#requirement\_google) | >= 3.67.0 |
+| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 3.67.0 |
+| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.21 |
 
 ## Providers
 

modules/services/cloud-bench/task/versions.tf

@@ -6,10 +6,6 @@ terraform {
       source  = "hashicorp/google"
       version = ">= 3.67.0"
     }
-    google-beta = {
-      source  = "hashicorp/google-beta"
-      version = ">= 3.67.0"
-    }
     sysdig = {
       source  = "sysdiglabs/sysdig"
       version = ">= 0.5.21"

modules/services/cloud-bench/trust_relationship/main.tf

@@ -20,10 +20,13 @@ locals {
 
 resource "sysdig_secure_cloud_account" "cloud_account" {
   account_id     = data.google_project.project.number
-  alias          = data.google_project.project.id
   cloud_provider = "gcp"
   role_enabled   = "true"
   role_name      = var.role_name
+
+  # Required as datasource prefixes id with '/projects/':
+  # https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project#id
+  alias = trimprefix(data.google_project.project.id, "projects/")
 }
 
 ###################################################

modules/services/cloud-bench/versions.tf

@@ -6,5 +6,13 @@ terraform {
       source  = "hashicorp/google"
       version = ">= 3.67.0"
     }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 3.67.0"
+    }
+    sysdig = {
+      source  = "sysdiglabs/sysdig"
+      version = ">= 0.5.21"
+    }
   }
 }