chore(sfs): migrate to new sdk structure

- use v1api for SFS service.

Author: s-inter

.gitignore

@@ -6,6 +6,9 @@ bin/
 *.so
 *.dylib
 
+# OS generated files
+.DS_Store
+
 ## IDE
 *.idea/
 *.vscode/

stackit/internal/services/sfs/export-policy/datasource.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
-	"github.com/stackitcloud/stackit-sdk-go/services/sfs"
+	sfs "github.com/stackitcloud/stackit-sdk-go/services/sfs/v1api"
 
 	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
 	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
@@ -79,7 +79,7 @@ func (d *exportPolicyDataSource) Read(ctx context.Context, req datasource.ReadRe
 	ctx = core.InitProviderContext(ctx)
 
 	// get export policy
-	exportPolicyResp, err := d.client.GetShareExportPolicy(ctx, projectId, region, exportPolicyId).Execute()
+	exportPolicyResp, err := d.client.DefaultAPI.GetShareExportPolicy(ctx, projectId, region, exportPolicyId).Execute()
 	if err != nil {
 		var openapiError *oapierror.GenericOpenAPIError
 		if errors.As(err, &openapiError) {
@@ -155,7 +155,7 @@ func (d *exportPolicyDataSource) Schema(_ context.Context, _ datasource.SchemaRe
 							Computed:    true,
 							Description: `IP access control list; 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).`,
 						},
-						"order": schema.Int64Attribute{
+						"order": schema.Int32Attribute{
 							Description: "Order of the rule within a Share Export Policy. The order is used so that when a client IP matches multiple rules, the first rule is applied",
 							Computed:    true,
 						},

stackit/internal/services/sfs/export-policy/resource.go

@@ -31,7 +31,7 @@ import (
 	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
 
 	"github.com/hashicorp/terraform-plugin-framework/resource"
-	"github.com/stackitcloud/stackit-sdk-go/services/sfs"
+	sfs "github.com/stackitcloud/stackit-sdk-go/services/sfs/v1api"
 )
 
 // Ensure the implementation satisfies the expected interfaces.
@@ -54,7 +54,7 @@ type Model struct {
 type rulesModel struct {
 	Description types.String `tfsdk:"description"`
 	IpAcl       types.List   `tfsdk:"ip_acl"`
-	Order       types.Int64  `tfsdk:"order"`
+	Order       types.Int32  `tfsdk:"order"`
 	ReadOnly    types.Bool   `tfsdk:"read_only"`
 	SetUuid     types.Bool   `tfsdk:"set_uuid"`
 	SuperUser   types.Bool   `tfsdk:"super_user"`
@@ -64,7 +64,7 @@ type rulesModel struct {
 var rulesTypes = map[string]attr.Type{
 	"description": types.StringType,
 	"ip_acl":      types.ListType{ElemType: types.StringType},
-	"order":       types.Int64Type,
+	"order":       types.Int32Type,
 	"read_only":   types.BoolType,
 	"set_uuid":    types.BoolType,
 	"super_user":  types.BoolType,
@@ -206,7 +206,7 @@ func (r *exportPolicyResource) Schema(_ context.Context, _ resource.SchemaReques
 								listvalidator.ValueStringsAre(validate.CIDR()),
 							},
 						},
-						"order": schema.Int64Attribute{
+						"order": schema.Int32Attribute{
 							Description: "Order of the rule within a Share Export Policy. The order is used so that when a client IP matches multiple rules, the first rule is applied",
 							Required:    true,
 						},
@@ -275,7 +275,7 @@ func (r *exportPolicyResource) Create(ctx context.Context, req resource.CreateRe
 		return
 	}
 
-	createResp, err := r.client.CreateShareExportPolicy(ctx, projectId, region).CreateShareExportPolicyPayload(*payload).Execute()
+	createResp, err := r.client.DefaultAPI.CreateShareExportPolicy(ctx, projectId, region).CreateShareExportPolicyPayload(*payload).Execute()
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating export policy", fmt.Sprintf("Calling API: %v", err))
 		return
@@ -298,7 +298,7 @@ func (r *exportPolicyResource) Create(ctx context.Context, req resource.CreateRe
 	}
 
 	// get export policy
-	getResp, err := r.client.GetShareExportPolicy(ctx, projectId, region, *createResp.ShareExportPolicy.Id).Execute()
+	getResp, err := r.client.DefaultAPI.GetShareExportPolicy(ctx, projectId, region, *createResp.ShareExportPolicy.Id).Execute()
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating export policy", fmt.Sprintf("Calling API to get export policy: %v", err))
 		return
@@ -337,7 +337,7 @@ func (r *exportPolicyResource) Read(ctx context.Context, req resource.ReadReques
 	ctx = core.InitProviderContext(ctx)
 
 	// get export policy
-	exportPolicyResp, err := r.client.GetShareExportPolicy(ctx, projectId, region, exportPolicyId).Execute()
+	exportPolicyResp, err := r.client.DefaultAPI.GetShareExportPolicy(ctx, projectId, region, exportPolicyId).Execute()
 	if err != nil {
 		var openapiError *oapierror.GenericOpenAPIError
 		if errors.As(err, &openapiError) {
@@ -401,7 +401,7 @@ func (r *exportPolicyResource) Update(ctx context.Context, req resource.UpdateRe
 		return
 	}
 
-	_, err = r.client.UpdateShareExportPolicy(ctx, projectId, region, exportPolicyId).UpdateShareExportPolicyPayload(*payload).Execute()
+	_, err = r.client.DefaultAPI.UpdateShareExportPolicy(ctx, projectId, region, exportPolicyId).UpdateShareExportPolicyPayload(*payload).Execute()
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating export policy", fmt.Sprintf("Calling API to update export policy: %v", err))
 		return
@@ -410,7 +410,7 @@ func (r *exportPolicyResource) Update(ctx context.Context, req resource.UpdateRe
 	ctx = core.LogResponse(ctx)
 
 	// get export policy
-	exportPolicyResp, err := r.client.GetShareExportPolicy(ctx, projectId, region, exportPolicyId).Execute()
+	exportPolicyResp, err := r.client.DefaultAPI.GetShareExportPolicy(ctx, projectId, region, exportPolicyId).Execute()
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating export policy", fmt.Sprintf("Calling API to get export policy: %v", err))
 		return
@@ -450,7 +450,7 @@ func (r *exportPolicyResource) Delete(ctx context.Context, req resource.DeleteRe
 
 	ctx = core.InitProviderContext(ctx)
 
-	_, err := r.client.DeleteShareExportPolicy(ctx, projectId, region, exportPolicyId).Execute()
+	_, err := r.client.DefaultAPI.DeleteShareExportPolicy(ctx, projectId, region, exportPolicyId).Execute()
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting export policy", fmt.Sprintf("Calling API: %v", err))
 	}
@@ -502,7 +502,7 @@ func mapFields(ctx context.Context, resp *sfs.GetShareExportPolicyResponse, mode
 	// iterate over Rules from response
 	if resp.ShareExportPolicy.Rules != nil {
 		rulesList := []attr.Value{}
-		for _, rule := range *resp.ShareExportPolicy.Rules {
+		for _, rule := range resp.ShareExportPolicy.Rules {
 			var ipAcl basetypes.ListValue
 			if rule.IpAcl != nil {
 				var diags diag.Diagnostics
@@ -515,9 +515,9 @@ func mapFields(ctx context.Context, resp *sfs.GetShareExportPolicyResponse, mode
 			}
 
 			rulesValues := map[string]attr.Value{
-				"description": types.StringPointerValue(rule.GetDescription()),
+				"description": types.StringPointerValue(rule.Description.Get()),
 				"ip_acl":      ipAcl,
-				"order":       types.Int64PointerValue(rule.Order),
+				"order":       types.Int32PointerValue(rule.Order),
 				"read_only":   types.BoolPointerValue(rule.ReadOnly),
 				"set_uuid":    types.BoolPointerValue(rule.SetUuid),
 				"super_user":  types.BoolPointerValue(rule.SuperUser),
@@ -564,14 +564,14 @@ func toCreatePayload(model *Model, rules []rulesModel) (*sfs.CreateShareExportPo
 	var tempRules []sfs.CreateShareExportPolicyRequestRule
 	for _, rule := range rules {
 		// convert list
-		convertedList, err := conversion.StringListToPointer(rule.IpAcl)
+		convertedList, err := conversion.StringListToSlice(rule.IpAcl)
 		if err != nil {
 			return nil, fmt.Errorf("conversion of rule failed")
 		}
 		tempRule := sfs.CreateShareExportPolicyRequestRule{
-			Description: sfs.NewNullableString(conversion.StringValueToPointer(rule.Description)),
+			Description: *sfs.NewNullableString(conversion.StringValueToPointer(rule.Description)),
 			IpAcl:       convertedList,
-			Order:       conversion.Int64ValueToPointer(rule.Order),
+			Order:       conversion.Int32ValueToPointer(rule.Order),
 			ReadOnly:    conversion.BoolValueToPointer(rule.ReadOnly),
 			SetUuid:     conversion.BoolValueToPointer(rule.SetUuid),
 			SuperUser:   conversion.BoolValueToPointer(rule.SuperUser),
@@ -581,12 +581,12 @@ func toCreatePayload(model *Model, rules []rulesModel) (*sfs.CreateShareExportPo
 
 	// name and rules
 	result := &sfs.CreateShareExportPolicyPayload{
-		Name: model.Name.ValueStringPointer(),
+		Name: model.Name.ValueString(),
 	}
 
 	// Rules should only be set if tempRules has value. Otherwise, the payload would contain `{ "rules": null }` what should be prevented
 	if tempRules != nil {
-		result.Rules = &tempRules
+		result.Rules = tempRules
 	}
 
 	return result, nil
@@ -604,14 +604,14 @@ func toUpdatePayload(model *Model, rules []rulesModel) (*sfs.UpdateShareExportPo
 	tempRules := make([]sfs.UpdateShareExportPolicyBodyRule, len(rules))
 	for i, rule := range rules {
 		// convert list
-		convertedList, err := conversion.StringListToPointer(rule.IpAcl)
+		convertedList, err := conversion.StringListToSlice(rule.IpAcl)
 		if err != nil {
 			return nil, fmt.Errorf("conversion of rule failed")
 		}
 		tempRule := sfs.UpdateShareExportPolicyBodyRule{
-			Description: sfs.NewNullableString(conversion.StringValueToPointer(rule.Description)),
+			Description: *sfs.NewNullableString(conversion.StringValueToPointer(rule.Description)),
 			IpAcl:       convertedList,
-			Order:       conversion.Int64ValueToPointer(rule.Order),
+			Order:       conversion.Int32ValueToPointer(rule.Order),
 			ReadOnly:    conversion.BoolValueToPointer(rule.ReadOnly),
 			SetUuid:     conversion.BoolValueToPointer(rule.SetUuid),
 			SuperUser:   conversion.BoolValueToPointer(rule.SuperUser),
@@ -623,7 +623,7 @@ func toUpdatePayload(model *Model, rules []rulesModel) (*sfs.UpdateShareExportPo
 	result := &sfs.UpdateShareExportPolicyPayload{
 		// Rules should *+never** result in a payload where they are defined as null, e.g. `{ "rules": null }`. Instead,
 		// they should either be set to an array (with values or empty) or they shouldn't be present in the payload.
-		Rules: &tempRules,
+		Rules: tempRules,
 	}
 	return result, nil
 }

stackit/internal/services/sfs/export-policy/resource_test.go

@@ -10,26 +10,26 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
-	"github.com/stackitcloud/stackit-sdk-go/services/sfs"
+	sfs "github.com/stackitcloud/stackit-sdk-go/services/sfs/v1api"
 )
 
 // global stuff
 var project_id = "project_id"
 
-func fixtureRulesResponse() *[]sfs.ShareExportPolicyRule {
-	return &[]sfs.ShareExportPolicyRule{
+func fixtureRulesResponse() []sfs.ShareExportPolicyRule {
+	return []sfs.ShareExportPolicyRule{
 		{
-			Description: sfs.NewNullableString(new("description")),
-			IpAcl:       new([]string{"172.16.0.0/24", "172.16.0.251/32"}),
-			Order:       new(int64(0)),
+			Description: *sfs.NewNullableString(new("description")),
+			IpAcl:       *new([]string{"172.16.0.0/24", "172.16.0.251/32"}),
+			Order:       new(int32(0)),
 			ReadOnly:    new(false),
 			SetUuid:     new(false),
 			SuperUser:   new(false),
 		},
 		{
-			Description: sfs.NewNullableString(new("description")),
-			IpAcl:       new([]string{"172.32.0.0/24", "172.32.0.251/32"}),
-			Order:       new(int64(1)),
+			Description: *sfs.NewNullableString(new("description")),
+			IpAcl:       *new([]string{"172.32.0.0/24", "172.32.0.251/32"}),
+			Order:       new(int32(1)),
 			ReadOnly:    new(false),
 			SetUuid:     new(false),
 			SuperUser:   new(false),
@@ -78,23 +78,23 @@ func fixtureResponseModel(rulesModel basetypes.ListValue) *Model {
 func fixtureRulesCreatePayload() []sfs.CreateShareExportPolicyRequestRule {
 	return []sfs.CreateShareExportPolicyRequestRule{
 		{
-			Description: sfs.NewNullableString(new("description")),
-			IpAcl: &[]string{
+			Description: *sfs.NewNullableString(new("description")),
+			IpAcl: []string{
 				"172.32.0.0/24",
 				"172.32.0.251/32",
 			},
-			Order:     new(int64(0)),
+			Order:     new(int32(0)),
 			ReadOnly:  new(false),
 			SetUuid:   new(false),
 			SuperUser: new(false),
 		},
 		{
-			Description: sfs.NewNullableString(new("description")),
-			IpAcl: &[]string{
+			Description: *sfs.NewNullableString(new("description")),
+			IpAcl: []string{
 				"172.16.0.0/24",
 				"172.16.0.251/32",
 			},
-			Order:     new(int64(1)),
+			Order:     new(int32(1)),
 			ReadOnly:  new(false),
 			SetUuid:   new(false),
 			SuperUser: new(false),
@@ -105,23 +105,23 @@ func fixtureRulesCreatePayload() []sfs.CreateShareExportPolicyRequestRule {
 func fixtureRulesUpdatePayload() []sfs.UpdateShareExportPolicyBodyRule {
 	return []sfs.UpdateShareExportPolicyBodyRule{
 		{
-			Description: sfs.NewNullableString(new("description")),
-			IpAcl: &[]string{
+			Description: *sfs.NewNullableString(new("description")),
+			IpAcl: []string{
 				"172.32.0.0/24",
 				"172.32.0.251/32",
 			},
-			Order:     new(int64(0)),
+			Order:     new(int32(0)),
 			ReadOnly:  new(false),
 			SetUuid:   new(false),
 			SuperUser: new(false),
 		},
 		{
-			Description: sfs.NewNullableString(new("description")),
-			IpAcl: &[]string{
+			Description: *sfs.NewNullableString(new("description")),
+			IpAcl: []string{
 				"172.16.0.0/24",
 				"172.16.0.251/32",
 			},
-			Order:     new(int64(1)),
+			Order:     new(int32(1)),
 			ReadOnly:  new(false),
 			SetUuid:   new(false),
 			SuperUser: new(false),
@@ -134,15 +134,15 @@ func fixtureRulesPayloadModel() []rulesModel {
 		{
 			Description: types.StringValue("description"),
 			IpAcl:       types.ListValueMust(types.StringType, []attr.Value{types.StringValue("172.32.0.0/24"), types.StringValue("172.32.0.251/32")}),
-			Order:       types.Int64Value(0),
+			Order:       types.Int32Value(0),
 			ReadOnly:    types.BoolValue(false),
 			SetUuid:     types.BoolValue(false),
 			SuperUser:   types.BoolValue(false),
 		},
 		{
 			Description: types.StringValue("description"),
 			IpAcl:       types.ListValueMust(types.StringType, []attr.Value{types.StringValue("172.16.0.0/24"), types.StringValue("172.16.0.251/32")}),
-			Order:       types.Int64Value(1),
+			Order:       types.Int32Value(1),
 			ReadOnly:    types.BoolValue(false),
 			SetUuid:     types.BoolValue(false),
 			SuperUser:   types.BoolValue(false),
@@ -152,14 +152,14 @@ func fixtureRulesPayloadModel() []rulesModel {
 
 func fixtureExportPolicyCreatePayload(rules *[]sfs.CreateShareExportPolicyRequestRule) *sfs.CreateShareExportPolicyPayload {
 	return &sfs.CreateShareExportPolicyPayload{
-		Name:  new("createPayloadName"),
-		Rules: rules,
+		Name:  *new("createPayloadName"),
+		Rules: *rules,
 	}
 }
 
 func fixtureExportPolicyUpdatePayload(rules []sfs.UpdateShareExportPolicyBodyRule) *sfs.UpdateShareExportPolicyPayload {
 	return &sfs.UpdateShareExportPolicyPayload{
-		Rules: &rules,
+		Rules: rules,
 	}
 }
 
@@ -197,9 +197,9 @@ func TestMapFields(t *testing.T) {
 				ProjectId: types.StringValue(project_id),
 			},
 			input: &sfs.GetShareExportPolicyResponse{
-				ShareExportPolicy: &sfs.GetShareExportPolicyResponseShareExportPolicy{
+				ShareExportPolicy: &sfs.ShareExportPolicy{
 					Id:    new("uuid1"),
-					Rules: &[]sfs.ShareExportPolicyRule{},
+					Rules: []sfs.ShareExportPolicyRule{},
 				},
 			},
 			expectedModel: fixtureResponseModel(types.ListValueMust(types.ObjectType{AttrTypes: rulesTypes}, []attr.Value{})),
@@ -212,7 +212,7 @@ func TestMapFields(t *testing.T) {
 				ProjectId: types.StringValue(project_id),
 			},
 			input: &sfs.GetShareExportPolicyResponse{
-				ShareExportPolicy: &sfs.GetShareExportPolicyResponseShareExportPolicy{
+				ShareExportPolicy: &sfs.ShareExportPolicy{
 					Id:    new("uuid1"),
 					Rules: fixtureRulesResponse(),
 				},