Merge pull request #195 from controlplane-com/majid/change-type-where-order-matters

Majid/change type where order matters

Author: MajidAbuRmila

CHANGELOG.MD

@@ -1,3 +1,10 @@
+## 1.2.13
+
+- Fix order of values in command array in workload resource.
+- Deprecate 'default' endpoint_naming_format in gvc resource; add 'legacy' as replacement.
+- Fix order of values in deploy_role_chain in mk8s resource.
+- Fix order of values in container ports in workload resource.
+
 ## 1.2.12
 
 - Fix noisy diffs for `dictionary_as_envs` across runs in secret resource.

Makefile

@@ -3,7 +3,7 @@ HOSTNAME=controlplane.com
 NAMESPACE=com
 NAME=cpln
 BINARY=terraform-provider-${NAME}
-VERSION=1.2.12
+VERSION=1.2.13
 OS_ARCH=linux_amd64
 
 default: install

docs/index.md

@@ -56,7 +56,7 @@ terraform {
   required_providers {
     cpln = {
       source = "controlplane-com/cpln"
-      version = "1.2.12"
+      version = "1.2.13"
     }
   }
 }

internal/provider/models/mk8s/mk8s.go

@@ -158,7 +158,7 @@ type AwsProviderModel struct {
 	PreInstallScript     types.String `tfsdk:"pre_install_script"`
 	Image                types.List   `tfsdk:"image"`
 	DeployRoleArn        types.String `tfsdk:"deploy_role_arn"`
-	DeployRoleChain      types.Set    `tfsdk:"deploy_role_chain"`
+	DeployRoleChain      types.List   `tfsdk:"deploy_role_chain"`
 	VpcId                types.String `tfsdk:"vpc_id"`
 	KeyPair              types.String `tfsdk:"key_pair"`
 	DiskEncryptionKeyArn types.String `tfsdk:"disk_encryption_key_arn"`
@@ -178,7 +178,7 @@ func (a AwsProviderModel) AttributeTypes() attr.Type {
 			"pre_install_script":      types.StringType,
 			"image":                   types.ListType{ElemType: AwsProviderAmiModel{}.AttributeTypes()},
 			"deploy_role_arn":         types.StringType,
-			"deploy_role_chain":       types.SetType{ElemType: AwsProviderAssumeRoleLinkModel{}.AttributeTypes()},
+			"deploy_role_chain":       types.ListType{ElemType: AwsProviderAssumeRoleLinkModel{}.AttributeTypes()},
 			"vpc_id":                  types.StringType,
 			"key_pair":                types.StringType,
 			"disk_encryption_key_arn": types.StringType,

internal/provider/models/workload/workload.go

@@ -15,7 +15,7 @@ type ContainerModel struct {
 	WorkingDirectory types.String `tfsdk:"working_directory"`
 	Metrics          types.List   `tfsdk:"metrics"`
 	Port             types.Int32  `tfsdk:"port"`
-	Ports            types.Set    `tfsdk:"ports"`
+	Ports            types.List   `tfsdk:"ports"`
 	Memory           types.String `tfsdk:"memory"`
 	ReadinessProbe   types.List   `tfsdk:"readiness_probe"`
 	LivenessProbe    types.List   `tfsdk:"liveness_probe"`
@@ -40,7 +40,7 @@ func (c ContainerModel) AttributeTypes() attr.Type {
 			"working_directory": types.StringType,
 			"metrics":           types.ListType{ElemType: ContainerMetricsModel{}.AttributeTypes()},
 			"port":              types.Int32Type,
-			"ports":             types.SetType{ElemType: ContainerPortModel{}.AttributeTypes()},
+			"ports":             types.ListType{ElemType: ContainerPortModel{}.AttributeTypes()},
 			"memory":            types.StringType,
 			"readiness_probe":   types.ListType{ElemType: ContainerHealthCheckModel{}.AttributeTypes()},
 			"liveness_probe":    types.ListType{ElemType: ContainerHealthCheckModel{}.AttributeTypes()},

internal/provider/resource_mk8s.go

@@ -354,7 +354,7 @@ func (mr *Mk8sResource) Schema(ctx context.Context, req resource.SchemaRequest,
 					Blocks: map[string]schema.Block{
 						"networking": mr.NetworkingSchema(),
 						"image":      mr.AwsAmiSchema(),
-						"deploy_role_chain": schema.SetNestedBlock{
+						"deploy_role_chain": schema.ListNestedBlock{
 							Description: "",
 							NestedObject: schema.NestedBlockObject{
 								Attributes: map[string]schema.Attribute{
@@ -1958,11 +1958,11 @@ func (mro *Mk8sResourceOperator) buildAwsAmi(state types.List) *client.Mk8sAwsAm
 }
 
 // buildAwsAssumeRoleLink constructs a []client.Mk8sAwsAssumeRoleLink from the given Terraform state.
-func (mro *Mk8sResourceOperator) buildAwsAssumeRoleLink(state types.Set) *[]client.Mk8sAwsAssumeRoleLink {
-	// Convert Terraform set into model blocks using generic helper
-	blocks, ok := BuildSet[models.AwsProviderAssumeRoleLinkModel](mro.Ctx, mro.Diags, state)
+func (mro *Mk8sResourceOperator) buildAwsAssumeRoleLink(state types.List) *[]client.Mk8sAwsAssumeRoleLink {
+	// Convert Terraform list into model blocks using generic helper
+	blocks, ok := BuildList[models.AwsProviderAssumeRoleLinkModel](mro.Ctx, mro.Diags, state)
 
-	// Return nil if conversion failed or set was empty
+	// Return nil if conversion failed or List was empty
 	if !ok {
 		return nil
 	}
@@ -3212,15 +3212,15 @@ func (mro *Mk8sResourceOperator) flattenAwsAmi(input *client.Mk8sAwsAmi) types.L
 	return FlattenList(mro.Ctx, mro.Diags, []models.AwsProviderAmiModel{block})
 }
 
-// flattenAwsAssumeRoleLink transforms *[]client.Mk8sAwsAssumeRoleLink into a types.Set.
-func (mro *Mk8sResourceOperator) flattenAwsAssumeRoleLink(input *[]client.Mk8sAwsAssumeRoleLink) types.Set {
+// flattenAwsAssumeRoleLink transforms *[]client.Mk8sAwsAssumeRoleLink into a types.List.
+func (mro *Mk8sResourceOperator) flattenAwsAssumeRoleLink(input *[]client.Mk8sAwsAssumeRoleLink) types.List {
 	// Get attribute types
 	elementType := models.AwsProviderAssumeRoleLinkModel{}.AttributeTypes()
 
 	// Check if the input is nil
 	if input == nil {
-		// Return a null set
-		return types.SetNull(elementType)
+		// Return a null List
+		return types.ListNull(elementType)
 	}
 
 	// Define the blocks slice
@@ -3239,8 +3239,8 @@ func (mro *Mk8sResourceOperator) flattenAwsAssumeRoleLink(input *[]client.Mk8sAw
 		blocks = append(blocks, block)
 	}
 
-	// Return the successfully created types.Set
-	return FlattenSet(mro.Ctx, mro.Diags, blocks)
+	// Return the successfully created types.List
+	return FlattenList(mro.Ctx, mro.Diags, blocks)
 }
 
 // flattenAwsProviderNodePools transforms *[]client.Mk8sAwsPool into a types.Set.

internal/provider/resource_workload.go

@@ -429,7 +429,7 @@ func (wr *WorkloadResource) Schema(ctx context.Context, req resource.SchemaReque
 								listvalidator.SizeAtMost(1),
 							},
 						},
-						"ports": schema.SetNestedBlock{
+						"ports": schema.ListNestedBlock{
 							Description: "Communication endpoints used by the workload to send and receive network traffic.",
 							NestedObject: schema.NestedBlockObject{
 								Attributes: map[string]schema.Attribute{
@@ -1689,7 +1689,7 @@ func (wr *WorkloadResource) ModifyContainers(ctx context.Context, diags *diag.Di
 	}
 
 	// Build ports from container
-	ports, ok := BuildSet[models.ContainerPortModel](ctx, diags, container.Ports)
+	ports, ok := BuildList[models.ContainerPortModel](ctx, diags, container.Ports)
 
 	// If the port number is still nil, extract the port number from the very first item of container ports
 	if ok && len(ports) != 0 {
@@ -1713,7 +1713,7 @@ func (wr *WorkloadResource) ModifyContainers(ctx context.Context, diags *diag.Di
 	}
 
 	// Set ports back to container
-	container.Ports = FlattenSet(ctx, diags, ports)
+	container.Ports = FlattenList(ctx, diags, ports)
 
 	// Set probes back to container
 	container.LivenessProbe = FlattenList(ctx, diags, livenessProbe)
@@ -2122,7 +2122,7 @@ func (wro *WorkloadResourceOperator) buildContainers(state types.List) *[]client
 	// Iterate over each block and construct an output item
 	for _, block := range blocks {
 		// Build block ports
-		ports, ok := BuildSet[models.ContainerPortModel](wro.Ctx, wro.Diags, block.Ports)
+		ports, ok := BuildList[models.ContainerPortModel](wro.Ctx, wro.Diags, block.Ports)
 
 		// Skip if ports are nil, this shouldn't happen but let's handle it anyway
 		if !block.Ports.IsNull() && !block.Ports.IsUnknown() && !ok {
@@ -3302,15 +3302,15 @@ func (wro *WorkloadResourceOperator) flattenContainerMetrics(input *client.Workl
 	return FlattenList(wro.Ctx, wro.Diags, []models.ContainerMetricsModel{block})
 }
 
-// flattenContainerPort transforms *[]client.WorkloadContainerPort into a types.Set.
-func (wro *WorkloadResourceOperator) flattenContainerPort(input *[]client.WorkloadContainerPort) types.Set {
+// flattenContainerPort transforms *[]client.WorkloadContainerPort into a types.List.
+func (wro *WorkloadResourceOperator) flattenContainerPort(input *[]client.WorkloadContainerPort) types.List {
 	// Get attribute types
 	elementType := models.ContainerPortModel{}.AttributeTypes()
 
 	// Check if the input is nil
 	if input == nil {
-		// Return a null set
-		return types.SetNull(elementType)
+		// Return a null list
+		return types.ListNull(elementType)
 	}
 
 	// Define the blocks slice
@@ -3328,8 +3328,8 @@ func (wro *WorkloadResourceOperator) flattenContainerPort(input *[]client.Worklo
 		blocks = append(blocks, block)
 	}
 
-	// Return the successfully created types.Set
-	return FlattenSet(wro.Ctx, wro.Diags, blocks)
+	// Return the successfully created types.List
+	return FlattenList(wro.Ctx, wro.Diags, blocks)
 }
 
 // flattenHealthCheck transforms *client.WorkloadHealthCheck into a types.List.