diff --git a/docs/data-sources/service_account.md b/docs/data-sources/service_account.md index 884696b9..3811009a 100644 --- a/docs/data-sources/service_account.md +++ b/docs/data-sources/service_account.md @@ -4,15 +4,12 @@ page_title: "stackit_service_account Data Source - stackit" subcategory: "" description: |- Service account data source schema. - ~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our guide https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources for how to opt-in to use beta resources. --- # stackit_service_account (Data Source) Service account data source schema. -~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our [guide](https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources) for how to opt-in to use beta resources. - ## Example Usage ```terraform diff --git a/docs/resources/service_account.md b/docs/resources/service_account.md index c6f5e9b1..3a8c712f 100644 --- a/docs/resources/service_account.md +++ b/docs/resources/service_account.md @@ -4,15 +4,12 @@ page_title: "stackit_service_account Resource - stackit" subcategory: "" description: |- Service account resource schema. - ~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our guide https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources for how to opt-in to use beta resources. --- # stackit_service_account (Resource) Service account resource schema. -~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our [guide](https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources) for how to opt-in to use beta resources. - ## Example Usage ```terraform diff --git a/docs/resources/service_account_access_token.md b/docs/resources/service_account_access_token.md index 78d76e5e..661e9bfc 100644 --- a/docs/resources/service_account_access_token.md +++ b/docs/resources/service_account_access_token.md @@ -4,7 +4,6 @@ page_title: "stackit_service_account_access_token Resource - stackit" subcategory: "" description: |- Service account access token schema. - ~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our guide https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources for how to opt-in to use beta resources. Example Usage Automatically rotate access tokens @@ -31,8 +30,6 @@ description: |- # stackit_service_account_access_token (Resource) Service account access token schema. - -~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our [guide](https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources) for how to opt-in to use beta resources. ## Example Usage diff --git a/docs/resources/service_account_key.md b/docs/resources/service_account_key.md index 6a2b3655..8628384f 100644 --- a/docs/resources/service_account_key.md +++ b/docs/resources/service_account_key.md @@ -4,7 +4,6 @@ page_title: "stackit_service_account_key Resource - stackit" subcategory: "" description: |- Service account key schema. - ~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our guide https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources for how to opt-in to use beta resources. Example Usage Automatically rotate service account keys @@ -31,8 +30,6 @@ description: |- # stackit_service_account_key (Resource) Service account key schema. - -~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our [guide](https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources) for how to opt-in to use beta resources. ## Example Usage diff --git a/stackit/internal/services/serviceaccount/account/datasource.go b/stackit/internal/services/serviceaccount/account/datasource.go index 07868d0c..29bd5fcd 100644 --- a/stackit/internal/services/serviceaccount/account/datasource.go +++ b/stackit/internal/services/serviceaccount/account/datasource.go @@ -12,7 +12,6 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/serviceaccount" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/features" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) @@ -45,11 +44,6 @@ func (r *serviceAccountDataSource) Configure(ctx context.Context, req datasource return } - features.CheckBetaResourcesEnabled(ctx, &providerData, &resp.Diagnostics, "stackit_service_account", "datasource") - if resp.Diagnostics.HasError() { - return - } - var apiClient *serviceaccount.APIClient var err error if providerData.ServiceAccountCustomEndpoint != "" { @@ -90,7 +84,7 @@ func (r *serviceAccountDataSource) Schema(_ context.Context, _ datasource.Schema // The datasource schema differs slightly from the resource schema. // In this case, the email attribute is required to read the service account data from the API. resp.Schema = schema.Schema{ - MarkdownDescription: features.AddBetaDescription("Service account data source schema."), + MarkdownDescription: "Service account data source schema.", Description: "Service account data source schema.", Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{ diff --git a/stackit/internal/services/serviceaccount/account/resource.go b/stackit/internal/services/serviceaccount/account/resource.go index 522360de..138de1a2 100644 --- a/stackit/internal/services/serviceaccount/account/resource.go +++ b/stackit/internal/services/serviceaccount/account/resource.go @@ -20,7 +20,6 @@ import ( "github.com/stackitcloud/stackit-sdk-go/services/serviceaccount" "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/features" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) @@ -63,11 +62,6 @@ func (r *serviceAccountResource) Configure(ctx context.Context, req resource.Con return } - features.CheckBetaResourcesEnabled(ctx, &providerData, &resp.Diagnostics, "stackit_service_account", "resource") - if resp.Diagnostics.HasError() { - return - } - // Initialize the API client with the appropriate authentication and endpoint settings. var apiClient *serviceaccount.APIClient var err error @@ -108,7 +102,7 @@ func (r *serviceAccountResource) Schema(_ context.Context, _ resource.SchemaRequ } resp.Schema = schema.Schema{ - MarkdownDescription: features.AddBetaDescription("Service account resource schema."), + MarkdownDescription: "Service account resource schema.", Description: "Service account resource schema.", Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{ diff --git a/stackit/internal/services/serviceaccount/key/resource.go b/stackit/internal/services/serviceaccount/key/resource.go index 0ee9a36d..ebe136bf 100644 --- a/stackit/internal/services/serviceaccount/key/resource.go +++ b/stackit/internal/services/serviceaccount/key/resource.go @@ -24,7 +24,6 @@ import ( "github.com/stackitcloud/stackit-sdk-go/services/serviceaccount" "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/features" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) @@ -71,11 +70,6 @@ func (r *serviceAccountKeyResource) Configure(ctx context.Context, req resource. return } - features.CheckBetaResourcesEnabled(ctx, &providerData, &resp.Diagnostics, "stackit_service_account_key", "resource") - if resp.Diagnostics.HasError() { - return - } - // Initialize the API client with the appropriate authentication and endpoint settings. var apiClient *serviceaccount.APIClient var err error @@ -120,7 +114,7 @@ func (r *serviceAccountKeyResource) Schema(_ context.Context, _ resource.SchemaR "json": "The raw JSON representation of the service account key json, available for direct use.", } resp.Schema = schema.Schema{ - MarkdownDescription: fmt.Sprintf("%s%s", features.AddBetaDescription(descriptions["main"]), markdownDescription), + MarkdownDescription: fmt.Sprintf("%s%s", descriptions["main"], markdownDescription), Description: descriptions["main"], Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{ diff --git a/stackit/internal/services/serviceaccount/token/resource.go b/stackit/internal/services/serviceaccount/token/resource.go index 37ea8bea..a2e4daee 100644 --- a/stackit/internal/services/serviceaccount/token/resource.go +++ b/stackit/internal/services/serviceaccount/token/resource.go @@ -25,7 +25,6 @@ import ( "github.com/stackitcloud/stackit-sdk-go/services/serviceaccount" "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/features" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) @@ -73,11 +72,6 @@ func (r *serviceAccountTokenResource) Configure(ctx context.Context, req resourc return } - features.CheckBetaResourcesEnabled(ctx, &providerData, &resp.Diagnostics, "stackit_service_account_access_token", "resource") - if resp.Diagnostics.HasError() { - return - } - // Initialize the API client with the appropriate authentication and endpoint settings. var apiClient *serviceaccount.APIClient var err error @@ -124,7 +118,7 @@ func (r *serviceAccountTokenResource) Schema(_ context.Context, _ resource.Schem "valid_until": "Estimated expiration timestamp of the access token. For precise validity, check the JWT details.", } resp.Schema = schema.Schema{ - MarkdownDescription: fmt.Sprintf("%s%s", features.AddBetaDescription(descriptions["main"]), markdownDescription), + MarkdownDescription: fmt.Sprintf("%s%s", descriptions["main"], markdownDescription), Description: descriptions["main"], Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{