Skip to content

Commit 4f592fc

Browse files
modular-magicianmodular-magician
authored
Update more gke tests to use bootstrapped network (#9664) (#6778)
[upstream:7ab2f9b27100dd2c513dc8f93377648fa217b608] Signed-off-by: Modular Magician <[email protected]>
1 parent c9f11b1 commit 4f592fc

19 files changed

+379
-140
lines changed

‎.changelog/9664.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google-beta/services/container/resource_container_cluster_test.go‎

Lines changed: 141 additions & 94 deletions
Large diffs are not rendered by default.

‎google-beta/services/gkebackup/iam_gke_backup_backup_plan_generated_test.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ func TestAccGKEBackupBackupPlanIamBindingGenerated(t *testing.T) {
3636
"project": envvar.GetTestProjectFromEnv(),
3737

3838
"deletion_protection": false,
39+
"network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
40+
"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
3941
}
4042

4143
acctest.VcrTest(t, resource.TestCase{
@@ -74,6 +76,8 @@ func TestAccGKEBackupBackupPlanIamMemberGenerated(t *testing.T) {
7476
"project": envvar.GetTestProjectFromEnv(),
7577

7678
"deletion_protection": false,
79+
"network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
80+
"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
7781
}
7882

7983
acctest.VcrTest(t, resource.TestCase{
@@ -103,6 +107,8 @@ func TestAccGKEBackupBackupPlanIamPolicyGenerated(t *testing.T) {
103107
"project": envvar.GetTestProjectFromEnv(),
104108

105109
"deletion_protection": false,
110+
"network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
111+
"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
106112
}
107113

108114
acctest.VcrTest(t, resource.TestCase{
@@ -147,6 +153,8 @@ resource "google_container_cluster" "primary" {
147153
}
148154
}
149155
deletion_protection = "%{deletion_protection}"
156+
network = "%{network_name}"
157+
subnetwork = "%{subnetwork_name}"
150158
}
151159
152160
resource "google_gke_backup_backup_plan" "basic" {
@@ -185,6 +193,8 @@ resource "google_container_cluster" "primary" {
185193
}
186194
}
187195
deletion_protection = "%{deletion_protection}"
196+
network = "%{network_name}"
197+
subnetwork = "%{subnetwork_name}"
188198
}
189199
190200
resource "google_gke_backup_backup_plan" "basic" {
@@ -238,6 +248,8 @@ resource "google_container_cluster" "primary" {
238248
}
239249
}
240250
deletion_protection = "%{deletion_protection}"
251+
network = "%{network_name}"
252+
subnetwork = "%{subnetwork_name}"
241253
}
242254
243255
resource "google_gke_backup_backup_plan" "basic" {
@@ -278,6 +290,8 @@ resource "google_container_cluster" "primary" {
278290
}
279291
}
280292
deletion_protection = "%{deletion_protection}"
293+
network = "%{network_name}"
294+
subnetwork = "%{subnetwork_name}"
281295
}
282296
283297
resource "google_gke_backup_backup_plan" "basic" {
@@ -316,6 +330,8 @@ resource "google_container_cluster" "primary" {
316330
}
317331
}
318332
deletion_protection = "%{deletion_protection}"
333+
network = "%{network_name}"
334+
subnetwork = "%{subnetwork_name}"
319335
}
320336
321337
resource "google_gke_backup_backup_plan" "basic" {

‎google-beta/services/gkebackup/iam_gke_backup_restore_plan_generated_test.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ func TestAccGKEBackupRestorePlanIamBindingGenerated(t *testing.T) {
3636
"project": envvar.GetTestProjectFromEnv(),
3737

3838
"deletion_protection": false,
39+
"network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
40+
"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
3941
}
4042

4143
acctest.VcrTest(t, resource.TestCase{
@@ -74,6 +76,8 @@ func TestAccGKEBackupRestorePlanIamMemberGenerated(t *testing.T) {
7476
"project": envvar.GetTestProjectFromEnv(),
7577

7678
"deletion_protection": false,
79+
"network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
80+
"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
7781
}
7882

7983
acctest.VcrTest(t, resource.TestCase{
@@ -103,6 +107,8 @@ func TestAccGKEBackupRestorePlanIamPolicyGenerated(t *testing.T) {
103107
"project": envvar.GetTestProjectFromEnv(),
104108

105109
"deletion_protection": false,
110+
"network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
111+
"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
106112
}
107113

108114
acctest.VcrTest(t, resource.TestCase{
@@ -147,6 +153,8 @@ resource "google_container_cluster" "primary" {
147153
}
148154
}
149155
deletion_protection = "%{deletion_protection}"
156+
network = "%{network_name}"
157+
subnetwork = "%{subnetwork_name}"
150158
}
151159
152160
resource "google_gke_backup_backup_plan" "basic" {
@@ -201,6 +209,8 @@ resource "google_container_cluster" "primary" {
201209
}
202210
}
203211
deletion_protection = "%{deletion_protection}"
212+
network = "%{network_name}"
213+
subnetwork = "%{subnetwork_name}"
204214
}
205215
206216
resource "google_gke_backup_backup_plan" "basic" {
@@ -270,6 +280,8 @@ resource "google_container_cluster" "primary" {
270280
}
271281
}
272282
deletion_protection = "%{deletion_protection}"
283+
network = "%{network_name}"
284+
subnetwork = "%{subnetwork_name}"
273285
}
274286
275287
resource "google_gke_backup_backup_plan" "basic" {
@@ -326,6 +338,8 @@ resource "google_container_cluster" "primary" {
326338
}
327339
}
328340
deletion_protection = "%{deletion_protection}"
341+
network = "%{network_name}"
342+
subnetwork = "%{subnetwork_name}"
329343
}
330344
331345
resource "google_gke_backup_backup_plan" "basic" {
@@ -380,6 +394,8 @@ resource "google_container_cluster" "primary" {
380394
}
381395
}
382396
deletion_protection = "%{deletion_protection}"
397+
network = "%{network_name}"
398+
subnetwork = "%{subnetwork_name}"
383399
}
384400
385401
resource "google_gke_backup_backup_plan" "basic" {

‎google-beta/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ func TestAccGKEBackupBackupPlan_gkebackupBackupplanBasicExample(t *testing.T) {
3737
context := map[string]interface{}{
3838
"project": envvar.GetTestProjectFromEnv(),
3939
"deletion_protection": false,
40+
"network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
41+
"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
4042
"random_suffix": acctest.RandString(t, 10),
4143
}
4244

@@ -73,6 +75,8 @@ resource "google_container_cluster" "primary" {
7375
}
7476
}
7577
deletion_protection = "%{deletion_protection}"
78+
network = "%{network_name}"
79+
subnetwork = "%{subnetwork_name}"
7680
}
7781
7882
resource "google_gke_backup_backup_plan" "basic" {
@@ -93,6 +97,8 @@ func TestAccGKEBackupBackupPlan_gkebackupBackupplanAutopilotExample(t *testing.T
9397

9498
context := map[string]interface{}{
9599
"deletion_protection": false,
100+
"network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
101+
"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
96102
"random_suffix": acctest.RandString(t, 10),
97103
}
98104

@@ -131,6 +137,8 @@ resource "google_container_cluster" "primary" {
131137
}
132138
}
133139
deletion_protection = "%{deletion_protection}"
140+
network = "%{network_name}"
141+
subnetwork = "%{subnetwork_name}"
134142
}
135143
136144
resource "google_gke_backup_backup_plan" "autopilot" {
@@ -152,6 +160,8 @@ func TestAccGKEBackupBackupPlan_gkebackupBackupplanCmekExample(t *testing.T) {
152160
context := map[string]interface{}{
153161
"project": envvar.GetTestProjectFromEnv(),
154162
"deletion_protection": false,
163+
"network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
164+
"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
155165
"random_suffix": acctest.RandString(t, 10),
156166
}
157167

@@ -188,6 +198,8 @@ resource "google_container_cluster" "primary" {
188198
}
189199
}
190200
deletion_protection = "%{deletion_protection}"
201+
network = "%{network_name}"
202+
subnetwork = "%{subnetwork_name}"
191203
}
192204
193205
resource "google_gke_backup_backup_plan" "cmek" {
@@ -224,6 +236,8 @@ func TestAccGKEBackupBackupPlan_gkebackupBackupplanFullExample(t *testing.T) {
224236
context := map[string]interface{}{
225237
"project": envvar.GetTestProjectFromEnv(),
226238
"deletion_protection": false,
239+
"network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
240+
"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
227241
"random_suffix": acctest.RandString(t, 10),
228242
}
229243

@@ -260,6 +274,8 @@ resource "google_container_cluster" "primary" {
260274
}
261275
}
262276
deletion_protection = "%{deletion_protection}"
277+
network = "%{network_name}"
278+
subnetwork = "%{subnetwork_name}"
263279
}
264280
265281
resource "google_gke_backup_backup_plan" "full" {

‎google-beta/services/gkebackup/resource_gke_backup_backup_plan_test.go‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ func TestAccGKEBackupBackupPlan_update(t *testing.T) {
1515
t.Parallel()
1616

1717
context := map[string]interface{}{
18-
"project": envvar.GetTestProjectFromEnv(),
19-
"random_suffix": acctest.RandString(t, 10),
18+
"project": envvar.GetTestProjectFromEnv(),
19+
"random_suffix": acctest.RandString(t, 10),
20+
"network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"),
21+
"subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")),
2022
}
2123

2224
acctest.VcrTest(t, resource.TestCase{
@@ -56,21 +58,23 @@ resource "google_container_cluster" "primary" {
5658
workload_pool = "%{project}.svc.id.goog"
5759
}
5860
addons_config {
59-
gke_backup_agent_config {
60-
enabled = true
61-
}
61+
gke_backup_agent_config {
62+
enabled = true
63+
}
6264
}
6365
deletion_protection = false
66+
network = "%{network_name}"
67+
subnetwork = "%{subnetwork_name}"
6468
}
65-
69+
6670
resource "google_gke_backup_backup_plan" "backupplan" {
6771
name = "tf-test-testplan%{random_suffix}"
6872
cluster = google_container_cluster.primary.id
6973
location = "us-central1"
7074
backup_config {
71-
include_volume_data = false
72-
include_secrets = false
73-
all_namespaces = true
75+
include_volume_data = false
76+
include_secrets = false
77+
all_namespaces = true
7478
}
7579
labels = {
7680
"some-key-1": "some-value-1"
@@ -89,36 +93,38 @@ resource "google_container_cluster" "primary" {
8993
workload_pool = "%{project}.svc.id.goog"
9094
}
9195
addons_config {
92-
gke_backup_agent_config {
93-
enabled = true
94-
}
96+
gke_backup_agent_config {
97+
enabled = true
98+
}
9599
}
96100
deletion_protection = false
101+
network = "%{network_name}"
102+
subnetwork = "%{subnetwork_name}"
97103
}
98104
99105
resource "google_gke_backup_backup_plan" "backupplan" {
100106
name = "tf-test-testplan%{random_suffix}"
101107
cluster = google_container_cluster.primary.id
102108
location = "us-central1"
103109
retention_policy {
104-
backup_delete_lock_days = 30
105-
backup_retain_days = 180
110+
backup_delete_lock_days = 30
111+
backup_retain_days = 180
106112
}
107113
backup_schedule {
108114
cron_schedule = "0 9 * * 1"
109115
}
110116
backup_config {
111-
include_volume_data = true
112-
include_secrets = true
113-
selected_applications {
114-
namespaced_names {
115-
name = "app1"
116-
namespace = "ns1"
117-
}
118-
namespaced_names {
119-
name = "app2"
120-
namespace = "ns2"
121-
}
117+
include_volume_data = true
118+
include_secrets = true
119+
selected_applications {
120+
namespaced_names {
121+
name = "app1"
122+
namespace = "ns1"
123+
}
124+
namespaced_names {
125+
name = "app2"
126+
namespace = "ns2"
127+
}
122128
}
123129
}
124130
labels = {

0 commit comments

Comments
 (0)