Merge branch 'master' into patch-1

rancher · Sep 5, 2024 · 40ff457 · 40ff457
2 parents eb0c7c4 + 4d338b6
commit 40ff457
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/rancher2/resource_rancher2_role_template.go b/rancher2/resource_rancher2_role_template.go
@@ -2,10 +2,11 @@ package rancher2
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"log"
 	"time"
 
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
@@ -110,7 +111,14 @@ func resourceRancher2RoleTemplateUpdate(d *schema.ResourceData, meta interface{}
 			"rules":           expandPolicyRules(d.Get("rules").([]interface{})),
 			"annotations":     toMapString(d.Get("annotations").(map[string]interface{})),
 			"labels":          toMapString(d.Get("labels").(map[string]interface{})),
-			"externalRules":   expandPolicyRules(d.Get("external_rules").([]interface{})),
+		}
+
+		if update["external"].(bool) {
+			if v, ok := d.Get("external_rules").([]interface{}); ok && len(v) > 0 {
+				update["externalRules"] = expandPolicyRules(v)
+			}
+		} else {
+			update["externalRules"] = nil
 		}
 
 		switch update["context"] {