diff --git a/examples/minimal/main.tf b/examples/minimal/main.tf index afaa33f..6930be2 100644 --- a/examples/minimal/main.tf +++ b/examples/minimal/main.tf @@ -4,10 +4,10 @@ module "init" { # This is an example only; if you're adding this block to a live configuration, # make sure to use the latest release of the init module, found here: # https://github.com/entur/terraform-aiven-kafka-connect-init/releases - source = "github.com/entur/terraform-aiven-kafka-connect-init//modules/init?ref=v1.1.3" - access_token = var.my_aiven_access_token - project_name = "my-aiven-project-name" - service_name = "my-aiven-kafka-connect-service-name" + source = "github.com/entur/terraform-aiven-kafka-connect-init//modules/init?ref=v1.1.4" + access_token = var.my_aiven_access_token + project_name = "my-aiven-project-name" + kafka_service_name = "my-aiven-kafka-connect-service-name" } # ci: x-release-please-start-version diff --git a/examples/minimal_test/main.tf b/examples/minimal_test/main.tf index 679a264..1a2009a 100644 --- a/examples/minimal_test/main.tf +++ b/examples/minimal_test/main.tf @@ -4,10 +4,10 @@ module "init" { # This is an example only; if you're adding this block to a live configuration, # make sure to use the latest release of the init module, found here: # https://github.com/entur/terraform-aiven-kafka-connect-init/releases - source = "github.com/entur/terraform-aiven-kafka-connect-init//modules/init?ref=v1.1.3" - access_token = var.api_token - project_name = "my-aiven-project" - service_name = "my-aiven-kafka-connect-service-name" + source = "github.com/entur/terraform-aiven-kafka-connect-init//modules/init?ref=v1.1.4" + access_token = var.api_token + project_name = "my-aiven-project" + kafka_service_name = "my-aiven-kafka-connect-service-name" } module "bigquery-sink" { diff --git a/modules/bigquery-sink/connector.tf b/modules/bigquery-sink/connector.tf index 9c1bff2..44d39a1 100644 --- a/modules/bigquery-sink/connector.tf +++ b/modules/bigquery-sink/connector.tf @@ -10,7 +10,7 @@ resource "google_service_account_key" "bq-sa-key" { data "aiven_kafka_user" "kafka_user" { project = var.init.aiven.project - service_name = var.init.aiven.service + service_name = var.init.aiven.kafka_service_name username = var.kafka_username } @@ -45,6 +45,6 @@ locals { resource "aiven_kafka_connector" "bigquery-sink-connector" { connector_name = var.connector_name project = var.init.aiven.project - service_name = var.init.aiven.service + service_name = var.init.aiven.connect_service_name config = merge(local.standard_configuration, var.additional_configuration) } diff --git a/modules/bigquery-sink/variables.tf b/modules/bigquery-sink/variables.tf index 764568e..909e9f3 100644 --- a/modules/bigquery-sink/variables.tf +++ b/modules/bigquery-sink/variables.tf @@ -2,10 +2,11 @@ variable "init" { description = "Entur init module output. https://github.com/entur/terraform-aiven-kafka-connect-init" type = object({ aiven = object({ - access_token = string - project = string - service = string - schema_registry_url = string + access_token = string + project = string + kafka_service_name = string + connect_service_name = string + schema_registry_url = string }) default_configuration = map(string) })