diff --git a/docs/data-sources/logme_credential.md b/docs/data-sources/logme_credential.md index 21afd8fb..147cd6cc 100644 --- a/docs/data-sources/logme_credential.md +++ b/docs/data-sources/logme_credential.md @@ -35,5 +35,5 @@ data "stackit_logme_credential" "example" { - `id` (String) Terraform's internal data source. identifier. It is structured as "`project_id`,`instance_id`,`credential_id`". - `password` (String, Sensitive) - `port` (Number) -- `uri` (String) +- `uri` (String, Sensitive) - `username` (String) diff --git a/docs/data-sources/mariadb_credential.md b/docs/data-sources/mariadb_credential.md index b4140ec9..dc5de136 100644 --- a/docs/data-sources/mariadb_credential.md +++ b/docs/data-sources/mariadb_credential.md @@ -37,5 +37,5 @@ data "stackit_mariadb_credential" "example" { - `name` (String) - `password` (String, Sensitive) - `port` (Number) -- `uri` (String) +- `uri` (String, Sensitive) - `username` (String) diff --git a/docs/data-sources/opensearch_credential.md b/docs/data-sources/opensearch_credential.md index bd558041..c4ab336c 100644 --- a/docs/data-sources/opensearch_credential.md +++ b/docs/data-sources/opensearch_credential.md @@ -37,5 +37,5 @@ data "stackit_opensearch_credential" "example" { - `password` (String, Sensitive) - `port` (Number) - `scheme` (String) -- `uri` (String) +- `uri` (String, Sensitive) - `username` (String) diff --git a/docs/data-sources/postgresql_credential.md b/docs/data-sources/postgresql_credential.md index e51d8f73..d7a6872f 100644 --- a/docs/data-sources/postgresql_credential.md +++ b/docs/data-sources/postgresql_credential.md @@ -41,5 +41,5 @@ data "stackit_postgresql_credential" "example" { - `name` (String) - `password` (String, Sensitive) - `port` (Number) -- `uri` (String) +- `uri` (String, Sensitive) - `username` (String) diff --git a/docs/data-sources/rabbitmq_credential.md b/docs/data-sources/rabbitmq_credential.md index 7d31de79..a95165ad 100644 --- a/docs/data-sources/rabbitmq_credential.md +++ b/docs/data-sources/rabbitmq_credential.md @@ -39,6 +39,6 @@ data "stackit_rabbitmq_credential" "example" { - `management` (String) - `password` (String, Sensitive) - `port` (Number) -- `uri` (String) +- `uri` (String, Sensitive) - `uris` (List of String) - `username` (String) diff --git a/docs/data-sources/redis_credential.md b/docs/data-sources/redis_credential.md index 7d550469..bab579b7 100644 --- a/docs/data-sources/redis_credential.md +++ b/docs/data-sources/redis_credential.md @@ -37,5 +37,5 @@ data "stackit_redis_credential" "example" { - `load_balanced_host` (String) - `password` (String, Sensitive) - `port` (Number) -- `uri` (String) Connection URI. Currently the returned uri doesn't support SSL, but you can enable it by using `rediss://` instead of `redis://`. We will provide the SSL connection in a future release +- `uri` (String, Sensitive) Connection URI. - `username` (String) diff --git a/docs/resources/logme_credential.md b/docs/resources/logme_credential.md index 62259114..ebf0df8d 100644 --- a/docs/resources/logme_credential.md +++ b/docs/resources/logme_credential.md @@ -34,5 +34,5 @@ resource "stackit_logme_credential" "example" { - `id` (String) Terraform's internal resource identifier. It is structured as "`project_id`,`instance_id`,`credential_id`". - `password` (String, Sensitive) - `port` (Number) -- `uri` (String) +- `uri` (String, Sensitive) - `username` (String) diff --git a/docs/resources/mariadb_credential.md b/docs/resources/mariadb_credential.md index 11b95026..a9d69642 100644 --- a/docs/resources/mariadb_credential.md +++ b/docs/resources/mariadb_credential.md @@ -36,5 +36,5 @@ resource "stackit_mariadb_credential" "example" { - `name` (String) - `password` (String, Sensitive) - `port` (Number) -- `uri` (String) +- `uri` (String, Sensitive) - `username` (String) diff --git a/docs/resources/opensearch_credential.md b/docs/resources/opensearch_credential.md index afd9ee6b..c8fd77f9 100644 --- a/docs/resources/opensearch_credential.md +++ b/docs/resources/opensearch_credential.md @@ -36,5 +36,5 @@ resource "stackit_opensearch_credential" "example" { - `password` (String, Sensitive) - `port` (Number) - `scheme` (String) -- `uri` (String) +- `uri` (String, Sensitive) - `username` (String) diff --git a/docs/resources/postgresql_credential.md b/docs/resources/postgresql_credential.md index 7733f8df..45dcee0a 100644 --- a/docs/resources/postgresql_credential.md +++ b/docs/resources/postgresql_credential.md @@ -40,5 +40,5 @@ resource "stackit_postgresql_credential" "example" { - `name` (String) - `password` (String, Sensitive) - `port` (Number) -- `uri` (String) +- `uri` (String, Sensitive) - `username` (String) diff --git a/docs/resources/rabbitmq_credential.md b/docs/resources/rabbitmq_credential.md index f975ca00..0662fcdb 100644 --- a/docs/resources/rabbitmq_credential.md +++ b/docs/resources/rabbitmq_credential.md @@ -38,6 +38,6 @@ resource "stackit_rabbitmq_credential" "example" { - `management` (String) - `password` (String, Sensitive) - `port` (Number) -- `uri` (String) +- `uri` (String, Sensitive) - `uris` (List of String) - `username` (String) diff --git a/docs/resources/redis_credential.md b/docs/resources/redis_credential.md index 2480124f..8f5089f0 100644 --- a/docs/resources/redis_credential.md +++ b/docs/resources/redis_credential.md @@ -36,5 +36,5 @@ resource "stackit_redis_credential" "example" { - `load_balanced_host` (String) - `password` (String, Sensitive) - `port` (Number) -- `uri` (String) Connection URI. Currently the returned uri doesn't support SSL, but you can enable it by using `rediss://` instead of `redis://`. We will provide the SSL connection in a future release +- `uri` (String, Sensitive) Connection URI. - `username` (String) diff --git a/stackit/internal/services/logme/credential/datasource.go b/stackit/internal/services/logme/credential/datasource.go index afa4e3c7..1df9a2a4 100644 --- a/stackit/internal/services/logme/credential/datasource.go +++ b/stackit/internal/services/logme/credential/datasource.go @@ -125,7 +125,8 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ Computed: true, }, "uri": schema.StringAttribute{ - Computed: true, + Computed: true, + Sensitive: true, }, "username": schema.StringAttribute{ Computed: true, diff --git a/stackit/internal/services/logme/credential/resource.go b/stackit/internal/services/logme/credential/resource.go index 05932d04..13071662 100644 --- a/stackit/internal/services/logme/credential/resource.go +++ b/stackit/internal/services/logme/credential/resource.go @@ -159,7 +159,8 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest, Computed: true, }, "uri": schema.StringAttribute{ - Computed: true, + Computed: true, + Sensitive: true, }, "username": schema.StringAttribute{ Computed: true, diff --git a/stackit/internal/services/mariadb/credential/datasource.go b/stackit/internal/services/mariadb/credential/datasource.go index 5198c782..dce7db1a 100644 --- a/stackit/internal/services/mariadb/credential/datasource.go +++ b/stackit/internal/services/mariadb/credential/datasource.go @@ -133,7 +133,8 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ Computed: true, }, "uri": schema.StringAttribute{ - Computed: true, + Computed: true, + Sensitive: true, }, "username": schema.StringAttribute{ Computed: true, diff --git a/stackit/internal/services/mariadb/credential/resource.go b/stackit/internal/services/mariadb/credential/resource.go index 983a689a..e897049f 100644 --- a/stackit/internal/services/mariadb/credential/resource.go +++ b/stackit/internal/services/mariadb/credential/resource.go @@ -169,7 +169,8 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest, Computed: true, }, "uri": schema.StringAttribute{ - Computed: true, + Computed: true, + Sensitive: true, }, "username": schema.StringAttribute{ Computed: true, diff --git a/stackit/internal/services/opensearch/credential/datasource.go b/stackit/internal/services/opensearch/credential/datasource.go index d2f28a6b..b96a4fce 100644 --- a/stackit/internal/services/opensearch/credential/datasource.go +++ b/stackit/internal/services/opensearch/credential/datasource.go @@ -133,7 +133,8 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ Computed: true, }, "uri": schema.StringAttribute{ - Computed: true, + Computed: true, + Sensitive: true, }, "username": schema.StringAttribute{ Computed: true, diff --git a/stackit/internal/services/opensearch/credential/resource.go b/stackit/internal/services/opensearch/credential/resource.go index 39f53b7a..efc3f64d 100644 --- a/stackit/internal/services/opensearch/credential/resource.go +++ b/stackit/internal/services/opensearch/credential/resource.go @@ -169,7 +169,8 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest, Computed: true, }, "uri": schema.StringAttribute{ - Computed: true, + Computed: true, + Sensitive: true, }, "username": schema.StringAttribute{ Computed: true, diff --git a/stackit/internal/services/postgresql/credential/datasource.go b/stackit/internal/services/postgresql/credential/datasource.go index af9c0bfd..56858b83 100644 --- a/stackit/internal/services/postgresql/credential/datasource.go +++ b/stackit/internal/services/postgresql/credential/datasource.go @@ -149,7 +149,8 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ Computed: true, }, "uri": schema.StringAttribute{ - Computed: true, + Computed: true, + Sensitive: true, }, "username": schema.StringAttribute{ Computed: true, diff --git a/stackit/internal/services/postgresql/credential/resource.go b/stackit/internal/services/postgresql/credential/resource.go index 8a115959..36ee0f3e 100644 --- a/stackit/internal/services/postgresql/credential/resource.go +++ b/stackit/internal/services/postgresql/credential/resource.go @@ -185,7 +185,8 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest, Computed: true, }, "uri": schema.StringAttribute{ - Computed: true, + Computed: true, + Sensitive: true, }, "username": schema.StringAttribute{ Computed: true, diff --git a/stackit/internal/services/rabbitmq/credential/datasource.go b/stackit/internal/services/rabbitmq/credential/datasource.go index 1bab12b3..02b4ca75 100644 --- a/stackit/internal/services/rabbitmq/credential/datasource.go +++ b/stackit/internal/services/rabbitmq/credential/datasource.go @@ -140,7 +140,8 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ Computed: true, }, "uri": schema.StringAttribute{ - Computed: true, + Computed: true, + Sensitive: true, }, "uris": schema.ListAttribute{ ElementType: types.StringType, diff --git a/stackit/internal/services/rabbitmq/credential/resource.go b/stackit/internal/services/rabbitmq/credential/resource.go index 7edbc05f..a5f176ab 100644 --- a/stackit/internal/services/rabbitmq/credential/resource.go +++ b/stackit/internal/services/rabbitmq/credential/resource.go @@ -179,7 +179,8 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest, Computed: true, }, "uri": schema.StringAttribute{ - Computed: true, + Computed: true, + Sensitive: true, }, "uris": schema.ListAttribute{ ElementType: types.StringType, diff --git a/stackit/internal/services/redis/credential/datasource.go b/stackit/internal/services/redis/credential/datasource.go index a9a88aa7..8eb72729 100644 --- a/stackit/internal/services/redis/credential/datasource.go +++ b/stackit/internal/services/redis/credential/datasource.go @@ -82,7 +82,7 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ "credential_id": "The credential's ID.", "instance_id": "ID of the Redis instance.", "project_id": "STACKIT project ID to which the instance is associated.", - "uri": "Connection URI. Currently the returned uri doesn't support SSL, but you can enable it by using `rediss://` instead of `redis://`. We will provide the SSL connection in a future release", + "uri": "Connection URI.", } resp.Schema = schema.Schema{ @@ -136,6 +136,7 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ "uri": schema.StringAttribute{ Description: descriptions["uri"], Computed: true, + Sensitive: true, }, "username": schema.StringAttribute{ Computed: true, diff --git a/stackit/internal/services/redis/credential/resource.go b/stackit/internal/services/redis/credential/resource.go index 7bce44ba..3c1f7ab0 100644 --- a/stackit/internal/services/redis/credential/resource.go +++ b/stackit/internal/services/redis/credential/resource.go @@ -104,7 +104,7 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest, "credential_id": "The credential's ID.", "instance_id": "ID of the Redis instance.", "project_id": "STACKIT Project ID to which the instance is associated.", - "uri": "Connection URI. Currently the returned uri doesn't support SSL, but you can enable it by using `rediss://` instead of `redis://`. We will provide the SSL connection in a future release", + "uri": "Connection URI.", } resp.Schema = schema.Schema{ @@ -172,6 +172,7 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest, "uri": schema.StringAttribute{ Description: descriptions["uri"], Computed: true, + Sensitive: true, }, "username": schema.StringAttribute{ Computed: true, diff --git a/stackit/internal/services/ske/project/datasource.go b/stackit/internal/services/ske/project/datasource.go index 6089190b..7c1e7840 100644 --- a/stackit/internal/services/ske/project/datasource.go +++ b/stackit/internal/services/ske/project/datasource.go @@ -75,7 +75,7 @@ func (r *projectDataSource) Configure(ctx context.Context, req datasource.Config func (r *projectDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) { resp.Schema = schema.Schema{ Description: "SKE project data source schema. Must have a `region` specified in the provider configuration. Warning: SKE project resource is no longer in use and will be removed with the next release. SKE service enablement is done automatically when a new cluster is created.", - DeprecationMessage: "SKE project datasource is no longer in use and will be removed with the next minor release. SKE service enablement is done automatically when a new cluster is created.", + DeprecationMessage: "SKE project datasource is no longer in use and will be removed after October 10th 2024. SKE service enablement is done automatically when a new cluster is created.", Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{ Description: "Terraform's internal data source. ID. It is structured as \"`project_id`\".", diff --git a/stackit/internal/services/ske/project/resource.go b/stackit/internal/services/ske/project/resource.go index 9edf238e..9c459c4b 100644 --- a/stackit/internal/services/ske/project/resource.go +++ b/stackit/internal/services/ske/project/resource.go @@ -88,8 +88,8 @@ func (r *projectResource) Schema(_ context.Context, _ resource.SchemaRequest, re resp.Schema = schema.Schema{ Description: "SKE project resource schema. Must have a `region` specified in the provider configuration. This resource allows you to enable the SKE service and you can only have one per project. " + "Before deleting this resource, all SKE clusters associated to the project must be deleted. Otherwise, error would occur due to the existing clusters. In such case, it is highly recommended to remove the SKE project from the state, directly using the \"`terraform state rm`\". " + - "Warning: SKE project resource is no longer in use and will be removed with the next minor release. SKE service enablement is done automatically when a new cluster is created.", - DeprecationMessage: "SKE project resource is no longer in use and will be removed with the next minor release. SKE service enablement is done automatically when a new cluster is created. " + + "Warning: SKE project resource is no longer in use and will be removed after October 10th 2024. SKE service enablement is done automatically when a new cluster is created.", + DeprecationMessage: "SKE project resource is no longer in use and will be removed after October 10th 2024. SKE service enablement is done automatically when a new cluster is created. " + "For deleting the SKE project resource, it is highly recommended to remove the SKE project from the state, directly using the \"`terraform state rm`\".", Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{