[fix]:[CDS-75647] fix policyset showing diff (#658)

harness · Aug 21, 2023 · f26c888 · f26c888
1 parent 8c76145
commit f26c888
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/internal/service/platform/policy/resource_policy.go b/internal/service/platform/policy/resource_policy.go
@@ -170,7 +170,6 @@ func readPolicy(d *schema.ResourceData, policy policymgmt.Policy) {
 	d.SetId(policy.Identifier)
 	_ = d.Set("identifier", policy.Identifier)
 	_ = d.Set("org_id", policy.OrgId)
-	_ = d.Set("account_id", policy.AccountId)
 	_ = d.Set("project_id", policy.ProjectId)
 	_ = d.Set("name", policy.Name)
 	_ = d.Set("rego", policy.Rego)

diff --git a/internal/service/platform/policyset/resource_policyset.go b/internal/service/platform/policyset/resource_policyset.go
@@ -20,7 +20,7 @@ func ResourcePolicyset() *schema.Resource {
 		UpdateContext: resourcePolicysetCreateOrUpdate,
 		DeleteContext: resourcePolicysetDelete,
 		CreateContext: resourcePolicysetCreateOrUpdate,
-		Importer:      helpers.OrgResourceImporter,
+		Importer:      helpers.MultiLevelResourceImporter,
 
 		Schema: map[string]*schema.Schema{
 			"type": {
@@ -38,16 +38,13 @@ func ResourcePolicyset() *schema.Resource {
 			"enabled": {
 				Description: "Enabled for the policyset.",
 				Type:        schema.TypeBool,
-				Required:    false,
-				Computed:    false,
 				Optional:    true,
 			},
 			"policies": {
 				Description: "List of policy identifiers / severity for the policyset.",
 				Type:        schema.TypeList,
-				Computed:    false,
+				Computed:    true,
 				Optional:    true,
-				Required:    false,
 				MinItems:    1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -220,7 +217,6 @@ func readPolicyset(d *schema.ResourceData, policy policymgmt.PolicySet2) {
 	d.SetId(policy.Identifier)
 	_ = d.Set("identifier", policy.Identifier)
 	_ = d.Set("org_id", policy.OrgId)
-	_ = d.Set("account_id", policy.AccountId)
 	_ = d.Set("project_id", policy.ProjectId)
 	_ = d.Set("name", policy.Name)
 	_ = d.Set("action", policy.Action)

diff --git a/internal/service/platform/policyset/resource_policyset_test.go b/internal/service/platform/policyset/resource_policyset_test.go
@@ -53,17 +53,23 @@ func TestAccResourcePolicyset(t *testing.T) {
 				ResourceName:      resourceName,
 				ImportState:       true,
 				ImportStateVerify: true,
-				ImportStateIdFunc: acctest.OrgResourceImportStateIdFunc(resourceName),
+				ImportStateIdFunc: acctest.AccountLevelResourceImportStateIdFunc(resourceName),
 			},
 		},
 	})
 }
 
 func testAccResourcePolicyset(id, name, action, policyType string, enabled bool) string {
 	return fmt.Sprintf(`
-		resource "harness_platform_policy" "test" {
-			identifier = "%[1]s"
-			name = "%[1]s"
+		resource "harness_platform_policy" "first" {
+			identifier = "policyFirst"
+			name = "policyFirst"
+			rego = "some text"
+		}
+
+		resource "harness_platform_policy" "second" {
+			identifier = "policySecond"
+			name = "policySecond"
 			rego = "some text"
 		}
 		resource "harness_platform_policyset" "test" {
@@ -73,7 +79,12 @@ func testAccResourcePolicyset(id, name, action, policyType string, enabled bool)
 			type = "%[4]s"
 			enabled = %[5]t
 			policies {
-				identifier = "%[1]s"
+				identifier = harness_platform_policy.first.identifier
+			  severity = "warning"
+			}
+
+			policies {
+				identifier = harness_platform_policy.second.identifier
 			  severity = "warning"
 			}
 		}