Skip to content

Commit 2c4cc0c

Browse files
authoredFeb 14, 2025··
refactor(current-domain) Remove dot from **current-domain** (#3433)
1 parent ea645bf commit 2c4cc0c

File tree

2 files changed

+82
-84
lines changed

2 files changed

+82
-84
lines changed
 

‎integrationTest/helpers_integration_test.go

+6-8
Original file line numberDiff line numberDiff line change
@@ -109,23 +109,21 @@ func makeChanges(t *testing.T, prv providers.DNSServiceProvider, dc *models.Doma
109109
dom, _ := dc.Copy()
110110
for _, r := range tst.Records {
111111
rc := models.RecordConfig(*r)
112+
112113
if strings.Contains(rc.GetTargetField(), "**current-domain**") {
113-
_ = rc.SetTarget(strings.Replace(rc.GetTargetField(), "**current-domain**", domainName, 1) + ".")
114-
}
115-
if strings.Contains(rc.GetTargetField(), "**current-domain-no-trailing**") {
116-
_ = rc.SetTarget(strings.Replace(rc.GetTargetField(), "**current-domain-no-trailing**", domainName, 1))
114+
_ = rc.SetTarget(strings.Replace(rc.GetTargetField(), "**current-domain**", domainName, 1))
117115
}
118116
if strings.Contains(rc.GetLabelFQDN(), "**current-domain**") {
119117
rc.SetLabelFromFQDN(strings.Replace(rc.GetLabelFQDN(), "**current-domain**", domainName, 1), domainName)
120118
}
121-
// if providers.ProviderHasCapability(*providerToRun, providers.CanUseAzureAlias) {
119+
122120
if strings.Contains(rc.GetTargetField(), "**subscription-id**") {
123121
_ = rc.SetTarget(strings.Replace(rc.GetTargetField(), "**subscription-id**", origConfig["SubscriptionID"], 1))
124122
}
125123
if strings.Contains(rc.GetTargetField(), "**resource-group**") {
126124
_ = rc.SetTarget(strings.Replace(rc.GetTargetField(), "**resource-group**", origConfig["ResourceGroup"], 1))
127125
}
128-
//}
126+
129127
dom.Records = append(dom.Records, &rc)
130128
}
131129
dom.Unmanaged = tst.Unmanaged
@@ -285,7 +283,7 @@ func (tc *TestCase) UnsafeIgnore() *TestCase {
285283

286284
func SetLabel(r *models.RecordConfig, label, domain string) {
287285
r.Name = label
288-
r.NameFQDN = dnsutil.AddOrigin(label, "**current-domain**")
286+
r.NameFQDN = dnsutil.AddOrigin(label, "**current-domain**.")
289287
}
290288

291289
func withMeta(record *models.RecordConfig, metadata map[string]string) *models.RecordConfig {
@@ -425,7 +423,7 @@ func makeRec(name, target, typ string) *models.RecordConfig {
425423
Type: typ,
426424
TTL: 300,
427425
}
428-
SetLabel(r, name, "**current-domain**")
426+
SetLabel(r, name, "**current-domain**.")
429427
r.MustSetTarget(target)
430428
return r
431429
}

0 commit comments

Comments
 (0)
Please sign in to comment.