fix(civo): normalize @ apex record names

The Civo DNS API may return "@" as the record name for apex (root)
domain records. The provider only handled the empty string case,
causing apex records to be unrecognized during reconciliation. This
led to repeated "database_dns_record_already_exist" errors on every
sync loop as the provider attempted to re-create records it couldn't
find.

Normalize "@" to "" in both Records() and getRecordID().

Related: #6183
Signed-off-by: Cody J. Hanson <cody@codyjhanson.com>

Author: cjohnhanson

provider/civo/civo.go

@@ -132,7 +132,8 @@ func (p *CivoProvider) Records(ctx context.Context) ([]*endpoint.Endpoint, error
 
 				// root name is identified by the empty string and should be
 				// translated to zone name for the endpoint entry.
-				if r.Name == "" {
+				// The Civo API may return "@" for apex records instead of "".
+				if r.Name == "" || r.Name == "@" {
 					name = zone.Name
 				}
 
@@ -539,7 +540,12 @@ func getRecordID(records []civogo.DNSRecord, zone civogo.DNSDomain, ep endpoint.
 	for _, record := range records {
 		stripedName := getStrippedRecordName(zone, ep)
 		toUpper := strings.ToUpper(string(record.Type))
-		if record.Name == stripedName && toUpper == ep.RecordType {
+		// The Civo API may return "@" for apex record names instead of "".
+		recordName := record.Name
+		if recordName == "@" {
+			recordName = ""
+		}
+		if recordName == stripedName && toUpper == ep.RecordType {
 			matchedRecords = append(matchedRecords, record)
 		}
 	}

provider/civo/civo_test.go

@@ -130,6 +130,49 @@ func TestCivoProviderRecords(t *testing.T) {
 	assert.Equal(t, int(records[1].RecordTTL), expected[1].TTL)
 }
 
+func TestCivoProviderRecordsApexAt(t *testing.T) {
+	client, server, _ := civogo.NewAdvancedClientForTesting([]civogo.ConfigAdvanceClientForTesting{
+		{
+			Method: "GET",
+			Value: []civogo.ValueAdvanceClientForTesting{
+				{
+					RequestBody: ``,
+					URL:         "/v2/dns/12345/records",
+					ResponseBody: `[
+						{"id": "1", "domain_id":"12345", "account_id": "1", "name": "@", "type": "A", "value": "10.0.0.0", "ttl": 600},
+						{"id": "2", "account_id": "1", "domain_id":"12345", "name": "www", "type": "A", "value": "10.0.0.1", "ttl": 600}
+						]`,
+				},
+				{
+					RequestBody: ``,
+					URL:         "/v2/dns",
+					ResponseBody: `[
+						{"id": "12345", "account_id": "1", "name": "example.com"}
+						]`,
+				},
+			},
+		},
+	})
+
+	defer server.Close()
+	provider := &CivoProvider{
+		Client:       *client,
+		domainFilter: endpoint.NewDomainFilter([]string{"example.com"}),
+	}
+
+	records, err := provider.Records(context.Background())
+	assert.NoError(t, err)
+	assert.Len(t, records, 2)
+
+	// The "@" apex record should be translated to the zone name
+	assert.Equal(t, "example.com", records[0].DNSName)
+	assert.Equal(t, "A", records[0].RecordType)
+	assert.Equal(t, "10.0.0.0", records[0].Targets[0])
+
+	// Regular subdomain record should work as before
+	assert.Equal(t, "www.example.com", records[1].DNSName)
+}
+
 func TestCivoProviderRecordsWithError(t *testing.T) {
 	client, server, _ := civogo.NewAdvancedClientForTesting([]civogo.ConfigAdvanceClientForTesting{
 		{
@@ -866,6 +909,30 @@ func TestCivoProviderGetRecordID(t *testing.T) {
 	assert.Equal(t, id[0].ID, record[0].ID)
 }
 
+func TestCivoProviderGetRecordIDApexAt(t *testing.T) {
+	zone := civogo.DNSDomain{
+		ID:   "12345",
+		Name: "test.com",
+	}
+
+	// Civo API may return "@" for apex record names
+	records := []civogo.DNSRecord{{
+		ID:          "1",
+		Type:        "A",
+		Name:        "@",
+		Value:       "10.0.0.0",
+		DNSDomainID: "12345",
+		TTL:         600,
+	}}
+
+	// Apex endpoint: DNSName == zone name, so getStrippedRecordName returns ""
+	ep := endpoint.Endpoint{DNSName: "test.com", Targets: endpoint.Targets{"10.0.0.0"}, RecordType: "A"}
+	matched := getRecordID(records, zone, ep)
+
+	assert.Len(t, matched, 1)
+	assert.Equal(t, "1", matched[0].ID)
+}
+
 func TestCivo_submitChangesCreate(t *testing.T) {
 	log.SetOutput(io.Discard)
 	client, server, _ := civogo.NewAdvancedClientForTesting([]civogo.ConfigAdvanceClientForTesting{