ignore min_cpu_platform change from null to Intel/Auto (#162)

ucloud · Feb 26, 2024 · aa70aaf · aa70aaf
1 parent a2bbcda
commit aa70aaf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/ucloud/resource_ucloud_instance.go b/ucloud/resource_ucloud_instance.go
@@ -292,6 +292,12 @@ func resourceUCloudInstance() *schema.Resource {
 				Optional: true,
 				ForceNew: true,
 				Default:  "Intel/Auto",
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					if old == "" && new == "Intel/Auto" {
+						return true
+					}
+					return false
+				},
 			},
 
 			"cpu_platform": {

diff --git a/ucloud/resource_ucloud_uk8s_cluster.go b/ucloud/resource_ucloud_uk8s_cluster.go
@@ -202,6 +202,12 @@ func resourceUCloudUK8SCluster() *schema.Resource {
 							Optional: true,
 							ForceNew: true,
 							Default:  "Intel/Auto",
+							DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+								if old == "" && new == "Intel/Auto" {
+									return true
+								}
+								return false
+							},
 							ValidateFunc: validation.StringInSlice([]string{
 								"Intel/Auto",
 								"Intel/IvyBridge",

diff --git a/ucloud/resource_ucloud_uk8s_node.go b/ucloud/resource_ucloud_uk8s_node.go
@@ -3,10 +3,11 @@ package ucloud
 import (
 	"encoding/base64"
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/customdiff"
 	"strings"
 	"time"
 
+	"github.com/hashicorp/terraform-plugin-sdk/helper/customdiff"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
@@ -170,6 +171,13 @@ func resourceUCloudUK8SNode() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
+				Default:  "Intel/Auto",
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					if old == "" && new == "Intel/Auto" {
+						return true
+					}
+					return false
+				},
 				ValidateFunc: validation.StringInSlice([]string{
 					"Intel/Auto",
 					"Intel/IvyBridge",