rominf · rominf · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -116,7 +116,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
 
-      - uses: nick-invision/retry@v2
+      - uses: nick-invision/retry@v3
         if: always()
         with:
           timeout_minutes: 15

diff --git a/.github/workflows/sweep.yml b/.github/workflows/sweep.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           go-version-file: go.mod
 
-      - uses: nick-invision/retry@v2
+      - uses: nick-invision/retry@v3
         if: always()
         with:
           timeout_minutes: 15

diff --git a/.golangci.yml b/.golangci.yml
@@ -16,6 +16,8 @@ linters:
     - unconvert
     - unused
     - stylecheck
+    - errorlint
+    - prealloc
 
 issues:
   exclude:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,9 +11,18 @@ nav_order: 1
 
 ## [MAJOR.MINOR.PATCH] - YYYY-MM-DD
 
+<!-- TODO: uncomment when dragonfly is supported -->
+<!-- - Dragonfly support -->
+- Fix `aiven_kafka_schema` JSON object diff suppress function
+
+## [4.13.3] - 2024-01-29
+
+- Update example code in flink_application_version docs to be valid and not use deprecated schema members
+- Fix `aiven_organization_user_group_member` deletion
+
 ## [4.13.2] - 2024-01-25
 
-- Fix `aiven_organization_group_memeber` fill model
+- Fix `aiven_organization_group_member` fill model
 - Add `aiven_flink` service deletiong check
 
 ## [4.13.1] - 2024-01-19

diff --git a/docs/data-sources/billing_group.md b/docs/data-sources/billing_group.md
@@ -3,12 +3,12 @@
 page_title: "aiven_billing_group Data Source - terraform-provider-aiven"
 subcategory: ""
 description: |-
-  The Billing Group data source provides information about the existing Aiven Account.
+  Provides information about an existing billing group.
 ---
 
 # aiven_billing_group (Data Source)
 
-The Billing Group data source provides information about the existing Aiven Account.
+Provides information about an existing billing group.
 
 ## Example Usage
 
@@ -23,23 +23,23 @@ data "aiven_billing_group" "foo" {
 
 ### Required
 
-- `billing_group_id` (String) The id of the billing group. To set up proper dependencies please refer to this variable as a reference.
+- `billing_group_id` (String) The ID of the billing group. To set up proper dependencies please refer to this variable as a reference.
 
 ### Read-Only
 
-- `account_id` (String) Account id
-- `address_lines` (Set of String) Address lines
-- `billing_currency` (String) Billing currency
-- `billing_emails` (Set of String) Billing contact emails
-- `billing_extra_text` (String) Billing extra text
-- `card_id` (String) Credit card id
-- `city` (String) City
-- `company` (String) Company name
-- `copy_from_billing_group` (String) ID of the billing group to copy from
-- `country_code` (String) Country code
+- `account_id` (String) Account ID.
+- `address_lines` (Set of String) Address lines 1 and 2. For example, street, PO box, or building.
+- `billing_currency` (String) Billing currency for the billing group. Supported currencies are: AUD, CAD, CHF, DKK, EUR, GBP, JPY, NOK, NZD, SEK, SGD, and USD.
+- `billing_emails` (Set of String) Email address of billing contacts. Invoices and other payment notifications are emailed to all billing contacts.
+- `billing_extra_text` (String) Additional information to include on your invoice (for example, a reference number).
+- `card_id` (String) Credit card ID.
+- `city` (String) City, district, suburb, town, or village.
+- `company` (String) Your company name.
+- `copy_from_billing_group` (String) ID of the billing group to copy the company name, address, currency, billing contacts, and extra text from.
+- `country_code` (String) Two-letter country code.
 - `id` (String) The ID of this resource.
-- `name` (String) Billing Group name
-- `parent_id` (String) An optional property to link a billing group to an already existing organization or account by using its ID. To set up proper dependencies please refer to this variable as a reference.
-- `state` (String) State
-- `vat_id` (String) VAT id
-- `zip_code` (String) Zip Code
+- `name` (String) Name of the billing group.
+- `parent_id` (String) Link a billing group to an existing organization or account by using its ID. To set up proper dependencies please refer to this variable as a reference.
+- `state` (String) State or province.
+- `vat_id` (String) The VAT identification number for your company.
+- `zip_code` (String) Zip or postal code.
diff --git a/docs/data-sources/kafka.md b/docs/data-sources/kafka.md
@@ -216,6 +216,7 @@ Read-Only:
 - `consumer_enable_auto_commit` (Boolean)
 - `consumer_request_max_bytes` (Number)
 - `consumer_request_timeout_ms` (Number)
+- `name_strategy` (String)
 - `name_strategy_validation` (Boolean)
 - `producer_acks` (String)
 - `producer_compression_type` (String)

diff --git a/docs/data-sources/redis.md b/docs/data-sources/redis.md
@@ -105,6 +105,7 @@ Read-Only:
 - `redis_pubsub_client_output_buffer_limit` (Number)
 - `redis_ssl` (Boolean)
 - `redis_timeout` (Number)
+- `redis_version` (String)
 - `service_log` (Boolean)
 - `service_to_fork_from` (String)
 - `static_ips` (Boolean)

diff --git a/docs/data-sources/service_integration_endpoint.md b/docs/data-sources/service_integration_endpoint.md
@@ -158,6 +158,8 @@ Read-Only:
 - `host` (String)
 - `password` (String)
 - `port` (Number)
+- `ssl_client_certificate` (String)
+- `ssl_client_key` (String)
 - `ssl_mode` (String)
 - `ssl_root_cert` (String)
 - `username` (String)

diff --git a/docs/resources/billing_group.md b/docs/resources/billing_group.md
@@ -3,12 +3,12 @@
 page_title: "aiven_billing_group Resource - terraform-provider-aiven"
 subcategory: ""
 description: |-
-  The Billing Group resource allows the creation and management of Aiven Billing Groups and association with the Projects.
+  Creates and manages billing groups and assigns them to projects.
 ---
 
 # aiven_billing_group (Resource)
 
-The Billing Group resource allows the creation and management of Aiven Billing Groups and association with the Projects.
+Creates and manages billing groups and assigns them to projects.
 
 ## Example Usage
 
@@ -30,25 +30,25 @@ resource "aiven_project" "pr1" {
 
 ### Required
 
-- `name` (String) Billing Group name
+- `name` (String) Name of the billing group.
 
 ### Optional
 
-- `account_id` (String, Deprecated) Account id
-- `address_lines` (Set of String) Address lines
-- `billing_currency` (String) Billing currency
-- `billing_emails` (Set of String) Billing contact emails
-- `billing_extra_text` (String) Billing extra text
-- `card_id` (String) Credit card id
-- `city` (String) City
-- `company` (String) Company name
-- `copy_from_billing_group` (String) ID of the billing group to copy from
-- `country_code` (String) Country code
-- `parent_id` (String) An optional property to link a billing group to an already existing organization or account by using its ID. To set up proper dependencies please refer to this variable as a reference.
-- `state` (String) State
+- `account_id` (String, Deprecated) Account ID.
+- `address_lines` (Set of String) Address lines 1 and 2. For example, street, PO box, or building.
+- `billing_currency` (String) Billing currency for the billing group. Supported currencies are: AUD, CAD, CHF, DKK, EUR, GBP, JPY, NOK, NZD, SEK, SGD, and USD.
+- `billing_emails` (Set of String) Email address of billing contacts. Invoices and other payment notifications are emailed to all billing contacts.
+- `billing_extra_text` (String) Additional information to include on your invoice (for example, a reference number).
+- `card_id` (String) Credit card ID.
+- `city` (String) City, district, suburb, town, or village.
+- `company` (String) Your company name.
+- `copy_from_billing_group` (String) ID of the billing group to copy the company name, address, currency, billing contacts, and extra text from.
+- `country_code` (String) Two-letter country code.
+- `parent_id` (String) Link a billing group to an existing organization or account by using its ID. To set up proper dependencies please refer to this variable as a reference.
+- `state` (String) State or province.
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
-- `vat_id` (String) VAT id
-- `zip_code` (String) Zip Code
+- `vat_id` (String) The VAT identification number for your company.
+- `zip_code` (String) Zip or postal code.
 
 ### Read-Only
 

diff --git a/docs/resources/cassandra.md b/docs/resources/cassandra.md
@@ -82,7 +82,7 @@ Optional:
 - `backup_hour` (Number) The hour of day (in UTC) when backup for the service is started. New backup is only started if previous backup has already completed.
 - `backup_minute` (Number) The minute of an hour when backup for the service is started. New backup is only started if previous backup has already completed.
 - `cassandra` (Block List, Max: 1) cassandra configuration values. (see [below for nested schema](#nestedblock--cassandra_user_config--cassandra))
-- `cassandra_version` (String) Cassandra major version.
+- `cassandra_version` (String) Cassandra version.
 - `ip_filter` (List of String, Deprecated) Allow incoming connections from CIDR address block, e.g. '10.20.0.0/16'.
 - `ip_filter_object` (Block List, Max: 1024) Allow incoming connections from CIDR address block, e.g. '10.20.0.0/16'. (see [below for nested schema](#nestedblock--cassandra_user_config--ip_filter_object))
 - `ip_filter_string` (List of String) Allow incoming connections from CIDR address block, e.g. '10.20.0.0/16'.

diff --git a/docs/resources/flink_application_deployment.md b/docs/resources/flink_application_deployment.md
@@ -10,7 +10,16 @@ description: |-
 
 The Flink Application Deployment resource allows the creation and management of Aiven Flink Application Deployments.
 
+## Example Usage
 
+```terraform
+resource "aiven_flink_application_deployment" "deployment" {
+  project = data.aiven_project.foo.project
+  service_name = aiven_flink.foo.service_name
+  application_id = aiven_flink_application.foo_app.application_id
+  version_id = aiven_flink_application_version.foo_app_version.application_version_id
+}
+```
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -45,3 +54,11 @@ Optional:
 - `delete` (String)
 - `read` (String)
 - `update` (String)
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+terraform import aiven_flink_application_deployment.foo_deploy project/service/application_id/application_version_id/deployment_id
+```
diff --git a/docs/resources/flink_application_version.md b/docs/resources/flink_application_version.md
@@ -18,11 +18,11 @@ resource "aiven_flink_application_version" "foo" {
   service_name   = aiven_flink.foo.service_name
   application_id = aiven_flink_application.foo.application_id
   statement      = <<EOT
-   INSERT INTO kafka_known_pizza SELECT * FROM kafka_pizza WHERE shop LIKE '%Luigis Pizza%'"
+   INSERT INTO kafka_known_pizza SELECT * FROM kafka_pizza WHERE shop LIKE '%Luigis Pizza%'
   EOT
-  sinks {
+  sink {
     create_table   = <<EOT
-    "CREATE TABLE kafka_known_pizza (
+    CREATE TABLE kafka_known_pizza (
         shop STRING,
         name STRING
     ) WITH (
@@ -35,7 +35,7 @@ resource "aiven_flink_application_version" "foo" {
   EOT
     integration_id = aiven_service_integration.flink_to_kafka.integration_id
   }
-  sources {
+  source {
     create_table   = <<EOT
     CREATE TABLE kafka_pizza (
         shop STRING,

diff --git a/docs/resources/kafka.md b/docs/resources/kafka.md
@@ -217,6 +217,7 @@ Optional:
 - `consumer_enable_auto_commit` (Boolean) If true the consumer's offset will be periodically committed to Kafka in the background. The default value is `true`.
 - `consumer_request_max_bytes` (Number) Maximum number of bytes in unencoded message keys and values by a single request. The default value is `67108864`.
 - `consumer_request_timeout_ms` (Number) The maximum total time to wait for messages for a request if the maximum number of messages has not yet been reached. The default value is `1000`.
+- `name_strategy` (String) Name strategy to use when selecting subject for storing schemas. The default value is `topic_name`.
 - `name_strategy_validation` (Boolean) If true, validate that given schema is registered under expected subject name by the used name strategy when producing messages. The default value is `true`.
 - `producer_acks` (String) The number of acknowledgments the producer requires the leader to have received before considering a request complete. If set to 'all' or '-1', the leader will wait for the full set of in-sync replicas to acknowledge the record. The default value is `1`.
 - `producer_compression_type` (String) Specify the default compression type for producers. This configuration accepts the standard compression codecs ('gzip', 'snappy', 'lz4', 'zstd'). It additionally accepts 'none' which is the default and equivalent to no compression.

diff --git a/docs/resources/organization_application_user.md b/docs/resources/organization_application_user.md
@@ -3,12 +3,12 @@
 page_title: "aiven_organization_application_user Resource - terraform-provider-aiven"
 subcategory: ""
 description: |-
-  Creates and manages an organization application user in Aiven. Please note that this resource is in beta and may change without notice. To use this resource, please set the PROVIDERAIVENENABLE_BETA environment variable.
+  Creates and manages an organization application user. Application users can be used for programmatic access to the platform. This features is in the limited availability stage. Contact [email protected] to try this feature. Please note that this resource is in beta and may change without notice. To use this resource, please set the PROVIDERAIVENENABLE_BETA environment variable.
 ---
 
 # aiven_organization_application_user (Resource)
 
-Creates and manages an organization application user in Aiven. Please note that this resource is in beta and may change without notice. To use this resource, please set the PROVIDER_AIVEN_ENABLE_BETA environment variable.
+Creates and manages an organization application user. Application users can be used for programmatic access to the platform. This features is in the limited availability stage. Contact [email protected] to try this feature. Please note that this resource is in beta and may change without notice. To use this resource, please set the PROVIDER_AIVEN_ENABLE_BETA environment variable.
 
 
 

diff --git a/docs/resources/redis.md b/docs/resources/redis.md
@@ -99,6 +99,7 @@ Optional:
 - `redis_pubsub_client_output_buffer_limit` (Number) Set output buffer limit for pub / sub clients in MB. The value is the hard limit, the soft limit is 1/4 of the hard limit. When setting the limit, be mindful of the available memory in the selected service plan.
 - `redis_ssl` (Boolean) Require SSL to access Redis. The default value is `true`.
 - `redis_timeout` (Number) Redis idle connection timeout in seconds. The default value is `300`.
+- `redis_version` (String) Redis major version.
 - `service_log` (Boolean) Store logs for the service so that they are available in the HTTP API and console.
 - `service_to_fork_from` (String) Name of another service to fork from. This has effect only when a new service is being created.
 - `static_ips` (Boolean) Use static public IP addresses.

diff --git a/docs/resources/service_integration_endpoint.md b/docs/resources/service_integration_endpoint.md
@@ -171,12 +171,14 @@ Optional:
 Required:
 
 - `host` (String) Hostname or IP address of the server.
-- `password` (String, Sensitive) Password.
 - `port` (Number) Port number of the server.
 - `username` (String) User name.
 
 Optional:
 
+- `password` (String, Sensitive) Password.
+- `ssl_client_certificate` (String) Client certificate.
+- `ssl_client_key` (String) Client key.
 - `ssl_mode` (String) SSL Mode. The default value is `verify-full`.
 - `ssl_root_cert` (String) SSL Root Cert.
 

diff --git a/examples/flink/main.tf b/examples/flink/main.tf
@@ -11,35 +11,30 @@ variable "aiven_api_token" {
   type = string
 }
 
-variable "aiven_card_id" {
-  type = string
-}
-
 provider "aiven" {
   api_token = var.aiven_api_token
 }
 
-resource "aiven_project" "project" {
+data "aiven_project" "prj" {
   project = "flink-project"
-  card_id = var.aiven_card_id
 }
 
 resource "aiven_flink" "flink" {
-  project      = aiven_project.project.project
+  project      = data.aiven_project.prj.project
   cloud_name   = "google-europe-west1"
   plan         = "business-8"
   service_name = "demo-flink"
 }
 
 resource "aiven_kafka" "kafka" {
-  project      = aiven_project.project.project
+  project      = data.aiven_project.prj.project
   cloud_name   = "google-europe-west1"
   plan         = "business-8"
   service_name = "demo-kafka"
 }
 
 resource "aiven_service_integration" "flink_to_kafka" {
-  project                  = aiven_project.project.project
+  project                  = data.aiven_project.prj.project
   integration_type         = "flink"
   destination_service_name = aiven_flink.flink.service_name
   source_service_name      = aiven_kafka.kafka.service_name
@@ -61,3 +56,55 @@ resource "aiven_kafka_topic" "sink" {
   topic_name   = "sink_topic"
 }
 
+resource "aiven_flink_application" "app" {
+  project      = data.aiven_project.prj.project
+  service_name = aiven_flink.flink.service_name
+  name         = "test-app"
+}
+
+
+resource "aiven_flink_application_version" "app_version" {
+  project        = data.aiven_project.prj.project
+  service_name   = aiven_flink.flink.service_name
+  application_id = aiven_flink_application.app.application_id
+  statement      = <<EOT
+   INSERT INTO kafka_known_pizza SELECT * FROM kafka_pizza WHERE shop LIKE '%Luigis Pizza%'
+  EOT
+  sink {
+    create_table   = <<EOT
+    CREATE TABLE kafka_known_pizza (
+        shop STRING,
+        name STRING
+    ) WITH (
+        'connector' = 'kafka',
+        'properties.bootstrap.servers' = '',
+        'scan.startup.mode' = 'earliest-offset',
+        'topic' = 'sink_topic',
+        'value.format' = 'json'
+    )
+  EOT
+    integration_id = aiven_service_integration.flink_to_kafka.integration_id
+  }
+  source {
+    create_table   = <<EOT
+    CREATE TABLE kafka_pizza (
+        shop STRING,
+        name STRING
+    ) WITH (
+        'connector' = 'kafka',
+        'properties.bootstrap.servers' = '',
+        'scan.startup.mode' = 'earliest-offset',
+        'topic' = 'source_topic',
+        'value.format' = 'json'
+    )
+    EOT
+    integration_id = aiven_service_integration.flink_to_kafka.integration_id
+  }
+}
+
+resource "aiven_flink_application_deployment" "deployment" {
+  project        = data.aiven_project.prj.project
+  service_name   = aiven_flink.flink.service_name
+  application_id = aiven_flink_application.app.application_id
+  version_id     = aiven_flink_application_version.app_version.application_version_id
+}
diff --git a/examples/resources/aiven_flink_application_deployment/import.sh b/examples/resources/aiven_flink_application_deployment/import.sh
@@ -0,0 +1 @@
+terraform import aiven_flink_application_deployment.foo_deploy project/service/application_id/application_version_id/deployment_id
diff --git a/examples/resources/aiven_flink_application_deployment/resource.tf b/examples/resources/aiven_flink_application_deployment/resource.tf
@@ -0,0 +1,6 @@
+resource "aiven_flink_application_deployment" "deployment" {
+  project = data.aiven_project.foo.project
+  service_name = aiven_flink.foo.service_name
+  application_id = aiven_flink_application.foo_app.application_id
+  version_id = aiven_flink_application_version.foo_app_version.application_version_id
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		terraform import aiven_flink_application_deployment.foo_deploy project/service/application_id/application_version_id/deployment_id