Skip to content

Commit

Permalink
Updated some tests from debian-9 to debian-11 (12/?) (#6365) (#4560)
Browse files Browse the repository at this point in the history 
Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
@modular-magician
modular-magician authored Aug 3, 2022
1 parent e44a75a commit 60a6bba
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 25 deletions.
3 changes: 3 additions & 0 deletions .changelog/6365.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
50 changes: 25 additions & 25 deletions google-beta/resource_compute_instance_migrate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func TestAccComputeInstanceMigrateState(t *testing.T) {
Boot: true,
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
},
Expand Down Expand Up @@ -164,7 +164,7 @@ func TestAccComputeInstanceMigrateState_bootDisk(t *testing.T) {
Boot: true,
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
},
Expand Down Expand Up @@ -232,7 +232,7 @@ func TestAccComputeInstanceMigrateState_v4FixBootDisk(t *testing.T) {
Boot: true,
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
},
Expand Down Expand Up @@ -294,7 +294,7 @@ func TestAccComputeInstanceMigrateState_attachedDiskFromSource(t *testing.T) {
diskName := fmt.Sprintf("instance-test-%s", randString(t, 10))
disk := &compute.Disk{
Name: diskName,
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
Zone: zone,
}
op, err := config.NewComputeClient(config.userAgent).Disks.Insert(config.Project, zone, disk).Do()
Expand All @@ -315,7 +315,7 @@ func TestAccComputeInstanceMigrateState_attachedDiskFromSource(t *testing.T) {
Boot: true,
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
{
Expand Down Expand Up @@ -375,7 +375,7 @@ func TestAccComputeInstanceMigrateState_v4FixAttachedDiskFromSource(t *testing.T
diskName := fmt.Sprintf("instance-test-%s", randString(t, 10))
disk := &compute.Disk{
Name: diskName,
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
Zone: zone,
}
op, err := config.NewComputeClient(config.userAgent).Disks.Insert(config.Project, zone, disk).Do()
Expand All @@ -396,7 +396,7 @@ func TestAccComputeInstanceMigrateState_v4FixAttachedDiskFromSource(t *testing.T
Boot: true,
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
{
Expand Down Expand Up @@ -459,13 +459,13 @@ func TestAccComputeInstanceMigrateState_attachedDiskFromEncryptionKey(t *testing
Boot: true,
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
{
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
DiskEncryptionKey: &compute.CustomerEncryptionKey{
RawKey: "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=",
Expand All @@ -492,7 +492,7 @@ func TestAccComputeInstanceMigrateState_attachedDiskFromEncryptionKey(t *testing
attributes := map[string]string{
"boot_disk.#": "1",
"disk.#": "1",
"disk.0.image": "projects/debian-cloud/global/images/family/debian-9",
"disk.0.image": "projects/debian-cloud/global/images/family/debian-11",
"disk.0.disk_encryption_key_raw": "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=",
"disk.0.disk_encryption_key_sha256": "esTuF7d4eatX4cnc4JsiEiaI+Rff78JgPhA/v1zxX9E=",
"zone": zone,
Expand Down Expand Up @@ -528,13 +528,13 @@ func TestAccComputeInstanceMigrateState_v4FixAttachedDiskFromEncryptionKey(t *te
Boot: true,
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
{
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
DiskEncryptionKey: &compute.CustomerEncryptionKey{
RawKey: "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=",
Expand All @@ -561,7 +561,7 @@ func TestAccComputeInstanceMigrateState_v4FixAttachedDiskFromEncryptionKey(t *te
attributes := map[string]string{
"boot_disk.#": "1",
"disk.#": "1",
"disk.0.image": "projects/debian-cloud/global/images/family/debian-9",
"disk.0.image": "projects/debian-cloud/global/images/family/debian-11",
"disk.0.disk_encryption_key_raw": "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=",
"disk.0.disk_encryption_key_sha256": "esTuF7d4eatX4cnc4JsiEiaI+Rff78JgPhA/v1zxX9E=",
"zone": zone,
Expand Down Expand Up @@ -596,19 +596,19 @@ func TestAccComputeInstanceMigrateState_attachedDiskFromAutoDeleteAndImage(t *te
Boot: true,
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
{
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
{
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/debian-9-stretch-v20180814",
SourceImage: "projects/debian-cloud/global/images/debian-11-bullseye-v20220719",
},
},
},
Expand All @@ -632,9 +632,9 @@ func TestAccComputeInstanceMigrateState_attachedDiskFromAutoDeleteAndImage(t *te
attributes := map[string]string{
"boot_disk.#": "1",
"disk.#": "2",
"disk.0.image": "projects/debian-cloud/global/images/debian-9-stretch-v20180814",
"disk.0.image": "projects/debian-cloud/global/images/debian-11-bullseye-v20220719",
"disk.0.auto_delete": "true",
"disk.1.image": "global/images/family/debian-9",
"disk.1.image": "global/images/family/debian-11",
"disk.1.auto_delete": "true",
"zone": zone,
}
Expand Down Expand Up @@ -669,19 +669,19 @@ func TestAccComputeInstanceMigrateState_v4FixAttachedDiskFromAutoDeleteAndImage(
Boot: true,
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
{
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
{
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/debian-9-stretch-v20180814",
SourceImage: "projects/debian-cloud/global/images/debian-11-bullseye-v20220719",
},
},
},
Expand All @@ -705,9 +705,9 @@ func TestAccComputeInstanceMigrateState_v4FixAttachedDiskFromAutoDeleteAndImage(
attributes := map[string]string{
"boot_disk.#": "1",
"disk.#": "2",
"disk.0.image": "projects/debian-cloud/global/images/debian-9-stretch-v20180814",
"disk.0.image": "projects/debian-cloud/global/images/debian-11-bullseye-v20220719",
"disk.0.auto_delete": "true",
"disk.1.image": "global/images/family/debian-9",
"disk.1.image": "global/images/family/debian-11",
"disk.1.auto_delete": "true",
"zone": zone,
}
Expand Down Expand Up @@ -742,7 +742,7 @@ func TestAccComputeInstanceMigrateState_scratchDisk(t *testing.T) {
Boot: true,
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
{
Expand Down Expand Up @@ -808,7 +808,7 @@ func TestAccComputeInstanceMigrateState_v4FixScratchDisk(t *testing.T) {
Boot: true,
AutoDelete: true,
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: "projects/debian-cloud/global/images/family/debian-9",
SourceImage: "projects/debian-cloud/global/images/family/debian-11",
},
},
{
Expand Down

0 comments on commit 60a6bba

Please sign in to comment.