From 2f83aa9302a37d0e5def193dcbe0ef5dca5eebc8 Mon Sep 17 00:00:00 2001 From: Patrick Gaskin Date: Tue, 28 Jan 2020 10:42:31 -0500 Subject: [PATCH] Internals: Switch to v2 go.mod, drop GOPATH, and fix Azure Pipelines (#595) * Switched to v2 go.mod Also set GO111MODULE=on in build stuff to always use Go modules even when in GOPATH. * Ensure go.mod, go.sum, and vendor are up to date * Attempt to fix Azure pipelines * Add set -e to properly fail on exit (it didn't seem to be propagating properly before). * Set workingDirectory for GoFmt and GoGen (this might be why it fails unlike compile and unitests). * Another attempt to fix Azure Pipelines * Use the Go env template for all go-related jobs. * Completely fixed Azure Pipelines * Added a display name to GoFmt for consistency. * Fixed diffs for GoFmt and GoGen. * Show git status for checks. * Drop GOPATH for tests TODO: Do the same for integration tests. * Drop GOPATH for integration tests * Show more diffs * Regenerate provider support matrix This wasn't done in #590... --- .travis.yml | 4 +- Dockerfile | 2 +- azure-pipelines.yml | 44 +++++++++++++----- build.ps1 | 4 +- build/azure-pipelines/go-env.yaml | 12 ++--- build/azure-pipelines/integration.yml | 6 +-- build/build.go | 3 +- build/generate/featureMatrix.go | 4 +- cmd/convertzone/main.go | 4 +- commands/commands.go | 4 +- commands/createDomains.go | 2 +- commands/getCerts.go | 8 ++-- commands/previewPush.go | 14 +++--- commands/printIR.go | 6 +-- docs/_includes/matrix.html | 26 +++++++++++ docs/flattener/js.go | 2 +- go.mod | 2 +- integrationTest/integration_test.go | 10 ++-- main.go | 4 +- models/dns.go | 2 +- pkg/acme/acme.go | 6 +-- pkg/js/js.go | 6 +-- pkg/nameservers/nameservers.go | 4 +- pkg/normalize/flatten.go | 4 +- pkg/normalize/importTransform_test.go | 2 +- pkg/normalize/validate.go | 6 +-- pkg/normalize/validate_test.go | 2 +- pkg/printer/printer.go | 2 +- providers/_all/all.go | 46 +++++++++---------- providers/activedir/activedirProvider.go | 2 +- providers/activedir/domains.go | 6 +-- providers/activedir/domains_test.go | 2 +- providers/azuredns/azureDnsProvider.go | 6 +-- providers/bind/bindProvider.go | 6 +-- providers/cloudflare/cloudflareProvider.go | 12 ++--- providers/cloudflare/preprocess_test.go | 4 +- providers/cloudflare/rest.go | 2 +- providers/cloudns/cloudnsProvider.go | 6 +-- providers/diff/diff.go | 4 +- providers/diff/diff_test.go | 4 +- .../digitalocean/digitaloceanProvider.go | 6 +-- providers/dnsimple/dnsimpleProvider.go | 6 +-- providers/exoscale/exoscaleProvider.go | 6 +-- providers/gandi/gandiProvider.go | 8 ++-- providers/gandi/livedns.go | 8 ++-- providers/gandi/livedns_test.go | 2 +- providers/gandi/protocol.go | 2 +- providers/gandi_v5/convert.go | 4 +- providers/gandi_v5/convert_test.go | 2 +- providers/gandi_v5/gandi_v5Provider.go | 8 ++-- providers/gcloud/gcloudProvider.go | 6 +-- providers/hexonet/hexonetProvider.go | 2 +- providers/hexonet/nameservers.go | 2 +- providers/hexonet/records.go | 4 +- providers/internetbs/internetbsProvider.go | 4 +- providers/linode/linodeProvider.go | 6 +-- providers/namecheap/namecheapProvider.go | 8 ++-- providers/namedotcom/namedotcomProvider.go | 2 +- providers/namedotcom/nameservers.go | 4 +- providers/namedotcom/records.go | 4 +- providers/ns1/ns1provider.go | 6 +-- providers/octodns/octodnsProvider.go | 8 ++-- providers/octodns/octoyaml/js.go | 4 +- providers/octodns/octoyaml/read.go | 2 +- providers/octodns/octoyaml/sort.go | 4 +- providers/octodns/octoyaml/write.go | 2 +- providers/opensrs/opensrsProvider.go | 4 +- providers/ovh/ovhProvider.go | 6 +-- providers/ovh/protocol.go | 2 +- providers/providers.go | 2 +- providers/route53/route53Provider.go | 6 +-- providers/softlayer/softlayerProvider.go | 6 +-- providers/vultr/convert_test.go | 2 +- providers/vultr/vultrProvider.go | 6 +-- 74 files changed, 244 insertions(+), 205 deletions(-) diff --git a/.travis.yml b/.travis.yml index 143a82793..2e72d9f69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ go: install: pwd script: - - go run build/validate/validate.go - - go test ./... + - go run -mod=readonly build/validate/validate.go + - go test -mod=readonly ./... notifications: email: diff --git a/Dockerfile b/Dockerfile index 80e5d0584..919fcee66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.13-alpine AS build-env WORKDIR /go/src/github.com/StackExchange/dnscontrol ADD . . RUN apk update && apk add git -RUN go run build/build.go -os=linux +RUN GO111MODULE=on go run build/build.go -os=linux RUN cp dnscontrol-Linux /go/bin/dnscontrol RUN dnscontrol version RUN go build -o cmd/convertzone/convertzone cmd/convertzone/main.go diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 98c74c7a6..9ca9132c8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,9 +1,3 @@ -variables: - GOBIN: '$(GOPATH)/bin' # Go binaries path - GOROOT: '/usr/local/go1.13' # Go installation path - GOPATH: '$(system.defaultWorkingDirectory)/gopath' # Go workspace path - modulePath: '$(GOPATH)/src/github.com/$(build.repository.name)' # Path to the module's code - trigger: batch: "true" branches: @@ -24,27 +18,53 @@ jobs: OS: linux steps: - template: build/azure-pipelines/go-env.yaml - - script: "go run build/build.go -os $(OS)" - workingDirectory: '$(modulePath)' + - script: "go run -mod=readonly build/build.go -os $(OS)" - job: "unittests" displayName: "Run Unit Tests" steps: - template: build/azure-pipelines/go-env.yaml - - script: "go test ./..." - workingDirectory: '$(modulePath)' + - script: "go test -mod=readonly ./..." + +- job: "modtidy" + displayName: "Check Go Modules" + steps: + - template: build/azure-pipelines/go-env.yaml + - script: | + set -e + go mod tidy + git status --porcelain + git diff + [ ! -n "$(git status --porcelain go.mod go.sum)" ] || { echo "Error: go.mod/go.sum outdated, please run go mod tidy."; false; } + +- job: "modvendor" + displayName: "Check Go Vendor" + steps: + - template: build/azure-pipelines/go-env.yaml + - script: | + set -e + go mod vendor + git status --porcelain + [ ! -n "$(git status --porcelain vendor)" ] || { echo "Error: Vendor does not match go.mod/go.sum, please run go mod vendor."; false; } - job: "GoFmt" + displayName: "Check Go Formatting" steps: + - template: build/azure-pipelines/go-env.yaml - script: | + set -e go fmt ./... + git status --porcelain git diff - git diff --exit-code + [ ! -n "$(git status --porcelain)" ] || { echo "Error: Go files not formatted, please run go fmt ./... ."; false; } - job: "GoGen" displayName: "Check Go Generate" steps: + - template: build/azure-pipelines/go-env.yaml - script: | + set -e go generate . + git status --porcelain git diff - git diff --exit-code + [ ! -n "$(git status --porcelain)" ] || { echo "Error: Generated files not up to date, please run go generate . ."; false; } diff --git a/build.ps1 b/build.ps1 index cf6dd45c8..14daa1f45 100644 --- a/build.ps1 +++ b/build.ps1 @@ -10,11 +10,13 @@ if ($SHA -eq ""){ $PKG = "github.com/StackExchange/dnscontrol" $DATE = [int][double]::Parse((Get-Date -UFormat %s)) -$FLAGS="-s -w -X main.SHA=$SHA -X main.BuildTime=$DATE" +$FLAGS="-mod=readonly -s -w -X main.SHA=$SHA -X main.BuildTime=$DATE" Write-Host $FLAGS $OrigGOOS = $env:GOOS +$env:GO111MODULE = "on" + Write-Host 'Building Linux' $env:GOOS = "linux" go build -o dnscontrol-Linux -ldflags "$FLAGS" $PKG diff --git a/build/azure-pipelines/go-env.yaml b/build/azure-pipelines/go-env.yaml index 74e58a454..fa486b015 100644 --- a/build/azure-pipelines/go-env.yaml +++ b/build/azure-pipelines/go-env.yaml @@ -1,12 +1,6 @@ # shared step for setting up go env # see https://docs.microsoft.com/en-us/azure/devops/pipelines/languages/go?view=azure-devops#build-a-container-image steps: -- script: | - mkdir -p '$(GOBIN)' - mkdir -p '$(GOPATH)/pkg' - mkdir -p '$(modulePath)' - shopt -s extglob - mv !(gopath) '$(modulePath)' - echo '##vso[task.prependpath]$(GOBIN)' - echo '##vso[task.prependpath]$(GOROOT)/bin' - displayName: 'Set up the Go workspace' +- task: GoTool@0 + inputs: + version: '1.13.6' diff --git a/build/azure-pipelines/integration.yml b/build/azure-pipelines/integration.yml index a7e3d5bc7..6f3327b15 100644 --- a/build/azure-pipelines/integration.yml +++ b/build/azure-pipelines/integration.yml @@ -1,9 +1,5 @@ variables: - GOBIN: '$(GOPATH)/bin' # Go binaries path - GOROOT: '/usr/local/go1.13' # Go installation path - GOPATH: '$(system.defaultWorkingDirectory)/gopath' # Go workspace path - modulePath: '$(GOPATH)/src/github.com/$(build.repository.name)' # Path to the module's code - wd: '$(modulePath)/integrationTest' + wd: '$(System.DefaultWorkingDirectory)/integrationTest' trigger: batch: "true" diff --git a/build/build.go b/build/build.go index f905ec302..ebdce32f7 100644 --- a/build/build.go +++ b/build/build.go @@ -17,12 +17,13 @@ var goos = flag.String("os", "", "OS to build (linux, windows, or darwin) Defaul func main() { flag.Parse() flags := fmt.Sprintf(`-s -w -X main.SHA="%s" -X main.BuildTime=%d`, getVersion(), time.Now().Unix()) - pkg := "github.com/StackExchange/dnscontrol" + pkg := "github.com/StackExchange/dnscontrol/v2" build := func(out, goos string) { log.Printf("Building %s", out) cmd := exec.Command("go", "build", "-o", out, "-ldflags", flags, pkg) os.Setenv("GOOS", goos) + os.Setenv("GO111MODULE", "on") cmd.Stderr = os.Stderr cmd.Stdout = os.Stdout err := cmd.Run() diff --git a/build/generate/featureMatrix.go b/build/generate/featureMatrix.go index a318abd7b..806195293 100644 --- a/build/generate/featureMatrix.go +++ b/build/generate/featureMatrix.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "sort" - "github.com/StackExchange/dnscontrol/providers" - _ "github.com/StackExchange/dnscontrol/providers/_all" + "github.com/StackExchange/dnscontrol/v2/providers" + _ "github.com/StackExchange/dnscontrol/v2/providers/_all" ) func generateFeatureMatrix() error { diff --git a/cmd/convertzone/main.go b/cmd/convertzone/main.go index 445c0e1c2..21c7ad11e 100644 --- a/cmd/convertzone/main.go +++ b/cmd/convertzone/main.go @@ -43,8 +43,8 @@ import ( "strconv" "strings" - "github.com/StackExchange/dnscontrol/providers/bind" - "github.com/StackExchange/dnscontrol/providers/octodns/octoyaml" + "github.com/StackExchange/dnscontrol/v2/providers/bind" + "github.com/StackExchange/dnscontrol/v2/providers/octodns/octoyaml" "github.com/miekg/dns" "github.com/miekg/dns/dnsutil" "github.com/pkg/errors" diff --git a/commands/commands.go b/commands/commands.go index e0a993a39..02d3e7294 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" "github.com/pkg/errors" "github.com/urfave/cli" ) diff --git a/commands/createDomains.go b/commands/createDomains.go index d0ef3cb17..610350c7f 100644 --- a/commands/createDomains.go +++ b/commands/createDomains.go @@ -3,7 +3,7 @@ package commands import ( "fmt" - "github.com/StackExchange/dnscontrol/providers" + "github.com/StackExchange/dnscontrol/v2/providers" "github.com/urfave/cli" ) diff --git a/commands/getCerts.go b/commands/getCerts.go index 9f706d06d..ba8d7e177 100644 --- a/commands/getCerts.go +++ b/commands/getCerts.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/acme" - "github.com/StackExchange/dnscontrol/pkg/normalize" - "github.com/StackExchange/dnscontrol/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/acme" + "github.com/StackExchange/dnscontrol/v2/pkg/normalize" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" "github.com/urfave/cli" ) diff --git a/commands/previewPush.go b/commands/previewPush.go index 000f41658..5842b858f 100644 --- a/commands/previewPush.go +++ b/commands/previewPush.go @@ -5,13 +5,13 @@ import ( "log" "os" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/nameservers" - "github.com/StackExchange/dnscontrol/pkg/normalize" - "github.com/StackExchange/dnscontrol/pkg/notifications" - "github.com/StackExchange/dnscontrol/pkg/printer" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/config" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/nameservers" + "github.com/StackExchange/dnscontrol/v2/pkg/normalize" + "github.com/StackExchange/dnscontrol/v2/pkg/notifications" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/config" "github.com/pkg/errors" "github.com/urfave/cli" ) diff --git a/commands/printIR.go b/commands/printIR.go index 1da8889ce..c1f7db097 100644 --- a/commands/printIR.go +++ b/commands/printIR.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/js" - "github.com/StackExchange/dnscontrol/pkg/normalize" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/js" + "github.com/StackExchange/dnscontrol/v2/pkg/normalize" "github.com/pkg/errors" "github.com/urfave/cli" ) diff --git a/docs/_includes/matrix.html b/docs/_includes/matrix.html index d46d966dd..6f2ce30cd 100644 --- a/docs/_includes/matrix.html +++ b/docs/_includes/matrix.html @@ -19,6 +19,7 @@
GANDI_V5
GCLOUD
HEXONET
+
INTERNETBS
LINODE
NAMECHEAP
NAMEDOTCOM
@@ -79,6 +80,9 @@ + + + @@ -145,6 +149,9 @@ + + + @@ -217,6 +224,9 @@ + + + @@ -278,6 +288,7 @@ + @@ -340,6 +351,7 @@ + @@ -398,6 +410,7 @@ + @@ -449,6 +462,7 @@ + SRV @@ -492,6 +506,7 @@ + @@ -547,6 +562,7 @@ + @@ -586,6 +602,7 @@ + @@ -629,6 +646,7 @@ + @@ -668,6 +686,7 @@ + @@ -707,6 +726,7 @@ + @@ -776,6 +796,9 @@ + + + @@ -848,6 +871,9 @@ + + + diff --git a/docs/flattener/js.go b/docs/flattener/js.go index 2b902bf12..7be9bdf06 100644 --- a/docs/flattener/js.go +++ b/docs/flattener/js.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/StackExchange/dnscontrol/pkg/spflib" + "github.com/StackExchange/dnscontrol/v2/pkg/spflib" "github.com/gopherjs/jquery" ) diff --git a/go.mod b/go.mod index 25fce98a1..30161894e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/StackExchange/dnscontrol +module github.com/StackExchange/dnscontrol/v2 go 1.13 diff --git a/integrationTest/integration_test.go b/integrationTest/integration_test.go index 06d2d974c..19bf668aa 100644 --- a/integrationTest/integration_test.go +++ b/integrationTest/integration_test.go @@ -9,11 +9,11 @@ import ( "strconv" "strings" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/nameservers" - "github.com/StackExchange/dnscontrol/providers" - _ "github.com/StackExchange/dnscontrol/providers/_all" - "github.com/StackExchange/dnscontrol/providers/config" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/nameservers" + "github.com/StackExchange/dnscontrol/v2/providers" + _ "github.com/StackExchange/dnscontrol/v2/providers/_all" + "github.com/StackExchange/dnscontrol/v2/providers/config" "github.com/miekg/dns/dnsutil" "github.com/pkg/errors" ) diff --git a/main.go b/main.go index 95314fadc..de18d4ec3 100644 --- a/main.go +++ b/main.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/StackExchange/dnscontrol/commands" - _ "github.com/StackExchange/dnscontrol/providers/_all" + "github.com/StackExchange/dnscontrol/v2/commands" + _ "github.com/StackExchange/dnscontrol/v2/providers/_all" ) //go:generate go run build/generate/generate.go build/generate/featureMatrix.go diff --git a/models/dns.go b/models/dns.go index 20f853270..f185bf143 100644 --- a/models/dns.go +++ b/models/dns.go @@ -44,7 +44,7 @@ type DNSProviderConfig struct { // FIXME(tal): In hindsight, the Nameserver struct is overkill. We // could have just used []string. Now every provider calls StringsToNameservers // and ever user calls StringsToNameservers. We should refactor this -// some day. https://github.com/StackExchange/dnscontrol/issues/577 +// some day. https://github.com/StackExchange/dnscontrol/v2/issues/577 // Nameserver describes a nameserver. type Nameserver struct { diff --git a/pkg/acme/acme.go b/pkg/acme/acme.go index a575de716..1763138dc 100644 --- a/pkg/acme/acme.go +++ b/pkg/acme/acme.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/nameservers" - "github.com/StackExchange/dnscontrol/pkg/notifications" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/nameservers" + "github.com/StackExchange/dnscontrol/v2/pkg/notifications" "github.com/go-acme/lego/certcrypto" "github.com/go-acme/lego/certificate" "github.com/go-acme/lego/challenge" diff --git a/pkg/js/js.go b/pkg/js/js.go index 9013a99f3..9a40abb9e 100644 --- a/pkg/js/js.go +++ b/pkg/js/js.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/printer" - "github.com/StackExchange/dnscontrol/pkg/transform" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/pkg/transform" "github.com/pkg/errors" "github.com/robertkrimen/otto" // load underscore js into vm by default _ "github.com/robertkrimen/otto/underscore" // required by otto diff --git a/pkg/nameservers/nameservers.go b/pkg/nameservers/nameservers.go index 9ae309239..2f82d633c 100644 --- a/pkg/nameservers/nameservers.go +++ b/pkg/nameservers/nameservers.go @@ -7,7 +7,7 @@ import ( "strconv" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" ) // DetermineNameservers will find all nameservers we should use for a domain. It follows the following rules: @@ -35,7 +35,7 @@ func DetermineNameservers(dc *models.DomainConfig) ([]*models.Nameserver, error) // FIXME(tlim): Rather than correct broken providers, we should print // a warning that the provider should be updated to store the FQDN // with no trailing dot. See also providers/namedotcom/nameservers.go - // Bug https://github.com/StackExchange/dnscontrol/issues/491 + // Bug https://github.com/StackExchange/dnscontrol/v2/issues/491 ns = append(ns, nss[i]) } } diff --git a/pkg/normalize/flatten.go b/pkg/normalize/flatten.go index ad1234ea0..89374c227 100644 --- a/pkg/normalize/flatten.go +++ b/pkg/normalize/flatten.go @@ -5,8 +5,8 @@ import ( "github.com/pkg/errors" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/spflib" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/spflib" ) // hasSpfRecords returns true if this record requests SPF unrolling. diff --git a/pkg/normalize/importTransform_test.go b/pkg/normalize/importTransform_test.go index d1ec4ab62..53c543c2c 100644 --- a/pkg/normalize/importTransform_test.go +++ b/pkg/normalize/importTransform_test.go @@ -3,7 +3,7 @@ package normalize import ( "testing" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" ) func makeRC(label, domain, target string, rc models.RecordConfig) *models.RecordConfig { diff --git a/pkg/normalize/validate.go b/pkg/normalize/validate.go index 16fc93b21..29675dcb3 100644 --- a/pkg/normalize/validate.go +++ b/pkg/normalize/validate.go @@ -5,9 +5,9 @@ import ( "net" "strings" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/transform" - "github.com/StackExchange/dnscontrol/providers" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/transform" + "github.com/StackExchange/dnscontrol/v2/providers" "github.com/miekg/dns" "github.com/miekg/dns/dnsutil" "github.com/pkg/errors" diff --git a/pkg/normalize/validate_test.go b/pkg/normalize/validate_test.go index 9cca46fdc..bc4fe2abf 100644 --- a/pkg/normalize/validate_test.go +++ b/pkg/normalize/validate_test.go @@ -5,7 +5,7 @@ import ( "fmt" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" ) func TestCheckLabel(t *testing.T) { diff --git a/pkg/printer/printer.go b/pkg/printer/printer.go index 939829b7e..71301ba95 100644 --- a/pkg/printer/printer.go +++ b/pkg/printer/printer.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" ) // CLI is an abstraction around the CLI. diff --git a/providers/_all/all.go b/providers/_all/all.go index 885231dc8..396377cd3 100644 --- a/providers/_all/all.go +++ b/providers/_all/all.go @@ -3,27 +3,27 @@ package all import ( // Define all known providers here. They should each register themselves with the providers package via init function. - _ "github.com/StackExchange/dnscontrol/providers/activedir" - _ "github.com/StackExchange/dnscontrol/providers/azuredns" - _ "github.com/StackExchange/dnscontrol/providers/bind" - _ "github.com/StackExchange/dnscontrol/providers/cloudflare" - _ "github.com/StackExchange/dnscontrol/providers/cloudns" - _ "github.com/StackExchange/dnscontrol/providers/digitalocean" - _ "github.com/StackExchange/dnscontrol/providers/dnsimple" - _ "github.com/StackExchange/dnscontrol/providers/exoscale" - _ "github.com/StackExchange/dnscontrol/providers/gandi" - _ "github.com/StackExchange/dnscontrol/providers/gandi_v5" - _ "github.com/StackExchange/dnscontrol/providers/gcloud" - _ "github.com/StackExchange/dnscontrol/providers/hexonet" - _ "github.com/StackExchange/dnscontrol/providers/internetbs" - _ "github.com/StackExchange/dnscontrol/providers/linode" - _ "github.com/StackExchange/dnscontrol/providers/namecheap" - _ "github.com/StackExchange/dnscontrol/providers/namedotcom" - _ "github.com/StackExchange/dnscontrol/providers/ns1" - _ "github.com/StackExchange/dnscontrol/providers/octodns" - _ "github.com/StackExchange/dnscontrol/providers/opensrs" - _ "github.com/StackExchange/dnscontrol/providers/ovh" - _ "github.com/StackExchange/dnscontrol/providers/route53" - _ "github.com/StackExchange/dnscontrol/providers/softlayer" - _ "github.com/StackExchange/dnscontrol/providers/vultr" + _ "github.com/StackExchange/dnscontrol/v2/providers/activedir" + _ "github.com/StackExchange/dnscontrol/v2/providers/azuredns" + _ "github.com/StackExchange/dnscontrol/v2/providers/bind" + _ "github.com/StackExchange/dnscontrol/v2/providers/cloudflare" + _ "github.com/StackExchange/dnscontrol/v2/providers/cloudns" + _ "github.com/StackExchange/dnscontrol/v2/providers/digitalocean" + _ "github.com/StackExchange/dnscontrol/v2/providers/dnsimple" + _ "github.com/StackExchange/dnscontrol/v2/providers/exoscale" + _ "github.com/StackExchange/dnscontrol/v2/providers/gandi" + _ "github.com/StackExchange/dnscontrol/v2/providers/gandi_v5" + _ "github.com/StackExchange/dnscontrol/v2/providers/gcloud" + _ "github.com/StackExchange/dnscontrol/v2/providers/hexonet" + _ "github.com/StackExchange/dnscontrol/v2/providers/internetbs" + _ "github.com/StackExchange/dnscontrol/v2/providers/linode" + _ "github.com/StackExchange/dnscontrol/v2/providers/namecheap" + _ "github.com/StackExchange/dnscontrol/v2/providers/namedotcom" + _ "github.com/StackExchange/dnscontrol/v2/providers/ns1" + _ "github.com/StackExchange/dnscontrol/v2/providers/octodns" + _ "github.com/StackExchange/dnscontrol/v2/providers/opensrs" + _ "github.com/StackExchange/dnscontrol/v2/providers/ovh" + _ "github.com/StackExchange/dnscontrol/v2/providers/route53" + _ "github.com/StackExchange/dnscontrol/v2/providers/softlayer" + _ "github.com/StackExchange/dnscontrol/v2/providers/vultr" ) diff --git a/providers/activedir/activedirProvider.go b/providers/activedir/activedirProvider.go index 555172439..69f38ad9c 100644 --- a/providers/activedir/activedirProvider.go +++ b/providers/activedir/activedirProvider.go @@ -5,7 +5,7 @@ import ( "fmt" "runtime" - "github.com/StackExchange/dnscontrol/providers" + "github.com/StackExchange/dnscontrol/v2/providers" "github.com/pkg/errors" ) diff --git a/providers/activedir/domains.go b/providers/activedir/domains.go index 64254fb94..e6f8fc73c 100644 --- a/providers/activedir/domains.go +++ b/providers/activedir/domains.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/printer" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/TomOnTime/utfutil" "github.com/pkg/errors" ) diff --git a/providers/activedir/domains_test.go b/providers/activedir/domains_test.go index 31e551ed6..c58d1a6df 100644 --- a/providers/activedir/domains_test.go +++ b/providers/activedir/domains_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" ) func makeRC(label, domain, target string, rc models.RecordConfig) *models.RecordConfig { diff --git a/providers/azuredns/azureDnsProvider.go b/providers/azuredns/azureDnsProvider.go index 73bd0dbda..b90bf4be7 100644 --- a/providers/azuredns/azureDnsProvider.go +++ b/providers/azuredns/azureDnsProvider.go @@ -8,9 +8,9 @@ import ( "time" "github.com/Azure/go-autorest/autorest/to" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/pkg/errors" adns "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2018-05-01/dns" diff --git a/providers/bind/bindProvider.go b/providers/bind/bindProvider.go index ee6a130e5..96f10b91b 100644 --- a/providers/bind/bindProvider.go +++ b/providers/bind/bindProvider.go @@ -25,9 +25,9 @@ import ( "github.com/miekg/dns" "github.com/pkg/errors" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" ) var features = providers.DocumentationNotes{ diff --git a/providers/cloudflare/cloudflareProvider.go b/providers/cloudflare/cloudflareProvider.go index 4c546fd91..d33739c2e 100644 --- a/providers/cloudflare/cloudflareProvider.go +++ b/providers/cloudflare/cloudflareProvider.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/printer" - "github.com/StackExchange/dnscontrol/pkg/transform" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/pkg/transform" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/miekg/dns/dnsutil" "github.com/pkg/errors" ) @@ -513,7 +513,7 @@ func (c *cfRecord) nativeToRecord(domain string) *models.RecordConfig { } rc.SetLabelFromFQDN(c.Name, domain) - // workaround for https://github.com/StackExchange/dnscontrol/issues/446 + // workaround for https://github.com/StackExchange/dnscontrol/v2/issues/446 if c.Type == "SPF" { c.Type = "TXT" } diff --git a/providers/cloudflare/preprocess_test.go b/providers/cloudflare/preprocess_test.go index 4253099c6..c5e3a7f0b 100644 --- a/providers/cloudflare/preprocess_test.go +++ b/providers/cloudflare/preprocess_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/transform" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/transform" ) func newDomainConfig() *models.DomainConfig { diff --git a/providers/cloudflare/rest.go b/providers/cloudflare/rest.go index 40322f83a..a158a2cef 100644 --- a/providers/cloudflare/rest.go +++ b/providers/cloudflare/rest.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" "github.com/pkg/errors" ) diff --git a/providers/cloudns/cloudnsProvider.go b/providers/cloudns/cloudnsProvider.go index d0eed11eb..5cd17859a 100644 --- a/providers/cloudns/cloudnsProvider.go +++ b/providers/cloudns/cloudnsProvider.go @@ -3,9 +3,9 @@ package cloudns import ( "encoding/json" "fmt" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/miekg/dns/dnsutil" "github.com/pkg/errors" "strconv" diff --git a/providers/diff/diff.go b/providers/diff/diff.go index 4c6915f09..c63c0c5c3 100644 --- a/providers/diff/diff.go +++ b/providers/diff/diff.go @@ -6,8 +6,8 @@ import ( "github.com/gobwas/glob" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" ) // Correlation stores a difference between two domains. diff --git a/providers/diff/diff_test.go b/providers/diff/diff_test.go index 68e465783..3aca0c888 100644 --- a/providers/diff/diff_test.go +++ b/providers/diff/diff_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" ) func myRecord(s string) *models.RecordConfig { @@ -263,7 +263,7 @@ func TestInvalidGlobIgnoredRecord(t *testing.T) { checkLengthsFull(t, existing, desired, 0, 1, 0, 0, false, []string{"www1", "www2", "[.www3"}) } -// from https://github.com/StackExchange/dnscontrol/issues/552 +// from https://github.com/StackExchange/dnscontrol/v2/issues/552 func TestCaas(t *testing.T) { existing := []*models.RecordConfig{ myRecord("test CAA 1 1.1.1.1"), diff --git a/providers/digitalocean/digitaloceanProvider.go b/providers/digitalocean/digitaloceanProvider.go index 5ade43b91..3287449fc 100644 --- a/providers/digitalocean/digitaloceanProvider.go +++ b/providers/digitalocean/digitaloceanProvider.go @@ -6,9 +6,9 @@ import ( "fmt" "net/http" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/miekg/dns/dnsutil" "github.com/pkg/errors" diff --git a/providers/dnsimple/dnsimpleProvider.go b/providers/dnsimple/dnsimpleProvider.go index 4a2adf1d7..f0668bec8 100644 --- a/providers/dnsimple/dnsimpleProvider.go +++ b/providers/dnsimple/dnsimpleProvider.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/pkg/errors" "golang.org/x/oauth2" diff --git a/providers/exoscale/exoscaleProvider.go b/providers/exoscale/exoscaleProvider.go index 0b35c3181..354a66b3b 100644 --- a/providers/exoscale/exoscaleProvider.go +++ b/providers/exoscale/exoscaleProvider.go @@ -8,9 +8,9 @@ import ( "github.com/exoscale/egoscale" "github.com/pkg/errors" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" ) type exoscaleProvider struct { diff --git a/providers/gandi/gandiProvider.go b/providers/gandi/gandiProvider.go index f674f2963..248fb6c68 100644 --- a/providers/gandi/gandiProvider.go +++ b/providers/gandi/gandiProvider.go @@ -5,10 +5,10 @@ import ( "fmt" "sort" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/printer" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/pkg/errors" "strings" diff --git a/providers/gandi/livedns.go b/providers/gandi/livedns.go index e2bebd88d..95c219cf5 100644 --- a/providers/gandi/livedns.go +++ b/providers/gandi/livedns.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/printer" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/google/uuid" "github.com/pkg/errors" gandiclient "github.com/prasmussen/gandi-api/client" diff --git a/providers/gandi/livedns_test.go b/providers/gandi/livedns_test.go index 9dffd5f0f..2a520a817 100644 --- a/providers/gandi/livedns_test.go +++ b/providers/gandi/livedns_test.go @@ -3,7 +3,7 @@ package gandi import ( "testing" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" "github.com/prasmussen/gandi-api/live_dns/record" "github.com/stretchr/testify/assert" ) diff --git a/providers/gandi/protocol.go b/providers/gandi/protocol.go index 894db3f40..01de41462 100644 --- a/providers/gandi/protocol.go +++ b/providers/gandi/protocol.go @@ -12,7 +12,7 @@ import ( gandiversion "github.com/prasmussen/gandi-api/domain/zone/version" gandioperation "github.com/prasmussen/gandi-api/operation" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" ) // fetchDomainList gets list of domains for account. Cache ids for easy lookup. diff --git a/providers/gandi_v5/convert.go b/providers/gandi_v5/convert.go index de3563e6e..87a31c033 100644 --- a/providers/gandi_v5/convert.go +++ b/providers/gandi_v5/convert.go @@ -3,8 +3,8 @@ package gandi5 // Convert the provider's native record description to models.RecordConfig. import ( - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" "github.com/pkg/errors" "github.com/tiramiseb/go-gandi/livedns" ) diff --git a/providers/gandi_v5/convert_test.go b/providers/gandi_v5/convert_test.go index cb332023d..9f76e117f 100644 --- a/providers/gandi_v5/convert_test.go +++ b/providers/gandi_v5/convert_test.go @@ -3,7 +3,7 @@ package gandi5 import ( "testing" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" ) func TestRecordsToNative_1(t *testing.T) { diff --git a/providers/gandi_v5/gandi_v5Provider.go b/providers/gandi_v5/gandi_v5Provider.go index cad54666e..60b921076 100644 --- a/providers/gandi_v5/gandi_v5Provider.go +++ b/providers/gandi_v5/gandi_v5Provider.go @@ -25,10 +25,10 @@ import ( "github.com/miekg/dns/dnsutil" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/printer" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/pkg/errors" ) diff --git a/providers/gcloud/gcloudProvider.go b/providers/gcloud/gcloudProvider.go index ab0f62760..bb5efe876 100644 --- a/providers/gcloud/gcloudProvider.go +++ b/providers/gcloud/gcloudProvider.go @@ -9,9 +9,9 @@ import ( gauth "golang.org/x/oauth2/google" gdns "google.golang.org/api/dns/v1" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/pkg/errors" ) diff --git a/providers/hexonet/hexonetProvider.go b/providers/hexonet/hexonetProvider.go index a0629482a..894135aea 100644 --- a/providers/hexonet/hexonetProvider.go +++ b/providers/hexonet/hexonetProvider.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/StackExchange/dnscontrol/providers" + "github.com/StackExchange/dnscontrol/v2/providers" hxcl "github.com/hexonet/go-sdk/client" ) diff --git a/providers/hexonet/nameservers.go b/providers/hexonet/nameservers.go index d25d4bf02..e2a14325a 100644 --- a/providers/hexonet/nameservers.go +++ b/providers/hexonet/nameservers.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" ) var defaultNameservers = []*models.Nameserver{ diff --git a/providers/hexonet/records.go b/providers/hexonet/records.go index 5a37fec2e..8b55ec4e4 100644 --- a/providers/hexonet/records.go +++ b/providers/hexonet/records.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers/diff" ) // HXRecord covers an individual DNS resource record. diff --git a/providers/internetbs/internetbsProvider.go b/providers/internetbs/internetbsProvider.go index 1194407bd..b83275cb0 100644 --- a/providers/internetbs/internetbsProvider.go +++ b/providers/internetbs/internetbsProvider.go @@ -2,8 +2,8 @@ package internetbs import ( "fmt" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" "github.com/pkg/errors" "sort" "strings" diff --git a/providers/linode/linodeProvider.go b/providers/linode/linodeProvider.go index 47c1c9148..b522dda3f 100644 --- a/providers/linode/linodeProvider.go +++ b/providers/linode/linodeProvider.go @@ -6,9 +6,9 @@ import ( "fmt" "net/http" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/miekg/dns/dnsutil" "github.com/pkg/errors" diff --git a/providers/namecheap/namecheapProvider.go b/providers/namecheap/namecheapProvider.go index c977541d4..b92d991da 100644 --- a/providers/namecheap/namecheapProvider.go +++ b/providers/namecheap/namecheapProvider.go @@ -9,10 +9,10 @@ import ( "golang.org/x/net/publicsuffix" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/printer" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" nc "github.com/billputer/go-namecheap" "github.com/pkg/errors" ) diff --git a/providers/namedotcom/namedotcomProvider.go b/providers/namedotcom/namedotcomProvider.go index ea0cd8915..aa700df46 100644 --- a/providers/namedotcom/namedotcomProvider.go +++ b/providers/namedotcom/namedotcomProvider.go @@ -4,7 +4,7 @@ package namedotcom import ( "encoding/json" - "github.com/StackExchange/dnscontrol/providers" + "github.com/StackExchange/dnscontrol/v2/providers" "github.com/namedotcom/go/namecom" "github.com/pkg/errors" ) diff --git a/providers/namedotcom/nameservers.go b/providers/namedotcom/nameservers.go index 3d8545c0e..3a52194b1 100644 --- a/providers/namedotcom/nameservers.go +++ b/providers/namedotcom/nameservers.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" "github.com/namedotcom/go/namecom" ) @@ -57,7 +57,7 @@ func (n *NameCom) GetRegistrarCorrections(dc *models.DomainConfig) ([]*models.Co expected = append(expected, ns.Name) // FIXME(tlim): This should store a FQDN with no trailing ".". // See pkg/nameservers/nameservers.go for details. - // Bug https://github.com/StackExchange/dnscontrol/issues/491 + // Bug https://github.com/StackExchange/dnscontrol/v2/issues/491 } sort.Strings(expected) expectedNameservers := strings.Join(expected, ",") diff --git a/providers/namedotcom/records.go b/providers/namedotcom/records.go index e92fc143b..9c833127e 100644 --- a/providers/namedotcom/records.go +++ b/providers/namedotcom/records.go @@ -8,8 +8,8 @@ import ( "github.com/namedotcom/go/namecom" "github.com/pkg/errors" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers/diff" ) var defaultNameservers = []*models.Nameserver{ diff --git a/providers/ns1/ns1provider.go b/providers/ns1/ns1provider.go index f17545b46..d470e03c0 100644 --- a/providers/ns1/ns1provider.go +++ b/providers/ns1/ns1provider.go @@ -5,15 +5,15 @@ import ( "fmt" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" "github.com/pkg/errors" "net/http" "strings" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "gopkg.in/ns1/ns1-go.v2/rest" "gopkg.in/ns1/ns1-go.v2/rest/model/dns" ) diff --git a/providers/octodns/octodnsProvider.go b/providers/octodns/octodnsProvider.go index 901c71d35..924494462 100644 --- a/providers/octodns/octodnsProvider.go +++ b/providers/octodns/octodnsProvider.go @@ -27,10 +27,10 @@ import ( "path/filepath" "strings" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" - "github.com/StackExchange/dnscontrol/providers/octodns/octoyaml" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" + "github.com/StackExchange/dnscontrol/v2/providers/octodns/octoyaml" "github.com/pkg/errors" ) diff --git a/providers/octodns/octoyaml/js.go b/providers/octodns/octoyaml/js.go index 19d9710a5..491671d41 100644 --- a/providers/octodns/octoyaml/js.go +++ b/providers/octodns/octoyaml/js.go @@ -5,8 +5,8 @@ import ( "fmt" "io/ioutil" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/transform" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/transform" "github.com/robertkrimen/otto" // load underscore js into vm by default diff --git a/providers/octodns/octoyaml/read.go b/providers/octodns/octoyaml/read.go index 485c973d6..42ccda910 100644 --- a/providers/octodns/octoyaml/read.go +++ b/providers/octodns/octoyaml/read.go @@ -15,7 +15,7 @@ import ( "reflect" "strconv" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" "github.com/pkg/errors" yaml "gopkg.in/yaml.v2" ) diff --git a/providers/octodns/octoyaml/sort.go b/providers/octodns/octoyaml/sort.go index 8e85a6f72..90d2fa870 100644 --- a/providers/octodns/octoyaml/sort.go +++ b/providers/octodns/octoyaml/sort.go @@ -7,8 +7,8 @@ import ( "net" "sort" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/pkg/natsort" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/pkg/natsort" "github.com/miekg/dns/dnsutil" ) diff --git a/providers/octodns/octoyaml/write.go b/providers/octodns/octoyaml/write.go index 6cd243e7f..f81629a3a 100644 --- a/providers/octodns/octoyaml/write.go +++ b/providers/octodns/octoyaml/write.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" "github.com/miekg/dns/dnsutil" "github.com/pkg/errors" yaml "gopkg.in/yaml.v2" diff --git a/providers/opensrs/opensrsProvider.go b/providers/opensrs/opensrsProvider.go index ca0d1ea4f..e16a00cfe 100644 --- a/providers/opensrs/opensrsProvider.go +++ b/providers/opensrs/opensrsProvider.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" opensrs "github.com/philhug/opensrs-go/opensrs" ) diff --git a/providers/ovh/ovhProvider.go b/providers/ovh/ovhProvider.go index 7aa23271b..946131583 100644 --- a/providers/ovh/ovhProvider.go +++ b/providers/ovh/ovhProvider.go @@ -6,9 +6,9 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/ovh/go-ovh/ovh" "github.com/pkg/errors" ) diff --git a/providers/ovh/protocol.go b/providers/ovh/protocol.go index 3487bceb4..24aa1f380 100644 --- a/providers/ovh/protocol.go +++ b/providers/ovh/protocol.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" "github.com/miekg/dns/dnsutil" "github.com/pkg/errors" ) diff --git a/providers/providers.go b/providers/providers.go index dbebedc56..0280ee3af 100644 --- a/providers/providers.go +++ b/providers/providers.go @@ -4,7 +4,7 @@ import ( "encoding/json" "log" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" "github.com/pkg/errors" ) diff --git a/providers/route53/route53Provider.go b/providers/route53/route53Provider.go index d2fcc8530..6a8237e96 100644 --- a/providers/route53/route53Provider.go +++ b/providers/route53/route53Provider.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" diff --git a/providers/softlayer/softlayerProvider.go b/providers/softlayer/softlayerProvider.go index fc86e8f46..0bcf1ffad 100644 --- a/providers/softlayer/softlayerProvider.go +++ b/providers/softlayer/softlayerProvider.go @@ -6,9 +6,9 @@ import ( "regexp" "strings" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/pkg/errors" "github.com/softlayer/softlayer-go/datatypes" diff --git a/providers/vultr/convert_test.go b/providers/vultr/convert_test.go index 259705978..128e29513 100644 --- a/providers/vultr/convert_test.go +++ b/providers/vultr/convert_test.go @@ -3,7 +3,7 @@ package vultr import ( "testing" - "github.com/StackExchange/dnscontrol/models" + "github.com/StackExchange/dnscontrol/v2/models" "github.com/vultr/govultr" ) diff --git a/providers/vultr/vultrProvider.go b/providers/vultr/vultrProvider.go index 09c89cfcb..b2a6d39f2 100644 --- a/providers/vultr/vultrProvider.go +++ b/providers/vultr/vultrProvider.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/StackExchange/dnscontrol/models" - "github.com/StackExchange/dnscontrol/providers" - "github.com/StackExchange/dnscontrol/providers/diff" + "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v2/providers/diff" "github.com/miekg/dns/dnsutil" "github.com/pkg/errors" "github.com/vultr/govultr"