fix: Fixed resources with custom IDs (#393)

willguibr · web-flow · commit 960eb62389d8 · 2025-02-10T18:14:52.000-08:00
* fix: Fixed resources with custom IDs.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 4.0.5 (February, 10 2025)
+
+### Notes
+
+- Release date: **(February, 10  2025)**
+- Supported Terraform version: **v1.x**
+
+### Bug Fixes
+
+- [PR #393](https://github.com/zscaler/terraform-provider-zia/pull/393) - Fixed the custom ID for the following resources:
+  - `zia_auth_settings_urls`
+  - `zia_sandbox_behavioral_analysis`
+  - `zia_security_settings`
+
 ## 4.0.4 (February, 6 2025)
 
 ### Notes
diff --git a/GNUmakefile b/GNUmakefile
@@ -196,14 +196,14 @@ test\:integration\:zscalertwo:
 build13: GOOS=$(shell go env GOOS)
 build13: GOARCH=$(shell go env GOARCH)
 ifeq ($(OS),Windows_NT)  # is Windows_NT on XP, 2000, 7, Vista, 10...
-build13: DESTINATION=$(APPDATA)/terraform.d/plugins/$(ZIA_PROVIDER_NAMESPACE)/4.0.4/$(GOOS)_$(GOARCH)
+build13: DESTINATION=$(APPDATA)/terraform.d/plugins/$(ZIA_PROVIDER_NAMESPACE)/4.0.5/$(GOOS)_$(GOARCH)
 else
-build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(ZIA_PROVIDER_NAMESPACE)/4.0.4/$(GOOS)_$(GOARCH)
+build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(ZIA_PROVIDER_NAMESPACE)/4.0.5/$(GOOS)_$(GOARCH)
 endif
 build13: fmtcheck
 	@echo "==> Installing plugin to $(DESTINATION)"
 	@mkdir -p $(DESTINATION)
-	go build -o $(DESTINATION)/terraform-provider-zia_v4.0.4
+	go build -o $(DESTINATION)/terraform-provider-zia_v4.0.5
 
 coverage: test
 	@echo "✓ Opening coverage for unit tests ..."
diff --git a/docs/guides/release-notes.md b/docs/guides/release-notes.md
@@ -12,10 +12,24 @@ description: |-
 Track all ZIA Terraform provider's releases. New resources, features, and bug fixes will be tracked here.
 
 ---
-``Last updated: v4.0.4``
+``Last updated: v4.0.5``
 
 ---
 
+## 4.0.5 (February, 10 2025)
+
+### Notes
+
+- Release date: **(February, 10  2025)**
+- Supported Terraform version: **v1.x**
+
+### Bug Fixes
+
+- [PR #393](https://github.com/zscaler/terraform-provider-zia/pull/393) - Fixed the custom ID for the following resources:
+  - `zia_auth_settings_urls`
+  - `zia_sandbox_behavioral_analysis`
+  - `zia_security_settings`
+
 ## 4.0.4 (February, 6 2025)
 
 ### Notes
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/hashicorp/go-hclog v1.6.3
 	github.com/hashicorp/terraform-plugin-sdk v1.17.2
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.0
-	github.com/zscaler/zscaler-sdk-go/v3 v3.1.3
+	github.com/zscaler/zscaler-sdk-go/v3 v3.1.4
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -401,8 +401,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRK
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
 github.com/zclconf/go-cty-yaml v1.0.2/go.mod h1:IP3Ylp0wQpYm50IHK8OZWKMu6sPJIUgKa8XhiVHura0=
-github.com/zscaler/zscaler-sdk-go/v3 v3.1.3 h1:TIR6dLxAb0QZPj7efrKjwlgNCsYvj3Zy7EDKMo0u70s=
-github.com/zscaler/zscaler-sdk-go/v3 v3.1.3/go.mod h1:2gXo+LVFYtr+/oCe+mETsXlb9sJEzRtPl6JwPhSIgWM=
+github.com/zscaler/zscaler-sdk-go/v3 v3.1.4 h1:1rQ3BzfsBeqczpVkdi2aQTAefhft5iUs85J+u/naaME=
+github.com/zscaler/zscaler-sdk-go/v3 v3.1.4/go.mod h1:2gXo+LVFYtr+/oCe+mETsXlb9sJEzRtPl6JwPhSIgWM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
diff --git a/zia/config.go b/zia/config.go
@@ -173,13 +173,6 @@ func NewConfig(d *schema.ResourceData) *Config {
 		config.sandboxCloud = os.Getenv("ZSCALER_SANDBOX_CLOUD")
 	}
 
-	if val, ok := d.GetOk("cloud"); ok {
-		config.cloud = val.(string)
-	}
-	if config.cloud == "" && os.Getenv("ZSCALER_CLOUD") != "" {
-		config.cloud = os.Getenv("ZSCALER_CLOUD")
-	}
-
 	if val, ok := d.GetOk("max_retries"); ok {
 		config.retryCount = val.(int)
 	}
diff --git a/zia/provider_test.go b/zia/provider_test.go
@@ -143,11 +143,11 @@ func TestProviderValidate(t *testing.T) {
 		cloud        string // Optional field
 		expectError  bool
 	}{
-		{"valid client_id + client_secret", "clientID", "clientSecret", "vanityDomain", "cloud", false},
-		{"missing client_id", "", "clientSecret", "vanityDomain", "cloud", true},
-		{"missing clientSecret", "clientID", "", "vanityDomain", "cloud", true},
-		{"missing vanity domain", "clientID", "clientSecret", "", "cloud", true},
-		{"valid client_id + client_secret without cloud", "clientID", "clientSecret", "vanityDomain", "", false}, // Ensures cloud is optional
+		{"valid client_id + client_secret", "clientID", "clientSecret", "vanityDomain", "zscaler_cloud", false},
+		{"missing client_id", "", "clientSecret", "vanityDomain", "zscaler_cloud", true},
+		{"missing clientSecret", "clientID", "", "vanityDomain", "zscaler_cloud", true},
+		{"missing vanity domain", "clientID", "clientSecret", "", "zscaler_cloud", true},
+		{"valid client_id + client_secret without zscaler_cloud", "clientID", "clientSecret", "vanityDomain", "", false}, // Ensures cloud is optional
 	}
 
 	// Execute each test case
@@ -162,7 +162,7 @@ func TestProviderValidate(t *testing.T) {
 			resourceConfig["client_secret"] = test.clientSecret
 		}
 		if test.cloud != "" {
-			resourceConfig["cloud"] = test.cloud
+			resourceConfig["zscaler_cloud"] = test.cloud
 		}
 
 		config := terraform.NewResourceConfigRaw(resourceConfig)
diff --git a/zia/resource_zia_auth_settings_urls.go b/zia/resource_zia_auth_settings_urls.go
@@ -58,7 +58,7 @@ func resourceAuthSettingsUrlsRead(ctx context.Context, d *schema.ResourceData, m
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	d.SetId("exempted_urls")
+	d.SetId("all_urls")
 	_ = d.Set("urls", res.URLs)
 	return nil
 }
@@ -82,7 +82,7 @@ func resourceAuthSettingsUrlsCreate(ctx context.Context, d *schema.ResourceData,
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	d.SetId("exempted_urls")
+	d.SetId("all_urls")
 	// Sleep for 2 seconds before potentially triggering the activation
 	time.Sleep(2 * time.Second)
 
diff --git a/zia/resource_zia_sandbox_behavioral_analysis_advanced_settings.go b/zia/resource_zia_sandbox_behavioral_analysis_advanced_settings.go
@@ -96,7 +96,7 @@ func resourceSandboxSettingsCreate(ctx context.Context, d *schema.ResourceData,
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	d.SetId("hash_list")
+	d.SetId("sandbox_settings")
 	// Sleep for 2 seconds before potentially triggering the activation
 	time.Sleep(2 * time.Second)
 
@@ -121,7 +121,7 @@ func resourceSandboxSettingsRead(ctx context.Context, d *schema.ResourceData, me
 	}
 
 	if resp != nil {
-		d.SetId("hash_list")
+		d.SetId("sandbox_settings")
 		sortedHashes := sortStringSlice(resp.FileHashesToBeBlocked)
 		err := d.Set("file_hashes_to_be_blocked", sortedHashes)
 		if err != nil {
diff --git a/zia/resource_zia_security_policy_settings.go b/zia/resource_zia_security_policy_settings.go
@@ -87,7 +87,7 @@ func resourceSecurityPolicySettingsCreate(ctx context.Context, d *schema.Resourc
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	d.SetId("url_list")
+	d.SetId("all_urls")
 
 	// Sleep for 2 seconds before potentially triggering the activation
 	time.Sleep(2 * time.Second)
@@ -143,7 +143,7 @@ func resourceSecurityPolicySettingsRead(ctx context.Context, d *schema.ResourceD
 	}
 
 	if resp != nil {
-		d.SetId("url_id")
+		d.SetId("all_urls")
 		_ = d.Set("whitelist_urls", resp.White)
 		_ = d.Set("blacklist_urls", resp.Black)
 
diff --git a/zia/resource_zia_url_filtering_rules.go b/zia/resource_zia_url_filtering_rules.go
@@ -763,7 +763,6 @@ func flattenCBIProfileSimple(cbiProfile *urlfilteringpolicies.CBIProfile) []inte
 			"id":   cbiProfile.ID,
 			"name": cbiProfile.Name,
 			"url":  cbiProfile.URL,
-			// "profile_seq": cbiProfile.ProfileSeq,
 		},
 	}
 }
diff --git a/zia/validator.go b/zia/validator.go
@@ -129,7 +129,7 @@ func validateURLFilteringCategories() schema.SchemaValidateDiagFunc {
 }
 
 var supportedURLFilteringRequestMethods = []string{
-	"OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "CONNECT", "OTHER",
+	"OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "CONNECT", "OTHER", "PROPFIND", "PROPPATCH", "MOVE", "MKCOL", "LOCK", "COPY", "UNLOCK", "PATCH",
 }
 
 func validateURLFilteringRequestMethods() schema.SchemaValidateDiagFunc {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ require (`
`9`	`9`	`github.com/hashicorp/go-hclog v1.6.3`
`10`	`10`	`github.com/hashicorp/terraform-plugin-sdk v1.17.2`
`11`	`11`	`github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.0`
`12`		`- github.com/zscaler/zscaler-sdk-go/v3 v3.1.3`
	`12`	`+ github.com/zscaler/zscaler-sdk-go/v3 v3.1.4`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -173,13 +173,6 @@ func NewConfig(d schema.ResourceData) Config {`
`173`	`173`	`config.sandboxCloud = os.Getenv("ZSCALER_SANDBOX_CLOUD")`
`174`	`174`	`}`
`175`	`175`
`176`		`- if val, ok := d.GetOk("cloud"); ok {`
`177`		`- config.cloud = val.(string)`
`178`		`- }`
`179`		`- if config.cloud == "" && os.Getenv("ZSCALER_CLOUD") != "" {`
`180`		`- config.cloud = os.Getenv("ZSCALER_CLOUD")`
`181`		`- }`
`182`		`-`
`183`	`176`	`if val, ok := d.GetOk("max_retries"); ok {`
`184`	`177`	`config.retryCount = val.(int)`
`185`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func resourceAuthSettingsUrlsRead(ctx context.Context, d *schema.ResourceData, m`
`58`	`58`	`if err != nil {`
`59`	`59`	`return diag.FromErr(err)`
`60`	`60`	`}`
`61`		`- d.SetId("exempted_urls")`
	`61`	`+ d.SetId("all_urls")`
`62`	`62`	`_ = d.Set("urls", res.URLs)`
`63`	`63`	`return nil`
`64`	`64`	`}`
`@@ -82,7 +82,7 @@ func resourceAuthSettingsUrlsCreate(ctx context.Context, d *schema.ResourceData,`
`82`	`82`	`if err != nil {`
`83`	`83`	`return diag.FromErr(err)`
`84`	`84`	`}`
`85`		`- d.SetId("exempted_urls")`
	`85`	`+ d.SetId("all_urls")`
`86`	`86`	`// Sleep for 2 seconds before potentially triggering the activation`
`87`	`87`	`time.Sleep(2 * time.Second)`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func resourceSecurityPolicySettingsCreate(ctx context.Context, d *schema.Resourc`
`87`	`87`	`if err != nil {`
`88`	`88`	`return diag.FromErr(err)`
`89`	`89`	`}`
`90`		`- d.SetId("url_list")`
	`90`	`+ d.SetId("all_urls")`
`91`	`91`
`92`	`92`	`// Sleep for 2 seconds before potentially triggering the activation`
`93`	`93`	`time.Sleep(2 * time.Second)`
`@@ -143,7 +143,7 @@ func resourceSecurityPolicySettingsRead(ctx context.Context, d *schema.ResourceD`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`if resp != nil {`
`146`		`- d.SetId("url_id")`
	`146`	`+ d.SetId("all_urls")`
`147`	`147`	`_ = d.Set("whitelist_urls", resp.White)`
`148`	`148`	`_ = d.Set("blacklist_urls", resp.Black)`
`149`	`149`