deprecating account id for incapsula_policy use incapsula_account_pol…

…icy_association instead (#400) * #CWMS-3818 setting the account id according to resource file in case its provided * #CWMS-3818 setting the account id according to resource file in case its provided * #CWMS-3818 setting the account id according to resource file in case its provided --------- Co-authored-by: nir-parizer-Imperva <[email protected]>
imperva · Mar 19, 2024 · 85b7d5c · 85b7d5c
1 parent 226c513
commit 85b7d5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/incapsula/resource_policy.go b/incapsula/resource_policy.go
@@ -67,6 +67,7 @@ func resourcePolicy() *schema.Resource {
 			"account_id": {
 				Description: "The Account ID of the policy.",
 				Type:        schema.TypeInt,
+				Deprecated:  "Use the incapsula_account_policy_association resource instead",
 				Computed:    true,
 				Optional:    true,
 				ForceNew:    true,
@@ -138,7 +139,11 @@ func resourcePolicyRead(d *schema.ResourceData, m interface{}) error {
 	d.Set("enabled", policyGetResponse.Value.Enabled)
 	d.Set("policy_type", policyGetResponse.Value.PolicyType)
 	d.Set("description", policyGetResponse.Value.Description)
-	d.Set("account_id", policyGetResponse.Value.AccountID)
+	if d.Get("account_id") != nil {
+		d.Set("account_id", d.Get("account_id"))
+	} else {
+		d.Set("account_id", policyGetResponse.Value.AccountID)
+	}
 
 	// JSON encode policy settings
 	policySettingsJSONBytes, err := json.MarshalIndent(policyGetResponse.Value.PolicySettings, "", "    ")
@@ -158,7 +163,9 @@ func resourcePolicyUpdate(d *schema.ResourceData, m interface{}) error {
 	if err != nil {
 		return err
 	}
-
+	if d.Get("account_id") != nil {
+		log.Printf("[WARN] Incapsula policy account id attribute is deprecated - please remove it\n")
+	}
 	policySettingsString := d.Get("policy_settings").(string)
 	var policySettings []PolicySetting
 	err = json.Unmarshal([]byte(policySettingsString), &policySettings)

diff --git a/website/docs/r/policy.html.markdown b/website/docs/r/policy.html.markdown
@@ -37,7 +37,6 @@ resource "incapsula_policy" "example-whitelist-ip-policy" {
 }
 
 resource "incapsula_policy" "example-acl-country-block-policy" {
-#    account_id      = var.account_id //should not be defined
     description     = "EXAMPLE ACL Block Countries based on attack."
     enabled         = true
     policy_type = "ACL"