stackit-dev-tools/terraform-provider-stackitprivatepreview
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

chore: remove beta state from service account (#803)

Browse source
This commit is contained in:
Mauritz Uphoff 2025-05-07 11:34:30 +02:00 • committed by GitHub
parent af1b6fee3b
commit 9cd402e09f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 4 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
stackit/internal/services/serviceaccount/account/datasource.go
View file

@ -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{

8
stackit/internal/services/serviceaccount/account/resource.go
View file

@ -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{

8
stackit/internal/services/serviceaccount/key/resource.go
View file

@ -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{

8
stackit/internal/services/serviceaccount/token/resource.go
View file

@ -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{