Merge branch 'main' into mp/cdn/feat/implement-redirects

Author: matheuspolitano

docs/data-sources/loadbalancer.md

@@ -49,7 +49,7 @@ data "stackit_loadbalancer" "example" {
 
 Optional:
 
-- `server_name_indicators` (Attributes List) A list of domain names to match in order to pass TLS traffic to the target pool in the current listener (see [below for nested schema](#nestedatt--listeners--server_name_indicators))
+- `server_name_indicators` (Attributes List, Deprecated) A list of domain names to match in order to pass TLS traffic to the target pool in the current listener (see [below for nested schema](#nestedatt--listeners--server_name_indicators))
 
 Read-Only:
 

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.

docs/resources/loadbalancer.md

@@ -260,7 +260,7 @@ Required:
 Optional:
 
 - `display_name` (String)
-- `server_name_indicators` (Attributes List) A list of domain names to match in order to pass TLS traffic to the target pool in the current listener (see [below for nested schema](#nestedatt--listeners--server_name_indicators))
+- `server_name_indicators` (Attributes List, Deprecated) A list of domain names to match in order to pass TLS traffic to the target pool in the current listener (see [below for nested schema](#nestedatt--listeners--server_name_indicators))
 - `tcp` (Attributes) Options that are specific to the TCP protocol. (see [below for nested schema](#nestedatt--listeners--tcp))
 - `udp` (Attributes) Options that are specific to the UDP protocol. (see [below for nested schema](#nestedatt--listeners--udp))
 

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/stackitcloud/stackit-sdk-go/services/git v0.11.0
 	github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5
 	github.com/stackitcloud/stackit-sdk-go/services/kms v1.6.0
-	github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0
+	github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.11.1
 	github.com/stackitcloud/stackit-sdk-go/services/logme v0.27.1
 	github.com/stackitcloud/stackit-sdk-go/services/logs v0.7.1
 	github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.27.1

go.sum

@@ -153,8 +153,6 @@ github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
 github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
-github.com/stackitcloud/stackit-sdk-go/core v0.23.0 h1:zPrOhf3Xe47rKRs1fg/AqKYUiJJRYjdcv+3qsS50mEs=
-github.com/stackitcloud/stackit-sdk-go/core v0.23.0/go.mod h1:osMglDby4csGZ5sIfhNyYq1bS1TxIdPY88+skE/kkmI=
 github.com/stackitcloud/stackit-sdk-go/core v0.24.0 h1:kHCcezCJ5OGSP7RRuGOxD5rF2wejpkEiRr/OdvNcuPQ=
 github.com/stackitcloud/stackit-sdk-go/core v0.24.0/go.mod h1:osMglDby4csGZ5sIfhNyYq1bS1TxIdPY88+skE/kkmI=
 github.com/stackitcloud/stackit-sdk-go/services/alb v0.12.1 h1:RKaxAymxlyxxE0Gta3yRuQWf07LnlcX+mfGnVB96NHA=
@@ -175,6 +173,8 @@ github.com/stackitcloud/stackit-sdk-go/services/kms v1.6.0 h1:WWU2LpqmazsPDgoRAV
 github.com/stackitcloud/stackit-sdk-go/services/kms v1.6.0/go.mod h1:FuyCm3s/Ihw+tkpVLGMXwgTtlhrijd31cUCUBWpn1p8=
 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0 h1:DxrN85V738CRLynu6MULQHO+OXyYnkhVPgoZKULfFIs=
 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0/go.mod h1:ClPE4TOM1FeaJiwTXvApq4gWaSgTLq6nU3PPHAIQDN4=
+github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.11.1 h1:8hLLCP4n9w3K3dqJaKF1PnMpX4qjR8UQL3gDr80hgDI=
+github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.11.1/go.mod h1:vqTjmecQ4+oVWzeo9tCOUZ3TrpIIzM+C0apC7cdAD0Y=
 github.com/stackitcloud/stackit-sdk-go/services/logme v0.27.1 h1:6AaWxQNtOEvIvbtyySi5KIrNzxGbKgOayUnA3fpuqns=
 github.com/stackitcloud/stackit-sdk-go/services/logme v0.27.1/go.mod h1:qwpGNPgF7LmfodGPXcgv9uldeSSuFMNJkyD6QPqfiCI=
 github.com/stackitcloud/stackit-sdk-go/services/logs v0.7.1 h1:cuQA5dO8WSM0LBHR2FBpf+RgKH7/DE7+5NUPLxDpgPg=

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/core/core.go

@@ -7,11 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/terraform-plugin-framework/types"
-	"github.com/stackitcloud/stackit-sdk-go/core/runtime"
-
 	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
+	"github.com/stackitcloud/stackit-sdk-go/core/runtime"
 )
 
 type ResourceType string

stackit/internal/services/iaas/server/resource.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
 	iaasUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iaas/utils"
 
 	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
@@ -314,6 +315,9 @@ func (r *serverResource) Schema(_ context.Context, _ resource.SchemaRequest, res
 						PlanModifiers: []planmodifier.String{
 							stringplanmodifier.RequiresReplace(),
 						},
+						Validators: []validator.String{
+							stringvalidator.OneOf(supportedSourceTypes...),
+						},
 					},
 					"source_id": schema.StringAttribute{
 						Description: "The ID of the source, either image ID or volume ID",
@@ -326,6 +330,7 @@ func (r *serverResource) Schema(_ context.Context, _ resource.SchemaRequest, res
 						Description: "Delete the volume during the termination of the server. Only allowed when `source_type` is `image`.",
 						Optional:    true,
 						Computed:    true,
+						Default:     booldefault.StaticBool(false),
 						PlanModifiers: []planmodifier.Bool{
 							boolplanmodifier.RequiresReplace(),
 						},