POWERDNS: Zone creation now abides by variant tags (#3830)

Author: eratzlaff

commands/createDomains.go

@@ -56,7 +56,7 @@ func CreateDomains(args CreateDomainsArgs) error {
 		for _, provider := range domain.DNSProviderInstances {
 			if creator, ok := provider.Driver.(providers.ZoneCreator); ok {
 				fmt.Println("  -", provider.Name)
-				err := creator.EnsureZoneExists(domain.Name)
+				err := creator.EnsureZoneExists(domain.Name, domain.Metadata)
 				if err != nil {
 					fmt.Printf("Error creating domain: %s\n", err)
 				}

commands/ppreviewPush.go

@@ -493,7 +493,7 @@ func oneZonePopulate(zone *models.DomainConfig, zc *cmdZoneCache) error {
 	var errs []error
 	// Loop over all the providers configured for that zone:
 	for _, provider := range zone.DNSProviderInstances {
-		populateCorrections, err := generatePopulateCorrections(provider, zone.Name, zc)
+		populateCorrections, err := generatePopulateCorrections(provider, zone, zc)
 		if err != nil {
 			errs = append(errs, err)
 		}
@@ -645,7 +645,7 @@ func writeReport(report string, reportItems []*ReportItem) error {
 	return nil
 }
 
-func generatePopulateCorrections(provider *models.DNSProviderInstance, zoneName string, zcache *cmdZoneCache) ([]*models.Correction, error) {
+func generatePopulateCorrections(provider *models.DNSProviderInstance, zone *models.DomainConfig, zcache *cmdZoneCache) ([]*models.Correction, error) {
 	lister, ok := provider.Driver.(providers.ZoneLister)
 	if !ok {
 		return nil, nil // We can't generate a list. No corrections are possible.
@@ -658,7 +658,7 @@ func generatePopulateCorrections(provider *models.DNSProviderInstance, zoneName
 	}
 	zones := *z
 
-	aceZoneName, _ := idna.ToASCII(zoneName)
+	aceZoneName, _ := idna.ToASCII(zone.Name)
 	if slices.Contains(zones, aceZoneName) {
 		return nil, nil // zone exists. Nothing to do.
 	}
@@ -671,7 +671,7 @@ func generatePopulateCorrections(provider *models.DNSProviderInstance, zoneName
 
 	return []*models.Correction{{
 		Msg: fmt.Sprintf("Ensuring zone %q exists in %q", aceZoneName, provider.Name),
-		F:   func() error { return creator.EnsureZoneExists(aceZoneName) },
+		F:   func() error { return creator.EnsureZoneExists(aceZoneName, zone.Metadata) },
 	}}, nil
 }
 

providers/akamaiedgedns/akamaiEdgeDnsProvider.go

@@ -99,7 +99,7 @@ func newEdgeDNSDSP(config map[string]string, metadata json.RawMessage) (provider
 }
 
 // EnsureZoneExists creates a zone if it does not exist
-func (a *edgeDNSProvider) EnsureZoneExists(domain string) error {
+func (a *edgeDNSProvider) EnsureZoneExists(domain string, metadata map[string]string) error {
 	if zoneDoesExist(domain) {
 		printer.Debugf("Zone %s already exists\n", domain)
 		return nil

providers/autodns/autoDnsProvider.go

@@ -250,7 +250,7 @@ func (api *autoDNSProvider) GetZoneRecords(domain string, meta map[string]string
 	return existingRecords, nil
 }
 
-func (api *autoDNSProvider) EnsureZoneExists(domain string) error {
+func (api *autoDNSProvider) EnsureZoneExists(domain string, metadata map[string]string) error {
 	// try to get zone
 	_, err := api.getZone(domain)
 

providers/azuredns/azureDnsProvider.go

@@ -691,7 +691,7 @@ func (a *azurednsProvider) fetchRecordSets(zoneName string) ([]*adns.RecordSet,
 	return records, nil
 }
 
-func (a *azurednsProvider) EnsureZoneExists(domain string) error {
+func (a *azurednsProvider) EnsureZoneExists(domain string, metadata map[string]string) error {
 	if _, ok := a.zones[domain]; ok {
 		return nil
 	}

providers/azureprivatedns/azurePrivateDnsProvider.go

@@ -523,7 +523,7 @@ func (a *azurednsProvider) fetchRecordSets(zoneName string) ([]*adns.RecordSet,
 	return records, nil
 }
 
-func (a *azurednsProvider) EnsureZoneExists(domain string) error {
+func (a *azurednsProvider) EnsureZoneExists(domain string, metadata map[string]string) error {
 	if _, ok := a.zones[domain]; ok {
 		return nil
 	}

providers/bunnydns/listzones.go

@@ -16,7 +16,7 @@ func (b *bunnydnsProvider) ListZones() ([]string, error) {
 	return zoneNames, nil
 }
 
-func (b *bunnydnsProvider) EnsureZoneExists(domain string) error {
+func (b *bunnydnsProvider) EnsureZoneExists(domain string, metadata map[string]string) error {
 	_, err := b.findZoneByDomain(domain)
 	if err == nil {
 		return nil

providers/cloudflare/cloudflareProvider.go

@@ -898,7 +898,7 @@ func getProxyMetadata(r *models.RecordConfig) map[string]string {
 }
 
 // EnsureZoneExists creates a zone if it does not exist
-func (c *cloudflareProvider) EnsureZoneExists(domain string) error {
+func (c *cloudflareProvider) EnsureZoneExists(domain string, metadata map[string]string) error {
 	if ok, err := c.zoneCache.HasZone(domain); err != nil || ok {
 		return err
 	}

providers/cloudns/cloudnsProvider.go

@@ -284,7 +284,7 @@ func (c *cloudnsProvider) GetZoneRecords(domain string, meta map[string]string)
 }
 
 // EnsureZoneExists creates a zone if it does not exist
-func (c *cloudnsProvider) EnsureZoneExists(domain string) error {
+func (c *cloudnsProvider) EnsureZoneExists(domain string, metadata map[string]string) error {
 	if _, ok, err := c.fetchDomainIndex(domain); err != nil {
 		return err
 	} else if ok { // zone already exists

providers/cnr/domains.go

@@ -3,7 +3,7 @@ package cnr
 // EnsureZoneExists returns an error
 // * if access to dnszone is not allowed (not authorized) or
 // * if it doesn't exist and creating it fails
-func (n *Client) EnsureZoneExists(domain string) error {
+func (n *Client) EnsureZoneExists(domain string, metadata map[string]string) error {
 	command := map[string]interface{}{
 		"COMMAND": "AddDNSZone",
 		"DNSZONE": domain,