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.

Sign up for GitHub

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

Allow instance disks to be deleted so resources are cleared in test infra #3948

Merged
merged 1 commit into from
Dec 30, 2021
Merged

Allow instance disks to be deleted so resources are cleared in test infra #3948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/5573.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
12 changes: 6 additions & 6 deletions google-beta/resource_compute_backend_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ resource "google_compute_instance_group_manager" "foobar" {
instance_template = google_compute_instance_template.foobar.self_link
name = "primary"
}
base_instance_name = "foobar"
base_instance_name = "tf-test-foobar"
zone = "us-central1-f"
target_size = 1
}
Expand Down Expand Up @@ -1030,7 +1030,7 @@ resource "google_compute_instance_group_manager" "foobar" {
instance_template = google_compute_instance_template.foobar.self_link
name = "primary"
}
base_instance_name = "foobar"
base_instance_name = "tf-test-foobar"
zone = "us-central1-f"
target_size = 1
}
Expand Down Expand Up @@ -1092,7 +1092,7 @@ resource "google_compute_instance_group_manager" "foobar" {
instance_template = google_compute_instance_template.foobar.self_link
name = "primary"
}
base_instance_name = "foobar"
base_instance_name = "tf-test-foobar"
zone = "us-central1-f"
target_size = 1
}
Expand Down Expand Up @@ -1294,7 +1294,7 @@ resource "google_compute_instance_group_manager" "foobar" {
instance_template = google_compute_instance_template.foobar.self_link
name = "primary"
}
base_instance_name = "foobar"
base_instance_name = "tf-test-foobar"
zone = "us-central1-f"
target_size = 1
}
Expand Down Expand Up @@ -1351,7 +1351,7 @@ resource "google_compute_instance_group_manager" "foobar" {
instance_template = google_compute_instance_template.foobar.self_link
name = "primary"
}
base_instance_name = "foobar"
base_instance_name = "tf-test-foobar"
zone = "us-central1-f"
target_size = 1
}
Expand Down Expand Up @@ -1635,7 +1635,7 @@ resource "google_compute_instance_group_manager" "foobar" {
instance_template = google_compute_instance_template.foobar.self_link
name = "primary"
}
base_instance_name = "foobar"
base_instance_name = "tf-test-foobar"
zone = "us-central1-f"
target_size = 1
}
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_disk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ resource "google_compute_instance_template" "template" {

resource "google_compute_instance_group_manager" "manager" {
name = "%s"
base_instance_name = "disk-igm"
base_instance_name = "tf-test-disk-igm"
version {
instance_template = google_compute_instance_template.template.self_link
name = "primary"
Expand Down
4 changes: 2 additions & 2 deletions google-beta/resource_compute_global_forwarding_rule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ resource "google_compute_instance_group_manager" "igm" {
instance_template = google_compute_instance_template.instance_template.self_link
name = "primary"
}
base_instance_name = "internal-igm"
base_instance_name = "tf-test-internal-igm"
zone = "us-central1-f"
target_size = 1
}
Expand Down Expand Up @@ -580,7 +580,7 @@ resource "google_compute_instance_group_manager" "igm" {
instance_template = google_compute_instance_template.instance_template.self_link
name = "primary"
}
base_instance_name = "internal-igm"
base_instance_name = "tf-test-internal-igm"
zone = "us-central1-f"
target_size = 1
}
Expand Down
44 changes: 22 additions & 22 deletions google-beta/resource_compute_instance_group_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ resource "google_compute_instance_group_manager" "igm-basic" {
}

target_pools = [google_compute_target_pool.igm-basic.self_link]
base_instance_name = "igm-basic"
base_instance_name = "tf-test-igm-basic"
zone = "us-central1-c"
target_size = 2
}
Expand All @@ -507,7 +507,7 @@ resource "google_compute_instance_group_manager" "igm-no-tp" {
instance_template = google_compute_instance_template.igm-basic.self_link
}

base_instance_name = "igm-no-tp"
base_instance_name = "tf-test-igm-no-tp"
zone = "us-central1-c"
target_size = 2
}
Expand Down Expand Up @@ -551,7 +551,7 @@ resource "google_compute_instance_group_manager" "igm-basic" {
instance_template = google_compute_instance_template.igm-basic.self_link
}

base_instance_name = "igm-basic"
base_instance_name = "tf-test-igm-basic"
zone = "us-central1-c"
}
`, template, igm)
Expand Down Expand Up @@ -601,7 +601,7 @@ resource "google_compute_instance_group_manager" "igm-update" {
}

target_pools = [google_compute_target_pool.igm-update.self_link]
base_instance_name = "igm-update"
base_instance_name = "tf-test-igm-update"
zone = "us-central1-c"
target_size = 2
named_port {
Expand Down Expand Up @@ -687,7 +687,7 @@ resource "google_compute_instance_group_manager" "igm-update" {
google_compute_target_pool.igm-update.self_link,
google_compute_target_pool.igm-update2.self_link,
]
base_instance_name = "igm-update"
base_instance_name = "tf-test-igm-update"
zone = "us-central1-c"
target_size = 3
named_port {
Expand Down Expand Up @@ -773,7 +773,7 @@ resource "google_compute_instance_group_manager" "igm-update" {
instance_template = google_compute_instance_template.igm-update2.self_link
}

base_instance_name = "igm-update"
base_instance_name = "tf-test-igm-update"
zone = "us-central1-c"
target_size = 3
named_port {
Expand Down Expand Up @@ -828,7 +828,7 @@ resource "google_compute_instance_group_manager" "igm-update" {
instance_template = google_compute_instance_template.igm-update.self_link
}

base_instance_name = "igm-update"
base_instance_name = "tf-test-igm-update"
zone = "us-central1-c"
target_size = 2
named_port {
Expand Down Expand Up @@ -877,7 +877,7 @@ resource "google_compute_instance_group_manager" "igm-rolling-update-policy" {
name = "prod"
instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
}
base_instance_name = "igm-rolling-update-policy"
base_instance_name = "tf-test-igm-rolling-update-policy"
zone = "us-central1-c"
target_size = 3
update_policy {
Expand Down Expand Up @@ -928,7 +928,7 @@ resource "google_compute_instance_group_manager" "igm-rolling-update-policy" {
name = "prod2"
instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
}
base_instance_name = "igm-rolling-update-policy"
base_instance_name = "tf-test-igm-rolling-update-policy"
zone = "us-central1-c"
target_size = 3
update_policy {
Expand Down Expand Up @@ -976,7 +976,7 @@ resource "google_compute_instance_group_manager" "igm-rolling-update-policy" {
name = "prod2"
instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
}
base_instance_name = "igm-rolling-update-policy"
base_instance_name = "tf-test-igm-rolling-update-policy"
zone = "us-central1-c"
target_size = 3
update_policy {
Expand Down Expand Up @@ -1025,7 +1025,7 @@ resource "google_compute_instance_group_manager" "igm-rolling-update-policy" {
name = "prod2"
instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
}
base_instance_name = "igm-rolling-update-policy"
base_instance_name = "tf-test-igm-rolling-update-policy"
zone = "us-central1-c"
target_size = 3
update_policy {
Expand Down Expand Up @@ -1073,7 +1073,7 @@ resource "google_compute_instance_group_manager" "igm-rolling-update-policy" {
name = "prod2"
instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
}
base_instance_name = "igm-rolling-update-policy"
base_instance_name = "tf-test-igm-rolling-update-policy"
zone = "us-central1-c"
target_size = 3
update_policy {
Expand Down Expand Up @@ -1127,7 +1127,7 @@ resource "google_compute_instance_group_manager" "igm-basic" {
name = "prod"
}

base_instance_name = "igm-basic"
base_instance_name = "tf-test-igm-basic"
zone = "us-central1-c"
target_size = 2
}
Expand All @@ -1141,7 +1141,7 @@ resource "google_compute_instance_group_manager" "igm-basic-2" {
instance_template = google_compute_instance_template.igm-basic.self_link
}

base_instance_name = "igm-basic-2"
base_instance_name = "tf-test-igm-basic-2"
zone = "us-west1-b"
target_size = 2
}
Expand Down Expand Up @@ -1188,7 +1188,7 @@ resource "google_compute_instance_group_manager" "igm-basic" {
name = "prod"
}
target_pools = [google_compute_target_pool.igm-basic.self_link]
base_instance_name = "igm-basic"
base_instance_name = "tf-test-igm-basic"
zone = "us-central1-c"
target_size = 2
auto_healing_policies {
Expand Down Expand Up @@ -1246,7 +1246,7 @@ resource "google_compute_instance_group_manager" "igm-basic" {
name = "prod"
}
target_pools = [google_compute_target_pool.igm-basic.self_link]
base_instance_name = "igm-basic"
base_instance_name = "tf-test-igm-basic"
zone = "us-central1-c"
target_size = 2
}
Expand Down Expand Up @@ -1308,7 +1308,7 @@ resource "google_compute_instance_template" "igm-canary" {
resource "google_compute_instance_group_manager" "igm-basic" {
description = "Terraform test instance group manager"
name = "%s"
base_instance_name = "igm-basic"
base_instance_name = "tf-test-igm-basic"
zone = "us-central1-c"
target_size = 2

Expand Down Expand Up @@ -1382,12 +1382,12 @@ resource "google_compute_instance_group_manager" "igm-basic" {
name = "prod"
}
target_pools = [google_compute_target_pool.igm-basic.self_link]
base_instance_name = "igm-basic"
base_instance_name = "tf-test-igm-basic"
zone = "us-central1-c"
target_size = 2
stateful_disk {
device_name = "my-stateful-disk"
delete_rule = "NEVER"
delete_rule = "ON_PERMANENT_INSTANCE_DELETION"
}
}

Expand Down Expand Up @@ -1454,7 +1454,7 @@ resource "google_compute_instance_group_manager" "igm-basic" {
name = "prod"
}
target_pools = [google_compute_target_pool.igm-basic.self_link]
base_instance_name = "igm-basic"
base_instance_name = "tf-test-igm-basic"
zone = "us-central1-c"
target_size = 2
stateful_disk {
Expand Down Expand Up @@ -1519,7 +1519,7 @@ resource "google_compute_instance_group_manager" "igm-basic" {
name = "prod"
}
target_pools = [google_compute_target_pool.igm-basic.self_link]
base_instance_name = "igm-basic"
base_instance_name = "tf-test-igm-basic"
zone = "us-central1-c"
wait_for_instances = true
wait_for_instances_status = "STABLE"
Expand Down Expand Up @@ -1581,7 +1581,7 @@ resource "google_compute_instance_group_manager" "igm-basic" {
name = "prod"
}
target_pools = [google_compute_target_pool.igm-basic.self_link]
base_instance_name = "igm-basic"
base_instance_name = "tf-test-igm-basic"
zone = "us-central1-c"
wait_for_instances = true
wait_for_instances_status = "UPDATED"
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_per_instance_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ resource "google_compute_instance_group_manager" "igm" {
instance_template = google_compute_instance_template.igm-basic.self_link
}

base_instance_name = "igm-no-tp"
base_instance_name = "tf-test-igm-no-tp"
}
`, context)
}
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_region_autoscaler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ resource "google_compute_region_instance_group_manager" "foobar" {
name = "primary"
}
target_pools = [google_compute_target_pool.foobar.self_link]
base_instance_name = "foobar"
base_instance_name = "tf-test-foobar"
region = "us-central1"
}

Expand Down
10 changes: 5 additions & 5 deletions google-beta/resource_compute_region_backend_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ resource "google_compute_instance_group_manager" "foobar" {
instance_template = google_compute_instance_template.foobar.self_link
name = "primary"
}
base_instance_name = "foobar"
base_instance_name = "tf-test-foobar"
zone = "us-central1-f"
target_size = 1
}
Expand Down Expand Up @@ -639,7 +639,7 @@ resource "google_compute_instance_group_manager" "foobar" {
instance_template = google_compute_instance_template.foobar.self_link
name = "primary"
}
base_instance_name = "foobar"
base_instance_name = "tf-test-foobar"
zone = "us-central1-f"
target_size = 1
}
Expand Down Expand Up @@ -704,7 +704,7 @@ resource "google_compute_instance_group_manager" "foobar" {
instance_template = google_compute_instance_template.foobar.self_link
name = "primary"
}
base_instance_name = "foobar"
base_instance_name = "tf-test-foobar"
zone = "us-central1-f"
target_size = 1
}
Expand Down Expand Up @@ -773,7 +773,7 @@ resource "google_compute_region_instance_group_manager" "rigm1" {
instance_template = google_compute_instance_template.instance_template.self_link
name = "primary"
}
base_instance_name = "internal-glb"
base_instance_name = "tf-test-internal-glb"
target_size = 1
}

Expand All @@ -784,7 +784,7 @@ resource "google_compute_region_instance_group_manager" "rigm2" {
instance_template = google_compute_instance_template.instance_template.self_link
name = "primary"
}
base_instance_name = "internal-glb"
base_instance_name = "tf-test-internal-glb"
target_size = 1
}

Expand Down
Loading