Skip to content

feat(resourcemanager): graduate folder resource to ga #1043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 6, 2025
Merged

feat(resourcemanager): graduate folder resource to ga #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16ea11b
feat(resourcemanager): graduate folder resource to ga
h3adex Oct 29, 2025
18c2d9a
review changes
h3adex Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions docs/data-sources/resourcemanager_folder.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@ page_title: "stackit_resourcemanager_folder Data Source - stackit"
subcategory: ""
description: |-
Resource Manager folder data source schema. To identify the folder, you need to provide the container_id.
~> This datasource 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_resourcemanager_folder (Data Source)

Resource Manager folder data source schema. To identify the folder, you need to provide the container_id.

~> This datasource 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
Expand Down
3 changes: 0 additions & 3 deletions docs/resources/resourcemanager_folder.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@ page_title: "stackit_resourcemanager_folder Resource - stackit"
subcategory: ""
description: |-
Resource Manager folder 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_resourcemanager_folder (Resource)

Resource Manager folder 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
Expand Down
8 changes: 1 addition & 7 deletions stackit/internal/services/resourcemanager/folder/datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/stackitcloud/stackit-sdk-go/services/resourcemanager"
"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"
resourcemanagerUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/resourcemanager/utils"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
Expand Down Expand Up @@ -49,11 +48,6 @@ func (d *folderDataSource) Configure(ctx context.Context, req datasource.Configu
return
}

features.CheckBetaResourcesEnabled(ctx, &providerData, &resp.Diagnostics, "stackit_resourcemanager_folder", "datasource")
if resp.Diagnostics.HasError() {
return
}

apiClient := resourcemanagerUtils.ConfigureClient(ctx, &providerData, &resp.Diagnostics)
if resp.Diagnostics.HasError() {
return
Expand All @@ -78,7 +72,7 @@ func (d *folderDataSource) Schema(_ context.Context, _ datasource.SchemaRequest,
}

resp.Schema = schema.Schema{
Description: features.AddBetaDescription(descriptions["main"], core.Datasource),
Description: descriptions["main"],
Attributes: map[string]schema.Attribute{
"id": schema.StringAttribute{
Description: descriptions["id"],
Expand Down
8 changes: 1 addition & 7 deletions stackit/internal/services/resourcemanager/folder/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"github.com/stackitcloud/stackit-sdk-go/services/resourcemanager"
"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"
resourcemanagerUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/resourcemanager/utils"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
)
Expand Down Expand Up @@ -81,11 +80,6 @@ func (r *folderResource) Configure(ctx context.Context, req resource.ConfigureRe
return
}

features.CheckBetaResourcesEnabled(ctx, &providerData, &resp.Diagnostics, "stackit_resourcemanager_folder", "resource")
if resp.Diagnostics.HasError() {
return
}

apiClient := resourcemanagerUtils.ConfigureClient(ctx, &providerData, &resp.Diagnostics)
if resp.Diagnostics.HasError() {
return
Expand All @@ -110,7 +104,7 @@ func (r *folderResource) Schema(_ context.Context, _ resource.SchemaRequest, res
}

resp.Schema = schema.Schema{
Description: features.AddBetaDescription(descriptions["main"], core.Resource),
Description: descriptions["main"],
Attributes: map[string]schema.Attribute{
"id": schema.StringAttribute{
Description: descriptions["id"],
Expand Down
12 changes: 6 additions & 6 deletions stackit/internal/services/resourcemanager/resourcemanager_acc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ func TestAccResourceManagerFolderContainerId(t *testing.T) {
// Create
{
ConfigVariables: testConfigResourceFolderParentContainerId,
Config: testutil.ResourceManagerProviderConfigBetaEnabled() + resourceFolder,
Config: testutil.ResourceManagerProviderConfig() + resourceFolder,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.example", "name", testutil.ConvertConfigVariable(testConfigResourceFolderParentContainerId["name"])),
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.example", "parent_container_id", testutil.ConvertConfigVariable(testConfigResourceFolderParentContainerId["parent_container_id"])),
Expand All @@ -297,7 +297,7 @@ func TestAccResourceManagerFolderContainerId(t *testing.T) {
data "stackit_resourcemanager_folder" "example" {
container_id = stackit_resourcemanager_folder.example.container_id
}
`, testutil.ResourceManagerProviderConfigBetaEnabled(), resourceFolder),
`, testutil.ResourceManagerProviderConfig(), resourceFolder),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.stackit_resourcemanager_folder.example", "name", testutil.ConvertConfigVariable(testConfigResourceFolderParentContainerId["name"])),
resource.TestCheckResourceAttr("data.stackit_resourcemanager_folder.example", "labels.%", "1"),
Expand All @@ -324,7 +324,7 @@ func TestAccResourceManagerFolderContainerId(t *testing.T) {
// Update
{
ConfigVariables: testConfigFolderNameParentContainerIdUpdated(),
Config: testutil.ResourceManagerProviderConfigBetaEnabled() + resourceFolder,
Config: testutil.ResourceManagerProviderConfig() + resourceFolder,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.example", "name", testutil.ConvertConfigVariable(testConfigFolderNameParentContainerIdUpdated()["name"])),
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.example", "parent_container_id", testutil.ConvertConfigVariable(testConfigFolderNameParentContainerIdUpdated()["parent_container_id"])),
Expand Down Expand Up @@ -352,7 +352,7 @@ func TestAccResourceManagerFolderParentUUID(t *testing.T) {
// Create
{
ConfigVariables: testConfigResourceFolderParentUUID,
Config: testutil.ResourceManagerProviderConfigBetaEnabled() + resourceFolder,
Config: testutil.ResourceManagerProviderConfig() + resourceFolder,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.example", "name", testutil.ConvertConfigVariable(testConfigResourceFolderParentUUID["name"])),
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.example", "parent_container_id", testutil.ConvertConfigVariable(testConfigResourceFolderParentUUID["parent_container_id"])),
Expand All @@ -376,7 +376,7 @@ func TestAccResourceManagerFolderParentUUID(t *testing.T) {
data "stackit_resourcemanager_folder" "example" {
container_id = stackit_resourcemanager_folder.example.container_id
}
`, testutil.ResourceManagerProviderConfigBetaEnabled(), resourceFolder),
`, testutil.ResourceManagerProviderConfig(), resourceFolder),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.stackit_resourcemanager_folder.example", "name", testutil.ConvertConfigVariable(testConfigResourceFolderParentUUID["name"])),
resource.TestCheckResourceAttr("data.stackit_resourcemanager_folder.example", "labels.%", "1"),
Expand All @@ -403,7 +403,7 @@ func TestAccResourceManagerFolderParentUUID(t *testing.T) {
// Update
{
ConfigVariables: testConfigFolderNameParentUUIDUpdated(),
Config: testutil.ResourceManagerProviderConfigBetaEnabled() + resourceFolder,
Config: testutil.ResourceManagerProviderConfig() + resourceFolder,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.example", "name", testutil.ConvertConfigVariable(testConfigFolderNameParentUUIDUpdated()["name"])),
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.example", "parent_container_id", testutil.ConvertConfigVariable(testConfigFolderNameParentUUIDUpdated()["parent_container_id"])),
Expand Down
25 changes: 0 additions & 25 deletions stackit/internal/testutil/testutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,31 +342,6 @@ func ResourceManagerProviderConfig() string {
)
}

func ResourceManagerProviderConfigBetaEnabled() string {
token := GetTestProjectServiceAccountToken("")
if ResourceManagerCustomEndpoint == "" || AuthorizationCustomEndpoint == "" {
return fmt.Sprintf(`
provider "stackit" {
service_account_token = "%s"
enable_beta_resources = true
}`,

token,
)
}
return fmt.Sprintf(`
provider "stackit" {
resourcemanager_custom_endpoint = "%s"
authorization_custom_endpoint = "%s"
service_account_token = "%s"
enable_beta_resources = true
}`,
ResourceManagerCustomEndpoint,
AuthorizationCustomEndpoint,
token,
)
}

func SecretsManagerProviderConfig() string {
if SecretsManagerCustomEndpoint == "" {
return `
Expand Down
Loading