1
0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00

GCLOUD: Adopt diff2 in compatibility mode (#1982)

This commit is contained in:
Tom Limoncelli
2023-01-24 12:07:33 -05:00
committed by GitHub
parent 3a7b150a2d
commit cb88bdd068

View File

@@ -205,12 +205,18 @@ func (g *gcloudProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*model
models.PostProcessRecords(existingRecords)
txtutil.SplitSingleLongTxt(dc.Records) // Autosplit long TXT records
var corrections []*models.Correction
if !diff2.EnableDiff2 || true { // Remove "|| true" when diff2 version arrives
// first collect keys that have changed
differ := diff.New(dc)
var differ diff.Differ
if !diff2.EnableDiff2 {
differ = diff.New(dc)
} else {
differ = diff.NewCompat(dc)
}
_, create, delete, modify, err := differ.IncrementalDiff(existingRecords)
if err != nil {
return nil, err
}
if err != nil {
return nil, fmt.Errorf("incdiff error: %w", err)
}
@@ -279,11 +285,7 @@ func (g *gcloudProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*model
Msg: desc,
F: runChange,
}}, nil
}
// Insert Future diff2 version here.
return corrections, nil
}
func nativeToRecord(set *gdns.ResourceRecordSet, rec, origin string) (*models.RecordConfig, error) {