delete node template custom_label

Makefile

@@ -26,13 +26,22 @@ generate-docs:
 	go install github.com/hashicorp/terraform-plugin-docs/cmd/[email protected]
 	tfplugindocs generate --rendered-provider-name "CAST AI" --ignore-deprecated
 
+.PHONY: generate-all
+generate-all: generate-sdk generate-docs
+
 .PHONY: build
 build: init-examples
 build: generate-sdk
 build:
 	@echo "==> Building terraform-provider-castai"
 	go build
 
+.PHONY: lint
+lint:
+	@echo "==> Running lint"
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+	golangci-lint run
+
 .PHONY: test
 test:
 	@echo "==> Running tests"

README.md

@@ -295,6 +295,46 @@ Example of node template import:
 terraform import castai_node_template.default_by_castai 105e6fa3-20b1-424e-v589-9a64d1eeabea/default-by-castai
 ```
 
+Migrating from 5.x.x to 6.x.x
+---------------------------
+
+Version 6.x.x changed:
+* Removed `custom_label` attribute in `castai_node_template` resource. Use `custom_labels` instead.
+
+Old configuration:
+```terraform
+module "castai-aks-cluster" {
+  node_templates = {
+    spot_tmpl = {
+      custom_label = {
+        key = "custom-label-key-1"
+        value = "custom-label-value-1"
+      }
+    }
+  }
+}
+```
+
+New configuration:
+```terraform
+module "castai-aks-cluster" {
+  node_templates = {
+    spot_tmpl = {
+      custom_labels = {
+        custom-label-key-1 = "custom-label-value-1"
+      }
+    }
+  }
+}
+```
+
+For more information for `castai-aks-cluster` module follow:
+https://github.com/castai/terraform-castai-aks/blob/main/README.md#migrating-from-2xx-to-3xx
+If you have used `castai-eks-cluster` or other modules follow:
+https://github.com/castai/terraform-castai-eks-cluster/blob/main/README.md#migrating-from-6xx-to-7xx
+If you have used `castai-gke-cluster` or other modules follow:
+https://github.com/castai/terraform-castai-gke-cluster/blob/main/README.md#migrating-from-3xx-to-4xx
+
 
 Developing the provider
 ---------------------------

castai/resource_node_configuration_eks_test.go

@@ -17,7 +17,7 @@ func TestAccResourceNodeConfiguration_eks(t *testing.T) {
 	resourceName := "castai_node_configuration.test"
 	clusterName := "core-tf-acc"
 
-	resource.ParallelTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: providerFactories,
 		CheckDestroy:      testAccCheckNodeConfigurationDestroy,

castai/resource_node_template.go

@@ -21,7 +21,6 @@ const (
 	FieldNodeTemplateConfigurationId                        = "configuration_id"
 	FieldNodeTemplateConstraints                            = "constraints"
 	FieldNodeTemplateCustomInstancesEnabled                 = "custom_instances_enabled"
-	FieldNodeTemplateCustomLabel                            = "custom_label"
 	FieldNodeTemplateCustomLabels                           = "custom_labels"
 	FieldNodeTemplateCustomTaints                           = "custom_taints"
 	FieldNodeTemplateEnableSpotDiversity                    = "enable_spot_diversity"
@@ -317,37 +316,13 @@ func resourceNodeTemplate() *schema.Resource {
 					},
 				},
 			},
-			FieldNodeTemplateCustomLabel: {
-				Type:     schema.TypeList,
-				MaxItems: 1,
-				Optional: true,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						FieldKey: {
-							Required:         true,
-							Type:             schema.TypeString,
-							ValidateDiagFunc: validation.ToDiagFunc(validation.StringIsNotWhiteSpace),
-							Description:      "Label key to be added to nodes created from this template.",
-						},
-						FieldValue: {
-							Required:         true,
-							Type:             schema.TypeString,
-							ValidateDiagFunc: validation.ToDiagFunc(validation.StringIsNotWhiteSpace),
-							Description:      "Label value to be added to nodes created from this template.",
-						},
-					},
-				},
-				Description: "Custom label key/value to be added to nodes created from this template.",
-				Deprecated:  "Remove the use of `custom_label` field. The custom labels should be set through the `custom_labels` field.",
-			},
 			FieldNodeTemplateCustomLabels: {
 				Type:     schema.TypeMap,
 				Optional: true,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
-				Description: "Custom labels to be added to nodes created from this template. " +
-					"If the field `custom_label` is present, the value of `custom_labels` will be ignored.",
+				Description: "Custom labels to be added to nodes created from this template.",
 			},
 			FieldNodeTemplateCustomTaints: {
 				Type:     schema.TypeList,
@@ -448,9 +423,6 @@ func resourceNodeTemplateRead(ctx context.Context, d *schema.ResourceData, meta
 			return diag.FromErr(fmt.Errorf("setting constraints: %w", err))
 		}
 	}
-	if err := d.Set(FieldNodeTemplateCustomLabel, flattenCustomLabel(nodeTemplate.CustomLabel)); err != nil {
-		return diag.FromErr(fmt.Errorf("setting custom label: %w", err))
-	}
 	if err := d.Set(FieldNodeTemplateCustomLabels, nodeTemplate.CustomLabels.AdditionalProperties); err != nil {
 		return diag.FromErr(fmt.Errorf("setting custom labels: %w", err))
 	}
@@ -602,7 +574,6 @@ func updateNodeTemplate(ctx context.Context, d *schema.ResourceData, meta any, s
 		FieldNodeTemplateShouldTaint,
 		FieldNodeTemplateConfigurationId,
 		FieldNodeTemplateRebalancingConfigMinNodes,
-		FieldNodeTemplateCustomLabel,
 		FieldNodeTemplateCustomLabels,
 		FieldNodeTemplateCustomTaints,
 		FieldNodeTemplateCustomInstancesEnabled,
@@ -630,10 +601,6 @@ func updateNodeTemplate(ctx context.Context, d *schema.ResourceData, meta any, s
 		req.ConfigurationId = toPtr(v.(string))
 	}
 
-	if v, ok := d.Get(FieldNodeTemplateCustomLabel).([]any); ok && len(v) > 0 {
-		req.CustomLabel = toCustomLabel(v[0].(map[string]any))
-	}
-
 	if req.CustomLabel == nil {
 		if v, ok := d.Get(FieldNodeTemplateCustomLabels).(map[string]any); ok && len(v) > 0 {
 			customLabels := map[string]string{}
@@ -713,20 +680,14 @@ func resourceNodeTemplateCreate(ctx context.Context, d *schema.ResourceData, met
 		}
 	}
 
-	if v, ok := d.Get(FieldNodeTemplateCustomLabel).([]any); ok && len(v) > 0 {
-		req.CustomLabel = toCustomLabel(v[0].(map[string]any))
-	}
-
-	if req.CustomLabel == nil {
-		if v, ok := d.Get(FieldNodeTemplateCustomLabels).(map[string]any); ok && len(v) > 0 {
-			customLabels := map[string]string{}
-
-			for k, v := range v {
-				customLabels[k] = v.(string)
-			}
+	if v, ok := d.Get(FieldNodeTemplateCustomLabels).(map[string]any); ok && len(v) > 0 {
+		customLabels := map[string]string{}
 
-			req.CustomLabels = &sdk.NodetemplatesV1NewNodeTemplate_CustomLabels{AdditionalProperties: customLabels}
+		for k, v := range v {
+			customLabels[k] = v.(string)
 		}
+
+		req.CustomLabels = &sdk.NodetemplatesV1NewNodeTemplate_CustomLabels{AdditionalProperties: customLabels}
 	}
 
 	if v, ok := d.Get(FieldNodeTemplateCustomTaints).([]any); ok && len(v) > 0 {
@@ -858,22 +819,6 @@ func nodeTemplateStateImporter(ctx context.Context, d *schema.ResourceData, meta
 	return nil, fmt.Errorf("failed to find node template with the following name: %v", id)
 }
 
-func toCustomLabel(obj map[string]any) *sdk.NodetemplatesV1Label {
-	if obj == nil {
-		return nil
-	}
-
-	out := &sdk.NodetemplatesV1Label{}
-	if v, ok := obj[FieldKey]; ok && v != "" {
-		out.Key = toPtr(v.(string))
-	}
-	if v, ok := obj[FieldValue]; ok && v != "" {
-		out.Value = toPtr(v.(string))
-	}
-
-	return out
-}
-
 func toCustomTaintsWithOptionalEffect(objs []map[string]any) *[]sdk.NodetemplatesV1TaintWithOptionalEffect {
 	if len(objs) == 0 {
 		return nil
@@ -900,21 +845,6 @@ func toCustomTaintsWithOptionalEffect(objs []map[string]any) *[]sdk.Nodetemplate
 	return out
 }
 
-func flattenCustomLabel(label *sdk.NodetemplatesV1Label) []map[string]string {
-	if label == nil {
-		return nil
-	}
-
-	m := map[string]string{}
-	if v := label.Key; v != nil {
-		m[FieldKey] = toString(v)
-	}
-	if v := label.Value; v != nil {
-		m[FieldValue] = toString(v)
-	}
-	return []map[string]string{m}
-}
-
 func flattenCustomTaints(taints *[]sdk.NodetemplatesV1Taint) []map[string]string {
 	if taints == nil {
 		return nil

castai/resource_node_template_test.go

@@ -164,7 +164,6 @@ constraints.0.spot_interruption_predictions_type = aws-rebalance-recommendations
 constraints.0.storage_optimized = false
 constraints.0.use_spot_fallbacks = false
 custom_instances_enabled = true
-custom_label.# = 0
 custom_labels.% = 2
 custom_labels.key-1 = value-1
 custom_labels.key-2 = value-2
@@ -372,7 +371,6 @@ func TestAccResourceNodeTemplate_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "is_enabled", "true"),
 					resource.TestCheckResourceAttr(resourceName, "should_taint", "true"),
 					resource.TestCheckResourceAttr(resourceName, "custom_instances_enabled", "false"),
-					resource.TestCheckResourceAttr(resourceName, "custom_label.#", "0"),
 					resource.TestCheckResourceAttr(resourceName, "custom_labels.%", "2"),
 					resource.TestCheckResourceAttr(resourceName, "custom_labels."+rName+"-label-key-1", rName+"-label-value-1"),
 					resource.TestCheckResourceAttr(resourceName, "custom_labels."+rName+"-label-key-2", rName+"-label-value-2"),
@@ -422,7 +420,6 @@ func TestAccResourceNodeTemplate_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "is_enabled", "true"),
 					resource.TestCheckResourceAttr(resourceName, "should_taint", "true"),
 					resource.TestCheckResourceAttr(resourceName, "custom_instances_enabled", "false"),
-					resource.TestCheckResourceAttr(resourceName, "custom_label.#", "0"),
 					resource.TestCheckResourceAttr(resourceName, "custom_labels.%", "2"),
 					resource.TestCheckResourceAttr(resourceName, "custom_labels."+rName+"-label-key-1", rName+"-label-value-1"),
 					resource.TestCheckResourceAttr(resourceName, "custom_labels."+rName+"-label-key-2", rName+"-label-value-2"),

castai/resource_rebalancing_job_eks_test.go

@@ -11,7 +11,7 @@ import (
 func TestAccResourceRebalancingJob_eks(t *testing.T) {
 	rName := fmt.Sprintf("%v-rebalancing-job-%v", ResourcePrefix, acctest.RandString(8))
 	clusterName := "core-tf-acc"
-	resource.ParallelTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		PreCheck: func() { testAccPreCheck(t) },
 
 		ProviderFactories: providerFactories,