fix internal validate errors caused by 4.0 changes (#25355)

hashicorp · Mar 21, 2024 · 7147248 · 7147248
1 parent 7113acd
commit 7147248
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/internal/services/containers/kubernetes_cluster_node_pool_resource.go b/internal/services/containers/kubernetes_cluster_node_pool_resource.go
@@ -208,10 +208,15 @@ func resourceKubernetesClusterNodePoolSchema() map[string]*pluginsdk.Schema {
 		},
 
 		"node_public_ip_prefix_id": {
-			Type:         pluginsdk.TypeString,
-			Optional:     true,
-			ForceNew:     true,
-			RequiredWith: []string{"enable_node_public_ip"},
+			Type:     pluginsdk.TypeString,
+			Optional: true,
+			ForceNew: true,
+			RequiredWith: func() []string {
+				if !features.FourPointOhBeta() {
+					return []string{"enable_node_public_ip"}
+				}
+				return []string{"node_public_ip_enabled"}
+			}(),
 		},
 
 		// Node Taints control the behaviour of the Node Pool, as such they should not be computed and

diff --git a/internal/services/containers/kubernetes_nodepool.go b/internal/services/containers/kubernetes_nodepool.go
@@ -166,7 +166,12 @@ func SchemaDefaultNodePool() *pluginsdk.Schema {
 						Optional:     true,
 						ForceNew:     true,
 						ValidateFunc: networkValidate.PublicIpPrefixID,
-						RequiredWith: []string{"default_node_pool.0.enable_node_public_ip"},
+						RequiredWith: func() []string {
+							if !features.FourPointOhBeta() {
+								return []string{"default_node_pool.0.enable_node_public_ip"}
+							}
+							return []string{"default_node_pool.0.node_public_ip_enabled"}
+						}(),
 					},
 
 					"node_taints": {

diff --git a/internal/services/network/subnet_resource.go b/internal/services/network/subnet_resource.go
@@ -212,7 +212,7 @@ func resourceSubnet() *pluginsdk.Resource {
 					return !features.FourPointOh()
 				}(),
 				ConflictsWith: func() []string {
-					if !features.FourPointOh() {
+					if !features.FourPointOhBeta() {
 						return []string{"enforce_private_link_endpoint_network_policies"}
 					}
 					return []string{}