From 2809570651ce4bf730329eea3740bd59dd4b99c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Niesiob=C4=99dzki?= <wiktorn@google.com>
Date: Sun, 23 Feb 2025 15:26:00 +0000
Subject: [PATCH] Fix E2E tests

---
 modules/compute-vm/README.md                  | 18 +++++++----
 modules/gcs/README.md                         | 32 +++++++++++++------
 .../examples/instance-schedule-create.yaml    | 11 ++++---
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/modules/compute-vm/README.md b/modules/compute-vm/README.md
index c359d8623..1928a8dce 100644
--- a/modules/compute-vm/README.md
+++ b/modules/compute-vm/README.md
@@ -740,10 +740,16 @@ To create a new policy set its configuration in the `instance_schedule` variable
 
 ```hcl
 module "project" {
-  source         = "./fabric/modules/project"
-  name           = var.project_id
-  project_create = false
-  services = ["compute.googleapis.com"]
+  source = "./fabric/modules/project"
+  name   = var.project_id
+  project_reuse = {
+    use_data_source = false
+    project_attributes = {
+      name             = var.project_id
+      number           = var.project_number
+      services_enabled = ["compute.googleapis.com"]
+    }
+  }
   iam_bindings_additive = {
     compute-admin-service-agent = {
       member = module.project.service_agents["compute"].iam_email
@@ -772,9 +778,9 @@ module "instance" {
       vm_stop  = "0 17 * * *"
     }
   }
-  depends_on = [module.project]  # ensure that grants are complete before creating schedule / instance
+  depends_on = [module.project] # ensure that grants are complete before creating schedule / instance
 }
-# tftest inventory=instance-schedule-create.yaml e2e skip
+# tftest inventory=instance-schedule-create.yaml e2e
 ```
 
 ### Snapshot Schedules
diff --git a/modules/gcs/README.md b/modules/gcs/README.md
index bc8784cfb..e4e55beff 100644
--- a/modules/gcs/README.md
+++ b/modules/gcs/README.md
@@ -36,10 +36,16 @@ module "bucket" {
 
 ```hcl
 module "project" {
-  source         = "./fabric/modules/project"
-  name           = var.project_id
-  project_create = false
-  services       = ["storage.googleapis.com"]
+  source = "./fabric/modules/project"
+  name   = var.project_id
+  project_reuse = {
+    use_data_source = false
+    project_attributes = {
+      name             = var.project_id
+      number           = var.project_number
+      services_enabled = ["storage.googleapis.com"]
+    }
+  }
 }
 
 module "kms" {
@@ -70,7 +76,7 @@ module "bucket" {
   encryption_key = module.kms.keys.bucket_key.id
 }
 
-# tftest modules=3 skip e2e
+# tftest modules=2 e2e
 ```
 
 ## Retention policy, soft delete policy and logging
@@ -123,10 +129,16 @@ module "bucket" {
 
 ```hcl
 module "project" {
-  source         = "./fabric/modules/project"
-  name           = var.project_id
-  project_create = false
-  services       = ["storage.googleapis.com"]
+  source = "./fabric/modules/project"
+  name   = var.project_id
+  project_reuse = {
+    use_data_source = false
+    project_attributes = {
+      name             = var.project_id
+      number           = var.project_number
+      services_enabled = ["storage.googleapis.com"]
+    }
+  }
 }
 
 module "bucket-gcs-notification" {
@@ -144,7 +156,7 @@ module "bucket-gcs-notification" {
     custom_attributes = {}
   }
 }
-# tftest skip e2e
+# tftest e2e
 ```
 
 ## Object upload
diff --git a/tests/modules/compute_vm/examples/instance-schedule-create.yaml b/tests/modules/compute_vm/examples/instance-schedule-create.yaml
index 1b5733f6d..32847798f 100644
--- a/tests/modules/compute_vm/examples/instance-schedule-create.yaml
+++ b/tests/modules/compute_vm/examples/instance-schedule-create.yaml
@@ -13,10 +13,12 @@
 # limitations under the License.
 
 values:
-  module.sole-tenancy.google_compute_instance.default[0]:
-    boot_disk:
-    - initialize_params:
-      - image: projects/cos-cloud/global/images/family/cos-stable
+  module.project.google_project_iam_member.bindings["compute-admin-service-agent"]:
+    condition: []
+    member: serviceAccount:service-123@compute-system.iam.gserviceaccount.com
+    project: project-id
+    role: roles/compute.instanceAdmin.v1
+
   module.instance.google_compute_resource_policy.schedule[0]:
     description: Schedule policy for schedule-test.
     instance_schedule_policy:
@@ -29,6 +31,7 @@ values:
       - schedule: 0 17 * * *
     name: schedule-test
     region: europe-west8
+    project: project-id
 
 counts:
   google_compute_instance: 1