Add ForceNew; resolves #76

joeymoore · web-flow · commit 9ba04629515f · 2021-05-20T11:22:19.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.7.5 (Released)
+* Fixed `naked_domain_san` and `wildcard_san` on the `site` resource.
+* Adding edit `server_address` ability to `data_center` resource.
+* Updating several resources parameters to include `ForceNew`.
+
 ## 2.7.4 (Released)
 
 * Add retry logic to `site` and `data_center` resources
diff --git a/GNUmakefile b/GNUmakefile
@@ -5,7 +5,7 @@ HOSTNAME=registry.terraform.io
 NAMESPACE=terraform-providers
 PKG_NAME=incapsula
 BINARY=terraform-provider-${PKG_NAME}
-VERSION=2.7.4
+# VERSION=2.7.4
 # OS_ARCH=darwin_amd64
 
 default: install
diff --git a/go.mod b/go.mod
@@ -2,4 +2,4 @@ module github.com/terraform-providers/terraform-provider-incapsula
 
 go 1.13
 
-require github.com/hashicorp/terraform-plugin-sdk/v2 v2.2.0
+require github.com/hashicorp/terraform-plugin-sdk/v2 v2.6.1
diff --git a/go.sum b/go.sum
diff --git a/incapsula/client_site.go b/incapsula/client_site.go
@@ -53,14 +53,14 @@ type SiteStatusResponse struct {
 		SetTypeTo     string   `json:"set_type_to"`
 		SetDataTo     []string `json:"set_data_to"`
 	} `json:"original_dns"`
-	Warnings                     []interface{} `json:"warnings"`
-	Active                       string        `json:"active"`
-	SupportAllTLSVersions        bool          `json:"support_all_tls_versions"`
-	WildcardSanForNewSites       bool          `json:"wildcard_san_for_new_sites"`
-	NakedDomainSanForNewWwwSites bool          `json:"naked_domain_san_for_new_www_sites"`
-	AdditionalErrors             []interface{} `json:"additionalErrors"`
-	DisplayName                  string        `json:"display_name"`
-	Security                     struct {
+	Warnings                             []interface{} `json:"warnings"`
+	Active                               string        `json:"active"`
+	SupportAllTLSVersions                bool          `json:"support_all_tls_versions"`
+	UseWildcardSanInsteadOfFullDomainSan bool          `json:"use_wildcard_san_instead_of_full_domain_san"`
+	AddNakedDomainSan                    bool          `json:"add_naked_domain_san"`
+	AdditionalErrors                     []interface{} `json:"additionalErrors"`
+	DisplayName                          string        `json:"display_name"`
+	Security                             struct {
 		Waf struct {
 			Rules []struct {
 				Action                 string `json:"action,omitempty"`
diff --git a/incapsula/resource_account.go b/incapsula/resource_account.go
@@ -25,7 +25,6 @@ func resourceAccount() *schema.Resource {
 				Description: "Email address. For example: joe@example.com.",
 				Type:        schema.TypeString,
 				Required:    true,
-				ForceNew:    true,
 			},
 
 			// Optional Arguments
@@ -34,6 +33,7 @@ func resourceAccount() *schema.Resource {
 				Type:        schema.TypeInt,
 				Optional:    true,
 				Computed:    true,
+				ForceNew:    true,
 			},
 			"ref_id": {
 				Description: "Customer specific identifier for this operation.",
@@ -44,6 +44,7 @@ func resourceAccount() *schema.Resource {
 				Description: "The account owner's name. For example: John Doe.",
 				Type:        schema.TypeString,
 				Optional:    true,
+				ForceNew:    true,
 			},
 			"plan_id": {
 				Description: "An identifier of the plan to assign to the new account. For example, ent100 for the Enterprise 100 plan.",
@@ -54,11 +55,13 @@ func resourceAccount() *schema.Resource {
 				Description: "Account name.",
 				Type:        schema.TypeString,
 				Optional:    true,
+				ForceNew:    true,
 			},
 			"logs_account_id": {
 				Description: "Available only for Enterprise Plan customers that purchased the Logs Integration SKU. Numeric identifier of the account that purchased the logs integration SKU and which collects the logs. If not specified, operation will be performed on the account identified by the authentication parameters.",
 				Type:        schema.TypeInt,
 				Optional:    true,
+				ForceNew:    true,
 			},
 			"log_level": {
 				Description:  "The log level. Options are `full`, `security`, and `none`.",
@@ -213,7 +216,7 @@ func resourceAccountRead(d *schema.ResourceData, m interface{}) error {
 func resourceAccountUpdate(d *schema.ResourceData, m interface{}) error {
 	client := m.(*Client)
 
-	updateParams := [3]string{"email ", "plan_id", "ref_id"}
+	updateParams := [7]string{"email", "plan_id", "ref_id", "error_page_template", "support_all_tls_versions", "naked_domain_san_for_new_www_sites", "wildcard_san_for_new_sites"}
 	for i := 0; i < len(updateParams); i++ {
 		param := updateParams[i]
 		if d.HasChange(param) && d.Get(param) != "" {
diff --git a/incapsula/resource_cache_rule.go b/incapsula/resource_cache_rule.go
@@ -37,6 +37,7 @@ func resourceCacheRule() *schema.Resource {
 				Description: "Numeric identifier of the site to operate on.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 			"name": {
 				Description: "Rule name",
diff --git a/incapsula/resource_certificate.go b/incapsula/resource_certificate.go
@@ -10,7 +10,7 @@ func resourceCertificate() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceCertificateCreate,
 		Read:   resourceCertificateRead,
-		Update: resourceCertificateUpdate,
+		Update: nil,
 		Delete: resourceCertificateDelete,
 		Importer: &schema.ResourceImporter{
 			State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
@@ -25,6 +25,7 @@ func resourceCertificate() *schema.Resource {
 				Description: "Numeric identifier of the site to operate on.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 			"certificate": {
 				Description: "The certificate file in base64 format.",
diff --git a/incapsula/resource_data_center.go b/incapsula/resource_data_center.go
@@ -38,6 +38,7 @@ func resourceDataCenter() *schema.Resource {
 				Description: "Numeric identifier of the site to operate on.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 			"name": {
 				Description: "The new data center's name.",
@@ -48,6 +49,7 @@ func resourceDataCenter() *schema.Resource {
 				Description: "The server's address. Possible values: IP, CNAME.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 
 			// Optional Arguments
diff --git a/incapsula/resource_data_center_server.go b/incapsula/resource_data_center_server.go
@@ -38,11 +38,13 @@ func resourceDataCenterServer() *schema.Resource {
 				Description: "Numeric identifier of the data center server to operate on.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 			"site_id": {
 				Description: "Numeric identifier of the site to operate on.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 
 			// Optional Arguments
diff --git a/incapsula/resource_incap_rule.go b/incapsula/resource_incap_rule.go
@@ -37,6 +37,7 @@ func resourceIncapRule() *schema.Resource {
 				Description: "Numeric identifier of the site to operate on.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 			"name": {
 				Description: "Rule name",
@@ -83,6 +84,7 @@ func resourceIncapRule() *schema.Resource {
 				Description: "Data center to forward request to. Applies only for `RULE_ACTION_FORWARD_TO_DC`.",
 				Type:        schema.TypeInt,
 				Optional:    true,
+				ForceNew:    true,
 			},
 			"rate_context": {
 				Description: "The context of the rate counter. Possible values `IP` or `Session`. Applies only to rules using `RULE_ACTION_RATE`.",
diff --git a/incapsula/resource_origin_pop.go b/incapsula/resource_origin_pop.go
@@ -24,6 +24,7 @@ func resourceOriginPOP() *schema.Resource {
 				Description: "Numeric identifier of the data center.",
 				Type:        schema.TypeInt,
 				Required:    true,
+				ForceNew:    true,
 			},
 			"origin_pop": {
 				Description: "The Origin POP code (must be lowercase), e.g: iad. Note, this field is create/update only. Reads are not supported as the API doesn't exist yet. Note that drift may happen.",
diff --git a/incapsula/resource_policy.go b/incapsula/resource_policy.go
@@ -58,6 +58,7 @@ func resourcePolicy() *schema.Resource {
 				Type:        schema.TypeInt,
 				Computed:    true,
 				Optional:    true,
+				ForceNew:    true,
 			},
 			"description": {
 				Description: "The policy description.",
diff --git a/incapsula/resource_policy_asset_association.go b/incapsula/resource_policy_asset_association.go
@@ -11,7 +11,7 @@ func resourcePolicyAssetAssociation() *schema.Resource {
 	return &schema.Resource{
 		Create:   resourcePolicyAssetAssociationCreate,
 		Read:     resourcePolicyAssetAssociationNil,
-		Update:   resourcePolicyAssetAssociationUpdate,
+		Update:   nil,
 		Delete:   resourcePolicyAssetAssociationDelete,
 		Importer: nil,
 
@@ -21,16 +21,19 @@ func resourcePolicyAssetAssociation() *schema.Resource {
 				Description: "The Policy ID for the asset association.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 			"asset_id": {
 				Description: "The Asset ID for the asset association. Only type of asset supported at the moment is site.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 			"asset_type": {
 				Description: "The Policy type for the asset association. Only value at the moment is `WEBSITE`.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 		},
 	}
@@ -62,36 +65,6 @@ func resourcePolicyAssetAssociationNil(d *schema.ResourceData, m interface{}) er
 	return nil
 }
 
-func resourcePolicyAssetAssociationUpdate(d *schema.ResourceData, m interface{}) error {
-	// We can end up in a situation where a user can change a attribute after creation
-	// Since policy asset association stacks the associations, we'll need to remove the prior before creating the new one
-	client := m.(*Client)
-
-	oldPolicyID, newPolicyID := d.GetChange("policy_id")
-	oldAssetID, newAssetID := d.GetChange("asset_id")
-	oldAssetType, newAssetType := d.GetChange("asset_type")
-
-	// Delete the old
-	err := client.DeletePolicyAssetAssociation(oldPolicyID.(string), oldAssetID.(string), oldAssetType.(string))
-	if err != nil {
-		return err
-	}
-
-	// Add the new
-	err = client.AddPolicyAssetAssociation(newPolicyID.(string), newAssetID.(string), newAssetType.(string))
-	if err != nil {
-		log.Printf("[ERROR] Could not create Incapsula policy asset association: policy ID (%s) - asset ID (%s) - asset type (%s) - %s\n", newPolicyID.(string), newAssetID.(string), newAssetType.(string), err)
-		return err
-	}
-
-	// Re-generate synthetic ID
-	syntheticID := fmt.Sprintf("%s-%s-%s", newPolicyID.(string), newAssetID.(string), newAssetType.(string))
-	d.SetId(syntheticID)
-	log.Printf("[INFO] Created Incapsula policy asset association with ID: %s - policy ID (%s) - asset ID (%s) - asset type (%s)\n", syntheticID, newPolicyID.(string), newAssetID.(string), newAssetType.(string))
-
-	return nil
-}
-
 func resourcePolicyAssetAssociationDelete(d *schema.ResourceData, m interface{}) error {
 	client := m.(*Client)
 
diff --git a/incapsula/resource_security_rule_exception.go b/incapsula/resource_security_rule_exception.go
@@ -58,11 +58,13 @@ func resourceSecurityRuleException() *schema.Resource {
 				Description: "Numeric identifier of the site to operate on.",
 				Type:        schema.TypeInt,
 				Required:    true,
+				ForceNew:    true,
 			},
 			"rule_id": {
 				Description: "The identifier of the security rule, e.g api.threats.cross_site_scripting.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 			"client_app_types": {
 				Description:      "A comma separated list of client application types,",
diff --git a/incapsula/resource_site.go b/incapsula/resource_site.go
@@ -44,6 +44,7 @@ func resourceSite() *schema.Resource {
 				Type:        schema.TypeInt,
 				Optional:    true,
 				Computed:    true,
+				ForceNew:    true,
 			},
 			"ref_id": {
 				Description: "Customer specific identifier for this operation.",
@@ -54,6 +55,7 @@ func resourceSite() *schema.Resource {
 				Description: "If this value is false, end users will not get emails about the add site process such as DNS instructions and SSL setup.",
 				Type:        schema.TypeString,
 				Optional:    true,
+				ForceNew:    true,
 			},
 			"site_ip": {
 				Description: "Manually set the web server IP/CNAME.",
@@ -65,11 +67,13 @@ func resourceSite() *schema.Resource {
 				Description: "If this value is true, manually set the site to support SSL. This option is only available for sites with manually configured IP/CNAME and for specific accounts.",
 				Type:        schema.TypeString,
 				Optional:    true,
+				ForceNew:    true,
 			},
 			"logs_account_id": {
 				Description: "Available only for Enterprise Plan customers that purchased the Logs Integration SKU. Numeric identifier of the account that purchased the logs integration SKU and which collects the logs. If not specified, operation will be performed on the account identified by the authentication parameters.",
 				Type:        schema.TypeString,
 				Optional:    true,
+				ForceNew:    true,
 			},
 			"active": {
 				Description: "active or bypass.",
@@ -143,6 +147,7 @@ func resourceSite() *schema.Resource {
 				Type:        schema.TypeString,
 				Computed:    true,
 				Optional:    true,
+				ForceNew:    true,
 			},
 			"perf_client_comply_no_cache": {
 				Description: "Comply with No-Cache and Max-Age directives in client requests. By default, these cache directives are ignored. Resources are dynamically profiled and re-configured to optimize performance.",
@@ -279,12 +284,14 @@ func resourceSite() *schema.Resource {
 				Type:        schema.TypeBool,
 				Optional:    true,
 				Default:     "true",
+				ForceNew:    true,
 			},
 			"wildcard_san": {
 				Description: "Use 'true' to add the wildcard SAN or 'false' to add the full domain SAN to the site’s SSL certificate. Default value: true",
 				Type:        schema.TypeBool,
 				Optional:    true,
 				Default:     "true",
+				ForceNew:    true,
 			},
 			// Computed Attributes
 			"site_creation_date": {
@@ -422,9 +429,9 @@ func resourceSiteRead(d *schema.ResourceData, m interface{}) error {
 	d.Set("site_creation_date", siteStatusResponse.SiteCreationDate)
 	d.Set("domain", siteStatusResponse.Domain)
 	d.Set("account_id", siteStatusResponse.AccountID)
-	d.Set("site_ip", siteStatusResponse.Ips[0])
-	d.Set("naked_domain_san", siteStatusResponse.NakedDomainSanForNewWwwSites)
-	d.Set("wildcard_san", siteStatusResponse.WildcardSanForNewSites)
+	//d.Set("site_ip", siteStatusResponse.Ips[0])
+	d.Set("naked_domain_san", siteStatusResponse.AddNakedDomainSan)
+	d.Set("wildcard_san", siteStatusResponse.UseWildcardSanInsteadOfFullDomainSan)
 	d.Set("acceleration_level", siteStatusResponse.AccelerationLevel)
 	d.Set("active", siteStatusResponse.Active)
 
@@ -519,13 +526,24 @@ func resourceSiteRead(d *schema.ResourceData, m interface{}) error {
 		return err
 	}
 
+	if len(listDataCentersResponse.DCs[0].Servers) == 0 {
+		log.Printf("[ERROR] Could not read Incapsula data center servers for domain: %s and site id: %d, %s\n", domain, siteID, err)
+		return err
+	}
+
 	dataCenterID := listDataCentersResponse.DCs[0].ID
 	if dataCenterID == "" {
 		return fmt.Errorf("[ERROR] Incapsula Data Center missing for Site ID %s", d.Get("site_id"))
 	}
 	dcID, _ := strconv.Atoi(dataCenterID)
 	d.Set("original_data_center_id", dcID)
 
+	siteIP := listDataCentersResponse.DCs[0].Servers[0].Address
+	if siteIP == "" {
+		return fmt.Errorf("[ERROR] Incapsula Data Center missing server address for Site ID %s", d.Get("site_id"))
+	}
+	d.Set("site_ip", siteIP)
+
 	log.Printf("[INFO] Finished reading Incapsula site for domain: %s\n", domain)
 
 	return nil
@@ -588,7 +606,7 @@ func resourceSiteDelete(d *schema.ResourceData, m interface{}) error {
 }
 
 func updateAdditionalSiteProperties(client *Client, d *schema.ResourceData) error {
-	updateParams := [7]string{"acceleration_level", "active", "approver", "domain_redirect_to_full", "domain_validation", "ignore_ssl", "remove_ssl"}
+	updateParams := [9]string{"acceleration_level", "active", "approver", "domain_redirect_to_full", "domain_validation", "ignore_ssl", "remove_ssl", "ref_id", "site_ip"}
 	for i := 0; i < len(updateParams); i++ {
 		param := updateParams[i]
 		if d.HasChange(param) && d.Get(param) != "" {
diff --git a/incapsula/resource_txt_settings.go b/incapsula/resource_txt_settings.go
@@ -23,6 +23,7 @@ func resourceTXTRecord() *schema.Resource {
 				Description: "Numeric identifier of the site.",
 				Type:        schema.TypeInt,
 				Required:    true,
+				ForceNew:    true,
 			},
 			// Optional Arguments
 			"txt_record_value_one": {
diff --git a/incapsula/resource_waf_security_rule.go b/incapsula/resource_waf_security_rule.go
@@ -52,11 +52,13 @@ func resourceWAFSecurityRule() *schema.Resource {
 				Description: "Numeric identifier of the site to operate on.",
 				Type:        schema.TypeInt,
 				Required:    true,
+				ForceNew:    true,
 			},
 			"rule_id": {
 				Description: "The identifier of the WAF rule, e.g api.threats.cross_site_scripting.",
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 			},
 
 			// Required for rule_id: api.threats.backdoor, api.threats.cross_site_scripting, api.threats.illegal_resource_access, api.threats.remote_file_inclusion, api.threats.sql_injection
diff --git a/website/docs/r/txt_settings.html.markdown b/website/docs/r/txt_settings.html.markdown

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ module github.com/terraform-providers/terraform-provider-incapsula`
`2`	`2`
`3`	`3`	`go 1.13`
`4`	`4`
`5`		`-require github.com/hashicorp/terraform-plugin-sdk/v2 v2.2.0`
	`5`	`+require github.com/hashicorp/terraform-plugin-sdk/v2 v2.6.1`