Change gce-uefi-images to default PROD image project. (#4539) (#3003)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Feb 26, 2021 · eadfd0c · eadfd0c
1 parent 4868a71
commit eadfd0c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/.changelog/4539.txt b/.changelog/4539.txt
@@ -0,0 +1,2 @@
+```release-note:none
+```
diff --git a/google-beta/resource_compute_instance_template_test.go b/google-beta/resource_compute_instance_template_test.go
@@ -1630,7 +1630,7 @@ func testAccComputeInstanceTemplate_withScratchDisk(suffix string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
 	family  = "centos-7"
-	project = "gce-uefi-images"
+	project = "centos-cloud"
 }
 resource "google_compute_instance_template" "foobar" {
   name           = "instancet-test-%s"
@@ -2114,7 +2114,7 @@ func testAccComputeInstanceTemplate_shieldedVmConfig(suffix string, enableSecure
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
   family  = "centos-7"
-  project = "gce-uefi-images"
+  project = "centos-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
@@ -2178,7 +2178,7 @@ func testAccComputeInstanceTemplate_enableDisplay(suffix string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
   family  = "centos-7"
-  project = "gce-uefi-images"
+  project = "centos-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
@@ -2204,14 +2204,14 @@ func testAccComputeInstanceTemplate_invalidDiskType(suffix string) string {
 # is resolved.
 # data "google_compute_image" "my_image" {
 # 	family  = "centos-7"
-# 	project = "gce-uefi-images"
+# 	project = "centos-cloud"
 # }
 resource "google_compute_instance_template" "foobar" {
   name           = "instancet-test-%s"
   machine_type   = "e2-medium"
   can_ip_forward = false
   disk {
-    source_image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
+    source_image = "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-7-v20210217"
     auto_delete  = true
     boot         = true
   }
@@ -2222,7 +2222,7 @@ resource "google_compute_instance_template" "foobar" {
     disk_type    = "local-ssd"
   }
   disk {
-    source_image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
+    source_image = "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-7-v20210217"
     auto_delete  = true
     type         = "SCRATCH"
   }

diff --git a/google-beta/resource_compute_instance_test.go b/google-beta/resource_compute_instance_test.go
@@ -4685,7 +4685,7 @@ func testAccComputeInstance_shieldedVmConfig(instance string, enableSecureBoot b
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
   family  = "centos-7"
-  project = "gce-uefi-images"
+  project = "centos-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
@@ -4752,7 +4752,7 @@ func testAccComputeInstance_enableDisplay(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
   family  = "centos-7"
-  project = "gce-uefi-images"
+  project = "centos-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
@@ -4781,7 +4781,7 @@ func testAccComputeInstance_enableDisplayUpdated(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
   family  = "centos-7"
-  project = "gce-uefi-images"
+  project = "centos-cloud"
 }
 
 resource "google_compute_instance" "foobar" {

diff --git a/google-beta/resource_compute_per_instance_config_test.go b/google-beta/resource_compute_per_instance_config_test.go
@@ -246,7 +246,7 @@ resource "google_compute_disk" "disk2" {
   name  = "test-disk3-%{random_suffix}"
   type  = "pd-ssd"
   zone  = google_compute_instance_group_manager.igm.zone
-  image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
+  image = "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-7-v20210217"
   physical_block_size_bytes = 4096
 }
 `, context) + testAccComputePerInstanceConfig_igm(context)

diff --git a/google-beta/resource_compute_region_per_instance_config_test.go b/google-beta/resource_compute_region_per_instance_config_test.go
@@ -246,7 +246,7 @@ resource "google_compute_disk" "disk2" {
   name  = "test-disk3-%{random_suffix}"
   type  = "pd-ssd"
   zone  = "us-central1-c"
-  image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
+  image = "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-7-v20210217"
   physical_block_size_bytes = 4096
 }
 `, context) + testAccComputeRegionPerInstanceConfig_rigm(context)

diff --git a/website/docs/d/compute_instance_serial_port.html.markdown b/website/docs/d/compute_instance_serial_port.html.markdown
@@ -36,7 +36,7 @@ resource "google_compute_instance" "windows" {
 
   boot_disk {
     initialize_params {
-      image = "gce-uefi-images/windows-2019"
+      image = "windows-cloud/windows-2019"
     }
   }
 

diff --git a/website/docs/guides/version_3_upgrade.html.markdown b/website/docs/guides/version_3_upgrade.html.markdown
@@ -761,15 +761,15 @@ fail:
 
 ```hcl
 disk {
-  source_image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
+  source_image = "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-7-v20210217"
   auto_delete  = true
   type         = "SCRATCH"
 }
 ```
 
 ```hcl
 disk {
-  source_image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
+  source_image = "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-7-v20210217"
   auto_delete  = true
   disk_type    = "local-ssd"
 }