Restored functionality with new build system (#22)

* Restored previous functionality

* Adding modified files

Author: mconfalonieri

README.md

@@ -59,7 +59,7 @@ provider: webhook
 
 extraArgs:
   webhook-provider-url: http://localhost:8888
-  txt-prefix: reg-
+  txt-prefix: "reg-%{record_type}-"
 
 sidecars:
   - name: hetzner-webhook
@@ -136,7 +136,7 @@ provider:
       timeoutSeconds: 5
 
 extraArgs:
-  - --txt-prefix=reg-
+  - "--txt-prefix=reg-%{record_type}-"
 ```
 
 And then:

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/google/go-licenses v1.6.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0
+	gotest.tools v2.2.0+incompatible
 	gotest.tools/gotestsum v1.10.0
 )
 
@@ -47,6 +48,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/otiai10/copy v1.14.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/sagikazarmark/locafero v0.3.0 // indirect

go.sum

@@ -1243,6 +1243,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/gotestsum v1.10.0 h1:lVO4uQJoxdsJb7jgmr1fg8QW7zGQ/tuqvsq5fHKyoHQ=
 gotest.tools/gotestsum v1.10.0/go.mod h1:6JHCiN6TEjA7Kaz23q1bH0e2Dc3YJjDUZ0DmctFZf+w=
 gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo=

internal/hetzner/provider.go

@@ -276,7 +276,7 @@ func (p *HetznerProvider) fetchZones(ctx context.Context) ([]hdns.Zone, error) {
 }
 
 // ensureZoneIDMappingPresent prepares the zoneIDNameMapper, that associates
-// each ZoneID with the zone name.
+// each ZoneID woth the zone name.
 func (p *HetznerProvider) ensureZoneIDMappingPresent(zones []hdns.Zone) {
 	zoneIDNameMapper := provider.ZoneIDName{}
 	for _, z := range zones {
@@ -330,18 +330,13 @@ func makeEndpointName(domain, entryName, epType string) string {
 //   - A-Records should respect ignored networks and should only contain IPv4
 //     entries.
 func (p HetznerProvider) makeEndpointTarget(domain, entryTarget, recordType string) (string, bool) {
-	if recordType != "CNAME" {
+	if domain == "" {
 		return entryTarget, true
 	}
 
-	adjustedTarget := entryTarget
-	if !strings.HasSuffix(entryTarget, ".") {
-		adjustedTarget = entryTarget + "."
-	}
-
-	if strings.HasSuffix(adjustedTarget, "."+domain+".") {
-		adjustedTarget = strings.TrimSuffix(adjustedTarget, "."+domain+".")
-	}
+	// Trim the trailing dot
+	adjustedTarget := strings.TrimSuffix(entryTarget, ".")
+	adjustedTarget = strings.TrimSuffix(adjustedTarget, "."+domain)
 
 	return adjustedTarget, true
 }
@@ -480,7 +475,7 @@ func processCreateActions(
 			continue
 		}
 
-		records := recordsByZoneID[zoneID]
+		records := recordsByZoneID[zoneName]
 
 		for _, ep := range endpoints {
 			// Warn if there are existing records since we expect to create only new records.
@@ -500,6 +495,9 @@ func processCreateActions(
 			}
 
 			for _, target := range ep.Targets {
+				if ep.RecordType == "CNAME" && !strings.HasSuffix(target, ".") {
+					target += "."
+				}
 				log.WithFields(log.Fields{
 					"zoneName":   zoneName,
 					"dnsName":    ep.DNSName,
@@ -585,6 +583,9 @@ func processUpdateActions(
 
 			// Generate create and delete actions based on existence of a record for each target.
 			for _, target := range ep.Targets {
+				if ep.RecordType == "CNAME" && !strings.HasSuffix(target, ".") {
+					target += "."
+				}
 				if record, ok := matchingRecordsByTarget[target]; ok {
 					log.WithFields(log.Fields{
 						"zoneName":   zoneName,