From a8b2397631278c63959da53b9914f453d393104b Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sat, 16 Feb 2019 14:56:15 +0100 Subject: [PATCH] chore: update golangci-lint. --- .travis.yml | 2 +- cmd/cmd_run.go | 2 +- providers/dns/sakuracloud/sakuracloud.go | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e5f26a6..cbef55ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ before_install: - go get -u github.com/letsencrypt/pebble/... # Install linters and misspell - - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.13.2 + - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.14.0 - golangci-lint --version install: diff --git a/cmd/cmd_run.go b/cmd/cmd_run.go index 82c5cced..a47d5097 100644 --- a/cmd/cmd_run.go +++ b/cmd/cmd_run.go @@ -106,7 +106,7 @@ func handleTOS(ctx *cli.Context, client *lego.Client) bool { case "", "y", "Y": return true case "n", "N": - log.Fatal("You did not accept the TOS. Unable to proceed.") + return false default: fmt.Println("Your input was invalid. Please answer with one of Y/y, n/N or by pressing enter.") } diff --git a/providers/dns/sakuracloud/sakuracloud.go b/providers/dns/sakuracloud/sakuracloud.go index 54c92a9f..ea2d4600 100644 --- a/providers/dns/sakuracloud/sakuracloud.go +++ b/providers/dns/sakuracloud/sakuracloud.go @@ -101,10 +101,7 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { return fmt.Errorf("sakuracloud: %v", err) } - records, err := d.findTxtRecords(fqdn, zone) - if err != nil { - return fmt.Errorf("sakuracloud: %v", err) - } + records := d.findTxtRecords(fqdn, zone) for _, record := range records { var updRecords []sacloud.DNSRecordSet @@ -155,7 +152,7 @@ func (d *DNSProvider) getHostedZone(domain string) (*sacloud.DNS, error) { return nil, fmt.Errorf("zone %s not found", zoneName) } -func (d *DNSProvider) findTxtRecords(fqdn string, zone *sacloud.DNS) ([]sacloud.DNSRecordSet, error) { +func (d *DNSProvider) findTxtRecords(fqdn string, zone *sacloud.DNS) []sacloud.DNSRecordSet { recordName := d.extractRecordName(fqdn, zone.Name) var res []sacloud.DNSRecordSet @@ -164,7 +161,7 @@ func (d *DNSProvider) findTxtRecords(fqdn string, zone *sacloud.DNS) ([]sacloud. res = append(res, record) } } - return res, nil + return res } func (d *DNSProvider) extractRecordName(fqdn, domain string) string {