Merge branch 'chore/loadbalancer-multi-api-support-sdk' of https://github.com/stackitcloud/terraform-provider-stackit into chore/loadbalancer-multi-api-support-sdk

Author: marceljk

docs/data-sources/opensearch_instance.md

@@ -59,4 +59,4 @@ Read-Only:
 - `sgw_acl` (String) Comma separated list of IP networks in CIDR notation which are allowed to access this instance.
 - `syslog` (List of String) List of syslog servers to send logs to.
 - `tls_ciphers` (List of String) List of TLS ciphers to use.
-- `tls_protocols` (String) The TLS protocol to use.
+- `tls_protocols` (List of String) List of TLS protocols to use.

golang-ci.yaml

@@ -40,6 +40,7 @@ linters:
         - typeDefFirst
         - ifElseChain
         - dupImport # https://github.com/go-critic/go-critic/issues/845
+        - rangeValCopy
       enabled-tags:
         - performance
         - style

stackit/internal/conversion/conversion.go

@@ -108,6 +108,16 @@ func Int64ValueToPointer(s basetypes.Int64Value) *int64 {
 	return &value
 }
 
+// Float32ValueToPointer converts basetypes.Float32Value to a pointer to float32.
+// It returns nil if the value is null or unknown.
+func Float32ValueToPointer(s basetypes.Float32Value) *float32 {
+	if s.IsNull() || s.IsUnknown() {
+		return nil
+	}
+	value := s.ValueFloat32()
+	return &value
+}
+
 // Float64ValueToPointer converts basetypes.Float64Value to a pointer to float64.
 // It returns nil if the value is null or unknown.
 func Float64ValueToPointer(s basetypes.Float64Value) *float64 {
@@ -131,11 +141,21 @@ func BoolValueToPointer(s basetypes.BoolValue) *bool {
 // StringListToPointer converts basetypes.ListValue to a pointer to a list of strings.
 // It returns nil if the value is null or unknown.
 func StringListToPointer(list basetypes.ListValue) (*[]string, error) {
+	result, err := StringListToSlice(list)
+	if result == nil {
+		return nil, err
+	}
+	return &result, err
+}
+
+// StringListToSlice converts basetypes.ListValue to a list of strings.
+// It returns nil if the value is null or unknown.
+func StringListToSlice(list basetypes.ListValue) ([]string, error) {
 	if list.IsNull() || list.IsUnknown() {
 		return nil, nil
 	}
 
-	listStr := []string{}
+	var listStr []string
 	for i, el := range list.Elements() {
 		elStr, ok := el.(types.String)
 		if !ok {
@@ -144,7 +164,7 @@ func StringListToPointer(list basetypes.ListValue) (*[]string, error) {
 		listStr = append(listStr, elStr.ValueString())
 	}
 
-	return &listStr, nil
+	return listStr, nil
 }
 
 // StringSetToPointer converts basetypes.SetValue to a pointer to a list of strings.

stackit/internal/conversion/conversion_test.go

@@ -449,3 +449,59 @@ func TestStringSetToSlice(t *testing.T) {
 		})
 	}
 }
+
+func TestStringListToSlice(t *testing.T) {
+	t.Parallel()
+	tests := []struct {
+		name    string
+		in      basetypes.ListValue
+		want    []string
+		wantErr bool
+	}{
+		{
+			name: "unknown",
+			in:   basetypes.NewListUnknown(types.StringType),
+			want: nil,
+		},
+		{
+			name: "null",
+			in:   basetypes.NewListNull(types.StringType),
+			want: nil,
+		},
+		{
+			name:    "invalid type",
+			in:      basetypes.NewListValueMust(types.Int64Type, []attr.Value{types.Int64Value(123)}),
+			wantErr: true,
+		},
+		{
+			name: "some values",
+			in: basetypes.NewListValueMust(
+				types.StringType,
+				[]attr.Value{
+					types.StringValue("abc"),
+					types.StringValue("xyz"),
+				},
+			),
+			want: []string{
+				"abc",
+				"xyz",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+			got, err := StringListToSlice(tt.in)
+			if tt.wantErr && err == nil {
+				t.Fatal("expected error")
+			}
+			if !tt.wantErr && err != nil {
+				t.Fatalf("expected no error, got: %v", err)
+			}
+			if d := cmp.Diff(got, tt.want); d != "" {
+				t.Fatalf("no match, diff: %s", d)
+			}
+		})
+	}
+}

stackit/internal/services/logme/credential/datasource.go

@@ -16,7 +16,7 @@ import (
 	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
 
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
-	"github.com/stackitcloud/stackit-sdk-go/services/logme"
+	logmeSdk "github.com/stackitcloud/stackit-sdk-go/services/logme/v1api"
 )
 
 // Ensure the implementation satisfies the expected interfaces.
@@ -31,7 +31,7 @@ func NewCredentialDataSource() datasource.DataSource {
 
 // credentialDataSource is the data source implementation.
 type credentialDataSource struct {
-	client *logme.APIClient
+	client *logmeSdk.APIClient
 }
 
 // Metadata returns the data source type name.
@@ -102,7 +102,7 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ
 				Computed:  true,
 				Sensitive: true,
 			},
-			"port": schema.Int64Attribute{
+			"port": schema.Int32Attribute{
 				Computed: true,
 			},
 			"uri": schema.StringAttribute{
@@ -134,7 +134,7 @@ func (r *credentialDataSource) Read(ctx context.Context, req datasource.ReadRequ
 	ctx = tflog.SetField(ctx, "instance_id", instanceId)
 	ctx = tflog.SetField(ctx, "credential_id", credentialId)
 
-	recordSetResp, err := r.client.GetCredentials(ctx, projectId, instanceId, credentialId).Execute()
+	recordSetResp, err := r.client.DefaultAPI.GetCredentials(ctx, projectId, instanceId, credentialId).Execute()
 	if err != nil {
 		utils.LogError(
 			ctx,

stackit/internal/services/logme/credential/resource.go

@@ -22,8 +22,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
-	"github.com/stackitcloud/stackit-sdk-go/services/logme"
-	"github.com/stackitcloud/stackit-sdk-go/services/logme/wait"
+
+	logmeSdk "github.com/stackitcloud/stackit-sdk-go/services/logme/v1api"
+	"github.com/stackitcloud/stackit-sdk-go/services/logme/v1api/wait"
 )
 
 // Ensure the implementation satisfies the expected interfaces.
@@ -40,7 +41,7 @@ type Model struct {
 	ProjectId    types.String `tfsdk:"project_id"`
 	Host         types.String `tfsdk:"host"`
 	Password     types.String `tfsdk:"password"`
-	Port         types.Int64  `tfsdk:"port"`
+	Port         types.Int32  `tfsdk:"port"`
 	Uri          types.String `tfsdk:"uri"`
 	Username     types.String `tfsdk:"username"`
 }
@@ -52,7 +53,7 @@ func NewCredentialResource() resource.Resource {
 
 // credentialResource is the resource implementation.
 type credentialResource struct {
-	client *logme.APIClient
+	client *logmeSdk.APIClient
 }
 
 // Metadata returns the resource type name.
@@ -137,7 +138,7 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest,
 				Computed:  true,
 				Sensitive: true,
 			},
-			"port": schema.Int64Attribute{
+			"port": schema.Int32Attribute{
 				Computed: true,
 			},
 			"uri": schema.StringAttribute{
@@ -168,19 +169,15 @@ func (r *credentialResource) Create(ctx context.Context, req resource.CreateRequ
 	ctx = tflog.SetField(ctx, "instance_id", instanceId)
 
 	// Create new recordset
-	credentialsResp, err := r.client.CreateCredentials(ctx, projectId, instanceId).Execute()
+	credentialsResp, err := r.client.DefaultAPI.CreateCredentials(ctx, projectId, instanceId).Execute()
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating credential", fmt.Sprintf("Calling API: %v", err))
 		return
 	}
 
 	ctx = core.LogResponse(ctx)
 
-	if credentialsResp.Id == nil {
-		core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating credential", "Got empty credential id")
-		return
-	}
-	credentialId := *credentialsResp.Id
+	credentialId := credentialsResp.Id
 	// Write id attributes to state before polling via the wait handler - just in case anything goes wrong during the wait handler
 	ctx = utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]any{
 		"project_id":    projectId,
@@ -191,7 +188,7 @@ func (r *credentialResource) Create(ctx context.Context, req resource.CreateRequ
 		return
 	}
 
-	waitResp, err := wait.CreateCredentialsWaitHandler(ctx, r.client, projectId, instanceId, credentialId).WaitWithContext(ctx)
+	waitResp, err := wait.CreateCredentialsWaitHandler(ctx, r.client.DefaultAPI, projectId, instanceId, credentialId).WaitWithContext(ctx)
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating credential", fmt.Sprintf("Instance creation waiting: %v", err))
 		return
@@ -229,7 +226,7 @@ func (r *credentialResource) Read(ctx context.Context, req resource.ReadRequest,
 	ctx = tflog.SetField(ctx, "instance_id", instanceId)
 	ctx = tflog.SetField(ctx, "credential_id", credentialId)
 
-	recordSetResp, err := r.client.GetCredentials(ctx, projectId, instanceId, credentialId).Execute()
+	recordSetResp, err := r.client.DefaultAPI.GetCredentials(ctx, projectId, instanceId, credentialId).Execute()
 	if err != nil {
 		oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped
 		if ok && oapiErr.StatusCode == http.StatusNotFound {
@@ -283,14 +280,14 @@ func (r *credentialResource) Delete(ctx context.Context, req resource.DeleteRequ
 	ctx = tflog.SetField(ctx, "credential_id", credentialId)
 
 	// Delete existing record set
-	err := r.client.DeleteCredentials(ctx, projectId, instanceId, credentialId).Execute()
+	err := r.client.DefaultAPI.DeleteCredentials(ctx, projectId, instanceId, credentialId).Execute()
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting credential", fmt.Sprintf("Calling API: %v", err))
 	}
 
 	ctx = core.LogResponse(ctx)
 
-	_, err = wait.DeleteCredentialsWaitHandler(ctx, r.client, projectId, instanceId, credentialId).WaitWithContext(ctx)
+	_, err = wait.DeleteCredentialsWaitHandler(ctx, r.client.DefaultAPI, projectId, instanceId, credentialId).WaitWithContext(ctx)
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting credential", fmt.Sprintf("Instance deletion waiting: %v", err))
 		return
@@ -318,7 +315,7 @@ func (r *credentialResource) ImportState(ctx context.Context, req resource.Impor
 	tflog.Info(ctx, "LogMe credential state imported")
 }
 
-func mapFields(credentialsResp *logme.CredentialsResponse, model *Model) error {
+func mapFields(credentialsResp *logmeSdk.CredentialsResponse, model *Model) error {
 	if credentialsResp == nil {
 		return fmt.Errorf("response input is nil")
 	}
@@ -333,20 +330,19 @@ func mapFields(credentialsResp *logme.CredentialsResponse, model *Model) error {
 	var credentialId string
 	if model.CredentialId.ValueString() != "" {
 		credentialId = model.CredentialId.ValueString()
-	} else if credentialsResp.Id != nil {
-		credentialId = *credentialsResp.Id
+	} else if credentialsResp.Id != "" {
+		credentialId = credentialsResp.Id
 	} else {
 		return fmt.Errorf("credentials id not present")
 	}
 
 	model.Id = utils.BuildInternalTerraformId(model.ProjectId.ValueString(), model.InstanceId.ValueString(), credentialId)
 	model.CredentialId = types.StringValue(credentialId)
-	if credentials != nil {
-		model.Host = types.StringPointerValue(credentials.Host)
-		model.Password = types.StringPointerValue(credentials.Password)
-		model.Port = types.Int64PointerValue(credentials.Port)
-		model.Uri = types.StringPointerValue(credentials.Uri)
-		model.Username = types.StringPointerValue(credentials.Username)
-	}
+	model.Host = types.StringValue(credentials.Host)
+	model.Password = types.StringValue(credentials.Password)
+	model.Port = types.Int32PointerValue(credentials.Port)
+	model.Uri = types.StringPointerValue(credentials.Uri)
+	model.Username = types.StringValue(credentials.Username)
+
 	return nil
 }