fix lint

Author: renato-rudnicki

5-app-infra/business_unit_1/development/README.md

@@ -18,5 +18,7 @@
 | instances\_zones | List of zone for compute instances |
 | project\_id | Project where compute instance was created |
 | region | Region where compute instance was created |
+| workload\_identity\_pool\_id | Workload identity pool ID. |
+| workload\_pool\_provider\_id | Workload pool provider used by confidential space. |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

5-app-infra/business_unit_1/nonproduction/README.md

@@ -18,5 +18,7 @@
 | instances\_zones | List of zone for compute instances |
 | project\_id | Project where compute instance was created |
 | region | Region where compute instance was created |
+| workload\_identity\_pool\_id | Workload identity pool ID. |
+| workload\_pool\_provider\_id | Workload pool provider used by confidential space. |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

5-app-infra/business_unit_1/production/README.md

@@ -18,5 +18,7 @@
 | instances\_zones | List of zone for compute instances |
 | project\_id | Project where compute instance was created |
 | region | Region where compute instance was created |
+| workload\_identity\_pool\_id | Workload identity pool ID. |
+| workload\_pool\_provider\_id | Workload pool provider used by confidential space. |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

5-app-infra/modules/confidential_space/README.md

@@ -26,6 +26,8 @@
 | instances\_details | List of details for compute instances |
 | instances\_self\_links | List of self-links for compute instances |
 | project\_id | Project where compute instance was created |
+| workload\_identity\_pool\_id | Workload identity pool ID. |
+| workload\_pool\_provider\_id | Workload pool provider used by confidential space. |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 

test/integration/app-infra/app_infra_test.go

@@ -79,7 +79,7 @@ func TestAppInfra(t *testing.T) {
 					gcOps := gcloud.WithCommonArgs([]string{"--project", projectID, "--zone", instanceZone, "--format", "json"})
 					instance := gcloud.Run(t, fmt.Sprintf("compute instances describe %s", instanceName), gcOps)
 					assert.Equal(machineType, instance.Get("machineType").String(), "should have machine_type f1-micro")
-					
+
 					computeInstanceList := gcloud.Run(t, fmt.Sprintf("compute instances list --format=json --project %s --filter name=confidential-instance", projectID))
 					assert.Len(computeInstanceList.Array(), 1)
 					computeInstance := computeInstanceList.Array()[0]

test/integration/projects/projects_test.go

@@ -178,24 +178,12 @@ func TestProjects(t *testing.T) {
 
 							enabledAPIS := gcloud.Runf(t, "services list --project %s --impersonate-service-account %s", projectID, terraformSA).Array()
 							listApis := testutils.GetResultFieldStrSlice(enabledAPIS, "config.name")
-							assert.Subset(listApis, restrictedApisEnabled, "APIs should have been enabled")
-
-							sharedProjectNumber := projects.GetStringOutput("confidential_space_project_number")
-							perimeter, err := gcloud.RunCmdE(t, fmt.Sprintf("access-context-manager perimeters dry-run describe %s --policy %s", perimeterName, policyID))
-							assert.NoError(err)
-							assert.True(strings.Contains(perimeter, sharedProjectNumber), fmt.Sprintf("dry-run service perimeter %s should contain project %s", perimeterName, sharedProjectNumber))
-
-							sharedVPC := gcloud.Runf(t, "compute shared-vpc get-host-project %s --impersonate-service-account %s", projectID, terraformSA)
-							assert.NotEmpty(sharedVPC.Map())
-
-							hostProjectID := sharedVPC.Get("name").String()
-							hostProject := gcloud.Runf(t, "projects describe %s --impersonate-service-account %s", hostProjectID, terraformSA)
-							assert.Equal("shared-vpc-host", hostProject.Get("labels.application_name").String(), "host project should have application_name label equals to shared-vpc-host")
-							assert.Equal(env, hostProject.Get("labels.environment").String(), fmt.Sprintf("project should have environment label %s", env))
-
-							hostNetwork := gcloud.Runf(t, "compute networks list --project %s --impersonate-service-account %s", hostProjectID, terraformSA).Array()[0]
-							assert.Equal(tt.sharedNetwork, hostNetwork.Get("name").String(), "should have a shared vpc")
+							assert.Subset(listApis, confidentialRestrictedApisEnabled, "API should have been enabled")
 
+							confidentialSpaceWorkloadSAEmail := projects.GetStringOutput("confidential_space_workload_sa")
+							confidentialSpaceSAName := fmt.Sprintf("projects/%s/serviceAccounts/%s", projectID, confidentialSpaceWorkloadSAEmail)
+							confidentialSpaceSA := gcloud.Runf(t, "iam service-accounts describe %s --project %s", confidentialSpaceWorkloadSAEmail, projectID)
+							assert.Equal(confidentialSpaceSAName, confidentialSpaceSA.Get("name").String(), fmt.Sprintf("service account %s should exist", confidentialSpaceWorkloadSAEmail))
 						}
 
 						if projectOutput == "floating_project" {