From 22be4ad1229a6287b0358e167143c689c3a86d76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 16 Sep 2024 22:03:22 +0000 Subject: [PATCH] chore(userconfig): generate schema --- docs/data-sources/grafana.md | 1 + docs/data-sources/kafka.md | 2 ++ docs/data-sources/opensearch.md | 3 +++ docs/resources/grafana.md | 1 + docs/resources/kafka.md | 4 +++- docs/resources/opensearch.md | 3 +++ docs/resources/pg.md | 2 +- .../sdkprovider/userconfig/service/grafana.go | 5 +++++ internal/sdkprovider/userconfig/service/kafka.go | 12 +++++++++++- .../sdkprovider/userconfig/service/opensearch.go | 15 +++++++++++++++ internal/sdkprovider/userconfig/service/pg.go | 1 + 11 files changed, 46 insertions(+), 3 deletions(-) diff --git a/docs/data-sources/grafana.md b/docs/data-sources/grafana.md index 8374513b5..ebc55cb9c 100644 --- a/docs/data-sources/grafana.md +++ b/docs/data-sources/grafana.md @@ -159,6 +159,7 @@ Read-Only: - `name` (String) - `scopes` (List of String) - `token_url` (String) +- `use_refresh_token` (Boolean) diff --git a/docs/data-sources/kafka.md b/docs/data-sources/kafka.md index 2befcc639..56eabcffc 100644 --- a/docs/data-sources/kafka.md +++ b/docs/data-sources/kafka.md @@ -324,6 +324,8 @@ Read-Only: Read-Only: - `leader_eligibility` (Boolean) +- `retriable_errors_silenced` (Boolean) +- `schema_reader_strict_mode` (Boolean) - `topic_name` (String) diff --git a/docs/data-sources/opensearch.md b/docs/data-sources/opensearch.md index 06e773d1f..d91b0f019 100644 --- a/docs/data-sources/opensearch.md +++ b/docs/data-sources/opensearch.md @@ -128,6 +128,7 @@ Read-Only: - `compress` (Boolean) - `container` (String) - `endpoint_suffix` (String) +- `indices` (String) - `key` (String) - `sas_token` (String) - `snapshot_name` (String) @@ -143,6 +144,7 @@ Read-Only: - `chunk_size` (String) - `compress` (Boolean) - `credentials` (String) +- `indices` (String) - `snapshot_name` (String) @@ -344,6 +346,7 @@ Read-Only: - `chunk_size` (String) - `compress` (Boolean) - `endpoint` (String) +- `indices` (String) - `region` (String) - `secret_key` (String) - `server_side_encryption` (Boolean) diff --git a/docs/resources/grafana.md b/docs/resources/grafana.md index 4dfbb63e0..09cf0def7 100644 --- a/docs/resources/grafana.md +++ b/docs/resources/grafana.md @@ -166,6 +166,7 @@ Optional: - `auto_login` (Boolean) Allow users to bypass the login screen and automatically log in. - `name` (String) Name of the OAuth integration. Example: `My authentication`. - `scopes` (List of String) OAuth scopes. +- `use_refresh_token` (Boolean) Set to true to use refresh token and check access token expiration. diff --git a/docs/resources/kafka.md b/docs/resources/kafka.md index e1b35ab6b..645b5eca8 100644 --- a/docs/resources/kafka.md +++ b/docs/resources/kafka.md @@ -121,7 +121,7 @@ Optional: - `kafka_rest_authorization` (Boolean) Enable authorization in Kafka-REST service. - `kafka_rest_config` (Block List, Max: 1) Kafka REST configuration (see [below for nested schema](#nestedblock--kafka_user_config--kafka_rest_config)) - `kafka_sasl_mechanisms` (Block List, Max: 1) Kafka SASL mechanisms (see [below for nested schema](#nestedblock--kafka_user_config--kafka_sasl_mechanisms)) -- `kafka_version` (String) Enum: `3.1`, `3.2`, `3.3`, `3.4`, `3.5`, `3.6`, `3.7`, and newer. Kafka major version. +- `kafka_version` (String) Enum: `3.1`, `3.2`, `3.3`, `3.4`, `3.5`, `3.6`, `3.7`, `3.8`, and newer. Kafka major version. - `letsencrypt_sasl_privatelink` (Boolean) Use Letsencrypt CA for Kafka SASL via Privatelink. - `private_access` (Block List, Max: 1) Allow access to selected service ports from private networks (see [below for nested schema](#nestedblock--kafka_user_config--private_access)) - `privatelink_access` (Block List, Max: 1) Allow access to selected service components through Privatelink (see [below for nested schema](#nestedblock--kafka_user_config--privatelink_access)) @@ -349,6 +349,8 @@ Optional: Optional: - `leader_eligibility` (Boolean) If true, Karapace / Schema Registry on the service nodes can participate in leader election. It might be needed to disable this when the schemas topic is replicated to a secondary cluster and Karapace / Schema Registry there must not participate in leader election. Defaults to `true`. +- `retriable_errors_silenced` (Boolean) If enabled, kafka errors which can be retried or custom errors specified for the service will not be raised, instead, a warning log is emitted. This will denoise issue tracking systems, i.e. sentry. Defaults to `true`. +- `schema_reader_strict_mode` (Boolean) If enabled, causes the Karapace schema-registry service to shutdown when there are invalid schema records in the `_schemas` topic. Defaults to `false`. - `topic_name` (String) The durable single partition topic that acts as the durable log for the data. This topic must be compacted to avoid losing data due to retention policy. Please note that changing this configuration in an existing Schema Registry / Karapace setup leads to previous schemas being inaccessible, data encoded with them potentially unreadable and schema ID sequence put out of order. It's only possible to do the switch while Schema Registry / Karapace is disabled. Defaults to `_schemas`. diff --git a/docs/resources/opensearch.md b/docs/resources/opensearch.md index 80065749a..175b4c723 100644 --- a/docs/resources/opensearch.md +++ b/docs/resources/opensearch.md @@ -142,6 +142,7 @@ Optional: - `chunk_size` (String) Big files can be broken down into chunks during snapshotting if needed. Should be the same as for the 3rd party repository. - `compress` (Boolean) When set to true metadata files are stored in compressed format. - `endpoint_suffix` (String) Defines the DNS suffix for Azure Storage endpoints. +- `indices` (String) A comma-delimited list of indices to restore from the snapshot. Multi-index syntax is supported. By default, a restore operation includes all data streams and indices in the snapshot. If this argument is provided, the restore operation only includes the data streams and indices that you specify. Example: `metrics*,logs*,data-20240823`. - `key` (String) Azure account secret key. One of key or sas_token should be specified. - `sas_token` (String) A shared access signatures (SAS) token. One of key or sas_token should be specified. @@ -160,6 +161,7 @@ Optional: - `chunk_size` (String) Big files can be broken down into chunks during snapshotting if needed. Should be the same as for the 3rd party repository. - `compress` (Boolean) When set to true metadata files are stored in compressed format. +- `indices` (String) A comma-delimited list of indices to restore from the snapshot. Multi-index syntax is supported. By default, a restore operation includes all data streams and indices in the snapshot. If this argument is provided, the restore operation only includes the data streams and indices that you specify. Example: `metrics*,logs*,data-20240823`. @@ -375,6 +377,7 @@ Optional: - `chunk_size` (String) Big files can be broken down into chunks during snapshotting if needed. Should be the same as for the 3rd party repository. - `compress` (Boolean) When set to true metadata files are stored in compressed format. - `endpoint` (String) The S3 service endpoint to connect to. If you are using an S3-compatible service then you should set this to the service’s endpoint. +- `indices` (String) A comma-delimited list of indices to restore from the snapshot. Multi-index syntax is supported. By default, a restore operation includes all data streams and indices in the snapshot. If this argument is provided, the restore operation only includes the data streams and indices that you specify. Example: `metrics*,logs*,data-20240823`. - `server_side_encryption` (Boolean) When set to true files are encrypted on server side. diff --git a/docs/resources/pg.md b/docs/resources/pg.md index 30580ebcb..f3b588ea3 100644 --- a/docs/resources/pg.md +++ b/docs/resources/pg.md @@ -133,7 +133,7 @@ Read-Only: Optional: -- `additional_backup_regions` (List of String) Additional Cloud Regions for Backup Replication. +- `additional_backup_regions` (List of String, Deprecated) Additional Cloud Regions for Backup Replication. - `admin_password` (String, Sensitive) Custom password for admin user. Defaults to random string. This must be set only when a new service is being created. - `admin_username` (String) Custom username for admin user. This must be set only when a new service is being created. Example: `avnadmin`. - `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. Example: `3`. diff --git a/internal/sdkprovider/userconfig/service/grafana.go b/internal/sdkprovider/userconfig/service/grafana.go index 9b3a8fd9a..1db08e130 100644 --- a/internal/sdkprovider/userconfig/service/grafana.go +++ b/internal/sdkprovider/userconfig/service/grafana.go @@ -184,6 +184,11 @@ func grafanaUserConfig() *schema.Schema { Required: true, Type: schema.TypeString, }, + "use_refresh_token": { + Description: "Set to true to use refresh token and check access token expiration.", + Optional: true, + Type: schema.TypeBool, + }, }}, MaxItems: 1, Optional: true, diff --git a/internal/sdkprovider/userconfig/service/kafka.go b/internal/sdkprovider/userconfig/service/kafka.go index 5f1b8e039..71b9a7a16 100644 --- a/internal/sdkprovider/userconfig/service/kafka.go +++ b/internal/sdkprovider/userconfig/service/kafka.go @@ -615,7 +615,7 @@ func kafkaUserConfig() *schema.Schema { Type: schema.TypeList, }, "kafka_version": { - Description: "Enum: `3.1`, `3.2`, `3.3`, `3.4`, `3.5`, `3.6`, `3.7`, and newer. Kafka major version.", + Description: "Enum: `3.1`, `3.2`, `3.3`, `3.4`, `3.5`, `3.6`, `3.7`, `3.8`, and newer. Kafka major version.", Optional: true, Type: schema.TypeString, }, @@ -741,6 +741,16 @@ func kafkaUserConfig() *schema.Schema { Optional: true, Type: schema.TypeBool, }, + "retriable_errors_silenced": { + Description: "If enabled, kafka errors which can be retried or custom errors specified for the service will not be raised, instead, a warning log is emitted. This will denoise issue tracking systems, i.e. sentry. Defaults to `true`.", + Optional: true, + Type: schema.TypeBool, + }, + "schema_reader_strict_mode": { + Description: "If enabled, causes the Karapace schema-registry service to shutdown when there are invalid schema records in the `_schemas` topic. Defaults to `false`.", + Optional: true, + Type: schema.TypeBool, + }, "topic_name": { Description: "The durable single partition topic that acts as the durable log for the data. This topic must be compacted to avoid losing data due to retention policy. Please note that changing this configuration in an existing Schema Registry / Karapace setup leads to previous schemas being inaccessible, data encoded with them potentially unreadable and schema ID sequence put out of order. It's only possible to do the switch while Schema Registry / Karapace is disabled. Defaults to `_schemas`.", Optional: true, diff --git a/internal/sdkprovider/userconfig/service/opensearch.go b/internal/sdkprovider/userconfig/service/opensearch.go index 4b45a926f..e8cf4bc26 100644 --- a/internal/sdkprovider/userconfig/service/opensearch.go +++ b/internal/sdkprovider/userconfig/service/opensearch.go @@ -56,6 +56,11 @@ func opensearchUserConfig() *schema.Schema { Optional: true, Type: schema.TypeString, }, + "indices": { + Description: "A comma-delimited list of indices to restore from the snapshot. Multi-index syntax is supported. By default, a restore operation includes all data streams and indices in the snapshot. If this argument is provided, the restore operation only includes the data streams and indices that you specify. Example: `metrics*,logs*,data-20240823`.", + Optional: true, + Type: schema.TypeString, + }, "key": { Description: "Azure account secret key. One of key or sas_token should be specified.", Optional: true, @@ -113,6 +118,11 @@ func opensearchUserConfig() *schema.Schema { Required: true, Type: schema.TypeString, }, + "indices": { + Description: "A comma-delimited list of indices to restore from the snapshot. Multi-index syntax is supported. By default, a restore operation includes all data streams and indices in the snapshot. If this argument is provided, the restore operation only includes the data streams and indices that you specify. Example: `metrics*,logs*,data-20240823`.", + Optional: true, + Type: schema.TypeString, + }, "snapshot_name": { Description: "The snapshot name to restore from.", Required: true, @@ -782,6 +792,11 @@ func opensearchUserConfig() *schema.Schema { Optional: true, Type: schema.TypeString, }, + "indices": { + Description: "A comma-delimited list of indices to restore from the snapshot. Multi-index syntax is supported. By default, a restore operation includes all data streams and indices in the snapshot. If this argument is provided, the restore operation only includes the data streams and indices that you specify. Example: `metrics*,logs*,data-20240823`.", + Optional: true, + Type: schema.TypeString, + }, "region": { Description: "S3 region.", Required: true, diff --git a/internal/sdkprovider/userconfig/service/pg.go b/internal/sdkprovider/userconfig/service/pg.go index f5a8baab4..a1fc426b2 100644 --- a/internal/sdkprovider/userconfig/service/pg.go +++ b/internal/sdkprovider/userconfig/service/pg.go @@ -15,6 +15,7 @@ func pgUserConfig() *schema.Schema { DiffSuppressFunc: diff.SuppressUnchanged, Elem: &schema.Resource{Schema: map[string]*schema.Schema{ "additional_backup_regions": { + Deprecated: "This property is deprecated.", Description: "Additional Cloud Regions for Backup Replication.", Elem: &schema.Schema{ Description: "Target cloud. Example: `aws-eu-central-1`.",