From 415fda55a4157b3f1071e168f880eb0812c4a46a Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Tue, 2 Aug 2022 23:36:44 +0000 Subject: [PATCH] Updated some tests from debian-9 to debian-11 (5/?) (#6357) Signed-off-by: Modular Magician --- .changelog/6357.txt | 3 +++ google/resource_compute_disk_test.go | 16 ++++++++-------- google/resource_compute_image_test.go | 14 +++++++------- 3 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 .changelog/6357.txt diff --git a/.changelog/6357.txt b/.changelog/6357.txt new file mode 100644 index 00000000000..8ec013c0699 --- /dev/null +++ b/.changelog/6357.txt @@ -0,0 +1,3 @@ +```release-note:none + +``` diff --git a/google/resource_compute_disk_test.go b/google/resource_compute_disk_test.go index 0b99c28abd6..882739da350 100644 --- a/google/resource_compute_disk_test.go +++ b/google/resource_compute_disk_test.go @@ -588,7 +588,7 @@ func testAccCheckEncryptionKey(t *testing.T, n string, disk *compute.Disk) resou func testAccComputeDisk_basic(diskName string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } @@ -608,7 +608,7 @@ resource "google_compute_disk" "foobar" { func testAccComputeDisk_timeout(diskName string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } @@ -628,7 +628,7 @@ resource "google_compute_disk" "foobar" { func testAccComputeDisk_updated(diskName string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } @@ -649,7 +649,7 @@ resource "google_compute_disk" "foobar" { func testAccComputeDisk_fromSnapshot(projectName, firstDiskName, snapshotName, diskName, ref_selector string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } @@ -682,7 +682,7 @@ resource "google_compute_disk" "seconddisk" { func testAccComputeDisk_encryption(diskName string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } @@ -706,7 +706,7 @@ data "google_project" "project" { } data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } @@ -735,7 +735,7 @@ resource "google_compute_disk" "foobar" { func testAccComputeDisk_deleteDetach(instanceName, diskName string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } @@ -772,7 +772,7 @@ resource "google_compute_instance" "bar" { func testAccComputeDisk_deleteDetachIGM(diskName, mgrName string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } diff --git a/google/resource_compute_image_test.go b/google/resource_compute_image_test.go index 90fa451a6f8..94844bf91bc 100644 --- a/google/resource_compute_image_test.go +++ b/google/resource_compute_image_test.go @@ -238,7 +238,7 @@ func testAccCheckComputeImageResolution(t *testing.T, n string) resource.TestChe family := rs.Primary.Attributes["family"] link := rs.Primary.Attributes["self_link"] - latestDebian, err := config.NewComputeClient(config.userAgent).Images.GetFromFamily("debian-cloud", "debian-9").Do() + latestDebian, err := config.NewComputeClient(config.userAgent).Images.GetFromFamily("debian-cloud", "debian-11").Do() if err != nil { return fmt.Errorf("Error retrieving latest debian: %s", err) } @@ -308,7 +308,7 @@ func testAccCheckComputeImageHasSourceType(image *compute.Image) resource.TestCh func testAccComputeImage_resolving(name, family string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } @@ -346,7 +346,7 @@ resource "google_compute_image" "foobar" { func testAccComputeImage_license(name string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } @@ -366,7 +366,7 @@ resource "google_compute_image" "foobar" { empty-label = "" } licenses = [ - "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/licenses/debian-9-stretch", + "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/licenses/debian-11-bullseye", ] } `, name, name) @@ -392,7 +392,7 @@ resource "google_compute_image" "foobar" { func testAccComputeImage_basedondisk(diskName, imageName string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } @@ -412,7 +412,7 @@ resource "google_compute_image" "foobar" { func testAccComputeImage_sourceImage(imageName string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" } @@ -426,7 +426,7 @@ resource "google_compute_image" "foobar" { func testAccComputeImage_sourceSnapshot(diskName, snapshotName, imageName string) string { return fmt.Sprintf(` data "google_compute_image" "my_image" { - family = "debian-9" + family = "debian-11" project = "debian-cloud" }