Merge pull request #7565 from cert-manager-bot/cherry-pick-7549-to-release-1.17

cert-manager-prow[bot] · web-flow · commit c658224baa1f · 2025-02-12T13:53:29.000Z
[release-1.17] chore(issuer/cloudflare): ensure we set ZoneID
diff --git a/pkg/issuer/acme/dns/cloudflare/cloudflare.go b/pkg/issuer/acme/dns/cloudflare/cloudflare.go
@@ -233,6 +233,10 @@ func (c *DNSProvider) findTxtRecord(ctx context.Context, fqdn, content string) (
 
 	for _, rec := range records {
 		if rec.Name == util.UnFqdn(fqdn) && rec.Content == content {
+			// Cloudflare made a breaking change to their API and removed the ZoneID from responses:
+			// https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#2024-11-30
+			// The simplest fix is to set the ZoneID manually here
+			rec.ZoneID = zoneID
 			return &rec, nil
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,10 @@ func (c *DNSProvider) findTxtRecord(ctx context.Context, fqdn, content string) (`
`233`	`233`
`234`	`234`	`for _, rec := range records {`
`235`	`235`	`if rec.Name == util.UnFqdn(fqdn) && rec.Content == content {`
	`236`	`+ // Cloudflare made a breaking change to their API and removed the ZoneID from responses:`
	`237`	`+ // https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#2024-11-30`
	`238`	`+ // The simplest fix is to set the ZoneID manually here`
	`239`	`+ rec.ZoneID = zoneID`
`236`	`240`	`return &rec, nil`
`237`	`241`	`}`
`238`	`242`	`}`