Skip to content

Commit a154a9e

Browse files
modular-magicianmodular-magician
authored
Merge pull request #8530 from GoogleCloudPlatform/pre_tgc_beta_main (#15396)
Signed-off-by: Modular Magician <[email protected]>
1 parent 44207fa commit a154a9e

File tree

50 files changed

+438
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+438
-265
lines changed

‎.changelog/8530.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google/data_source_google_service_networking_peered_dns_domain_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ resource "google_compute_network" "test" {
6868
}
6969
7070
resource "google_compute_global_address" "host-private-access" {
71-
name = "private-ip-alloc-host"
71+
name = "%s-ip"
7272
purpose = "VPC_PEERING"
7373
address_type = "INTERNAL"
7474
prefix_length = 24
@@ -118,5 +118,5 @@ data "google_service_networking_peered_dns_domain" "acceptance" {
118118
google_service_networking_peered_dns_domain.acceptance,
119119
]
120120
}
121-
`, project, project, org, billing, service, service, name, service, name, service)
121+
`, project, project, org, billing, service, project, service, name, service, name, service)
122122
}

‎google/resource_apigee_env_keystore_alias_pkcs12_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ resource "google_compute_network" "apigee_network" {
7878
}
7979
8080
resource "google_compute_global_address" "apigee_range" {
81-
name = "apigee-range"
81+
name = "tf-test-apigee-range%{random_suffix}"
8282
purpose = "VPC_PEERING"
8383
address_type = "INTERNAL"
8484
prefix_length = 16

‎google/resource_apigee_flowhook_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ resource "google_compute_network" "apigee_network" {
7777
}
7878
7979
resource "google_compute_global_address" "apigee_range" {
80-
name = "apigee-range"
80+
name = "tf-test-apigee-range%{random_suffix}"
8181
purpose = "VPC_PEERING"
8282
address_type = "INTERNAL"
8383
prefix_length = 16

‎google/resource_apigee_keystores_aliases_key_cert_file_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ resource "google_compute_network" "apigee_network" {
8787
}
8888
8989
resource "google_compute_global_address" "apigee_range" {
90-
name = "apigee-range"
90+
name = "tf-test-apigee-range%{random_suffix}"
9191
purpose = "VPC_PEERING"
9292
address_type = "INTERNAL"
9393
prefix_length = 16
@@ -208,7 +208,7 @@ resource "google_compute_network" "apigee_network" {
208208
}
209209
210210
resource "google_compute_global_address" "apigee_range" {
211-
name = "apigee-range"
211+
name = "tf-test-apigee-range%{random_suffix}"
212212
purpose = "VPC_PEERING"
213213
address_type = "INTERNAL"
214214
prefix_length = 16

‎google/resource_apigee_sharedflow_deployment_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ resource "google_compute_network" "apigee_network" {
8888
}
8989
9090
resource "google_compute_global_address" "apigee_range" {
91-
name = "apigee-range"
91+
name = "tf-test-apigee-range%{random_suffix}"
9292
purpose = "VPC_PEERING"
9393
address_type = "INTERNAL"
9494
prefix_length = 16

‎google/resource_apigee_sharedflow_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ resource "google_compute_network" "apigee_network" {
8888
}
8989
9090
resource "google_compute_global_address" "apigee_range" {
91-
name = "apigee-range"
91+
name = "tf-test-apigee-range%{random_suffix}"
9292
purpose = "VPC_PEERING"
9393
address_type = "INTERNAL"
9494
prefix_length = 16
@@ -194,7 +194,7 @@ resource "google_compute_network" "apigee_network" {
194194
}
195195
196196
resource "google_compute_global_address" "apigee_range" {
197-
name = "apigee-range"
197+
name = "tf-test-apigee-range%{random_suffix}"
198198
purpose = "VPC_PEERING"
199199
address_type = "INTERNAL"
200200
prefix_length = 16

‎google/resource_cloud_tasks_queue_test.go

+40
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,29 @@ func TestAccCloudTasksQueue_MaxRetryDiffSuppress0s(t *testing.T) {
9292
})
9393
}
9494

95+
// Make sure the diff suppression function handles the situation where an
96+
// unexpected time unit is used, e.g., 2.0s instead of 2s or 2.0s instead of
97+
// 2.000s
98+
func TestAccCloudTasksQueue_TimeUnitDiff(t *testing.T) {
99+
t.Parallel()
100+
testID := acctest.RandString(t, 10)
101+
cloudTaskName := fmt.Sprintf("tf-test-%s", testID)
102+
acctest.VcrTest(t, resource.TestCase{
103+
PreCheck: func() { acctest.AccTestPreCheck(t) },
104+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
105+
Steps: []resource.TestStep{
106+
{
107+
Config: testAccCloudtasksQueueTimeUnitDiff(cloudTaskName),
108+
},
109+
{
110+
ResourceName: "google_cloud_tasks_queue.default",
111+
ImportState: true,
112+
ImportStateVerify: true,
113+
},
114+
},
115+
})
116+
}
117+
95118
func testAccCloudTasksQueue_basic(name string) string {
96119
return fmt.Sprintf(`
97120
resource "google_cloud_tasks_queue" "default" {
@@ -186,3 +209,20 @@ func testAccCloudtasksQueueMaxRetry0s(cloudTaskName string) string {
186209
}
187210
`, cloudTaskName)
188211
}
212+
213+
func testAccCloudtasksQueueTimeUnitDiff(cloudTaskName string) string {
214+
return fmt.Sprintf(`
215+
resource "google_cloud_tasks_queue" "default" {
216+
name = "%s"
217+
location = "us-central1"
218+
219+
retry_config {
220+
max_attempts = -1
221+
max_backoff = "5.000s"
222+
max_doublings = 16
223+
max_retry_duration = "1.0s"
224+
min_backoff = "0.10s"
225+
}
226+
}
227+
`, cloudTaskName)
228+
}

‎google/resource_cloudids_endpoint_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ resource "google_compute_network" "default" {
5353
name = "tf-test-my-network%{random_suffix}"
5454
}
5555
resource "google_compute_global_address" "service_range" {
56-
name = "address"
56+
name = "tf-test-address%{random_suffix}"
5757
purpose = "VPC_PEERING"
5858
address_type = "INTERNAL"
5959
prefix_length = 16
@@ -82,7 +82,7 @@ resource "google_compute_network" "default" {
8282
name = "tf-test-my-network%{random_suffix}"
8383
}
8484
resource "google_compute_global_address" "service_range" {
85-
name = "address"
85+
name = "tf-test-address%{random_suffix}"
8686
purpose = "VPC_PEERING"
8787
address_type = "INTERNAL"
8888
prefix_length = 16

‎google/resource_composer_environment_test.go

+99
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,42 @@ func TestAccComposerEnvironment_ComposerV2(t *testing.T) {
488488
})
489489
}
490490

491+
func TestAccComposerEnvironment_UpdateComposerV2ResilienceMode(t *testing.T) {
492+
t.Parallel()
493+
494+
envName := fmt.Sprintf("%s-%d", testComposerEnvironmentPrefix, RandInt(t))
495+
network := fmt.Sprintf("%s-%d", testComposerNetworkPrefix, RandInt(t))
496+
subnetwork := network + "-1"
497+
498+
VcrTest(t, resource.TestCase{
499+
PreCheck: func() { acctest.AccTestPreCheck(t) },
500+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
501+
CheckDestroy: testAccComposerEnvironmentDestroyProducer(t),
502+
Steps: []resource.TestStep{
503+
{
504+
Config: testAccComposerEnvironment_composerV2HighResilience(envName, network, subnetwork),
505+
},
506+
{
507+
Config: testAccComposerEnvironment_updateComposerV2StandardResilience(envName, network, subnetwork),
508+
},
509+
{
510+
ResourceName: "google_composer_environment.test",
511+
ImportState: true,
512+
ImportStateVerify: true,
513+
},
514+
// This is a terrible clean-up step in order to get destroy to succeed,
515+
// due to dangling firewall rules left by the Composer Environment blocking network deletion.
516+
// TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer.
517+
{
518+
PlanOnly: true,
519+
ExpectNonEmptyPlan: false,
520+
Config: testAccComposerEnvironment_updateComposerV2StandardResilience(envName, network, subnetwork),
521+
Check: testAccCheckClearComposerEnvironmentFirewalls(t, network),
522+
},
523+
},
524+
})
525+
}
526+
491527
func TestAccComposerEnvironment_ComposerV2HighResilience(t *testing.T) {
492528
t.Parallel()
493529

@@ -1763,6 +1799,69 @@ resource "google_compute_subnetwork" "test" {
17631799
`, envName, compVersion, airflowVersion, network, subnetwork)
17641800
}
17651801

1802+
func testAccComposerEnvironment_updateComposerV2StandardResilience(envName, network, subnetwork string) string {
1803+
return fmt.Sprintf(`
1804+
resource "google_composer_environment" "test" {
1805+
name = "%s"
1806+
region = "us-east1"
1807+
1808+
config {
1809+
node_config {
1810+
network = google_compute_network.test.self_link
1811+
subnetwork = google_compute_subnetwork.test.self_link
1812+
}
1813+
1814+
software_config {
1815+
image_version = "composer-2-airflow-2"
1816+
}
1817+
1818+
workloads_config {
1819+
scheduler {
1820+
cpu = 1.25
1821+
memory_gb = 2.5
1822+
storage_gb = 5.4
1823+
count = 2
1824+
}
1825+
web_server {
1826+
cpu = 1.75
1827+
memory_gb = 3.0
1828+
storage_gb = 4.4
1829+
}
1830+
worker {
1831+
cpu = 0.5
1832+
memory_gb = 2.0
1833+
storage_gb = 3.4
1834+
min_count = 2
1835+
max_count = 5
1836+
}
1837+
}
1838+
environment_size = "ENVIRONMENT_SIZE_MEDIUM"
1839+
resilience_mode = "STANDARD_RESILIENCE"
1840+
private_environment_config {
1841+
enable_private_endpoint = true
1842+
cloud_composer_network_ipv4_cidr_block = "10.3.192.0/24"
1843+
master_ipv4_cidr_block = "172.16.194.0/23"
1844+
cloud_sql_ipv4_cidr_block = "10.3.224.0/20"
1845+
}
1846+
}
1847+
}
1848+
1849+
resource "google_compute_network" "test" {
1850+
name = "%s"
1851+
auto_create_subnetworks = false
1852+
}
1853+
1854+
resource "google_compute_subnetwork" "test" {
1855+
name = "%s"
1856+
ip_cidr_range = "10.2.0.0/16"
1857+
region = "us-east1"
1858+
network = google_compute_network.test.self_link
1859+
private_ip_google_access = true
1860+
}
1861+
1862+
`, envName, network, subnetwork)
1863+
}
1864+
17661865
func testAccComposerEnvironment_MasterAuthNetworksUpdate(compVersion, airflowVersion, envName, network, subnetwork string) string {
17671866
return fmt.Sprintf(`
17681867
resource "google_composer_environment" "test" {

‎google/resource_compute_forwarding_rule_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ func TestAccComputeForwardingRule_update(t *testing.T) {
4444
func TestAccComputeForwardingRule_ip(t *testing.T) {
4545
t.Parallel()
4646

47-
addrName := fmt.Sprintf("tf-%s", acctest.RandString(t, 10))
48-
poolName := fmt.Sprintf("tf-%s", acctest.RandString(t, 10))
49-
ruleName := fmt.Sprintf("tf-%s", acctest.RandString(t, 10))
47+
addrName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
48+
poolName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
49+
ruleName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
5050
addressRefFieldRaw := "address"
5151
addressRefFieldID := "id"
5252

‎google/resource_compute_router_nat_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ resource "google_compute_subnetwork" "foobar" {
678678
}
679679
680680
resource "google_compute_address" "foobar" {
681-
name = "router-nat-%s-addr"
681+
name = "%s-router-nat-addr"
682682
region = google_compute_subnetwork.foobar.region
683683
}
684684
@@ -721,7 +721,7 @@ resource "google_compute_subnetwork" "foobar" {
721721
}
722722
723723
resource "google_compute_address" "foobar" {
724-
name = "router-nat-%s-addr"
724+
name = "%s-router-nat-addr"
725725
region = google_compute_subnetwork.foobar.region
726726
}
727727
@@ -766,7 +766,7 @@ resource "google_compute_subnetwork" "foobar" {
766766
}
767767
768768
resource "google_compute_address" "foobar" {
769-
name = "router-nat-%s-addr"
769+
name = "%s-router-nat-addr"
770770
region = google_compute_subnetwork.foobar.region
771771
}
772772

‎google/resource_google_service_networking_peered_dns_domain_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestAccServiceNetworkingPeeredDNSDomain_basic(t *testing.T) {
1717
billingId := envvar.GetTestBillingAccountFromEnv(t)
1818

1919
project := fmt.Sprintf("tf-test-%d", acctest.RandInt(t))
20-
name := fmt.Sprintf("test-name-%d", acctest.RandInt(t))
20+
name := fmt.Sprintf("tf-test-%d", acctest.RandInt(t))
2121
service := "servicenetworking.googleapis.com"
2222

2323
acctest.VcrTest(t, resource.TestCase{
@@ -59,7 +59,7 @@ resource "google_compute_network" "test" {
5959
}
6060
6161
resource "google_compute_global_address" "host-private-access" {
62-
name = "private-ip-alloc-host"
62+
name = "%s-ip"
6363
purpose = "VPC_PEERING"
6464
address_type = "INTERNAL"
6565
prefix_length = 24
@@ -97,5 +97,5 @@ resource "google_service_networking_peered_dns_domain" "test" {
9797
google_service_networking_connection.host-private-access,
9898
]
9999
}
100-
`, project, project, org, billing, service, service, name, service)
100+
`, project, project, org, billing, service, project, service, name, service)
101101
}

0 commit comments

Comments
 (0)