Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

Commit bad483c

Browse files
Merge pull request #11 from entur/update_to_latest_init_module
fix: updated to the latest init module
2 parents a9107e2 + 0ce6b65 commit bad483c

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

examples/minimal/main.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ module "init" {
44
# This is an example only; if you're adding this block to a live configuration,
55
# make sure to use the latest release of the init module, found here:
66
# https://github.com/entur/terraform-aiven-kafka-connect-init/releases
7-
source = "github.com/entur/terraform-aiven-kafka-connect-init//modules/init?ref=v1.1.3"
8-
access_token = var.my_aiven_access_token
9-
project_name = "my-aiven-project-name"
10-
service_name = "my-aiven-kafka-connect-service-name"
7+
source = "github.com/entur/terraform-aiven-kafka-connect-init//modules/init?ref=v1.1.5"
8+
access_token = var.my_aiven_access_token
9+
project_name = "my-aiven-project-name"
10+
kafka_service_name = "my-aiven-kafka-service-name"
11+
connect_service_name = "my-aiven-kafka-connect-service-name"
1112
}
1213

1314
# ci: x-release-please-start-version

examples/minimal_test/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ module "init" {
44
# This is an example only; if you're adding this block to a live configuration,
55
# make sure to use the latest release of the init module, found here:
66
# https://github.com/entur/terraform-aiven-kafka-connect-init/releases
7-
source = "github.com/entur/terraform-aiven-kafka-connect-init//modules/init?ref=v1.1.3"
8-
access_token = var.api_token
9-
project_name = "my-aiven-project-name"
10-
service_name = "my-aiven-kafka-connect-service-name"
7+
source = "github.com/entur/terraform-aiven-kafka-connect-init//modules/init?ref=v1.1.5"
8+
access_token = var.api_token
9+
project_name = "my-aiven-project-name"
10+
kafka_service_name = "my-aiven-kafka-service-name"
1111
}
1212

1313

modules/elasticsearch-sink/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ No modules.
3636
| <a name="input_connection_username"></a> [connection\_username](#input\_connection\_username) | The username used for authentication against Elasticsearch service | `string` | n/a | yes |
3737
| <a name="input_connector_class"></a> [connector\_class](#input\_connector\_class) | Name or alias of the class for this connector | `string` | `"io.aiven.connect.elasticsearch.ElasticsearchSinkConnector"` | no |
3838
| <a name="input_connector_name"></a> [connector\_name](#input\_connector\_name) | Unique name for this connector in the connect cluster | `string` | n/a | yes |
39-
| <a name="input_init"></a> [init](#input\_init) | Entur init module output. https://github.com/entur/terraform-aiven-kafka-connect-init | <pre>object({<br> aiven = object({<br> access_token = string<br> project = string<br> service = string<br> schema_registry_url = string<br> })<br> default_configuration = map(string)<br> })</pre> | n/a | yes |
39+
| <a name="input_init"></a> [init](#input\_init) | Entur init module output. https://github.com/entur/terraform-aiven-kafka-connect-init | <pre>object({<br> aiven = object({<br> access_token = string<br> project = string<br> kafka_service_name = string<br> connect_service_name = string<br> schema_registry_url = string<br> })<br> default_configuration = map(string)<br> })</pre> | n/a | yes |
4040
| <a name="input_kafka_topics"></a> [kafka\_topics](#input\_kafka\_topics) | List of kafka topic names to sink data from | `list(string)` | n/a | yes |
4141
| <a name="input_kafka_username"></a> [kafka\_username](#input\_kafka\_username) | Aiven service registry username to connect to Kafka schema registry | `string` | n/a | yes |
4242
| <a name="input_type_name"></a> [type\_name](#input\_type\_name) | The Elasticsearch type name to use when indexing | `string` | `"_doc"` | no |

modules/elasticsearch-sink/connector.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ locals {
1616

1717
data "aiven_kafka_user" "kafka_user" {
1818
project = var.init.aiven.project
19-
service_name = var.init.aiven.service
19+
service_name = var.init.aiven.kafka_service_name
2020
username = var.kafka_username
2121
}
2222

2323
resource "aiven_kafka_connector" "elasticsearch-sink-connector" {
2424
connector_name = var.connector_name
2525
project = var.init.aiven.project
26-
service_name = var.init.aiven.service
26+
service_name = var.init.aiven.connect_service_name
2727
config = merge(local.standard_configuration, var.additional_configuration)
2828
}

modules/elasticsearch-sink/variables.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ variable "init" {
22
description = "Entur init module output. https://github.com/entur/terraform-aiven-kafka-connect-init"
33
type = object({
44
aiven = object({
5-
access_token = string
6-
project = string
7-
service = string
8-
schema_registry_url = string
5+
access_token = string
6+
project = string
7+
kafka_service_name = string
8+
connect_service_name = string
9+
schema_registry_url = string
910
})
1011
default_configuration = map(string)
1112
})

0 commit comments

Comments
 (0)