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.

Sign up for GitHub

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: detect zone dnssec as enabled when in pending status #1530

Merged
merged 2 commits into from
Apr 1, 2022
Merged

fix: detect zone dnssec as enabled when in pending status #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ea71ad
fix: detect zone dnssec as enabled when in pending status
xabinapal Mar 27, 2022
0341f9d
chore: add pr changelog
xabinapal Mar 27, 2022
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
3 changes: 3 additions & 0 deletions .changelog/1530.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/cloudflare_zone_dnssec: don't try to enable DNSSEC when state is "pending"
```
3 changes: 2 additions & 1 deletion cloudflare/resource_cloudflare_zone_dnssec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
// The supported status for a Zone DNSSEC setting
const (
DNSSECStatusActive = "active"
DNSSECStatusPending = "pending"
DNSSECStatusDisabled = "disabled"
)

Expand Down Expand Up @@ -41,7 +42,7 @@ func resourceCloudflareZoneDNSSECCreate(d *schema.ResourceData, meta interface{}
if err != nil {
return fmt.Errorf("error finding Zone DNSSEC %q: %s", zoneID, err)
}
if currentDNSSEC.Status != DNSSECStatusActive {
if currentDNSSEC.Status != DNSSECStatusActive && currentDNSSEC.Status != DNSSECStatusPending {
_, err := client.UpdateZoneDNSSEC(context.Background(), zoneID, cloudflare.ZoneDNSSECUpdateOptions{Status: DNSSECStatusActive})

if err != nil {
Expand Down