Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(fix): 🔧 Removed computed attribute from provisioning key #391

Merged
merged 4 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ jobs:
ZPA_CLOUD: ${{ secrets.ZPA_CLOUD }}
TF_ACC: ${{ secrets.TF_ACC }}
ZPA_ACC_TEST_FORCE_SWEEPERS: ${{ secrets.ZPA_ACC_TEST_FORCE_SWEEPERS }}
# needs:
# - zpa-qa-tenant01
# - zpa-qa-tenant02
needs:
- zpa-qa-tenant01
- zpa-qa-tenant02
# - zpa-qa2-tenant01

zpa-prod-tenant01:
Expand All @@ -90,8 +90,7 @@ jobs:
ZPA_CLOUD: ${{ secrets.ZPA_CLOUD }}
TF_ACC: ${{ secrets.TF_ACC }}
ZPA_ACC_TEST_FORCE_SWEEPERS: ${{ secrets.ZPA_ACC_TEST_FORCE_SWEEPERS }}
# needs:
# - zpa-qa-tenant01
# - zpa-qa-tenant02
# - zpa-qa2-tenant01
# - zpa-beta-tenant01
needs:
- zpa-qa-tenant01
- zpa-qa-tenant02
- zpa-beta-tenant01
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## 3.1.0 (December, 10 2023)

### Notes

- Release date: **(December, 10 2023)**
- Supported Terraform version: **v1.x**

### Fixes

- [PR #391](https://github.com/zscaler/terraform-provider-zpa/pull/391) - Removed `enrollment_cert_name` computed attribute from provisioning key resource

## 3.0.5 (November, 17 2023)

### Notes
Expand Down
6 changes: 3 additions & 3 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ testacc:
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/$(ZPA_PROVIDER_NAMESPACE)/3.0.5/$(GOOS)_$(GOARCH)
build13: DESTINATION=$(APPDATA)/terraform.d/plugins/$(ZPA_PROVIDER_NAMESPACE)/3.0.6/$(GOOS)_$(GOARCH)
else
build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(ZPA_PROVIDER_NAMESPACE)/3.0.5/$(GOOS)_$(GOARCH)
build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(ZPA_PROVIDER_NAMESPACE)/3.0.6/$(GOOS)_$(GOARCH)
endif
build13: fmtcheck
@echo "==> Installing plugin to $(DESTINATION)"
@mkdir -p $(DESTINATION)
go build -o $(DESTINATION)/terraform-provider-zpa_v3.0.5
go build -o $(DESTINATION)/terraform-provider-zpa_v3.0.6

coverage: test
@echo "✓ Opening coverage for unit tests ..."
Expand Down
13 changes: 12 additions & 1 deletion docs/guides/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,21 @@ Track all ZPA Terraform provider's releases. New resources, features, and bug fi

---

``Last updated: v3.0.5``
``Last updated: v3.1.0``

---

## 3.1.0 (December, 10 2023)

### Notes

- Release date: **(December, 10 2023)**
- Supported Terraform version: **v1.x**

### Fixes

- [PR #391](https://github.com/zscaler/terraform-provider-zpa/pull/391) - Removed `enrollment_cert_name` computed attribute from provisioning key resource

## 3.0.5 (November, 17 2023)

### Notes
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ require (
github.com/client9/misspell v0.3.4
github.com/fabiotavarespr/iso3166 v0.0.2
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
github.com/hashicorp/go-hclog v1.6.1
github.com/hashicorp/go-hclog v1.5.0
github.com/hashicorp/terraform-plugin-docs v0.16.0
github.com/hashicorp/terraform-plugin-sdk v1.17.2
github.com/hashicorp/terraform-plugin-sdk/v2 v2.30.0
github.com/zscaler/zscaler-sdk-go/v2 v2.2.1
github.com/zscaler/zscaler-sdk-go/v2 v2.2.2
)

require (
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBM
github.com/hashicorp/go-getter v1.5.3/go.mod h1:BrrV/1clo8cCYu6mxvboYg+KutTiFnXjMEgDD8+i7ZI=
github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=
github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
github.com/hashicorp/go-hclog v1.6.1 h1:pa92nu9bPoAqI7p+uPDCIWGAibUdlCi6TYWJEQQkLf8=
github.com/hashicorp/go-hclog v1.6.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
Expand Down Expand Up @@ -402,8 +402,8 @@ github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA
github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8=
github.com/zclconf/go-cty-yaml v1.0.2/go.mod h1:IP3Ylp0wQpYm50IHK8OZWKMu6sPJIUgKa8XhiVHura0=
github.com/zscaler/zscaler-sdk-go/v2 v2.2.1 h1:p4hRSyUGKSbz+iiRoAmBqIPTfWhKHWe1JTkAoP9HQEc=
github.com/zscaler/zscaler-sdk-go/v2 v2.2.1/go.mod h1:ZuSr5SoINzMxCVQPV1lh5xBEwsQLDmpEznEV9ey+gHg=
github.com/zscaler/zscaler-sdk-go/v2 v2.2.2 h1:iY/xxn69DESF1dPuLHrVdhgsdKUwtG6raS56k0r8lf0=
github.com/zscaler/zscaler-sdk-go/v2 v2.2.2/go.mod h1:ZuSr5SoINzMxCVQPV1lh5xBEwsQLDmpEznEV9ey+gHg=
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=
Expand Down
7 changes: 0 additions & 7 deletions zpa/resource_zpa_provisioning_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@ func resourceProvisioningKey() *schema.Resource {
Required: true,
Description: "ID of the enrollment certificate that can be used for this provisioning key.",
},
"enrollment_cert_name": {
Type: schema.TypeString,
Computed: true,
Description: "Read only property. Applicable only for GET calls, ignored in PUT/POST calls.",
},
"ui_config": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -189,7 +184,6 @@ func resourceProvisioningKeyRead(d *schema.ResourceData, m interface{}) error {
_ = d.Set("max_usage", resp.MaxUsage)
_ = d.Set("name", resp.Name)
_ = d.Set("enrollment_cert_id", resp.EnrollmentCertID)
_ = d.Set("enrollment_cert_name", resp.EnrollmentCertName)
_ = d.Set("ui_config", resp.UIConfig)
_ = d.Set("usage_count", resp.UsageCount)
_ = d.Set("zcomponent_id", resp.ZcomponentID)
Expand Down Expand Up @@ -248,7 +242,6 @@ func expandProvisioningKey(d *schema.ResourceData) provisioningkey.ProvisioningK
MaxUsage: d.Get("max_usage").(string),
Name: d.Get("name").(string),
EnrollmentCertID: d.Get("enrollment_cert_id").(string),
EnrollmentCertName: d.Get("enrollment_cert_name").(string),
UIConfig: d.Get("ui_config").(string),
UsageCount: d.Get("usage_count").(string),
ZcomponentID: d.Get("zcomponent_id").(string),
Expand Down
2 changes: 1 addition & 1 deletion zpa/version.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package zpa

// ProviderVersion is set at build-time in the release process
var ProviderVersion = "3.0.5"
var ProviderVersion = "3.0.6"