From fda9622cbc206b6ddebe4b346aae9ff8266fe641 Mon Sep 17 00:00:00 2001 From: Mauritz Uphoff <39736813+h3adex@users.noreply.github.com> Date: Mon, 3 Mar 2025 12:18:44 +0100 Subject: [PATCH] feat: add new sql-server roles (#699) * feat: add new sql-server roles * feat: remove role validation --- docs/data-sources/sqlserverflex_user.md | 2 +- docs/resources/sqlserverflex_user.md | 2 +- .../internal/services/sqlserverflex/user/datasource.go | 2 +- stackit/internal/services/sqlserverflex/user/resource.go | 9 +-------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/docs/data-sources/sqlserverflex_user.md b/docs/data-sources/sqlserverflex_user.md index 2b9d32a0..1d2c15b6 100644 --- a/docs/data-sources/sqlserverflex_user.md +++ b/docs/data-sources/sqlserverflex_user.md @@ -34,5 +34,5 @@ data "stackit_sqlserverflex_user" "example" { - `host` (String) - `id` (String) Terraform's internal data source. ID. It is structured as "`project_id`,`instance_id`,`user_id`". - `port` (Number) -- `roles` (Set of String) Database access levels for the user. Possible values: [`##STACKIT_LoginManager##`, `##STACKIT_DatabaseManager##`] +- `roles` (Set of String) Database access levels for the user. - `username` (String) Username of the SQLServer Flex instance. diff --git a/docs/resources/sqlserverflex_user.md b/docs/resources/sqlserverflex_user.md index 82c52176..6cf84b61 100644 --- a/docs/resources/sqlserverflex_user.md +++ b/docs/resources/sqlserverflex_user.md @@ -32,7 +32,7 @@ resource "stackit_sqlserverflex_user" "example" { ### Optional -- `roles` (Set of String) Database access levels for the user. Possible values: [`##STACKIT_LoginManager##`, `##STACKIT_DatabaseManager##`] +- `roles` (Set of String) Database access levels for the user. ### Read-Only diff --git a/stackit/internal/services/sqlserverflex/user/datasource.go b/stackit/internal/services/sqlserverflex/user/datasource.go index c23932ef..ede925dc 100644 --- a/stackit/internal/services/sqlserverflex/user/datasource.go +++ b/stackit/internal/services/sqlserverflex/user/datasource.go @@ -96,7 +96,7 @@ func (r *userDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, r "instance_id": "ID of the SQLServer Flex instance.", "project_id": "STACKIT project ID to which the instance is associated.", "username": "Username of the SQLServer Flex instance.", - "roles": "Database access levels for the user. Possible values: [`##STACKIT_LoginManager##`, `##STACKIT_DatabaseManager##`]", + "roles": "Database access levels for the user.", "password": "Password of the user account.", } diff --git a/stackit/internal/services/sqlserverflex/user/resource.go b/stackit/internal/services/sqlserverflex/user/resource.go index 5356f0b3..5cfa46f4 100644 --- a/stackit/internal/services/sqlserverflex/user/resource.go +++ b/stackit/internal/services/sqlserverflex/user/resource.go @@ -6,14 +6,12 @@ import ( "net/http" "strings" - "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" - "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" @@ -106,7 +104,7 @@ func (r *userResource) Schema(_ context.Context, _ resource.SchemaRequest, resp "instance_id": "ID of the SQLServer Flex instance.", "project_id": "STACKIT project ID to which the instance is associated.", "username": "Username of the SQLServer Flex instance.", - "roles": "Database access levels for the user. Possible values: [`##STACKIT_LoginManager##`, `##STACKIT_DatabaseManager##`]", + "roles": "Database access levels for the user.", "password": "Password of the user account.", } @@ -169,11 +167,6 @@ func (r *userResource) Schema(_ context.Context, _ resource.SchemaRequest, resp PlanModifiers: []planmodifier.Set{ setplanmodifier.RequiresReplace(), }, - Validators: []validator.Set{ - setvalidator.ValueStringsAre( - stringvalidator.OneOf("##STACKIT_LoginManager##", "##STACKIT_DatabaseManager##"), - ), - }, }, "password": schema.StringAttribute{ Description: descriptions["password"],