Merge pull request #14 from entur/use_latest_init_module

fix: using init module v1.1.4

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

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" {

modules/bigquery-sink/README.md

@@ -44,7 +44,7 @@ No modules.
 | <a name="input_bigquery_retry_count"></a> [bigquery\_retry\_count](#input\_bigquery\_retry\_count) | The number of retry attempts made for a BigQuery request that fails with a backend error or a quota exceeded error | `number` | `1` | no |
 | <a name="input_connector_class"></a> [connector\_class](#input\_connector\_class) | Name or alias of the class for this connector | `string` | `"com.wepay.kafka.connect.bigquery.BigQuerySinkConnector"` | no |
 | <a name="input_connector_name"></a> [connector\_name](#input\_connector\_name) | Unique name for this connector in the connect cluster | `string` | n/a | yes |
-| <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 |
+| <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 |
 | <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 |
 | <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 |
 | <a name="input_key_file"></a> [key\_file](#input\_key\_file) | The file containing a JSON key with BigQuery service account credentials | `string` | `""` | no |

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)
 }

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)
   })