Skip to content

Commit 81a7911

Browse files
modular-magicianmodular-magician
authored
Fix failing Managed Kafka Connect resource test failures (#13435) (#9728)
[upstream:d297ae2b466f6a26869484dd86bc79eafb79112c] Signed-off-by: Modular Magician <[email protected]>
1 parent ab57dd5 commit 81a7911

4 files changed

+226
-90
lines changed

‎google-beta/services/managedkafka/resource_managed_kafka_connect_cluster_generated_test.go

+55-20
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,28 @@ import (
2626
"github.com/hashicorp/terraform-plugin-testing/terraform"
2727

2828
"github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest"
29+
"github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar"
2930
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
3031
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
3132
)
3233

3334
func TestAccManagedKafkaConnectCluster_managedkafkaConnectClusterBasicExample(t *testing.T) {
35+
acctest.SkipIfVcr(t)
3436
t.Parallel()
3537

3638
context := map[string]interface{}{
37-
"random_suffix": acctest.RandString(t, 10),
39+
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
40+
"org_id": envvar.GetTestOrgFromEnv(t),
41+
"random_suffix": acctest.RandString(t, 10),
3842
}
3943

4044
acctest.VcrTest(t, resource.TestCase{
4145
PreCheck: func() { acctest.AccTestPreCheck(t) },
4246
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
43-
CheckDestroy: testAccCheckManagedKafkaConnectClusterDestroyProducer(t),
47+
ExternalProviders: map[string]resource.ExternalProvider{
48+
"time": {},
49+
},
50+
CheckDestroy: testAccCheckManagedKafkaConnectClusterDestroyProducer(t),
4451
Steps: []resource.TestStep{
4552
{
4653
Config: testAccManagedKafkaConnectCluster_managedkafkaConnectClusterBasicExample(context),
@@ -57,26 +64,50 @@ func TestAccManagedKafkaConnectCluster_managedkafkaConnectClusterBasicExample(t
5764

5865
func testAccManagedKafkaConnectCluster_managedkafkaConnectClusterBasicExample(context map[string]interface{}) string {
5966
return acctest.Nprintf(`
60-
resource "google_compute_network" "mkc_network" {
61-
name = "tf-test-my-network%{random_suffix}"
62-
auto_create_subnetworks = false
67+
resource "google_project" "project" {
68+
project_id = "tf-test%{random_suffix}"
69+
name = "tf-test%{random_suffix}"
70+
org_id = "%{org_id}"
71+
billing_account = "%{billing_account}"
72+
deletion_policy = "DELETE"
73+
74+
provider = google-beta
6375
}
6476
65-
resource "google_compute_subnetwork" "mkc_subnet" {
66-
name = "tf-test-my-subnetwork%{random_suffix}"
67-
ip_cidr_range = "10.2.0.0/16"
68-
region = "us-central1"
69-
network = google_compute_network.mkc_network.id
77+
resource "time_sleep" "wait_60_seconds" {
78+
create_duration = "60s"
79+
depends_on = [google_project.project]
80+
}
81+
82+
resource "google_project_service" "compute" {
83+
project = google_project.project.project_id
84+
service = "compute.googleapis.com"
85+
depends_on = [time_sleep.wait_60_seconds]
86+
87+
provider = google-beta
7088
}
7189
72-
resource "google_compute_subnetwork" "mkc_additional_subnet" {
73-
name = "tf-test-my-additional-subnetwork-0%{random_suffix}"
90+
resource "google_project_service" "managedkafka" {
91+
project = google_project.project.project_id
92+
service = "managedkafka.googleapis.com"
93+
depends_on = [time_sleep.wait_60_seconds]
94+
95+
provider = google-beta
96+
}
97+
98+
resource "google_compute_subnetwork" "mkc_secondary_subnet" {
99+
project = google_project.project.project_id
100+
name = "tf-test-my-secondary-subnetwork%{random_suffix}"
74101
ip_cidr_range = "10.3.0.0/16"
75102
region = "us-central1"
76-
network = google_compute_network.mkc_network.id
103+
network = "default"
104+
depends_on = [google_project_service.compute]
105+
106+
provider = google-beta
77107
}
78108
79109
resource "google_managed_kafka_cluster" "gmk_cluster" {
110+
project = google_project.project.project_id
80111
cluster_id = "tf-test-my-cluster%{random_suffix}"
81112
location = "us-central1"
82113
capacity_config {
@@ -86,15 +117,19 @@ resource "google_managed_kafka_cluster" "gmk_cluster" {
86117
gcp_config {
87118
access_config {
88119
network_configs {
89-
subnet = "projects/${data.google_project.project.project_id}/regions/us-central1/subnetworks/${google_compute_subnetwork.mkc_subnet.id}"
120+
subnet = "projects/${google_project.project.project_id}/regions/us-central1/subnetworks/default"
90121
}
91122
}
92123
}
124+
depends_on = [google_project_service.managedkafka]
125+
126+
provider = google-beta
93127
}
94128
95129
resource "google_managed_kafka_connect_cluster" "example" {
130+
project = google_project.project.project_id
96131
connect_cluster_id = "tf-test-my-connect-cluster%{random_suffix}"
97-
kafka_cluster = "projects/${data.google_project.project.project_id}/locations/us-central1/clusters/${google_managed_kafka_cluster.gmk_cluster.cluster_id}"
132+
kafka_cluster = "projects/${google_project.project.project_id}/locations/us-central1/clusters/${google_managed_kafka_cluster.gmk_cluster.cluster_id}"
98133
location = "us-central1"
99134
capacity_config {
100135
vcpu_count = 12
@@ -103,18 +138,18 @@ resource "google_managed_kafka_connect_cluster" "example" {
103138
gcp_config {
104139
access_config {
105140
network_configs {
106-
primary_subnet = "projects/${data.google_project.project.project_id}/regions/us-central1/subnetworks/${google_compute_subnetwork.mkc_subnet.id}"
107-
additional_subnets = ["${google_compute_subnetwork.mkc_additional_subnet.id}"]
108-
dns_domain_names = ["${google_managed_kafka_cluster.gmk_cluster.cluster_id}.us-central1.managedkafka-staging.${data.google_project.project.project_id}.cloud-staging.goog"]
141+
primary_subnet = "projects/${google_project.project.project_id}/regions/us-central1/subnetworks/default"
142+
additional_subnets = ["${google_compute_subnetwork.mkc_secondary_subnet.id}"]
143+
dns_domain_names = ["${google_managed_kafka_cluster.gmk_cluster.cluster_id}.us-central1.managedkafka.${google_project.project.project_id}.cloud.goog"]
109144
}
110145
}
111146
}
112147
labels = {
113148
key = "value"
114149
}
115-
}
150+
depends_on = [google_project_service.managedkafka]
116151
117-
data "google_project" "project" {
152+
provider = google-beta
118153
}
119154
`, context)
120155
}

‎google-beta/services/managedkafka/resource_managed_kafka_connector_generated_test.go

+67-22
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,28 @@ import (
2626
"github.com/hashicorp/terraform-plugin-testing/terraform"
2727

2828
"github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest"
29+
"github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar"
2930
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
3031
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
3132
)
3233

3334
func TestAccManagedKafkaConnector_managedkafkaConnectorBasicExample(t *testing.T) {
35+
acctest.SkipIfVcr(t)
3436
t.Parallel()
3537

3638
context := map[string]interface{}{
37-
"random_suffix": acctest.RandString(t, 10),
39+
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
40+
"org_id": envvar.GetTestOrgFromEnv(t),
41+
"random_suffix": acctest.RandString(t, 10),
3842
}
3943

4044
acctest.VcrTest(t, resource.TestCase{
4145
PreCheck: func() { acctest.AccTestPreCheck(t) },
4246
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
43-
CheckDestroy: testAccCheckManagedKafkaConnectorDestroyProducer(t),
47+
ExternalProviders: map[string]resource.ExternalProvider{
48+
"time": {},
49+
},
50+
CheckDestroy: testAccCheckManagedKafkaConnectorDestroyProducer(t),
4451
Steps: []resource.TestStep{
4552
{
4653
Config: testAccManagedKafkaConnector_managedkafkaConnectorBasicExample(context),
@@ -57,32 +64,58 @@ func TestAccManagedKafkaConnector_managedkafkaConnectorBasicExample(t *testing.T
5764

5865
func testAccManagedKafkaConnector_managedkafkaConnectorBasicExample(context map[string]interface{}) string {
5966
return acctest.Nprintf(`
60-
resource "google_compute_network" "mkc_network" {
61-
name = "tf-test-my-network-0%{random_suffix}"
62-
auto_create_subnetworks = false
67+
resource "google_project" "project" {
68+
project_id = "tf-test%{random_suffix}"
69+
name = "tf-test%{random_suffix}"
70+
org_id = "%{org_id}"
71+
billing_account = "%{billing_account}"
72+
deletion_policy = "DELETE"
73+
74+
provider = google-beta
6375
}
6476
65-
resource "google_compute_subnetwork" "mkc_subnet" {
66-
name = "tf-test-my-subnetwork-0%{random_suffix}"
67-
ip_cidr_range = "10.4.0.0/16"
68-
region = "us-central1"
69-
network = google_compute_network.mkc_network.id
77+
resource "time_sleep" "wait_60_seconds" {
78+
create_duration = "60s"
79+
depends_on = [google_project.project]
80+
}
81+
82+
resource "google_project_service" "compute" {
83+
project = google_project.project.project_id
84+
service = "compute.googleapis.com"
85+
depends_on = [time_sleep.wait_60_seconds]
86+
87+
provider = google-beta
88+
}
89+
90+
resource "google_project_service" "managedkafka" {
91+
project = google_project.project.project_id
92+
service = "managedkafka.googleapis.com"
93+
depends_on = [time_sleep.wait_60_seconds]
94+
95+
provider = google-beta
7096
}
7197
72-
resource "google_compute_subnetwork" "mkc_additional_subnet" {
73-
name = "tf-test-my-additional-subnetwork-0%{random_suffix}"
98+
resource "google_compute_subnetwork" "mkc_secondary_subnet" {
99+
project = google_project.project.project_id
100+
name = "tf-test-my-secondary-subnetwork-00%{random_suffix}"
74101
ip_cidr_range = "10.5.0.0/16"
75102
region = "us-central1"
76-
network = google_compute_network.mkc_network.id
103+
network = "default"
104+
depends_on = [google_project_service.compute]
105+
106+
provider = google-beta
77107
}
78108
79109
resource "google_pubsub_topic" "cps_topic" {
110+
project = google_project.project.project_id
80111
name = "tf-test-my-cps-topic%{random_suffix}"
81-
82112
message_retention_duration = "86600s"
113+
114+
provider = google-beta
83115
}
84116
85117
resource "google_managed_kafka_cluster" "gmk_cluster" {
118+
project = google_project.project.project_id
86119
cluster_id = "tf-test-my-cluster%{random_suffix}"
87120
location = "us-central1"
88121
capacity_config {
@@ -92,23 +125,31 @@ resource "google_managed_kafka_cluster" "gmk_cluster" {
92125
gcp_config {
93126
access_config {
94127
network_configs {
95-
subnet = "projects/${data.google_project.project.project_id}/regions/us-central1/subnetworks/${google_compute_subnetwork.mkc_subnet.id}"
128+
subnet = "projects/${google_project.project.project_id}/regions/us-central1/subnetworks/default"
96129
}
97130
}
98131
}
132+
depends_on = [google_project_service.managedkafka]
133+
134+
provider = google-beta
99135
}
100136
101137
resource "google_managed_kafka_topic" "gmk_topic" {
138+
project = google_project.project.project_id
102139
topic_id = "tf-test-my-topic%{random_suffix}"
103140
cluster = google_managed_kafka_cluster.gmk_cluster.cluster_id
104141
location = "us-central1"
105142
partition_count = 2
106143
replication_factor = 3
144+
depends_on = [google_project_service.managedkafka]
145+
146+
provider = google-beta
107147
}
108148
109149
resource "google_managed_kafka_connect_cluster" "mkc_cluster" {
150+
project = google_project.project.project_id
110151
connect_cluster_id = "tf-test-my-connect-cluster%{random_suffix}"
111-
kafka_cluster = "projects/${data.google_project.project.project_id}/locations/us-central1/clusters/${google_managed_kafka_cluster.gmk_cluster.cluster_id}"
152+
kafka_cluster = "projects/${google_project.project.project_id}/locations/us-central1/clusters/${google_managed_kafka_cluster.gmk_cluster.cluster_id}"
112153
location = "us-central1"
113154
capacity_config {
114155
vcpu_count = 12
@@ -117,18 +158,22 @@ resource "google_managed_kafka_connect_cluster" "mkc_cluster" {
117158
gcp_config {
118159
access_config {
119160
network_configs {
120-
primary_subnet = "projects/${data.google_project.project.project_id}/regions/us-central1/subnetworks/${google_compute_subnetwork.mkc_subnet.id}"
121-
additional_subnets = ["${google_compute_subnetwork.mkc_additional_subnet.id}"]
122-
dns_domain_names = ["${google_managed_kafka_cluster.gmk_cluster.cluster_id}.us-central1.managedkafka-staging.${data.google_project.project.project_id}.cloud-staging.goog"]
161+
primary_subnet = "projects/${google_project.project.project_id}/regions/us-central1/subnetworks/default"
162+
additional_subnets = ["${google_compute_subnetwork.mkc_secondary_subnet.id}"]
163+
dns_domain_names = ["${google_managed_kafka_cluster.gmk_cluster.cluster_id}.us-central1.managedkafka.${google_project.project.project_id}.cloud.goog"]
123164
}
124165
}
125166
}
126167
labels = {
127168
key = "value"
128169
}
170+
depends_on = [google_project_service.managedkafka]
171+
172+
provider = google-beta
129173
}
130174
131175
resource "google_managed_kafka_connector" "example" {
176+
project = google_project.project.project_id
132177
connector_id = "tf-test-my-connector%{random_suffix}"
133178
connect_cluster = google_managed_kafka_connect_cluster.mkc_cluster.connect_cluster_id
134179
location = "us-central1"
@@ -138,17 +183,17 @@ resource "google_managed_kafka_connector" "example" {
138183
"tasks.max" = "1"
139184
"topics" = "${google_managed_kafka_topic.gmk_topic.topic_id}"
140185
"cps.topic" = "${google_pubsub_topic.cps_topic.name}"
141-
"cps.project" = "${data.google_project.project.project_id}"
186+
"cps.project" = "${google_project.project.project_id}"
142187
"value.converter" = "org.apache.kafka.connect.storage.StringConverter"
143188
"key.converter" = "org.apache.kafka.connect.storage.StringConverter"
144189
}
145190
task_restart_policy {
146191
minimum_backoff = "60s"
147192
maximum_backoff = "1800s"
148193
}
149-
}
194+
depends_on = [google_project_service.managedkafka]
150195
151-
data "google_project" "project" {
196+
provider = google-beta
152197
}
153198
`, context)
154199
}

0 commit comments

Comments
 (0)