From e786f5bf60ee65f39f6413d96a299ba87bbb6db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20J=C3=BCttner?= Date: Sun, 13 Feb 2022 13:19:36 +0100 Subject: [PATCH] fix --- go.mod | 2 +- go.sum | 5 +++-- provider/akamai/akamai.go | 2 +- provider/alibabacloud/alibaba_cloud_test.go | 4 ++-- provider/aws/aws.go | 10 ++-------- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index a9f4f47ed..bbe52c68d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( cloud.google.com/go/compute v1.2.0 git.blindage.org/21h/hcloud-dns v0.0.0-20200807003420-f768ffe03f8d - github.com/Azure/azure-sdk-for-go v56.0.0+incompatible + github.com/Azure/azure-sdk-for-go v46.4.0+incompatible github.com/Azure/go-autorest/autorest v0.11.21 github.com/Azure/go-autorest/autorest/adal v0.9.16 github.com/Azure/go-autorest/autorest/to v0.4.0 diff --git a/go.sum b/go.sum index d6b384b18..6e3d9f2db 100644 --- a/go.sum +++ b/go.sum @@ -58,8 +58,9 @@ git.blindage.org/21h/hcloud-dns v0.0.0-20200807003420-f768ffe03f8d/go.mod h1:n26 git.lukeshu.com/go/libsystemd v0.5.3/go.mod h1:FfDoP0i92r4p5Vn4NCLxvjkd7rCOe6otPa4L6hZg9WM= github.com/0x4c6565/genie v1.0.0/go.mod h1:fDOjW0hFamMWOIkh4irf2D/TZpXXWMFtpP8MfgK0N3c= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v56.0.0+incompatible h1:jp/df9XKIJYtf4HIVA9cgmVbQpp12lxk73pcHvDsgDE= -github.com/Azure/azure-sdk-for-go v56.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v46.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v46.4.0+incompatible h1:fCN6Pi+tEiEwFa8RSmtVlFHRXEZ+DJm9gfx/MKqYWw4= +github.com/Azure/azure-sdk-for-go v46.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= diff --git a/provider/akamai/akamai.go b/provider/akamai/akamai.go index 6132a7d7e..730cf15da 100644 --- a/provider/akamai/akamai.go +++ b/provider/akamai/akamai.go @@ -242,7 +242,7 @@ func (p AkamaiProvider) Records(context.Context) (endpoints []*endpoint.Endpoint continue } var temp interface{} = int64(recordset.TTL) - var ttl endpoint.TTL = endpoint.TTL(temp.(int64)) + var ttl = endpoint.TTL(temp.(int64)) endpoints = append(endpoints, endpoint.NewEndpointWithTTL(recordset.Name, recordset.Type, ttl, diff --git a/provider/alibabacloud/alibaba_cloud_test.go b/provider/alibabacloud/alibaba_cloud_test.go index 306650814..6e78b6b1a 100644 --- a/provider/alibabacloud/alibaba_cloud_test.go +++ b/provider/alibabacloud/alibaba_cloud_test.go @@ -94,7 +94,7 @@ func (m *MockAlibabaCloudDNSAPI) UpdateDomainRecord(request *alidns.UpdateDomain } func (m *MockAlibabaCloudDNSAPI) DescribeDomains(request *alidns.DescribeDomainsRequest) (response *alidns.DescribeDomainsResponse, err error) { - var result alidns.Domains + var result alidns.DomainsInDescribeDomains for _, record := range m.records { domain := alidns.Domain{} domain.DomainName = record.DomainName @@ -209,7 +209,7 @@ func (m *MockAlibabaCloudPrivateZoneAPI) DescribeZoneInfo(request *pvtz.Describe response = pvtz.CreateDescribeZoneInfoResponse() response.ZoneId = m.zone.ZoneId response.ZoneName = m.zone.ZoneName - response.BindVpcs = pvtz.BindVpcs{Vpc: m.zone.Vpcs.Vpc} + response.BindVpcs = pvtz.BindVpcsInDescribeZoneInfo{Vpc: m.zone.Vpcs.Vpc} return response, nil } diff --git a/provider/aws/aws.go b/provider/aws/aws.go index 705020fed..8868de97d 100644 --- a/provider/aws/aws.go +++ b/provider/aws/aws.go @@ -292,10 +292,7 @@ func (p *AWSProvider) Zones(ctx context.Context) (map[string]*route53.HostedZone // wildcardUnescape converts \\052.abc back to *.abc // Route53 stores wildcards escaped: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html?shortFooter=true#domain-name-format-asterisk func wildcardUnescape(s string) string { - if strings.Contains(s, "\\052") { - s = strings.Replace(s, "\\052", "*", 1) - } - return s + return strings.Replace(s, "\\052", "*", 1) } // Records returns the list of records in a given hosted zone. @@ -888,8 +885,5 @@ func canonicalHostedZone(hostname string) string { // cleanZoneID removes the "/hostedzone/" prefix func cleanZoneID(id string) string { - if strings.HasPrefix(id, "/hostedzone/") { - id = strings.TrimPrefix(id, "/hostedzone/") - } - return id + return strings.TrimPrefix(id, "/hostedzone/") }