Skip to content

Commit 2328708

Browse files
Sh4d1ldez
authored andcommitted
scaleway: add cname support
Signed-off-by: Patrik Cyvoct <[email protected]>
1 parent 6da9220 commit 2328708

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ require (
6262
github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2
6363
github.com/sacloud/api-client-go v0.2.8
6464
github.com/sacloud/iaas-api-go v1.11.1
65-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17
65+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22
6666
github.com/softlayer/softlayer-go v1.1.2
6767
github.com/stretchr/testify v1.8.4
6868
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.490

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,8 +539,8 @@ github.com/sacloud/iaas-api-go v1.11.1 h1:2MsFZ4H1uRdRVx2nVXuERWQ3swoFc3XreIV5hJ
539539
github.com/sacloud/iaas-api-go v1.11.1/go.mod h1:uBDSa06F/V0OnoR66jGdbH0PVnCJw+NeE9RVbVgMfss=
540540
github.com/sacloud/packages-go v0.0.9 h1:GbinkBLC/eirFhHpLjoDW6JV7+95Rnd2d8RWj7Afeks=
541541
github.com/sacloud/packages-go v0.0.9/go.mod h1:k+EEUMF2LlncjbNIJNOqLyZ9wjTESPIWIk1OA7x9j2Q=
542-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17 h1:1WuWJu7/e8SqK+uQl7lfk/N/oMZTL2NE/TJsNKRNMc4=
543-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
542+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22 h1:wJrcTdddKOI8TFxs8cemnhKP2EmKy3yfUKHj3ZdfzYo=
543+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
544544
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
545545
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
546546
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=

providers/dns/scaleway/scaleway.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
121121
Comment: scw.StringPtr("used by lego"),
122122
}}
123123

124-
// TODO(ldez) replace domain by FQDN to follow CNAME.
125124
req := &scwdomain.UpdateDNSZoneRecordsRequest{
126-
DNSZone: domain,
125+
DNSZone: info.EffectiveFQDN,
127126
Changes: []*scwdomain.RecordChange{{
128127
Add: &scwdomain.RecordChangeAdd{Records: records},
129128
}},
130-
ReturnAllRecords: scw.BoolPtr(false),
129+
ReturnAllRecords: scw.BoolPtr(false),
130+
DisallowNewZoneCreation: true,
131131
}
132132

133133
_, err := d.client.UpdateDNSZoneRecords(req)
@@ -148,13 +148,13 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
148148
Data: scw.StringPtr(fmt.Sprintf(`%q`, info.Value)),
149149
}
150150

151-
// TODO(ldez) replace domain by FQDN to follow CNAME.
152151
req := &scwdomain.UpdateDNSZoneRecordsRequest{
153-
DNSZone: domain,
152+
DNSZone: info.EffectiveFQDN,
154153
Changes: []*scwdomain.RecordChange{{
155154
Delete: &scwdomain.RecordChangeDelete{IDFields: recordIdentifier},
156155
}},
157-
ReturnAllRecords: scw.BoolPtr(false),
156+
ReturnAllRecords: scw.BoolPtr(false),
157+
DisallowNewZoneCreation: true,
158158
}
159159

160160
_, err := d.client.UpdateDNSZoneRecords(req)

0 commit comments

Comments
 (0)