review feedback

marceljk · marceljk · commit efef7cac58a8 · 2025-12-19T11:27:09.000+01:00
diff --git a/docs/data-sources/sfs_resource_pool.md b/docs/data-sources/sfs_resource_pool.md
@@ -38,7 +38,7 @@ data "stackit_sfs_resource_pool" "resourcepool" {
 
 - `availability_zone` (String) Availability zone.
 - `id` (String) Terraform's internal resource ID. It is structured as "`project_id`,`resource_pool_id`".
-- `ip_acl` (List of String) SFS resource pool. Must have a region specified in the provider configuration.
+- `ip_acl` (List of String) List of IPs that can mount the resource pool in read-only; IPs must have a subnet mask (e.g. "172.16.0.0/24" for a range of IPs, or "172.16.0.250/32" for a specific IP).
 - `name` (String) Name of the resource pool.
 - `performance_class` (String) Name of the performance class.
 - `performance_class_downgradable_at` (String) Time when the performance class can be downgraded again.
diff --git a/docs/data-sources/sfs_share.md b/docs/data-sources/sfs_share.md
@@ -3,13 +3,13 @@
 page_title: "stackit_sfs_share Data Source - stackit"
 subcategory: ""
 description: |-
-  NFS-Share datasource schema. Must have a region specified in the provider configuration.
+  SFS Share schema. Must have a region specified in the provider configuration.
   ~> 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_sfs_share (Data Source)
 
-NFS-Share datasource schema. Must have a `region` specified in the provider configuration.
+SFS Share schema. Must have a `region` specified in the provider configuration.
 
 ~> 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.
 
@@ -29,7 +29,7 @@ data "stackit_sfs_share" "example" {
 ### Required
 
 - `project_id` (String) STACKIT project ID to which the share is associated.
-- `resource_pool_id` (String) The ID of the resource pool for the NFS share.
+- `resource_pool_id` (String) The ID of the resource pool for the SFS share.
 - `share_id` (String) share ID
 
 ### Optional
diff --git a/docs/resources/sfs_export_policy.md b/docs/resources/sfs_export_policy.md
@@ -26,6 +26,12 @@ resource "stackit_sfs_export_policy" "example" {
     }
   ]
 }
+
+# Only use the import statement, if you want to import an existing export policy
+import {
+  to = stackit_sfs_export_policy.example
+  id = "${var.project_id},${var.region},${var.policy_id}"
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
diff --git a/docs/resources/sfs_resource_pool.md b/docs/resources/sfs_resource_pool.md
@@ -4,15 +4,12 @@ page_title: "stackit_sfs_resource_pool Resource - stackit"
 subcategory: ""
 description: |-
   Resource-pool resource schema. Must have a region specified in the provider configuration.
-  SFS resource pool. Must have a region specified in the provider configuration.
   ~> 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_sfs_resource_pool (Resource)
 
 Resource-pool resource schema. Must have a `region` specified in the provider configuration.
-SFS resource pool. Must have a region specified in the provider configuration.
-
 
 ~> 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.
 
@@ -31,6 +28,12 @@ resource "stackit_sfs_resource_pool" "resourcepool" {
   ]
   snapshots_are_visible = true
 }
+
+# Only use the import statement, if you want to import an existing resource pool
+import {
+  to = stackit_sfs_resource_pool.resourcepool
+  id = "${var.project_id},${var.region},${var.resource_pool_id}"
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
@@ -39,7 +42,7 @@ resource "stackit_sfs_resource_pool" "resourcepool" {
 ### Required
 
 - `availability_zone` (String) Availability zone.
-- `ip_acl` (List of String) SFS resource pool. Must have a region specified in the provider configuration.
+- `ip_acl` (List of String) List of IPs that can mount the resource pool in read-only; IPs must have a subnet mask (e.g. "172.16.0.0/24" for a range of IPs, or "172.16.0.250/32" for a specific IP).
 - `name` (String) Name of the resource pool.
 - `performance_class` (String) Name of the performance class.
 - `project_id` (String) STACKIT project ID to which the resource pool is associated.
diff --git a/docs/resources/sfs_share.md b/docs/resources/sfs_share.md
@@ -3,14 +3,13 @@
 page_title: "stackit_sfs_share Resource - stackit"
 subcategory: ""
 description: |-
-  SFS Shares. Must have a region specified in the provider configuration.
+  SFS Share schema. Must have a region specified in the provider configuration.
   ~> 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_sfs_share (Resource)
 
-SFS Shares. Must have a region specified in the provider configuration.
-
+SFS Share schema. Must have a `region` specified in the provider configuration.
 
 ~> 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.
 
@@ -24,6 +23,12 @@ resource "stackit_sfs_share" "example" {
   export_policy              = "high-performance-class"
   space_hard_limit_gigabytes = 32
 }
+
+# Only use the import statement, if you want to import an existing sfs share
+import {
+  to = stackit_sfs_resource_pool.resourcepool
+  id = "${var.project_id},${var.region},${var.resource_pool_id},${var.share_id}"
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
@@ -37,7 +42,7 @@ clients with IPs matching the IP ACL of the Resource Pool hosting this Share.
 You can also assign a Share Export Policy after creating the Share
 - `name` (String) Name of the share.
 - `project_id` (String) STACKIT project ID to which the share is associated.
-- `resource_pool_id` (String) The ID of the resource pool for the NFS share.
+- `resource_pool_id` (String) The ID of the resource pool for the SFS share.
 - `space_hard_limit_gigabytes` (Number) Space hard limit for the Share. 
 				If zero, the Share will have access to the full space of the Resource Pool it lives in.
 				(unit: gigabytes)
diff --git a/examples/resources/stackit_sfs_export_policy/resource.tf b/examples/resources/stackit_sfs_export_policy/resource.tf
@@ -8,3 +8,9 @@ resource "stackit_sfs_export_policy" "example" {
     }
   ]
 }
+
+# Only use the import statement, if you want to import an existing export policy
+import {
+  to = stackit_sfs_export_policy.example
+  id = "${var.project_id},${var.region},${var.policy_id}"
+}
diff --git a/examples/resources/stackit_sfs_resource_pool/resource.tf b/examples/resources/stackit_sfs_resource_pool/resource.tf
@@ -10,3 +10,9 @@ resource "stackit_sfs_resource_pool" "resourcepool" {
   ]
   snapshots_are_visible = true
 }
+
+# Only use the import statement, if you want to import an existing resource pool
+import {
+  to = stackit_sfs_resource_pool.resourcepool
+  id = "${var.project_id},${var.region},${var.resource_pool_id}"
+}
diff --git a/examples/resources/stackit_sfs_share/resource.tf b/examples/resources/stackit_sfs_share/resource.tf
@@ -5,3 +5,9 @@ resource "stackit_sfs_share" "example" {
   export_policy              = "high-performance-class"
   space_hard_limit_gigabytes = 32
 }
+
+# Only use the import statement, if you want to import an existing sfs share
+import {
+  to = stackit_sfs_resource_pool.resourcepool
+  id = "${var.project_id},${var.region},${var.resource_pool_id},${var.share_id}"
+}
diff --git a/go.mod b/go.mod
@@ -36,7 +36,7 @@ require (
 	github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.2.1
 	github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.11.1
 	github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.2
-	github.com/stackitcloud/stackit-sdk-go/services/sfs v0.1.0
+	github.com/stackitcloud/stackit-sdk-go/services/sfs v0.2.0
 	github.com/stackitcloud/stackit-sdk-go/services/ske v1.4.0
 	github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.3.3
 	github.com/teambition/rrule-go v1.8.2
diff --git a/go.sum b/go.sum
@@ -201,8 +201,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.11.1 h1:crKlHl
 github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.11.1/go.mod h1:QCrAW/Rmf+styT25ke8cUV6hDHpdKNmAY14kkJ3+Fd8=
 github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.2 h1:s2iag/Gc4tuQH7x5I0n4mQWVhpfl/cj+SVNAFAB5ck0=
 github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.2/go.mod h1:DFEamKVoOjm/rjMwzfZK0Zg/hwsSkXOibdA4HcC6swk=
-github.com/stackitcloud/stackit-sdk-go/services/sfs v0.1.0 h1:RRzwDicugcWtEEBRSVVz+Cwb2OAsxodmO4ZJoftGfB0=
-github.com/stackitcloud/stackit-sdk-go/services/sfs v0.1.0/go.mod h1:XHOtGgBwwCqPSoQt2ojIRb/BeOd4kICwb9RuMXXFGt8=
+github.com/stackitcloud/stackit-sdk-go/services/sfs v0.2.0 h1:DRp1p0Gb1YZSnFXgkiKTHQD9bFfqn6OC3PcsDjqGJiw=
+github.com/stackitcloud/stackit-sdk-go/services/sfs v0.2.0/go.mod h1:XHOtGgBwwCqPSoQt2ojIRb/BeOd4kICwb9RuMXXFGt8=
 github.com/stackitcloud/stackit-sdk-go/services/ske v1.4.0 h1:V6RFvybDeJvvmT3g7/BZodF0gozz3TEpahbpiTftbeY=
 github.com/stackitcloud/stackit-sdk-go/services/ske v1.4.0/go.mod h1:xRBgpJ8P5Nf1T5tD0tGAeNg1FNQzx5VF7qqOXt2Fp3s=
 github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.3.3 h1:TFefEGGxvcI7euqyosbLS/zSEOy+3JMGOirW3vNj/84=
diff --git a/stackit/internal/services/sfs/export-policy/datasource.go b/stackit/internal/services/sfs/export-policy/datasource.go
@@ -20,11 +20,6 @@ import (
 	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
 )
 
-// datasourceBetaCheckDone is used to prevent multiple checks for beta resources.
-// This is a workaround for the lack of a global state in the provider and
-// needs to exist because the Configure method is called twice.
-var datasourceBetaCheckDone bool
-
 var (
 	_ datasource.DataSource              = (*exportPolicyDataSource)(nil)
 	_ datasource.DataSourceWithConfigure = (*exportPolicyDataSource)(nil)
@@ -48,12 +43,9 @@ func (d *exportPolicyDataSource) Configure(ctx context.Context, req datasource.C
 		return
 	}
 
-	if !datasourceBetaCheckDone {
-		features.CheckBetaResourcesEnabled(ctx, &d.providerData, &resp.Diagnostics, "stackit_sfs_export_policy", core.Datasource)
-		if resp.Diagnostics.HasError() {
-			return
-		}
-		datasourceBetaCheckDone = true
+	features.CheckBetaResourcesEnabled(ctx, &d.providerData, &resp.Diagnostics, "stackit_sfs_export_policy", core.Datasource)
+	if resp.Diagnostics.HasError() {
+		return
 	}
 
 	apiClient := sfsUtils.ConfigureClient(ctx, &d.providerData, &resp.Diagnostics)
diff --git a/stackit/internal/services/sfs/export-policy/resource.go b/stackit/internal/services/sfs/export-policy/resource.go
@@ -33,11 +33,6 @@ import (
 	"github.com/stackitcloud/stackit-sdk-go/services/sfs"
 )
 
-// resourceBetaCheckDone is used to prevent multiple checks for beta resources.
-// This is a workaround for the lack of a global state in the provider and
-// needs to exist because the Configure method is called twice.
-var resourceBetaCheckDone bool
-
 // Ensure the implementation satisfies the expected interfaces.
 var (
 	_ resource.Resource                = &exportPolicyResource{}
@@ -133,12 +128,9 @@ func (r *exportPolicyResource) Configure(ctx context.Context, req resource.Confi
 		return
 	}
 
-	if !resourceBetaCheckDone {
-		features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_sfs_export_policy", core.Resource)
-		if resp.Diagnostics.HasError() {
-			return
-		}
-		resourceBetaCheckDone = true
+	features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_sfs_export_policy", core.Resource)
+	if resp.Diagnostics.HasError() {
+		return
 	}
 
 	apiClient := sfsUtils.ConfigureClient(ctx, &r.providerData, &resp.Diagnostics)
diff --git a/stackit/internal/services/sfs/resourcepool/datasource.go b/stackit/internal/services/sfs/resourcepool/datasource.go
@@ -61,12 +61,9 @@ func (r *resourcePoolDataSource) Configure(ctx context.Context, req datasource.C
 		return
 	}
 
-	if !datasourceBetaCheckDone {
-		features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_sfs_resource_pool", core.Datasource)
-		if resp.Diagnostics.HasError() {
-			return
-		}
-		datasourceBetaCheckDone = true
+	features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_sfs_resource_pool", core.Datasource)
+	if resp.Diagnostics.HasError() {
+		return
 	}
 
 	apiClient := sfsUtils.ConfigureClient(ctx, &r.providerData, &resp.Diagnostics)
@@ -161,10 +158,9 @@ func (r *resourcePoolDataSource) Schema(_ context.Context, _ datasource.SchemaRe
 				Description: "Availability zone.",
 			},
 			"ip_acl": schema.ListAttribute{
-				ElementType:         types.StringType,
-				Computed:            true,
-				Description:         `List of IPs that can mount the resource pool in read-only; IPs must have a subnet mask (e.g. "172.16.0.0/24" for a range of IPs, or "172.16.0.250/32" for a specific IP).`,
-				MarkdownDescription: markdownDescription,
+				ElementType: types.StringType,
+				Computed:    true,
+				Description: `List of IPs that can mount the resource pool in read-only; IPs must have a subnet mask (e.g. "172.16.0.0/24" for a range of IPs, or "172.16.0.250/32" for a specific IP).`,
 				Validators: []validator.List{
 					listvalidator.ValueStringsAre(validate.CIDR()),
 				},
diff --git a/stackit/internal/services/sfs/resourcepool/description.md b/stackit/internal/services/sfs/resourcepool/description.md
diff --git a/stackit/internal/services/sfs/resourcepool/resource.go b/stackit/internal/services/sfs/resourcepool/resource.go
@@ -31,14 +31,6 @@ import (
 	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
 )
 
-// datasourceBetaCheckDone is used to prevent multiple checks for beta resources.
-// This is a workaround for the lack of a global state in the provider and
-// needs to exist because the Configure method is called twice.
-var datasourceBetaCheckDone bool
-
-//go:embed description.md
-var markdownDescription string
-
 // Ensure the implementation satisfies the expected interfaces.
 var (
 	_ resource.Resource                = &resourcePoolResource{}
@@ -113,12 +105,9 @@ func (r *resourcePoolResource) Configure(ctx context.Context, req resource.Confi
 		return
 	}
 
-	if !datasourceBetaCheckDone {
-		features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_sfs_resource_pool", core.Resource)
-		if resp.Diagnostics.HasError() {
-			return
-		}
-		datasourceBetaCheckDone = true
+	features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_sfs_resource_pool", core.Resource)
+	if resp.Diagnostics.HasError() {
+		return
 	}
 
 	apiClient := sfsUtils.ConfigureClient(ctx, &r.providerData, &resp.Diagnostics)
@@ -133,7 +122,7 @@ func (r *resourcePoolResource) Configure(ctx context.Context, req resource.Confi
 func (r *resourcePoolResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
 	description := "Resource-pool resource schema. Must have a `region` specified in the provider configuration."
 	resp.Schema = schema.Schema{
-		MarkdownDescription: features.AddBetaDescription(description+"\n"+markdownDescription, core.Resource),
+		MarkdownDescription: features.AddBetaDescription(description, core.Resource),
 		Description:         description,
 		Attributes: map[string]schema.Attribute{
 			"id": schema.StringAttribute{
@@ -182,10 +171,9 @@ func (r *resourcePoolResource) Schema(_ context.Context, _ resource.SchemaReques
 				},
 			},
 			"ip_acl": schema.ListAttribute{
-				ElementType:         types.StringType,
-				Required:            true,
-				Description:         `List of IPs that can mount the resource pool in read-only; IPs must have a subnet mask (e.g. "172.16.0.0/24" for a range of IPs, or "172.16.0.250/32" for a specific IP).`,
-				MarkdownDescription: markdownDescription,
+				ElementType: types.StringType,
+				Required:    true,
+				Description: `List of IPs that can mount the resource pool in read-only; IPs must have a subnet mask (e.g. "172.16.0.0/24" for a range of IPs, or "172.16.0.250/32" for a specific IP).`,
 				Validators: []validator.List{
 					listvalidator.SizeAtLeast(1),
 					listvalidator.ValueStringsAre(validate.CIDR()),
diff --git a/stackit/internal/services/sfs/sfs_acc_test.go b/stackit/internal/services/sfs/sfs_acc_test.go
@@ -434,7 +434,7 @@ func createClient() (*sfs.APIClient, error) {
 	var client *sfs.APIClient
 	var err error
 	if testutil.SFSCustomEndpoint == "" {
-		client, err = sfs.NewAPIClient(config.WithRegion(testutil.Region))
+		client, err = sfs.NewAPIClient()
 	} else {
 		client, err = sfs.NewAPIClient(
 			config.WithEndpoint(testutil.SFSCustomEndpoint),
diff --git a/stackit/internal/services/sfs/share/datasource.go b/stackit/internal/services/sfs/share/datasource.go
@@ -54,12 +54,9 @@ func (r *shareDataSource) Configure(ctx context.Context, req datasource.Configur
 		return
 	}
 
-	if !datasourceBetaCheckDone {
-		features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_sfs_share", core.Datasource)
-		if resp.Diagnostics.HasError() {
-			return
-		}
-		datasourceBetaCheckDone = true
+	features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_sfs_share", core.Datasource)
+	if resp.Diagnostics.HasError() {
+		return
 	}
 
 	apiClient := sfsUtils.ConfigureClient(ctx, &r.providerData, &resp.Diagnostics)
@@ -126,7 +123,7 @@ func (r *shareDataSource) Read(ctx context.Context, req datasource.ReadRequest,
 
 // Schema implements datasource.DataSource.
 func (r *shareDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) {
-	description := "NFS-Share datasource schema. Must have a `region` specified in the provider configuration."
+	description := "SFS Share schema. Must have a `region` specified in the provider configuration."
 	resp.Schema = schema.Schema{
 		MarkdownDescription: features.AddBetaDescription(description, core.Datasource),
 		Description:         description,
@@ -144,7 +141,7 @@ func (r *shareDataSource) Schema(_ context.Context, _ datasource.SchemaRequest,
 				},
 			},
 			"resource_pool_id": schema.StringAttribute{
-				Description: "The ID of the resource pool for the NFS share.",
+				Description: "The ID of the resource pool for the SFS share.",
 				Required:    true,
 				Validators: []validator.String{
 					validate.UUID(),
diff --git a/stackit/internal/services/sfs/share/description.md b/stackit/internal/services/sfs/share/description.md
diff --git a/stackit/internal/services/sfs/share/resource.go b/stackit/internal/services/sfs/share/resource.go
diff --git a/stackit/internal/services/sfs/share/resource_test.go b/stackit/internal/services/sfs/share/resource_test.go
diff --git a/stackit/internal/services/sfs/snapshots/datasource.go b/stackit/internal/services/sfs/snapshots/datasource.go
diff --git a/stackit/internal/services/sfs/utils/util.go b/stackit/internal/services/sfs/utils/util.go
diff --git a/stackit/internal/services/sfs/utils/util_test.go b/stackit/internal/services/sfs/utils/util_test.go

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,12 @@ resource "stackit_sfs_export_policy" "example" {`
`26`	`26`	`}`
`27`	`27`	`]`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+# Only use the import statement, if you want to import an existing export policy`
	`31`	`+import {`
	`32`	`+ to = stackit_sfs_export_policy.example`
	`33`	`+ id = "${var.project_id},${var.region},${var.policy_id}"`
	`34`	`+}`
`29`	`35`	```
`30`	`36`
`31`	`37`	`<!-- schema generated by tfplugindocs -->`
Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,9 @@ resource "stackit_sfs_export_policy" "example" {`
`8`	`8`	`}`
`9`	`9`	`]`
`10`	`10`	`}`
	`11`	`+`
	`12`	`+# Only use the import statement, if you want to import an existing export policy`
	`13`	`+import {`
	`14`	`+ to = stackit_sfs_export_policy.example`
	`15`	`+ id = "${var.project_id},${var.region},${var.policy_id}"`
	`16`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,9 @@ resource "stackit_sfs_resource_pool" "resourcepool" {`
`10`	`10`	`]`
`11`	`11`	`snapshots_are_visible = true`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+# Only use the import statement, if you want to import an existing resource pool`
	`15`	`+import {`
	`16`	`+ to = stackit_sfs_resource_pool.resourcepool`
	`17`	`+ id = "${var.project_id},${var.region},${var.resource_pool_id}"`
	`18`	`+}`