fix: Remove legacy benchmark task creation

examples/organization-org_compliance/README.md

@@ -147,7 +147,6 @@ module "secure-for-cloud_example_organization" {
 |------|-------------|------|---------|:--------:|
 | <a name="input_organization_domain"></a> [organization\_domain](#input\_organization\_domain) | Organization domain. e.g. sysdig.com | `string` | n/a | yes |
 | <a name="input_benchmark_project_ids"></a> [benchmark\_project\_ids](#input\_benchmark\_project\_ids) | Google cloud project IDs to run Benchmarks on. It will create a trust-relationship on each, to allow Sysdig usage. If empty, all organization projects will be defaulted. | `list(string)` | `[]` | no |
-| <a name="input_benchmark_regions"></a> [benchmark\_regions](#input\_benchmark\_regions) | List of regions in which to run the benchmark. If empty, the task will contain all regions by default. | `list(string)` | `[]` | no |
 | <a name="input_benchmark_role_name"></a> [benchmark\_role\_name](#input\_benchmark\_role\_name) | The name of the Service Account that will be created. | `string` | `"sysdigcloudbench"` | no |
 | <a name="input_deploy_benchmark"></a> [deploy\_benchmark](#input\_deploy\_benchmark) | whether benchmark module is to be deployed | `bool` | `true` | no |
 | <a name="input_deploy_scanning"></a> [deploy\_scanning](#input\_deploy\_scanning) | true/false whether scanning module is to be deployed | `bool` | `false` | no |
@@ -213,7 +212,6 @@ Apache 2 Licensed. See LICENSE for full details.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_benchmark_project_ids"></a> [benchmark\_project\_ids](#input\_benchmark\_project\_ids) | Google cloud project IDs to run Benchmarks on. It will create a trust-relationship on each, to allow Sysdig usage. If empty, all organization projects will be defaulted. | `list(string)` | `[]` | no |
-| <a name="input_benchmark_regions"></a> [benchmark\_regions](#input\_benchmark\_regions) | List of regions in which to run the benchmark. If empty, the task will contain all regions by default. | `list(string)` | `[]` | no |
 | <a name="input_benchmark_role_name"></a> [benchmark\_role\_name](#input\_benchmark\_role\_name) | The name of the Service Account that will be created. | `string` | `"sysdigcloudbench"` | no |
 | <a name="input_deploy_benchmark"></a> [deploy\_benchmark](#input\_deploy\_benchmark) | whether benchmark module is to be deployed | `bool` | `true` | no |
 | <a name="input_deploy_scanning"></a> [deploy\_scanning](#input\_deploy\_scanning) | true/false whether scanning module is to be deployed | `bool` | `false` | no |

examples/organization-org_compliance/main.tf

@@ -128,7 +128,6 @@ module "cloud_bench_workload_identity" {
 
   organization_domain = var.organization_domain
   role_name           = var.benchmark_role_name
-  regions             = var.benchmark_regions
   project_ids         = var.benchmark_project_ids
   project_id          = data.google_client_config.current.project
 }

examples/organization-org_compliance/variables.tf

@@ -40,12 +40,6 @@ variable "deploy_benchmark" {
   default     = true
 }
 
-variable "benchmark_regions" {
-  type        = list(string)
-  description = "List of regions in which to run the benchmark. If empty, the task will contain all regions by default."
-  default     = []
-}
-
 variable "benchmark_project_ids" {
   default     = []
   type        = list(string)

examples/organization/README.md

@@ -141,7 +141,6 @@ module "secure-for-cloud_example_organization" {
 |------|-------------|------|---------|:--------:|
 | <a name="input_organization_domain"></a> [organization\_domain](#input\_organization\_domain) | Organization domain. e.g. sysdig.com | `string` | n/a | yes |
 | <a name="input_benchmark_project_ids"></a> [benchmark\_project\_ids](#input\_benchmark\_project\_ids) | Google cloud project IDs to run Benchmarks on. It will create a trust-relationship on each, to allow Sysdig usage. If empty, all organization projects will be defaulted. | `list(string)` | `[]` | no |
-| <a name="input_benchmark_regions"></a> [benchmark\_regions](#input\_benchmark\_regions) | List of regions in which to run the benchmark. If empty, the task will contain all regions by default. | `list(string)` | `[]` | no |
 | <a name="input_benchmark_role_name"></a> [benchmark\_role\_name](#input\_benchmark\_role\_name) | The name of the Service Account that will be created. | `string` | `"sysdigcloudbench"` | no |
 | <a name="input_deploy_benchmark"></a> [deploy\_benchmark](#input\_deploy\_benchmark) | whether benchmark module is to be deployed | `bool` | `true` | no |
 | <a name="input_deploy_scanning"></a> [deploy\_scanning](#input\_deploy\_scanning) | true/false whether scanning module is to be deployed | `bool` | `false` | no |

examples/organization/benchmark.tf

@@ -14,6 +14,5 @@ module "cloud_bench" {
   is_organizational   = true
   organization_domain = var.organization_domain
   role_name           = "${var.name}${var.benchmark_role_name}"
-  regions             = var.benchmark_regions
   project_ids         = local.benchmark_projects_ids
 }

examples/organization/variables.tf

@@ -41,12 +41,6 @@ variable "deploy_benchmark" {
   default     = true
 }
 
-variable "benchmark_regions" {
-  type        = list(string)
-  description = "List of regions in which to run the benchmark. If empty, the task will contain all regions by default."
-  default     = []
-}
-
 variable "benchmark_project_ids" {
   default     = []
   type        = list(string)

examples/single-project-k8s/README.md

@@ -111,7 +111,6 @@ See [inputs summary](#inputs) or module module [`variables.tf`](./variables.tf)
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_benchmark_regions"></a> [benchmark\_regions](#input\_benchmark\_regions) | List of regions in which to run the benchmark. If empty, the task will contain all regions by default. | `list(string)` | `[]` | no |
 | <a name="input_benchmark_role_name"></a> [benchmark\_role\_name](#input\_benchmark\_role\_name) | The name of the Service Account that will be created. | `string` | `"sysdigcloudbench"` | no |
 | <a name="input_cloud_connector_image"></a> [cloud\_connector\_image](#input\_cloud\_connector\_image) | Cloud-connector image to deploy | `string` | `"quay.io/sysdig/cloud-connector"` | no |
 | <a name="input_deploy_benchmark"></a> [deploy\_benchmark](#input\_deploy\_benchmark) | whether benchmark module is to be deployed | `bool` | `true` | no |

examples/single-project-k8s/benchmark.tf

@@ -5,6 +5,5 @@ module "cloud_bench" {
   is_organizational            = false
   role_name                    = "${var.name}${var.benchmark_role_name}"
   project_id                   = data.google_client_config.current.project
-  regions                      = var.benchmark_regions
   reuse_workload_identity_pool = var.reuse_workload_identity_pool
 }

examples/single-project-k8s/variables.tf

@@ -16,12 +16,6 @@ variable "deploy_benchmark" {
   default     = true
 }
 
-variable "benchmark_regions" {
-  type        = list(string)
-  description = "List of regions in which to run the benchmark. If empty, the task will contain all regions by default."
-  default     = []
-}
-
 variable "benchmark_role_name" {
   type        = string
   description = "The name of the Service Account that will be created."

examples/single-project/README.md

@@ -108,7 +108,6 @@ module "secure-for-cloud_example_single-project" {
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_benchmark_regions"></a> [benchmark\_regions](#input\_benchmark\_regions) | List of regions in which to run the benchmark. If empty, the task will contain all regions by default. | `list(string)` | `[]` | no |
 | <a name="input_benchmark_role_name"></a> [benchmark\_role\_name](#input\_benchmark\_role\_name) | The name of the Service Account that will be created. | `string` | `"sysdigcloudbench"` | no |
 | <a name="input_cloud_connector_image"></a> [cloud\_connector\_image](#input\_cloud\_connector\_image) | The image to use for the Cloud Connector. | `string` | `"us-docker.pkg.dev/sysdig-public-registry/secure-for-cloud/cloud-connector:latest"` | no |
 | <a name="input_deploy_benchmark"></a> [deploy\_benchmark](#input\_deploy\_benchmark) | whether benchmark module is to be deployed | `bool` | `true` | no |

examples/single-project/benchmark.tf

@@ -5,6 +5,5 @@ module "cloud_bench" {
   is_organizational            = false
   role_name                    = "${var.name}${var.benchmark_role_name}"
   project_id                   = data.google_client_config.current.project
-  regions                      = var.benchmark_regions
   reuse_workload_identity_pool = var.reuse_workload_identity_pool
 }

examples/single-project/variables.tf

@@ -19,12 +19,6 @@ variable "deploy_benchmark" {
   default     = true
 }
 
-variable "benchmark_regions" {
-  type        = list(string)
-  description = "List of regions in which to run the benchmark. If empty, the task will contain all regions by default."
-  default     = []
-}
-
 variable "benchmark_role_name" {
   type        = string
   description = "The name of the Service Account that will be created."

modules/services/cloud-bench-workload-identity/README.md

@@ -6,7 +6,6 @@
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
 | <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
 | <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0 |
-| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.1.0 |
 | <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.46 |
 
 ## Providers

modules/services/cloud-bench-workload-identity/main.tf

@@ -22,14 +22,3 @@ module "trust_relationship" {
   project_ids           = local.project_ids
   project_id_number_map = local.project_id_to_number_map
 }
-
-module "task" {
-  source              = "./task"
-  project_id          = var.project_id
-  project_ids         = local.project_ids
-  regions             = var.regions
-  is_organizational   = true
-  organization_domain = var.organization_domain
-
-  depends_on = [module.trust_relationship]
-}

modules/services/cloud-bench-workload-identity/variables.tf

@@ -1,9 +1,3 @@
-variable "regions" {
-  type        = list(string)
-  description = "List of regions in which to run the benchmark. If empty, the task will contain all regions by default."
-  default     = []
-}
-
 variable "role_name" {
   type        = string
   description = "The name of the Service Account that will be created."

modules/services/cloud-bench-workload-identity/versions.tf

@@ -2,10 +2,6 @@ terraform {
   required_version = ">= 0.15.0"
 
   required_providers {
-    random = {
-      source  = "hashicorp/random"
-      version = ">= 3.1.0"
-    }
     google = {
       source  = "hashicorp/google"
       version = ">= 4.21.0"

modules/services/cloud-bench/README.md

@@ -15,7 +15,6 @@ Deployed on **Sysdig Backend**
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
 | <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
 | <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0 |
-| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.1.0 |
 | <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.21 |
 
 ## Providers
@@ -26,7 +25,6 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_task"></a> [task](#module\_task) | ./task | n/a |
 | <a name="module_trust_relationship"></a> [trust\_relationship](#module\_trust\_relationship) | ./trust_relationship | n/a |
 
 ## Resources
@@ -41,7 +39,6 @@ No resources.
 | <a name="input_organization_domain"></a> [organization\_domain](#input\_organization\_domain) | Organization domain. e.g. sysdig.com | `string` | `""` | no |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | Google cloud project ID to run Benchmarks on. It will create a trust-relationship, to allow Sysdig usage. | `string` | `""` | no |
 | <a name="input_project_ids"></a> [project\_ids](#input\_project\_ids) | Google cloud project IDs to run Benchmarks on. It will create a trust-relationship on each, to allow Sysdig usage. If empty, all organization projects will be defaulted. | `list(string)` | `[]` | no |
-| <a name="input_regions"></a> [regions](#input\_regions) | List of regions in which to run the benchmark. If empty, the task will contain all regions by default. | `list(string)` | `[]` | no |
 | <a name="input_reuse_workload_identity_pool"></a> [reuse\_workload\_identity\_pool](#input\_reuse\_workload\_identity\_pool) | Reuse existing workload identity pool, from previous deployment, with name 'sysdigcloud'. <br/> Will help overcome <a href='https://github.com/sysdiglabs/terraform-google-secure-for-cloud#q-getting-error-creating-workloadidentitypool-googleapi-error-409-requested-entity-already-exists'>redeploying error due to GCP softdelete</a><br/> | `bool` | `false` | no |
 | <a name="input_role_name"></a> [role\_name](#input\_role\_name) | The name of the Service Account/Role that will be created. Modify this value in case of conflict / 409 error to bypass Google soft delete | `string` | `"sysdigcloudbench"` | no |
 

modules/services/cloud-bench/main.tf

@@ -10,14 +10,3 @@ module "trust_relationship" {
   role_name                    = var.role_name
   reuse_workload_identity_pool = var.reuse_workload_identity_pool
 }
-
-module "task" {
-  source              = "./task"
-  project_id          = var.project_id
-  project_ids         = local.project_ids
-  regions             = var.regions
-  is_organizational   = var.is_organizational
-  organization_domain = var.organization_domain
-
-  depends_on = [module.trust_relationship]
-}