Skip to content

Commit e9ffe5a

Browse files
salmanysalmany
authored
Promoting Managed Kafka Connect to GA (#15175)
1 parent 5df9ee0 commit e9ffe5a

File tree

4 files changed

+44
-141
lines changed

4 files changed

+44
-141
lines changed

‎mmv1/products/managedkafka/ConnectCluster.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
---
1515
name: 'ConnectCluster'
1616
description: A Managed Service for Kafka Connect cluster.
17-
min_version: 'beta'
1817
docs:
1918
id_format: 'projects/{{project}}/locations/{{location}}/connectClusters/{{connect_cluster_id}}'
2019
base_url: 'projects/{{project}}/locations/{{location}}/connectClusters'
@@ -41,7 +40,6 @@ custom_code:
4140
examples:
4241
- name: 'managedkafka_connect_cluster_basic'
4342
primary_resource_id: 'example'
44-
min_version: 'beta'
4543
vars:
4644
connect_cluster_id: 'my-connect-cluster'
4745
cluster_id: 'my-cluster'

‎mmv1/products/managedkafka/Connector.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
---
1515
name: 'Connector'
1616
description: A Managed Service for Kafka Connect Connectors.
17-
min_version: 'beta'
1817
docs:
1918
id_format: 'projects/{{project}}/locations/{{location}}/connectClusters/{{connect_cluster}}/connectors/{{connector_id}}'
2019
base_url: 'projects/{{project}}/locations/{{location}}/connectClusters/{{connect_cluster}}/connectors'
@@ -31,7 +30,6 @@ timeouts:
3130
examples:
3231
- name: 'managedkafka_connector_basic'
3332
primary_resource_id: 'example'
34-
min_version: 'beta'
3533
vars:
3634
connector_id: 'my-connector'
3735
connect_cluster_id: 'my-connect-cluster'

‎mmv1/templates/terraform/examples/managedkafka_connect_cluster_basic.tf.tmpl‎

Lines changed: 14 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,49 @@
1-
resource "google_project" "project" {
2-
project_id = "tf-test%{random_suffix}"
3-
name = "tf-test%{random_suffix}"
4-
org_id = "{{index $.TestEnvVars "org_id"}}"
5-
billing_account = "{{index $.TestEnvVars "billing_account"}}"
6-
deletion_policy = "DELETE"
7-
8-
provider = google-beta
9-
}
10-
11-
resource "time_sleep" "wait_60_seconds" {
12-
create_duration = "60s"
13-
depends_on = [google_project.project]
14-
}
15-
16-
resource "google_project_service" "compute" {
17-
project = google_project.project.project_id
18-
service = "compute.googleapis.com"
19-
depends_on = [time_sleep.wait_60_seconds]
20-
21-
provider = google-beta
22-
}
23-
24-
resource "google_project_service" "managedkafka" {
25-
project = google_project.project.project_id
26-
service = "managedkafka.googleapis.com"
27-
depends_on = [google_project_service.compute]
28-
29-
provider = google-beta
30-
}
31-
32-
resource "time_sleep" "wait_120_seconds" {
33-
create_duration = "120s"
34-
depends_on = [google_project_service.managedkafka]
1+
data "google_project" "project" {
352
}
363

374
resource "google_compute_subnetwork" "mkc_secondary_subnet" {
38-
project = google_project.project.project_id
5+
project = data.google_project.project.project_id
396
name = "{{index $.Vars "secondary_subnet_id"}}"
407
ip_cidr_range = "10.3.0.0/16"
418
region = "us-central1"
429
network = "default"
43-
depends_on = [time_sleep.wait_120_seconds]
44-
45-
provider = google-beta
4610
}
4711

48-
resource "google_managed_kafka_cluster" "gmk_cluster" {
49-
project = google_project.project.project_id
12+
resource "google_managed_kafka_cluster" "cluster" {
5013
cluster_id = "{{index $.Vars "cluster_id"}}"
51-
location = "us-central1"
14+
location = "us-central1"
5215
capacity_config {
53-
vcpu_count = 3
16+
vcpu_count = 3
5417
memory_bytes = 3221225472
5518
}
5619
gcp_config {
5720
access_config {
5821
network_configs {
59-
subnet = "projects/${google_project.project.project_id}/regions/us-central1/subnetworks/default"
22+
subnet = "projects/${data.google_project.project.number}/regions/us-central1/subnetworks/default"
6023
}
6124
}
6225
}
63-
depends_on = [google_project_service.managedkafka]
64-
65-
provider = google-beta
6626
}
6727

6828
resource "google_managed_kafka_connect_cluster" "{{$.PrimaryResourceId}}" {
69-
project = google_project.project.project_id
7029
connect_cluster_id = "{{index $.Vars "connect_cluster_id"}}"
71-
kafka_cluster = "projects/${google_project.project.project_id}/locations/us-central1/clusters/${google_managed_kafka_cluster.gmk_cluster.cluster_id}"
72-
location = "us-central1"
30+
kafka_cluster = "projects/${data.google_project.project.project_id}/locations/us-central1/clusters/${google_managed_kafka_cluster.cluster.cluster_id}"
31+
location = "us-central1"
32+
7333
capacity_config {
74-
vcpu_count = 12
34+
vcpu_count = 12
7535
memory_bytes = 21474836480
7636
}
7737
gcp_config {
7838
access_config {
7939
network_configs {
80-
primary_subnet = "projects/${google_project.project.project_id}/regions/us-central1/subnetworks/default"
81-
additional_subnets = ["${google_compute_subnetwork.mkc_secondary_subnet.id}"]
82-
dns_domain_names = ["${google_managed_kafka_cluster.gmk_cluster.cluster_id}.us-central1.managedkafka.${google_project.project.project_id}.cloud.goog"]
40+
primary_subnet = "projects/${data.google_project.project.number}/regions/us-central1/subnetworks/default"
41+
additional_subnets = [google_compute_subnetwork.mkc_secondary_subnet.id]
42+
dns_domain_names = ["${google_managed_kafka_cluster.cluster.cluster_id}.us-central1.managedkafka.${data.google_project.project.project_id}.cloud.goog"]
8343
}
8444
}
8545
}
8646
labels = {
8747
key = "value"
8848
}
89-
depends_on = [google_project_service.managedkafka]
90-
91-
provider = google-beta
92-
}
49+
}

‎mmv1/templates/terraform/examples/managedkafka_connector_basic.tf.tmpl‎

Lines changed: 30 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,86 @@
1-
resource "google_project" "project" {
2-
project_id = "tf-test%{random_suffix}"
3-
name = "tf-test%{random_suffix}"
4-
org_id = "{{index $.TestEnvVars "org_id"}}"
5-
billing_account = "{{index $.TestEnvVars "billing_account"}}"
6-
deletion_policy = "DELETE"
7-
8-
provider = google-beta
9-
}
10-
11-
resource "time_sleep" "wait_60_seconds" {
12-
create_duration = "60s"
13-
depends_on = [google_project.project]
14-
}
15-
16-
resource "google_project_service" "compute" {
17-
project = google_project.project.project_id
18-
service = "compute.googleapis.com"
19-
depends_on = [time_sleep.wait_60_seconds]
20-
21-
provider = google-beta
22-
}
23-
24-
resource "google_project_service" "managedkafka" {
25-
project = google_project.project.project_id
26-
service = "managedkafka.googleapis.com"
27-
depends_on = [google_project_service.compute]
28-
29-
provider = google-beta
30-
}
31-
32-
resource "time_sleep" "wait_120_seconds" {
33-
create_duration = "120s"
34-
depends_on = [google_project_service.managedkafka]
1+
data "google_project" "project" {
352
}
363

374
resource "google_compute_subnetwork" "mkc_secondary_subnet" {
38-
project = google_project.project.project_id
5+
project = data.google_project.project.project_id
396
name = "{{index $.Vars "secondary_subnet_id"}}"
407
ip_cidr_range = "10.5.0.0/16"
418
region = "us-central1"
429
network = "default"
43-
depends_on = [time_sleep.wait_120_seconds]
44-
45-
provider = google-beta
4610
}
4711

4812
resource "google_pubsub_topic" "cps_topic" {
49-
project = google_project.project.project_id
50-
name = "{{index $.Vars "cps_topic_name"}}"
13+
project = data.google_project.project.project_id
14+
name = "{{index $.Vars "cps_topic_name"}}"
5115
message_retention_duration = "86600s"
52-
53-
provider = google-beta
5416
}
5517

5618
resource "google_managed_kafka_cluster" "gmk_cluster" {
57-
project = google_project.project.project_id
5819
cluster_id = "{{index $.Vars "cluster_id"}}"
59-
location = "us-central1"
20+
location = "us-central1"
6021
capacity_config {
61-
vcpu_count = 3
22+
vcpu_count = 3
6223
memory_bytes = 3221225472
6324
}
6425
gcp_config {
6526
access_config {
6627
network_configs {
67-
subnet = "projects/${google_project.project.project_id}/regions/us-central1/subnetworks/default"
28+
subnet = "projects/${data.google_project.project.number}/regions/us-central1/subnetworks/default"
6829
}
6930
}
7031
}
71-
depends_on = [google_project_service.managedkafka]
72-
73-
provider = google-beta
7432
}
7533

7634
resource "google_managed_kafka_topic" "gmk_topic" {
77-
project = google_project.project.project_id
78-
topic_id = "{{index $.Vars "topic_id"}}"
79-
cluster = google_managed_kafka_cluster.gmk_cluster.cluster_id
80-
location = "us-central1"
81-
partition_count = 2
35+
topic_id = "{{index $.Vars "topic_id"}}"
36+
cluster = google_managed_kafka_cluster.gmk_cluster.cluster_id
37+
location = "us-central1"
38+
partition_count = 2
8239
replication_factor = 3
83-
depends_on = [google_project_service.managedkafka]
84-
85-
provider = google-beta
8640
}
8741

8842
resource "google_managed_kafka_connect_cluster" "mkc_cluster" {
89-
project = google_project.project.project_id
9043
connect_cluster_id = "{{index $.Vars "connect_cluster_id"}}"
91-
kafka_cluster = "projects/${google_project.project.project_id}/locations/us-central1/clusters/${google_managed_kafka_cluster.gmk_cluster.cluster_id}"
92-
location = "us-central1"
44+
kafka_cluster = "projects/${data.google_project.project.project_id}/locations/us-central1/clusters/${google_managed_kafka_cluster.gmk_cluster.cluster_id}"
45+
location = "us-central1"
9346
capacity_config {
94-
vcpu_count = 12
47+
vcpu_count = 12
9548
memory_bytes = 21474836480
9649
}
9750
gcp_config {
9851
access_config {
9952
network_configs {
100-
primary_subnet = "projects/${google_project.project.project_id}/regions/us-central1/subnetworks/default"
101-
additional_subnets = ["${google_compute_subnetwork.mkc_secondary_subnet.id}"]
102-
dns_domain_names = ["${google_managed_kafka_cluster.gmk_cluster.cluster_id}.us-central1.managedkafka.${google_project.project.project_id}.cloud.goog"]
53+
primary_subnet = "projects/${data.google_project.project.number}/regions/us-central1/subnetworks/default"
54+
additional_subnets = [
55+
google_compute_subnetwork.mkc_secondary_subnet.id
56+
]
57+
dns_domain_names = [
58+
"${google_managed_kafka_cluster.gmk_cluster.cluster_id}.us-central1.managedkafka.${data.google_project.project.project_id}.cloud.goog"
59+
]
10360
}
10461
}
10562
}
10663
labels = {
10764
key = "value"
10865
}
109-
depends_on = [google_project_service.managedkafka]
110-
111-
provider = google-beta
11266
}
11367

11468
resource "google_managed_kafka_connector" "{{$.PrimaryResourceId}}" {
115-
project = google_project.project.project_id
116-
connector_id = "{{index $.Vars "connector_id"}}"
69+
connector_id = "{{index $.Vars "connector_id"}}"
11770
connect_cluster = google_managed_kafka_connect_cluster.mkc_cluster.connect_cluster_id
118-
location = "us-central1"
71+
location = "us-central1"
11972
configs = {
12073
"connector.class" = "com.google.pubsub.kafka.sink.CloudPubSubSinkConnector"
121-
"name" = "{{index $.Vars "connector_id"}}"
122-
"tasks.max" = "1"
123-
"topics" = "${google_managed_kafka_topic.gmk_topic.topic_id}"
124-
"cps.topic" = "${google_pubsub_topic.cps_topic.name}"
125-
"cps.project" = "${google_project.project.project_id}"
74+
"name" = "{{index $.Vars "connector_id"}}"
75+
"tasks.max" = "3"
76+
"topics" = google_managed_kafka_topic.gmk_topic.topic_id
77+
"cps.topic" = google_pubsub_topic.cps_topic.name
78+
"cps.project" = data.google_project.project.project_id
12679
"value.converter" = "org.apache.kafka.connect.storage.StringConverter"
127-
"key.converter" = "org.apache.kafka.connect.storage.StringConverter"
80+
"key.converter" = "org.apache.kafka.connect.storage.StringConverter"
12881
}
12982
task_restart_policy {
13083
minimum_backoff = "60s"
13184
maximum_backoff = "1800s"
13285
}
133-
depends_on = [google_project_service.managedkafka]
134-
135-
provider = google-beta
136-
}
86+
}

0 commit comments

Comments
 (0)