add v1 suffix to resource names

rubenhoenle · rubenhoenle · commit e48153e9f83f · 2026-04-17T19:07:32.000+02:00
diff --git a/docs/resources/secretsmanager_instance_role_binding_v1.md b/docs/resources/secretsmanager_instance_role_binding_v1.md
@@ -1,27 +1,19 @@
 ---
 # generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "stackit_secretsmanager_secret_group_role_binding Resource - stackit"
+page_title: "stackit_secretsmanager_instance_role_binding_v1 Resource - stackit"
 subcategory: ""
 description: |-
   IAM role binding resource schema.
   ~> This resource is part of the iam experiment and is likely going to undergo significant changes or be removed in the future. Use it at your own discretion.
 ---
 
-# stackit_secretsmanager_secret_group_role_binding (Resource)
+# stackit_secretsmanager_instance_role_binding_v1 (Resource)
 
 IAM role binding resource schema.
 
 ~> This resource is part of the iam experiment and is likely going to undergo significant changes or be removed in the future. Use it at your own discretion.
 
-## Example Usage
 
-```terraform
-resource "stackit_secretsmanager_secret_group_role_binding" "role_binding" {
-  resource_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  role        = "owner"
-  subject     = "john.doe@example.com"
-}
-```
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -39,13 +31,3 @@ resource "stackit_secretsmanager_secret_group_role_binding" "role_binding" {
 ### Read-Only
 
 - `id` (String) Terraform's internal resource identifier. It is structured as "`region`,`resource_id`,`role`,`subject`".
-
-## Import
-
-```terraform
-# Only use the import statement, if you want to import an existing folder role assignment
-import {
-  to = stackit_secretsmanager_secret_group_role_binding.import-example
-  id = "${var.region},${var.resource_id},${var.role},${var.subject}"
-}
-```
diff --git a/docs/resources/secretsmanager_secret_group_role_binding_v1.md b/docs/resources/secretsmanager_secret_group_role_binding_v1.md
@@ -1,27 +1,19 @@
 ---
 # generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "stackit_secretsmanager_instance_role_binding Resource - stackit"
+page_title: "stackit_secretsmanager_secret_group_role_binding_v1 Resource - stackit"
 subcategory: ""
 description: |-
   IAM role binding resource schema.
   ~> This resource is part of the iam experiment and is likely going to undergo significant changes or be removed in the future. Use it at your own discretion.
 ---
 
-# stackit_secretsmanager_instance_role_binding (Resource)
+# stackit_secretsmanager_secret_group_role_binding_v1 (Resource)
 
 IAM role binding resource schema.
 
 ~> This resource is part of the iam experiment and is likely going to undergo significant changes or be removed in the future. Use it at your own discretion.
 
-## Example Usage
 
-```terraform
-resource "stackit_secretsmanager_instance_role_binding" "role_binding" {
-  resource_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  role        = "owner"
-  subject     = "john.doe@example.com"
-}
-```
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -39,13 +31,3 @@ resource "stackit_secretsmanager_instance_role_binding" "role_binding" {
 ### Read-Only
 
 - `id` (String) Terraform's internal resource identifier. It is structured as "`region`,`resource_id`,`role`,`subject`".
-
-## Import
-
-```terraform
-# Only use the import statement, if you want to import an existing folder role assignment
-import {
-  to = stackit_secretsmanager_instance_role_binding.import-example
-  id = "${var.region},${var.resource_id},${var.role},${var.subject}"
-}
-```
diff --git a/stackit/internal/services/iam/rolebindings/v1/generic/resource.go b/stackit/internal/services/iam/rolebindings/v1/generic/resource.go
@@ -59,7 +59,7 @@ type RoleBindingResource[C any] struct {
 
 // Metadata returns the resource type name.
 func (r *RoleBindingResource[C]) Metadata(_ context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) {
-	resp.TypeName = fmt.Sprintf("%s_%s_%s_role_binding", req.ProviderTypeName, r.ApiName, r.ResourceType)
+	resp.TypeName = fmt.Sprintf("%s_%s_%s_role_binding_v1", req.ProviderTypeName, r.ApiName, r.ResourceType)
 }
 
 // Configure adds the provider configured client to the resource.
@@ -69,7 +69,7 @@ func (r *RoleBindingResource[C]) Configure(ctx context.Context, req resource.Con
 		return
 	}
 
-	features.CheckExperimentEnabled(ctx, &providerData, features.IamExperiment, fmt.Sprintf("stackit_%s_%s_role_binding", r.ApiName, r.ResourceType), core.Resource, &resp.Diagnostics)
+	features.CheckExperimentEnabled(ctx, &providerData, features.IamExperiment, fmt.Sprintf("stackit_%s_%s_role_binding_v1", r.ApiName, r.ResourceType), core.Resource, &resp.Diagnostics)
 	if resp.Diagnostics.HasError() {
 		return
 	}
diff --git a/stackit/internal/services/iam/rolebindings/v1/generic/resource_test.go b/stackit/internal/services/iam/rolebindings/v1/generic/resource_test.go
diff --git a/stackit/internal/services/iam/rolebindings/v1/rolebindings-testing/acc_test_builder.go b/stackit/internal/services/iam/rolebindings/v1/rolebindings-testing/acc_test_builder.go
@@ -14,7 +14,7 @@ import (
 func NewRoleBindingAccTestBuilder(tfProviderConfig, apiName, resourceType, resourceID string) *RoleBindingAccTestBuilder {
 	return &RoleBindingAccTestBuilder{
 		providerConfig:     tfProviderConfig,
-		resourceIdentifier: "stackit_" + apiName + "_" + resourceType + "_role_binding." + resourceID,
+		resourceIdentifier: "stackit_" + apiName + "_" + resourceType + "_role_binding_v1." + resourceID,
 	}
 }
 
diff --git a/stackit/internal/services/iam/rolebindings/v1/rolebindings.go b/stackit/internal/services/iam/rolebindings/v1/rolebindings.go
@@ -1,16 +1,16 @@
-package rolebindings
+package v1
 
 import (
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 
-	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/services/secretsmanager"
+	secretsmanager2 "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/v1/services/secretsmanager"
 )
 
 // NewRoleBindingResources is a helper function to simplify the provider implementation.
 func NewRoleBindingResources() []func() resource.Resource {
 	return []func() resource.Resource{
 		// secretsmanager
-		secretsmanager.NewSecretsmanagerInstanceRoleBindingResource,
-		secretsmanager.NewSecretsmanagerSecretGroupRoleBindingResource,
+		secretsmanager2.NewSecretsmanagerInstanceRoleBindingResource,
+		secretsmanager2.NewSecretsmanagerSecretGroupRoleBindingResource,
 	}
 }
diff --git a/stackit/internal/services/iam/rolebindings/v1/services/secretsmanager/iam_rolebindings_secretsmanager_acc_test.go b/stackit/internal/services/iam/rolebindings/v1/services/secretsmanager/iam_rolebindings_secretsmanager_acc_test.go
@@ -9,7 +9,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 
-	rolebindings_testing "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/rolebindings-testing"
+	rolebindings_testing "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/v1/rolebindings-testing"
+
 	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil"
 )
 
diff --git a/stackit/internal/services/iam/rolebindings/v1/services/secretsmanager/instance.go b/stackit/internal/services/iam/rolebindings/v1/services/secretsmanager/instance.go
@@ -6,7 +6,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	secretsmanagerV1Alpha "github.com/stackitcloud/stackit-sdk-go/services/secretsmanager/v1alphaapi"
 
-	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/generic"
+	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/v1/generic"
+
 	secretsmanagerUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/secretsmanager/utils"
 )
 
diff --git a/stackit/internal/services/iam/rolebindings/v1/services/secretsmanager/secret_group.go b/stackit/internal/services/iam/rolebindings/v1/services/secretsmanager/secret_group.go
@@ -6,7 +6,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	secretsmanagerV1Alpha "github.com/stackitcloud/stackit-sdk-go/services/secretsmanager/v1alphaapi"
 
-	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/generic"
+	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/v1/generic"
+
 	secretsmanagerUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/secretsmanager/utils"
 )
 
diff --git a/stackit/internal/services/iam/rolebindings/v1/services/secretsmanager/testdata/instance.tf b/stackit/internal/services/iam/rolebindings/v1/services/secretsmanager/testdata/instance.tf
@@ -8,7 +8,7 @@ resource "stackit_secretsmanager_instance" "instance" {
   name       = var.instance_name
 }
 
-resource "stackit_secretsmanager_instance_role_binding" "role_binding" {
+resource "stackit_secretsmanager_instance_role_binding_v1" "role_binding" {
   resource_id = stackit_secretsmanager_instance.instance.instance_id
   role        = var.role
   subject     = var.subject
diff --git a/stackit/provider.go b/stackit/provider.go
@@ -61,7 +61,7 @@ import (
 	iaasServiceAccountAttach "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iaas/serviceaccountattach"
 	iaasVolume "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iaas/volume"
 	iaasVolumeAttach "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iaas/volumeattach"
-	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings"
+	iamRoleBindingsV1 "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/v1"
 	kmsKey "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/kms/key"
 	kmsKeyRing "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/kms/keyring"
 	kmsWrappingKey "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/kms/wrapping-key"
@@ -791,7 +791,7 @@ func (p *Provider) Resources(_ context.Context) []func() resource.Resource {
 	}
 	resources = append(resources, roleAssignements.NewRoleAssignmentResources()...)
 	resources = append(resources, customRole.NewCustomRoleResources()...)
-	resources = append(resources, rolebindings.NewRoleBindingResources()...)
+	resources = append(resources, iamRoleBindingsV1.NewRoleBindingResources()...)
 
 	return resources
 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ type RoleBindingResource[C any] struct {`
`59`	`59`
`60`	`60`	`// Metadata returns the resource type name.`
`61`	`61`	`func (r RoleBindingResource[C]) Metadata(_ context.Context, req resource.MetadataRequest, resp resource.MetadataResponse) {`
`62`		`- resp.TypeName = fmt.Sprintf("%s_%s_%s_role_binding", req.ProviderTypeName, r.ApiName, r.ResourceType)`
	`62`	`+ resp.TypeName = fmt.Sprintf("%s_%s_%s_role_binding_v1", req.ProviderTypeName, r.ApiName, r.ResourceType)`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`// Configure adds the provider configured client to the resource.`
`@@ -69,7 +69,7 @@ func (r *RoleBindingResource[C]) Configure(ctx context.Context, req resource.Con`
`69`	`69`	`return`
`70`	`70`	`}`
`71`	`71`
`72`		`- features.CheckExperimentEnabled(ctx, &providerData, features.IamExperiment, fmt.Sprintf("stackit_%s_%s_role_binding", r.ApiName, r.ResourceType), core.Resource, &resp.Diagnostics)`
	`72`	`+ features.CheckExperimentEnabled(ctx, &providerData, features.IamExperiment, fmt.Sprintf("stackit_%s_%s_role_binding_v1", r.ApiName, r.ResourceType), core.Resource, &resp.Diagnostics)`
`73`	`73`	`if resp.Diagnostics.HasError() {`
`74`	`74`	`return`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`func NewRoleBindingAccTestBuilder(tfProviderConfig, apiName, resourceType, resourceID string) *RoleBindingAccTestBuilder {`
`15`	`15`	`return &RoleBindingAccTestBuilder{`
`16`	`16`	`providerConfig: tfProviderConfig,`
`17`		`- resourceIdentifier: "stackit_" + apiName + "_" + resourceType + "_role_binding." + resourceID,`
	`17`	`+ resourceIdentifier: "stackit_" + apiName + "_" + resourceType + "_role_binding_v1." + resourceID,`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`		`-package rolebindings`
	`1`	`+package v1`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/hashicorp/terraform-plugin-framework/resource"`
`5`	`5`
`6`		`- "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/services/secretsmanager"`
	`6`	`+ secretsmanager2 "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/v1/services/secretsmanager"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// NewRoleBindingResources is a helper function to simplify the provider implementation.`
`10`	`10`	`func NewRoleBindingResources() []func() resource.Resource {`
`11`	`11`	`return []func() resource.Resource{`
`12`	`12`	`// secretsmanager`
`13`		`- secretsmanager.NewSecretsmanagerInstanceRoleBindingResource,`
`14`		`- secretsmanager.NewSecretsmanagerSecretGroupRoleBindingResource,`
	`13`	`+ secretsmanager2.NewSecretsmanagerInstanceRoleBindingResource,`
	`14`	`+ secretsmanager2.NewSecretsmanagerSecretGroupRoleBindingResource,`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ import (`
`9`	`9`	`"github.com/hashicorp/terraform-plugin-testing/helper/acctest"`
`10`	`10`	`"github.com/hashicorp/terraform-plugin-testing/helper/resource"`
`11`	`11`
`12`		`- rolebindings_testing "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/rolebindings-testing"`
	`12`	`+ rolebindings_testing "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/v1/rolebindings-testing"`
	`13`	`+`
`13`	`14`	`"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil"`
`14`	`15`	`)`
`15`	`16`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@ import (`
`6`	`6`	`"github.com/hashicorp/terraform-plugin-framework/resource"`
`7`	`7`	`secretsmanagerV1Alpha "github.com/stackitcloud/stackit-sdk-go/services/secretsmanager/v1alphaapi"`
`8`	`8`
`9`		`- "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/generic"`
	`9`	`+ "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iam/rolebindings/v1/generic"`
	`10`	`+`
`10`	`11`	`secretsmanagerUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/secretsmanager/utils"`
`11`	`12`	`)`
`12`	`13`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ resource "stackit_secretsmanager_instance" "instance" {`
`8`	`8`	`name = var.instance_name`
`9`	`9`	`}`
`10`	`10`
`11`		`-resource "stackit_secretsmanager_instance_role_binding" "role_binding" {`
	`11`	`+resource "stackit_secretsmanager_instance_role_binding_v1" "role_binding" {`
`12`	`12`	`resource_id = stackit_secretsmanager_instance.instance.instance_id`
`13`	`13`	`role = var.role`
`14`	`14`	`subject = var.subject`