remove code not used

renato-rudnicki · renato-rudnicki · commit f471283926b0 · 2025-09-01T19:47:22.000-03:00
diff --git a/5-app-infra/business_unit_1/development/main.tf b/5-app-infra/business_unit_1/development/main.tf
@@ -42,11 +42,10 @@ module "peering_gce_instance" {
 module "confidential_space" {
   source = "../../modules/confidential_space"
 
-  environment                          = local.environment
-  confidential_image_digest            = var.confidential_image_digest
-  confidential_space_workload_operator = local.confidential_space_workload_sa
-  business_unit                        = local.business_unit
-  project_suffix                       = "conf-space"
-  region                               = coalesce(var.instance_region, local.default_region)
-  remote_state_bucket                  = var.remote_state_bucket
+  environment               = local.environment
+  confidential_image_digest = var.confidential_image_digest
+  business_unit             = local.business_unit
+  project_suffix            = "conf-space"
+  region                    = coalesce(var.instance_region, local.default_region)
+  remote_state_bucket       = var.remote_state_bucket
 }
diff --git a/5-app-infra/business_unit_1/development/remote.tf b/5-app-infra/business_unit_1/development/remote.tf
@@ -15,8 +15,7 @@
  */
 
 locals {
-  default_region                 = data.terraform_remote_state.projects_env.outputs.default_region
-  confidential_space_workload_sa = data.terraform_remote_state.projects_env.outputs.confidential_space_workload_sa
+  default_region = data.terraform_remote_state.projects_env.outputs.default_region
 }
 
 data "terraform_remote_state" "projects_env" {
diff --git a/5-app-infra/business_unit_1/nonproduction/main.tf b/5-app-infra/business_unit_1/nonproduction/main.tf
@@ -42,11 +42,10 @@ module "peering_gce_instance" {
 module "confidential_space" {
   source = "../../modules/confidential_space"
 
-  environment                          = local.environment
-  confidential_image_digest            = var.confidential_image_digest
-  confidential_space_workload_operator = local.confidential_space_workload_sa
-  business_unit                        = local.business_unit
-  project_suffix                       = "conf-space"
-  region                               = coalesce(var.instance_region, local.default_region)
-  remote_state_bucket                  = var.remote_state_bucket
+  environment               = local.environment
+  confidential_image_digest = var.confidential_image_digest
+  business_unit             = local.business_unit
+  project_suffix            = "conf-space"
+  region                    = coalesce(var.instance_region, local.default_region)
+  remote_state_bucket       = var.remote_state_bucket
 }
diff --git a/5-app-infra/business_unit_1/nonproduction/remote.tf b/5-app-infra/business_unit_1/nonproduction/remote.tf
@@ -15,8 +15,7 @@
  */
 
 locals {
-  default_region                 = data.terraform_remote_state.projects_env.outputs.default_region
-  confidential_space_workload_sa = data.terraform_remote_state.projects_env.outputs.confidential_space_workload_sa
+  default_region = data.terraform_remote_state.projects_env.outputs.default_region
 }
 
 data "terraform_remote_state" "projects_env" {
diff --git a/5-app-infra/business_unit_1/production/main.tf b/5-app-infra/business_unit_1/production/main.tf
@@ -42,11 +42,10 @@ module "peering_gce_instance" {
 module "confidential_space" {
   source = "../../modules/confidential_space"
 
-  environment                          = local.environment
-  confidential_image_digest            = var.confidential_image_digest
-  confidential_space_workload_operator = local.confidential_space_workload_sa
-  business_unit                        = local.business_unit
-  project_suffix                       = "conf-space"
-  region                               = coalesce(var.instance_region, local.default_region)
-  remote_state_bucket                  = var.remote_state_bucket
+  environment               = local.environment
+  confidential_image_digest = var.confidential_image_digest
+  business_unit             = local.business_unit
+  project_suffix            = "conf-space"
+  region                    = coalesce(var.instance_region, local.default_region)
+  remote_state_bucket       = var.remote_state_bucket
 }
diff --git a/5-app-infra/business_unit_1/production/remote.tf b/5-app-infra/business_unit_1/production/remote.tf
@@ -15,8 +15,7 @@
  */
 
 locals {
-  default_region                 = data.terraform_remote_state.projects_env.outputs.default_region
-  confidential_space_workload_sa = data.terraform_remote_state.projects_env.outputs.confidential_space_workload_sa
+  default_region = data.terraform_remote_state.projects_env.outputs.default_region
 }
 
 data "terraform_remote_state" "projects_env" {
diff --git a/5-app-infra/modules/confidential_space/README.md b/5-app-infra/modules/confidential_space/README.md
@@ -8,7 +8,6 @@
 | confidential\_image\_digest | SHA256 digest of the Docker image to be used for running the workload in Confidential Space. This value ensures the integrity and immutability of the image, guaranteeing that only the expected and verified code is executed within the confidential environment. Expected format: `sha256:<digest>`. | `string` | n/a | yes |
 | confidential\_instance\_type | (Optional) Defines the confidential computing technology the instance uses. SEV is an AMD feature. TDX is an Intel feature. One of the following values is required: SEV, SEV\_SNP, TDX. | `string` | `"SEV"` | no |
 | confidential\_machine\_type | Machine type to create for confidential instance. | `string` | `"n2d-standard-2"` | no |
-| confidential\_space\_workload\_operator | The person who runs the workload that operates on the combined confidential data. Entries must be in the standard GCP form: `user:email@example.com` or `serviceAccount:my-service-account@example.com`. | `string` | `null` | no |
 | cpu\_platform | The CPU platform used by this instance. If confidential\_instance\_type is set as SEV, then it is an AMD feature. TDX is an Intel feature. | `string` | `"AMD Milan"` | no |
 | environment | The environment the single project belongs to | `string` | n/a | yes |
 | num\_instances | Number of instances to create | `number` | `1` | no |
diff --git a/5-app-infra/modules/confidential_space/main.tf b/5-app-infra/modules/confidential_space/main.tf
@@ -37,7 +37,6 @@ locals {
   resource_manager_tags             = local.env_project_resource_manager_tags[var.project_suffix]
   artifact_registry_repository      = "tf-runners"
   confidential_space_project_number = data.terraform_remote_state.projects_env.outputs.confidential_space_project_number
-  confidential_space_project_id     = data.terraform_remote_state.projects_env.outputs.confidential_space_project
   confidential_space_workload_sa    = data.terraform_remote_state.projects_env.outputs.confidential_space_workload_sa
 }
 
diff --git a/5-app-infra/modules/confidential_space/variables.tf b/5-app-infra/modules/confidential_space/variables.tf
@@ -88,9 +88,3 @@ variable "confidential_image_digest" {
   type        = string
 }
 
-variable "confidential_space_workload_operator" {
-  description = "The person who runs the workload that operates on the combined confidential data. Entries must be in the standard GCP form: `user:email@example.com` or `serviceAccount:my-service-account@example.com`."
-  type        = string
-  default     = null
-}
-
diff --git a/5-app-infra/modules/env_base/variables.tf b/5-app-infra/modules/env_base/variables.tf
@@ -39,11 +39,13 @@ variable "num_instances" {
 
 variable "machine_type" {
   description = "Machine type to create, e.g. n1-standard-1"
+  type        = string
   default     = "f1-micro"
 }
 
 variable "hostname" {
   description = "Hostname of instances"
+  type        = string
   default     = "example-app"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`locals {`
`18`		`- default_region = data.terraform_remote_state.projects_env.outputs.default_region`
`19`		`- confidential_space_workload_sa = data.terraform_remote_state.projects_env.outputs.confidential_space_workload_sa`
	`18`	`+ default_region = data.terraform_remote_state.projects_env.outputs.default_region`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`data "terraform_remote_state" "projects_env" {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ locals {`
`37`	`37`	`resource_manager_tags = local.env_project_resource_manager_tags[var.project_suffix]`
`38`	`38`	`artifact_registry_repository = "tf-runners"`
`39`	`39`	`confidential_space_project_number = data.terraform_remote_state.projects_env.outputs.confidential_space_project_number`
`40`		`- confidential_space_project_id = data.terraform_remote_state.projects_env.outputs.confidential_space_project`
`41`	`40`	`confidential_space_workload_sa = data.terraform_remote_state.projects_env.outputs.confidential_space_workload_sa`
`42`	`41`	`}`
`43`	`42`
Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,3 @@ variable "confidential_image_digest" {`
`88`	`88`	`type = string`
`89`	`89`	`}`
`90`	`90`
`91`		`-variable "confidential_space_workload_operator" {`
`92`		- description = "The person who runs the workload that operates on the combined confidential data. Entries must be in the standard GCP form: `user:[email protected]` or `serviceAccount:[email protected]`."
`93`		`- type = string`
`94`		`- default = null`
`95`		`-}`
`96`		`-`
Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,13 @@ variable "num_instances" {`
`39`	`39`
`40`	`40`	`variable "machine_type" {`
`41`	`41`	`description = "Machine type to create, e.g. n1-standard-1"`
	`42`	`+ type = string`
`42`	`43`	`default = "f1-micro"`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`variable "hostname" {`
`46`	`47`	`description = "Hostname of instances"`
	`48`	`+ type = string`
`47`	`49`	`default = "example-app"`
`48`	`50`	`}`
`49`	`51`