Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated some tests from debian-9 to debian-11 (5/?) #12233

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/6357.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
16 changes: 8 additions & 8 deletions google/resource_compute_disk_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand Down Expand Up @@ -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"
}

Expand All @@ -706,7 +706,7 @@ data "google_project" "project" {
}

data "google_compute_image" "my_image" {
family = "debian-9"
family = "debian-11"
project = "debian-cloud"
}

Expand Down Expand Up @@ -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"
}

Expand Down Expand Up @@ -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"
}

Expand Down
14 changes: 7 additions & 7 deletions google/resource_compute_image_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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"
}

Expand Down Expand Up @@ -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"
}

Expand All @@ -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)
Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand Down