diff --git a/docs/data-sources/account_team_project.md b/docs/data-sources/account_team_project.md index c6b53d901..5ff414251 100644 --- a/docs/data-sources/account_team_project.md +++ b/docs/data-sources/account_team_project.md @@ -32,4 +32,4 @@ data "aiven_account_team_project" "account_team_project1" { ### Read-Only - `id` (String) The ID of this resource. -- `team_type` (String) The Account team project type. The possible values are `admin`, `operator`, `developer`, `read_only`, `project:permissions:read` and `service:logs:read`. +- `team_type` (String) The Account team project type. The possible values are `admin`, `operator`, `developer`, `read_only`, `project:integrations:read`, `project:networking:read`, `project:permissions:read`, `service:logs:read`, `project:services:read` and `project:audit_logs:read`. diff --git a/docs/data-sources/opensearch.md b/docs/data-sources/opensearch.md index 9978ff2c5..ac40e3f0f 100644 --- a/docs/data-sources/opensearch.md +++ b/docs/data-sources/opensearch.md @@ -130,6 +130,7 @@ Read-Only: - `endpoint_suffix` (String) - `indices` (String) - `key` (String) +- `restore_global_state` (Boolean) - `sas_token` (String) - `snapshot_name` (String) @@ -145,6 +146,7 @@ Read-Only: - `compress` (Boolean) - `credentials` (String) - `indices` (String) +- `restore_global_state` (Boolean) - `snapshot_name` (String) @@ -449,6 +451,7 @@ Read-Only: - `endpoint` (String) - `indices` (String) - `region` (String) +- `restore_global_state` (Boolean) - `secret_key` (String) - `server_side_encryption` (Boolean) - `snapshot_name` (String) diff --git a/docs/data-sources/project_user.md b/docs/data-sources/project_user.md index d617fc274..889026e35 100644 --- a/docs/data-sources/project_user.md +++ b/docs/data-sources/project_user.md @@ -31,4 +31,4 @@ data "aiven_project_user" "mytestuser" { - `accepted` (Boolean) Whether the user has accepted the request to join the project. Users get an invite and become project members after accepting the invite. - `id` (String) The ID of this resource. -- `member_type` (String) Project membership type. The possible values are `admin`, `developer`, `operator`, `project:permissions:read`, `read_only` and `service:logs:read`. +- `member_type` (String) Project membership type. The possible values are `admin`, `developer`, `operator`, `project:audit_logs:read`, `project:integrations:read`, `project:networking:read`, `project:permissions:read`, `project:services:read`, `read_only` and `service:logs:read`. diff --git a/docs/data-sources/service_integration_endpoint.md b/docs/data-sources/service_integration_endpoint.md index a9f5e0efe..9d2b29714 100644 --- a/docs/data-sources/service_integration_endpoint.md +++ b/docs/data-sources/service_integration_endpoint.md @@ -31,7 +31,7 @@ data "aiven_service_integration_endpoint" "myendpoint" { - `datadog_user_config` (List of Object) Datadog user configurable settings (see [below for nested schema](#nestedatt--datadog_user_config)) - `endpoint_config` (Map of String) Integration endpoint specific backend configuration -- `endpoint_type` (String) Type of the service integration endpoint. Possible values: `autoscaler`, `datadog`, `external_aws_cloudwatch_logs`, `external_aws_cloudwatch_metrics`, `external_aws_s3`, `external_clickhouse`, `external_elasticsearch_logs`, `external_google_cloud_bigquery`, `external_google_cloud_logging`, `external_kafka`, `external_mysql`, `external_opensearch_logs`, `external_postgresql`, `external_redis`, `external_schema_registry`, `external_sumologic_logs`, `jolokia`, `prometheus`, `rsyslog` +- `endpoint_type` (String) Type of the service integration endpoint. Possible values: `autoscaler`, `datadog`, `external_aws_cloudwatch_logs`, `external_aws_cloudwatch_metrics`, `external_aws_s3`, `external_clickhouse`, `external_elasticsearch_logs`, `external_google_cloud_bigquery`, `external_google_cloud_logging`, `external_kafka`, `external_mysql`, `external_opensearch_logs`, `external_postgresql`, `external_prometheus`, `external_redis`, `external_schema_registry`, `external_sumologic_logs`, `jolokia`, `prometheus`, `rsyslog` - `external_aws_cloudwatch_logs_user_config` (List of Object) ExternalAwsCloudwatchLogs user configurable settings (see [below for nested schema](#nestedatt--external_aws_cloudwatch_logs_user_config)) - `external_aws_cloudwatch_metrics_user_config` (List of Object) ExternalAwsCloudwatchMetrics user configurable settings (see [below for nested schema](#nestedatt--external_aws_cloudwatch_metrics_user_config)) - `external_aws_s3_user_config` (List of Object) ExternalAwsS3 user configurable settings (see [below for nested schema](#nestedatt--external_aws_s3_user_config)) @@ -43,6 +43,7 @@ data "aiven_service_integration_endpoint" "myendpoint" { - `external_mysql_user_config` (List of Object) ExternalMysql user configurable settings (see [below for nested schema](#nestedatt--external_mysql_user_config)) - `external_opensearch_logs_user_config` (List of Object) ExternalOpensearchLogs user configurable settings (see [below for nested schema](#nestedatt--external_opensearch_logs_user_config)) - `external_postgresql` (List of Object) ExternalPostgresql user configurable settings (see [below for nested schema](#nestedatt--external_postgresql)) +- `external_prometheus_user_config` (List of Object) ExternalPrometheus user configurable settings (see [below for nested schema](#nestedatt--external_prometheus_user_config)) - `external_schema_registry_user_config` (List of Object) ExternalSchemaRegistry user configurable settings (see [below for nested schema](#nestedatt--external_schema_registry_user_config)) - `id` (String) The ID of this resource. - `jolokia_user_config` (List of Object) Jolokia user configurable settings (see [below for nested schema](#nestedatt--jolokia_user_config)) @@ -203,6 +204,16 @@ Read-Only: - `username` (String) + +### Nested Schema for `external_prometheus_user_config` + +Read-Only: + +- `basic_auth_password` (String) +- `basic_auth_username` (String) +- `service_uri` (String) + + ### Nested Schema for `external_schema_registry_user_config` diff --git a/docs/resources/account_team_project.md b/docs/resources/account_team_project.md index 82794bd03..c3c7577f9 100644 --- a/docs/resources/account_team_project.md +++ b/docs/resources/account_team_project.md @@ -48,7 +48,7 @@ resource "aiven_account_team_project" "main" { ### Optional - `project_name` (String) The name of an already existing project -- `team_type` (String) The Account team project type. The possible values are `admin`, `operator`, `developer`, `read_only`, `project:permissions:read` and `service:logs:read`. +- `team_type` (String) The Account team project type. The possible values are `admin`, `operator`, `developer`, `read_only`, `project:integrations:read`, `project:networking:read`, `project:permissions:read`, `service:logs:read`, `project:services:read` and `project:audit_logs:read`. - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts)) ### Read-Only diff --git a/docs/resources/opensearch.md b/docs/resources/opensearch.md index f1c18a984..8a1da4414 100644 --- a/docs/resources/opensearch.md +++ b/docs/resources/opensearch.md @@ -144,6 +144,7 @@ Optional: - `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, Sensitive) Azure account secret key. One of key or sas_token should be specified. +- `restore_global_state` (Boolean) If true, restore the cluster state. Defaults to false. - `sas_token` (String, Sensitive) A shared access signatures (SAS) token. One of key or sas_token should be specified. @@ -162,6 +163,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`. +- `restore_global_state` (Boolean) If true, restore the cluster state. Defaults to false. @@ -497,6 +499,7 @@ Optional: - `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`. +- `restore_global_state` (Boolean) If true, restore the cluster state. Defaults to false. - `server_side_encryption` (Boolean) When set to true files are encrypted on server side. diff --git a/docs/resources/organization_group_project.md b/docs/resources/organization_group_project.md index fb6beb75d..5010043c4 100644 --- a/docs/resources/organization_group_project.md +++ b/docs/resources/organization_group_project.md @@ -44,7 +44,7 @@ resource "aiven_organization_group_project" "example" { - `group_id` (String) The ID of the user group. - `project` (String) The project that the users in the group are members of. -- `role` (String) [Project-level role](https://aiven.io/docs/platform/reference/project-member-privileges) assigned to all users in the group. The possible values are `admin`, `operator`, `developer`, `read_only`, `project:permissions:read` and `service:logs:read`. +- `role` (String) [Project-level role](https://aiven.io/docs/platform/reference/project-member-privileges) assigned to all users in the group. The possible values are `admin`, `operator`, `developer`, `read_only`, `project:integrations:read`, `project:networking:read`, `project:permissions:read`, `service:logs:read`, `project:services:read` and `project:audit_logs:read`. ### Optional diff --git a/docs/resources/organization_permission.md b/docs/resources/organization_permission.md index 58c19ee0b..e059518b4 100644 --- a/docs/resources/organization_permission.md +++ b/docs/resources/organization_permission.md @@ -70,7 +70,7 @@ resource "aiven_organization_permission" "developers" { Required: -- `permissions` (Set of String) List of permissions. The possible values are `admin`, `developer`, `operator`, `project:permissions:read`, `read_only` and `service:logs:read`. +- `permissions` (Set of String) List of permissions. The possible values are `admin`, `developer`, `operator`, `project:audit_logs:read`, `project:integrations:read`, `project:networking:read`, `project:permissions:read`, `project:services:read`, `read_only` and `service:logs:read`. - `principal_id` (String) ID of the user or group. - `principal_type` (String) The type of principal. The possible values are `user` and `user_group`. diff --git a/docs/resources/project_user.md b/docs/resources/project_user.md index a32225e6f..6f1df766b 100644 --- a/docs/resources/project_user.md +++ b/docs/resources/project_user.md @@ -26,7 +26,7 @@ resource "aiven_project_user" "mytestuser" { ### Required - `email` (String) Email address of the user in lowercase. Changing this property forces recreation of the resource. -- `member_type` (String) Project membership type. The possible values are `admin`, `developer`, `operator`, `project:permissions:read`, `read_only` and `service:logs:read`. +- `member_type` (String) Project membership type. The possible values are `admin`, `developer`, `operator`, `project:audit_logs:read`, `project:integrations:read`, `project:networking:read`, `project:permissions:read`, `project:services:read`, `read_only` and `service:logs:read`. - `project` (String) The name of the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. Changing this property forces recreation of the resource. ### Optional diff --git a/docs/resources/service_integration_endpoint.md b/docs/resources/service_integration_endpoint.md index 88df8738c..2f71e7fb8 100644 --- a/docs/resources/service_integration_endpoint.md +++ b/docs/resources/service_integration_endpoint.md @@ -18,7 +18,7 @@ The Service Integration Endpoint resource allows the creation and management of ### Required - `endpoint_name` (String) Name of the service integration endpoint -- `endpoint_type` (String) Type of the service integration endpoint. Possible values: `autoscaler`, `datadog`, `external_aws_cloudwatch_logs`, `external_aws_cloudwatch_metrics`, `external_aws_s3`, `external_clickhouse`, `external_elasticsearch_logs`, `external_google_cloud_bigquery`, `external_google_cloud_logging`, `external_kafka`, `external_mysql`, `external_opensearch_logs`, `external_postgresql`, `external_redis`, `external_schema_registry`, `external_sumologic_logs`, `jolokia`, `prometheus`, `rsyslog` +- `endpoint_type` (String) Type of the service integration endpoint. Possible values: `autoscaler`, `datadog`, `external_aws_cloudwatch_logs`, `external_aws_cloudwatch_metrics`, `external_aws_s3`, `external_clickhouse`, `external_elasticsearch_logs`, `external_google_cloud_bigquery`, `external_google_cloud_logging`, `external_kafka`, `external_mysql`, `external_opensearch_logs`, `external_postgresql`, `external_prometheus`, `external_redis`, `external_schema_registry`, `external_sumologic_logs`, `jolokia`, `prometheus`, `rsyslog` - `project` (String) Project the service integration endpoint belongs to ### Optional @@ -35,6 +35,7 @@ The Service Integration Endpoint resource allows the creation and management of - `external_mysql_user_config` (Block List, Max: 1) ExternalMysql user configurable settings (see [below for nested schema](#nestedblock--external_mysql_user_config)) - `external_opensearch_logs_user_config` (Block List, Max: 1) ExternalOpensearchLogs user configurable settings (see [below for nested schema](#nestedblock--external_opensearch_logs_user_config)) - `external_postgresql` (Block List, Max: 1) ExternalPostgresql user configurable settings (see [below for nested schema](#nestedblock--external_postgresql)) +- `external_prometheus_user_config` (Block List, Max: 1) ExternalPrometheus user configurable settings (see [below for nested schema](#nestedblock--external_prometheus_user_config)) - `external_schema_registry_user_config` (Block List, Max: 1) ExternalSchemaRegistry user configurable settings (see [below for nested schema](#nestedblock--external_schema_registry_user_config)) - `jolokia_user_config` (Block List, Max: 1) Jolokia user configurable settings (see [below for nested schema](#nestedblock--jolokia_user_config)) - `prometheus_user_config` (Block List, Max: 1) Prometheus user configurable settings (see [below for nested schema](#nestedblock--prometheus_user_config)) @@ -250,6 +251,16 @@ Optional: `. + +### Nested Schema for `external_prometheus_user_config` + +Optional: + +- `basic_auth_password` (String, Sensitive) Prometheus basic authentication password. Example: `fhyFNBjj3R`. +- `basic_auth_username` (String) Prometheus basic authentication username. Example: `prom4851`. +- `service_uri` (String) Prometheus enabled write endpoint. Example: `https://write.example.com/`. + + ### Nested Schema for `external_schema_registry_user_config` diff --git a/go.mod b/go.mod index c578e59a1..861825761 100644 --- a/go.mod +++ b/go.mod @@ -3,21 +3,20 @@ module github.com/aiven/terraform-provider-aiven go 1.23 require ( - github.com/aiven/aiven-go-client/v2 v2.28.0 - github.com/aiven/go-client-codegen v0.41.0 + github.com/aiven/aiven-go-client/v2 v2.30.0 + github.com/aiven/go-client-codegen v0.45.0 github.com/avast/retry-go v3.0.0+incompatible github.com/dave/jennifer v1.7.1 github.com/docker/go-units v0.5.0 github.com/google/go-cmp v0.6.0 github.com/gruntwork-io/terratest v0.47.2 - github.com/hamba/avro/v2 v2.26.0 + github.com/hamba/avro/v2 v2.27.0 github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 github.com/hashicorp/terraform-plugin-framework v1.12.0 github.com/hashicorp/terraform-plugin-go v0.24.0 github.com/hashicorp/terraform-plugin-mux v0.16.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0 github.com/kelseyhightower/envconfig v1.4.0 - github.com/rs/zerolog v1.33.0 github.com/samber/lo v1.47.0 github.com/stoewer/go-strcase v1.3.0 github.com/stretchr/testify v1.9.0 @@ -42,6 +41,7 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/rs/zerolog v1.33.0 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect @@ -59,7 +59,7 @@ require ( cloud.google.com/go v0.112.0 // indirect cloud.google.com/go/storage v1.36.0 // indirect github.com/agext/levenshtein v1.2.3 // indirect - github.com/aiven/go-api-schemas v1.92.0 + github.com/aiven/go-api-schemas v1.94.0 github.com/aws/aws-sdk-go v1.44.122 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -83,7 +83,7 @@ require ( github.com/hashicorp/terraform-exec v0.21.0 // indirect github.com/hashicorp/terraform-json v0.22.1 // indirect github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1 - github.com/hashicorp/terraform-plugin-framework-validators v0.13.0 + github.com/hashicorp/terraform-plugin-framework-validators v0.14.0 github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect github.com/hashicorp/terraform-plugin-testing v1.10.0 github.com/hashicorp/terraform-registry-address v0.2.3 // indirect @@ -91,7 +91,7 @@ require ( github.com/hashicorp/yamux v0.1.1 // indirect github.com/jinzhu/copier v0.4.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect - github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/compress v1.17.10 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect diff --git a/go.sum b/go.sum index fe0e28dab..28d19cc1f 100644 --- a/go.sum +++ b/go.sum @@ -195,12 +195,12 @@ github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiA github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/aiven/aiven-go-client/v2 v2.28.0 h1:P2UgIeUCwtDEgeeQkC1sdcWJHat1ViDc03QHS0OrUgQ= -github.com/aiven/aiven-go-client/v2 v2.28.0/go.mod h1:KdHfLIlIRZIfCSEBd39j1Q81jlSb6Nd+oCQKqERfnuA= -github.com/aiven/go-api-schemas v1.92.0 h1:nEPgkMAupqmqaBoVq3/MaKJqZwHstkVeLdCR8M8pBC0= -github.com/aiven/go-api-schemas v1.92.0/go.mod h1:qS3E/3R+aKQbHsqXzNHqlXATY1kbVNzhiJvk2IDmADI= -github.com/aiven/go-client-codegen v0.41.0 h1:lFjl8njSqLmqbXzcHAD0nRBql/U8Ik5x68t+3f0kTnQ= -github.com/aiven/go-client-codegen v0.41.0/go.mod h1:FfbH32Xb+Hx5zeKTIug1Y8SfMeB+AKNRzxgrzkts2oA= +github.com/aiven/aiven-go-client/v2 v2.30.0 h1:dj1nRuO1XglnwH2IwKmqEl3SGaqKebDoxnd+SRjxQRg= +github.com/aiven/aiven-go-client/v2 v2.30.0/go.mod h1:Eyxa+fNgayObmUBW94uJuEkyOe1646cEpjFzhm/NETY= +github.com/aiven/go-api-schemas v1.94.0 h1:kbszL56VLORPZ2jXmQBP6FJpihcmiLGdH051G8zBRd0= +github.com/aiven/go-api-schemas v1.94.0/go.mod h1:qS3E/3R+aKQbHsqXzNHqlXATY1kbVNzhiJvk2IDmADI= +github.com/aiven/go-client-codegen v0.45.0 h1:5+5eCN42Qb0QegJSYDw7WCi3z1IHemFyRxzJBN2TnaQ= +github.com/aiven/go-client-codegen v0.45.0/go.mod h1:FfbH32Xb+Hx5zeKTIug1Y8SfMeB+AKNRzxgrzkts2oA= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= @@ -393,8 +393,8 @@ github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/gruntwork-io/terratest v0.47.2 h1:t6iWwsqJH7Gx0RwXleU/vjc+2c0JXRMdj3DxYXTBssQ= github.com/gruntwork-io/terratest v0.47.2/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64= -github.com/hamba/avro/v2 v2.26.0 h1:IaT5l6W3zh7K67sMrT2+RreJyDTllBGVJm4+Hedk9qE= -github.com/hamba/avro/v2 v2.26.0/go.mod h1:I8glyswHnpED3Nlx2ZdUe+4LJnCOOyiCzLMno9i/Uu0= +github.com/hamba/avro/v2 v2.27.0 h1:IAM4lQ0VzUIKBuo4qlAiLKfqALSrFC+zi1iseTtbBKU= +github.com/hamba/avro/v2 v2.27.0/go.mod h1:jN209lopfllfrz7IGoZErlDz+AyUJ3vrBePQFZwYf5I= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -440,8 +440,8 @@ github.com/hashicorp/terraform-plugin-framework v1.12.0 h1:7HKaueHPaikX5/7cbC1r9 github.com/hashicorp/terraform-plugin-framework v1.12.0/go.mod h1:N/IOQ2uYjW60Jp39Cp3mw7I/OpC/GfZ0385R0YibmkE= github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1 h1:gm5b1kHgFFhaKFhm4h2TgvMUlNzFAtUqlcOWnWPm+9E= github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1/go.mod h1:MsjL1sQ9L7wGwzJ5RjcI6FzEMdyoBnw+XK8ZnOvQOLY= -github.com/hashicorp/terraform-plugin-framework-validators v0.13.0 h1:bxZfGo9DIUoLLtHMElsu+zwqI4IsMZQBRRy4iLzZJ8E= -github.com/hashicorp/terraform-plugin-framework-validators v0.13.0/go.mod h1:wGeI02gEhj9nPANU62F2jCaHjXulejm/X+af4PdZaNo= +github.com/hashicorp/terraform-plugin-framework-validators v0.14.0 h1:3PCn9iyzdVOgHYOBmncpSSOxjQhCTYmc+PGvbdlqSaI= +github.com/hashicorp/terraform-plugin-framework-validators v0.14.0/go.mod h1:LwDKNdzxrDY/mHBrlC6aYfE2fQ3Dk3gaJD64vNiXvo4= github.com/hashicorp/terraform-plugin-go v0.24.0 h1:2WpHhginCdVhFIrWHxDEg6RBn3YaWzR2o6qUeIEat2U= github.com/hashicorp/terraform-plugin-go v0.24.0/go.mod h1:tUQ53lAsOyYSckFGEefGC5C8BAaO0ENqzFd3bQeuYQg= github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0= @@ -480,8 +480,8 @@ github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= +github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -530,8 +530,8 @@ github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= +github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/internal/sdkprovider/userconfig/service/influxdb.go b/internal/sdkprovider/userconfig/service/influxdb.go index be0ca045a..22dfbcbf9 100644 --- a/internal/sdkprovider/userconfig/service/influxdb.go +++ b/internal/sdkprovider/userconfig/service/influxdb.go @@ -72,6 +72,11 @@ func influxdbUserConfig() *schema.Schema { Optional: true, Type: schema.TypeList, }, + "influxdb_version": { + Description: "Enum: `1.8`, and newer. InfluxDB major version. Default: `1.8`.", + Optional: true, + Type: schema.TypeString, + }, "ip_filter": { Deprecated: "Deprecated. Use `ip_filter_string` instead.", Description: "Allow incoming connections from CIDR address block, e.g. `10.20.0.0/16`.", diff --git a/internal/sdkprovider/userconfig/service/opensearch.go b/internal/sdkprovider/userconfig/service/opensearch.go index c24ee2f65..2980431a8 100644 --- a/internal/sdkprovider/userconfig/service/opensearch.go +++ b/internal/sdkprovider/userconfig/service/opensearch.go @@ -68,6 +68,11 @@ func opensearchUserConfig() *schema.Schema { Sensitive: true, Type: schema.TypeString, }, + "restore_global_state": { + Description: "If true, restore the cluster state. Defaults to false.", + Optional: true, + Type: schema.TypeBool, + }, "sas_token": { Description: "A shared access signatures (SAS) token. One of key or sas_token should be specified.", Optional: true, @@ -128,6 +133,11 @@ func opensearchUserConfig() *schema.Schema { Optional: true, Type: schema.TypeString, }, + "restore_global_state": { + Description: "If true, restore the cluster state. Defaults to false.", + Optional: true, + Type: schema.TypeBool, + }, "snapshot_name": { Description: "The snapshot name to restore from.", Required: true, @@ -1019,6 +1029,11 @@ func opensearchUserConfig() *schema.Schema { Required: true, Type: schema.TypeString, }, + "restore_global_state": { + Description: "If true, restore the cluster state. Defaults to false.", + Optional: true, + Type: schema.TypeBool, + }, "secret_key": { Description: "AWS secret key.", Required: true, diff --git a/internal/sdkprovider/userconfig/serviceintegrationendpoint/external_prometheus.go b/internal/sdkprovider/userconfig/serviceintegrationendpoint/external_prometheus.go new file mode 100644 index 000000000..c02d35a30 --- /dev/null +++ b/internal/sdkprovider/userconfig/serviceintegrationendpoint/external_prometheus.go @@ -0,0 +1,37 @@ +// Code generated by user config generator. DO NOT EDIT. + +package serviceintegrationendpoint + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + + "github.com/aiven/terraform-provider-aiven/internal/sdkprovider/userconfig/diff" +) + +func externalPrometheusUserConfig() *schema.Schema { + return &schema.Schema{ + Description: "ExternalPrometheus user configurable settings", + DiffSuppressFunc: diff.SuppressUnchanged, + Elem: &schema.Resource{Schema: map[string]*schema.Schema{ + "basic_auth_password": { + Description: "Prometheus basic authentication password. Example: `fhyFNBjj3R`.", + Optional: true, + Sensitive: true, + Type: schema.TypeString, + }, + "basic_auth_username": { + Description: "Prometheus basic authentication username. Example: `prom4851`.", + Optional: true, + Type: schema.TypeString, + }, + "service_uri": { + Description: "Prometheus enabled write endpoint. Example: `https://write.example.com/`.", + Optional: true, + Type: schema.TypeString, + }, + }}, + MaxItems: 1, + Optional: true, + Type: schema.TypeList, + } +} diff --git a/internal/sdkprovider/userconfig/serviceintegrationendpoint/serviceintegrationendpoint.go b/internal/sdkprovider/userconfig/serviceintegrationendpoint/serviceintegrationendpoint.go index 69e2022e6..f2c18f706 100644 --- a/internal/sdkprovider/userconfig/serviceintegrationendpoint/serviceintegrationendpoint.go +++ b/internal/sdkprovider/userconfig/serviceintegrationendpoint/serviceintegrationendpoint.go @@ -30,6 +30,8 @@ func GetUserConfig(kind string) *schema.Schema { return externalOpensearchLogsUserConfig() case "external_postgresql": return externalPostgresqlUserConfig() + case "external_prometheus": + return externalPrometheusUserConfig() case "external_schema_registry": return externalSchemaRegistryUserConfig() case "jolokia": @@ -48,5 +50,5 @@ func GetFieldMapping(kind string) map[string]string { return map[string]map[string]string{}[kind] } func UserConfigTypes() []string { - return []string{"datadog", "external_aws_cloudwatch_logs", "external_aws_cloudwatch_metrics", "external_aws_s3", "external_clickhouse", "external_elasticsearch_logs", "external_google_cloud_bigquery", "external_google_cloud_logging", "external_kafka", "external_mysql", "external_opensearch_logs", "external_postgresql", "external_schema_registry", "jolokia", "prometheus", "rsyslog"} + return []string{"datadog", "external_aws_cloudwatch_logs", "external_aws_cloudwatch_metrics", "external_aws_s3", "external_clickhouse", "external_elasticsearch_logs", "external_google_cloud_bigquery", "external_google_cloud_logging", "external_kafka", "external_mysql", "external_opensearch_logs", "external_postgresql", "external_prometheus", "external_schema_registry", "jolokia", "prometheus", "rsyslog"} }