diff --git a/build/build.go b/build/build.go index ebdce32f7..eff57bafa 100644 --- a/build/build.go +++ b/build/build.go @@ -17,7 +17,7 @@ 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/v2" + pkg := "github.com/StackExchange/dnscontrol/v3" build := func(out, goos string) { log.Printf("Building %s", out) diff --git a/build/generate/featureMatrix.go b/build/generate/featureMatrix.go index 355c67e63..f68111de1 100644 --- a/build/generate/featureMatrix.go +++ b/build/generate/featureMatrix.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "sort" - "github.com/StackExchange/dnscontrol/v2/providers" - _ "github.com/StackExchange/dnscontrol/v2/providers/_all" + "github.com/StackExchange/dnscontrol/v3/providers" + _ "github.com/StackExchange/dnscontrol/v3/providers/_all" ) func generateFeatureMatrix() error { diff --git a/cmd/convertzone/main.go b/cmd/convertzone/main.go index 79bedf623..3c2fac6e4 100644 --- a/cmd/convertzone/main.go +++ b/cmd/convertzone/main.go @@ -46,8 +46,8 @@ import ( "github.com/miekg/dns" "github.com/miekg/dns/dnsutil" - "github.com/StackExchange/dnscontrol/v2/pkg/prettyzone" - "github.com/StackExchange/dnscontrol/v2/providers/octodns/octoyaml" + "github.com/StackExchange/dnscontrol/v3/pkg/prettyzone" + "github.com/StackExchange/dnscontrol/v3/providers/octodns/octoyaml" ) var flagInfmt = flag.String("in", "zone", "zone|octodns") diff --git a/commands/commands.go b/commands/commands.go index 12fc9bf9a..262f19a2e 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -9,8 +9,8 @@ import ( "github.com/urfave/cli/v2" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/printer" ) // categories of commands diff --git a/commands/createDomains.go b/commands/createDomains.go index d0dd1dcbb..df5dee462 100644 --- a/commands/createDomains.go +++ b/commands/createDomains.go @@ -3,7 +3,7 @@ package commands import ( "fmt" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/providers" "github.com/urfave/cli/v2" ) diff --git a/commands/getCerts.go b/commands/getCerts.go index 33648d0af..c9fece6ff 100644 --- a/commands/getCerts.go +++ b/commands/getCerts.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "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/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/acme" + "github.com/StackExchange/dnscontrol/v3/pkg/normalize" + "github.com/StackExchange/dnscontrol/v3/pkg/printer" "github.com/urfave/cli/v2" ) diff --git a/commands/getZones.go b/commands/getZones.go index 21384b774..b1102672b 100644 --- a/commands/getZones.go +++ b/commands/getZones.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/prettyzone" - "github.com/StackExchange/dnscontrol/v2/providers" - "github.com/StackExchange/dnscontrol/v2/providers/config" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/prettyzone" + "github.com/StackExchange/dnscontrol/v3/providers" + "github.com/StackExchange/dnscontrol/v3/providers/config" "github.com/urfave/cli/v2" ) diff --git a/commands/gz_test.go b/commands/gz_test.go index f395562bb..73996ca3f 100644 --- a/commands/gz_test.go +++ b/commands/gz_test.go @@ -9,7 +9,7 @@ import ( "github.com/andreyvit/diff" - _ "github.com/StackExchange/dnscontrol/v2/providers/_all" + _ "github.com/StackExchange/dnscontrol/v3/providers/_all" ) func TestFormatTypes(t *testing.T) { diff --git a/commands/previewPush.go b/commands/previewPush.go index a7ba214d7..1a2643321 100644 --- a/commands/previewPush.go +++ b/commands/previewPush.go @@ -7,13 +7,13 @@ import ( "github.com/urfave/cli/v2" - "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/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/nameservers" + "github.com/StackExchange/dnscontrol/v3/pkg/normalize" + "github.com/StackExchange/dnscontrol/v3/pkg/notifications" + "github.com/StackExchange/dnscontrol/v3/pkg/printer" + "github.com/StackExchange/dnscontrol/v3/providers" + "github.com/StackExchange/dnscontrol/v3/providers/config" ) var _ = cmd(catMain, func() *cli.Command { diff --git a/commands/printIR.go b/commands/printIR.go index 8e730c1de..0a634b2c6 100644 --- a/commands/printIR.go +++ b/commands/printIR.go @@ -7,9 +7,9 @@ import ( "github.com/urfave/cli/v2" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/js" - "github.com/StackExchange/dnscontrol/v2/pkg/normalize" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/js" + "github.com/StackExchange/dnscontrol/v3/pkg/normalize" ) var _ = cmd(catDebug, func() *cli.Command { diff --git a/docs/flattener/js.go b/docs/flattener/js.go index 7be9bdf06..2c5bc42be 100644 --- a/docs/flattener/js.go +++ b/docs/flattener/js.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/StackExchange/dnscontrol/v2/pkg/spflib" + "github.com/StackExchange/dnscontrol/v3/pkg/spflib" "github.com/gopherjs/jquery" ) diff --git a/docs/release-engineering.md b/docs/release-engineering.md index e3aaace73..154291b23 100644 --- a/docs/release-engineering.md +++ b/docs/release-engineering.md @@ -47,8 +47,8 @@ how it tests that gofmt was run. Edit the "Version" variable in `main.go` and commit. ``` -export PREVVERSION=2.10.0 <<< Change to the previous version -export VERSION=2.11.0 <<< Change to the new release version +export PREVVERSION=3.0.0 <<< Change to the previous version +export VERSION=3.1.0 <<< Change to the new release version git checkout master vi main.go git commit -m'Release v'"$VERSION" main.go @@ -56,6 +56,16 @@ git tag v"$VERSION" git push origin tag v"$VERSION" ``` +NOTE: If you bump the major version, you need to change all the source +files. The last time this was done (v2 -> v3) these two commands +automated all that: + +``` +# Make all the changes: +sed -i.bak -e 's@github.com.StackExchange.dnscontrol.v2@github.com/StackExchange/dnscontrol/v3@g' go.* $(fgrep -lri --include '*.go' github.com/StackExchange/dnscontrol/v2 *) +# Delete the backup files: +find * -name \*.bak -delete +``` ## Step 4. Write the release notes. diff --git a/go.mod b/go.mod index d19624430..43c57e4b7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/StackExchange/dnscontrol/v2 +module github.com/StackExchange/dnscontrol/v3 go 1.14 diff --git a/integrationTest/integration_test.go b/integrationTest/integration_test.go index b25a49a27..9f0147f5c 100644 --- a/integrationTest/integration_test.go +++ b/integrationTest/integration_test.go @@ -10,11 +10,11 @@ import ( "github.com/miekg/dns/dnsutil" - "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/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/nameservers" + "github.com/StackExchange/dnscontrol/v3/providers" + _ "github.com/StackExchange/dnscontrol/v3/providers/_all" + "github.com/StackExchange/dnscontrol/v3/providers/config" ) var providerToRun = flag.String("provider", "", "Provider to run") diff --git a/main.go b/main.go index d46b12358..e52a75172 100644 --- a/main.go +++ b/main.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/StackExchange/dnscontrol/v2/commands" - _ "github.com/StackExchange/dnscontrol/v2/providers/_all" + "github.com/StackExchange/dnscontrol/v3/commands" + _ "github.com/StackExchange/dnscontrol/v3/providers/_all" ) //go:generate go run build/generate/generate.go build/generate/featureMatrix.go diff --git a/pkg/acme/acme.go b/pkg/acme/acme.go index c8c13aa66..9c508e70c 100644 --- a/pkg/acme/acme.go +++ b/pkg/acme/acme.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/nameservers" - "github.com/StackExchange/dnscontrol/v2/pkg/notifications" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/nameservers" + "github.com/StackExchange/dnscontrol/v3/pkg/notifications" "github.com/go-acme/lego/certcrypto" "github.com/go-acme/lego/certificate" "github.com/go-acme/lego/challenge" diff --git a/pkg/diff/diff.go b/pkg/diff/diff.go index 7464c3872..bbb3480e3 100644 --- a/pkg/diff/diff.go +++ b/pkg/diff/diff.go @@ -6,8 +6,8 @@ import ( "github.com/gobwas/glob" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/printer" ) // Correlation stores a difference between two domains. diff --git a/pkg/diff/diff_test.go b/pkg/diff/diff_test.go index 9fe5da7ff..28e4a9b41 100644 --- a/pkg/diff/diff_test.go +++ b/pkg/diff/diff_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) func myRecord(s string) *models.RecordConfig { diff --git a/pkg/js/js.go b/pkg/js/js.go index 759015710..2caa46106 100644 --- a/pkg/js/js.go +++ b/pkg/js/js.go @@ -10,9 +10,9 @@ import ( "github.com/robertkrimen/otto" // load underscore js into vm by default _ "github.com/robertkrimen/otto/underscore" // required by otto - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/printer" - "github.com/StackExchange/dnscontrol/v2/pkg/transform" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/printer" + "github.com/StackExchange/dnscontrol/v3/pkg/transform" ) // currentDirectory is the current directory as used by require(). diff --git a/pkg/nameservers/nameservers.go b/pkg/nameservers/nameservers.go index f85d7bbc1..2c8b1f5cc 100644 --- a/pkg/nameservers/nameservers.go +++ b/pkg/nameservers/nameservers.go @@ -7,7 +7,7 @@ import ( "strconv" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) // DetermineNameservers will find all nameservers we should use for a domain. It follows the following rules: diff --git a/pkg/normalize/flatten.go b/pkg/normalize/flatten.go index 134837ddd..2993cac4e 100644 --- a/pkg/normalize/flatten.go +++ b/pkg/normalize/flatten.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/spflib" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/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 8b4a099ca..f199f0580 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/v2/models" + "github.com/StackExchange/dnscontrol/v3/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 880164639..b47e1f49e 100644 --- a/pkg/normalize/validate.go +++ b/pkg/normalize/validate.go @@ -5,9 +5,9 @@ import ( "net" "strings" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/transform" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/transform" + "github.com/StackExchange/dnscontrol/v3/providers" "github.com/miekg/dns" "github.com/miekg/dns/dnsutil" ) diff --git a/pkg/normalize/validate_test.go b/pkg/normalize/validate_test.go index a59719646..548f75ff7 100644 --- a/pkg/normalize/validate_test.go +++ b/pkg/normalize/validate_test.go @@ -5,7 +5,7 @@ import ( "fmt" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) func TestCheckLabel(t *testing.T) { diff --git a/pkg/prettyzone/prettyzone.go b/pkg/prettyzone/prettyzone.go index 854c48f88..99f7f5c44 100644 --- a/pkg/prettyzone/prettyzone.go +++ b/pkg/prettyzone/prettyzone.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" "github.com/miekg/dns" ) diff --git a/pkg/prettyzone/prettyzone_test.go b/pkg/prettyzone/prettyzone_test.go index ca0e55dcc..4a3a699b9 100644 --- a/pkg/prettyzone/prettyzone_test.go +++ b/pkg/prettyzone/prettyzone_test.go @@ -7,7 +7,7 @@ import ( "math/rand" "testing" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" "github.com/miekg/dns" "github.com/miekg/dns/dnsutil" ) diff --git a/pkg/prettyzone/sorting.go b/pkg/prettyzone/sorting.go index 0c1df7197..bc84d9202 100644 --- a/pkg/prettyzone/sorting.go +++ b/pkg/prettyzone/sorting.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) // ZoneGenData is the configuration description for the zone generator. diff --git a/pkg/printer/printer.go b/pkg/printer/printer.go index 71301ba95..65ae88266 100644 --- a/pkg/printer/printer.go +++ b/pkg/printer/printer.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) // CLI is an abstraction around the CLI. diff --git a/providers/_all/all.go b/providers/_all/all.go index e3ca2152b..d813b6f82 100644 --- a/providers/_all/all.go +++ b/providers/_all/all.go @@ -3,26 +3,26 @@ package all import ( // Define all known providers here. They should each register themselves with the providers package via init function. - _ "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_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" + _ "github.com/StackExchange/dnscontrol/v3/providers/activedir" + _ "github.com/StackExchange/dnscontrol/v3/providers/azuredns" + _ "github.com/StackExchange/dnscontrol/v3/providers/bind" + _ "github.com/StackExchange/dnscontrol/v3/providers/cloudflare" + _ "github.com/StackExchange/dnscontrol/v3/providers/cloudns" + _ "github.com/StackExchange/dnscontrol/v3/providers/digitalocean" + _ "github.com/StackExchange/dnscontrol/v3/providers/dnsimple" + _ "github.com/StackExchange/dnscontrol/v3/providers/exoscale" + _ "github.com/StackExchange/dnscontrol/v3/providers/gandi_v5" + _ "github.com/StackExchange/dnscontrol/v3/providers/gcloud" + _ "github.com/StackExchange/dnscontrol/v3/providers/hexonet" + _ "github.com/StackExchange/dnscontrol/v3/providers/internetbs" + _ "github.com/StackExchange/dnscontrol/v3/providers/linode" + _ "github.com/StackExchange/dnscontrol/v3/providers/namecheap" + _ "github.com/StackExchange/dnscontrol/v3/providers/namedotcom" + _ "github.com/StackExchange/dnscontrol/v3/providers/ns1" + _ "github.com/StackExchange/dnscontrol/v3/providers/octodns" + _ "github.com/StackExchange/dnscontrol/v3/providers/opensrs" + _ "github.com/StackExchange/dnscontrol/v3/providers/ovh" + _ "github.com/StackExchange/dnscontrol/v3/providers/route53" + _ "github.com/StackExchange/dnscontrol/v3/providers/softlayer" + _ "github.com/StackExchange/dnscontrol/v3/providers/vultr" ) diff --git a/providers/activedir/activedirProvider.go b/providers/activedir/activedirProvider.go index 0e501d0ac..cf71500a6 100644 --- a/providers/activedir/activedirProvider.go +++ b/providers/activedir/activedirProvider.go @@ -5,7 +5,7 @@ import ( "fmt" "runtime" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/providers" ) // This is the struct that matches either (or both) of the Registrar and/or DNSProvider interfaces: diff --git a/providers/activedir/domains.go b/providers/activedir/domains.go index c55060e28..5e0cb7201 100644 --- a/providers/activedir/domains.go +++ b/providers/activedir/domains.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/pkg/printer" "github.com/TomOnTime/utfutil" ) diff --git a/providers/activedir/domains_test.go b/providers/activedir/domains_test.go index c58d1a6df..0ba487d86 100644 --- a/providers/activedir/domains_test.go +++ b/providers/activedir/domains_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/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 53e4df393..5e22e94bf 100644 --- a/providers/azuredns/azureDnsProvider.go +++ b/providers/azuredns/azureDnsProvider.go @@ -11,9 +11,9 @@ import ( aauth "github.com/Azure/go-autorest/autorest/azure/auth" "github.com/Azure/go-autorest/autorest/to" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" ) type azureDnsProvider struct { diff --git a/providers/bind/bindProvider.go b/providers/bind/bindProvider.go index 862641b57..5e79efeb2 100644 --- a/providers/bind/bindProvider.go +++ b/providers/bind/bindProvider.go @@ -25,10 +25,10 @@ import ( "github.com/miekg/dns" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/pkg/prettyzone" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/pkg/prettyzone" + "github.com/StackExchange/dnscontrol/v3/providers" ) var features = providers.DocumentationNotes{ diff --git a/providers/bind/soa.go b/providers/bind/soa.go index 7c22d1387..a7cc5060c 100644 --- a/providers/bind/soa.go +++ b/providers/bind/soa.go @@ -1,7 +1,7 @@ package bind import ( - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) func makeSoa(origin string, defSoa *SoaInfo, existing, desired *models.RecordConfig) (*models.RecordConfig, uint32) { diff --git a/providers/bind/soa_test.go b/providers/bind/soa_test.go index 4bf8a4afa..d70828055 100644 --- a/providers/bind/soa_test.go +++ b/providers/bind/soa_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) func Test_makeSoa(t *testing.T) { diff --git a/providers/cloudflare/cloudflareProvider.go b/providers/cloudflare/cloudflareProvider.go index 3f42de170..aa0f67e42 100644 --- a/providers/cloudflare/cloudflareProvider.go +++ b/providers/cloudflare/cloudflareProvider.go @@ -10,11 +10,11 @@ import ( "github.com/miekg/dns/dnsutil" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/pkg/printer" - "github.com/StackExchange/dnscontrol/v2/pkg/transform" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/pkg/printer" + "github.com/StackExchange/dnscontrol/v3/pkg/transform" + "github.com/StackExchange/dnscontrol/v3/providers" ) /* diff --git a/providers/cloudflare/preprocess_test.go b/providers/cloudflare/preprocess_test.go index c5e3a7f0b..d396ac160 100644 --- a/providers/cloudflare/preprocess_test.go +++ b/providers/cloudflare/preprocess_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/transform" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/transform" ) func newDomainConfig() *models.DomainConfig { diff --git a/providers/cloudflare/rest.go b/providers/cloudflare/rest.go index 5a896a19c..37225d500 100644 --- a/providers/cloudflare/rest.go +++ b/providers/cloudflare/rest.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) const ( diff --git a/providers/cloudns/cloudnsProvider.go b/providers/cloudns/cloudnsProvider.go index 98ef6362e..ab5e67ece 100644 --- a/providers/cloudns/cloudnsProvider.go +++ b/providers/cloudns/cloudnsProvider.go @@ -7,9 +7,9 @@ import ( "github.com/miekg/dns/dnsutil" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" ) /* diff --git a/providers/digitalocean/digitaloceanProvider.go b/providers/digitalocean/digitaloceanProvider.go index 50fdcd7e1..3a4e16329 100644 --- a/providers/digitalocean/digitaloceanProvider.go +++ b/providers/digitalocean/digitaloceanProvider.go @@ -6,9 +6,9 @@ import ( "fmt" "net/http" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" "github.com/miekg/dns/dnsutil" "github.com/digitalocean/godo" diff --git a/providers/dnsimple/dnsimpleProvider.go b/providers/dnsimple/dnsimpleProvider.go index 1d4931da6..7a4d427a0 100644 --- a/providers/dnsimple/dnsimpleProvider.go +++ b/providers/dnsimple/dnsimpleProvider.go @@ -11,9 +11,9 @@ import ( dnsimpleapi "github.com/dnsimple/dnsimple-go/dnsimple" "golang.org/x/oauth2" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" ) var features = providers.DocumentationNotes{ diff --git a/providers/exoscale/exoscaleProvider.go b/providers/exoscale/exoscaleProvider.go index 6cc1f981b..34d1b5896 100644 --- a/providers/exoscale/exoscaleProvider.go +++ b/providers/exoscale/exoscaleProvider.go @@ -8,9 +8,9 @@ import ( "github.com/exoscale/egoscale" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" ) type exoscaleProvider struct { diff --git a/providers/gandi_v5/convert.go b/providers/gandi_v5/convert.go index 127ebef6d..39dad4b6c 100644 --- a/providers/gandi_v5/convert.go +++ b/providers/gandi_v5/convert.go @@ -7,8 +7,8 @@ import ( "github.com/tiramiseb/go-gandi/livedns" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/printer" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/printer" ) // nativeToRecord takes a DNS record from Gandi and returns a native RecordConfig struct. diff --git a/providers/gandi_v5/convert_test.go b/providers/gandi_v5/convert_test.go index 9f76e117f..8ada0fab3 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/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) func TestRecordsToNative_1(t *testing.T) { diff --git a/providers/gandi_v5/gandi_v5Provider.go b/providers/gandi_v5/gandi_v5Provider.go index 170af5ad0..b1c1f649d 100644 --- a/providers/gandi_v5/gandi_v5Provider.go +++ b/providers/gandi_v5/gandi_v5Provider.go @@ -24,10 +24,10 @@ import ( "github.com/miekg/dns/dnsutil" gandi "github.com/tiramiseb/go-gandi" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/pkg/printer" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/pkg/printer" + "github.com/StackExchange/dnscontrol/v3/providers" ) // Section 1: Register this provider in the system. diff --git a/providers/gcloud/gcloudProvider.go b/providers/gcloud/gcloudProvider.go index 928d44576..6219c6fb3 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/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" ) var features = providers.DocumentationNotes{ diff --git a/providers/hexonet/hexonetProvider.go b/providers/hexonet/hexonetProvider.go index 002e21c39..c6a23a5f1 100644 --- a/providers/hexonet/hexonetProvider.go +++ b/providers/hexonet/hexonetProvider.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/providers" hxcl "github.com/hexonet/go-sdk/apiclient" ) diff --git a/providers/hexonet/nameservers.go b/providers/hexonet/nameservers.go index d028b3227..d911d7ab5 100644 --- a/providers/hexonet/nameservers.go +++ b/providers/hexonet/nameservers.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) var defaultNameservers = []*models.Nameserver{ diff --git a/providers/hexonet/records.go b/providers/hexonet/records.go index 1705fc2d7..922229a39 100644 --- a/providers/hexonet/records.go +++ b/providers/hexonet/records.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" ) // HXRecord covers an individual DNS resource record. diff --git a/providers/internetbs/internetbsProvider.go b/providers/internetbs/internetbsProvider.go index 2d421cca2..ffd258def 100644 --- a/providers/internetbs/internetbsProvider.go +++ b/providers/internetbs/internetbsProvider.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/providers" ) /* diff --git a/providers/linode/linodeProvider.go b/providers/linode/linodeProvider.go index 147c6fc8c..42210eedf 100644 --- a/providers/linode/linodeProvider.go +++ b/providers/linode/linodeProvider.go @@ -12,9 +12,9 @@ import ( "github.com/miekg/dns/dnsutil" "golang.org/x/oauth2" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" ) /* diff --git a/providers/namecheap/namecheapProvider.go b/providers/namecheap/namecheapProvider.go index f21ea2d26..b3f8c3ad6 100644 --- a/providers/namecheap/namecheapProvider.go +++ b/providers/namecheap/namecheapProvider.go @@ -10,10 +10,10 @@ import ( nc "github.com/billputer/go-namecheap" "golang.org/x/net/publicsuffix" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/pkg/printer" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/pkg/printer" + "github.com/StackExchange/dnscontrol/v3/providers" ) // NamecheapDefaultNs lists the default nameservers for this provider. diff --git a/providers/namedotcom/namedotcomProvider.go b/providers/namedotcom/namedotcomProvider.go index 960a7a19d..3c222196f 100644 --- a/providers/namedotcom/namedotcomProvider.go +++ b/providers/namedotcom/namedotcomProvider.go @@ -7,7 +7,7 @@ import ( "github.com/namedotcom/go/namecom" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/providers" ) const defaultAPIBase = "api.name.com" diff --git a/providers/namedotcom/nameservers.go b/providers/namedotcom/nameservers.go index 4db323306..1b878ec37 100644 --- a/providers/namedotcom/nameservers.go +++ b/providers/namedotcom/nameservers.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" "github.com/namedotcom/go/namecom" ) diff --git a/providers/namedotcom/records.go b/providers/namedotcom/records.go index ed556b4fe..fffd13be6 100644 --- a/providers/namedotcom/records.go +++ b/providers/namedotcom/records.go @@ -8,8 +8,8 @@ import ( "github.com/namedotcom/go/namecom" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" ) var defaultNameservers = []*models.Nameserver{ diff --git a/providers/ns1/ns1provider.go b/providers/ns1/ns1provider.go index 781a4dc87..f9fe0ceff 100644 --- a/providers/ns1/ns1provider.go +++ b/providers/ns1/ns1provider.go @@ -9,9 +9,9 @@ import ( "gopkg.in/ns1/ns1-go.v2/rest" "gopkg.in/ns1/ns1-go.v2/rest/model/dns" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" ) var docNotes = providers.DocumentationNotes{ diff --git a/providers/octodns/octodnsProvider.go b/providers/octodns/octodnsProvider.go index cef56d4a8..f769a61ce 100644 --- a/providers/octodns/octodnsProvider.go +++ b/providers/octodns/octodnsProvider.go @@ -27,10 +27,10 @@ import ( "path/filepath" "strings" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" - "github.com/StackExchange/dnscontrol/v2/providers/octodns/octoyaml" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" + "github.com/StackExchange/dnscontrol/v3/providers/octodns/octoyaml" ) var features = providers.DocumentationNotes{ diff --git a/providers/octodns/octoyaml/js.go b/providers/octodns/octoyaml/js.go index 491671d41..bd30f8032 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/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/transform" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/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 eef9714b2..2e11054e7 100644 --- a/providers/octodns/octoyaml/read.go +++ b/providers/octodns/octoyaml/read.go @@ -18,7 +18,7 @@ import ( yaml "gopkg.in/yaml.v2" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) // ReadYaml parses a yaml input and returns a list of RecordConfigs diff --git a/providers/octodns/octoyaml/sort.go b/providers/octodns/octoyaml/sort.go index 90d2fa870..fe0fae9c3 100644 --- a/providers/octodns/octoyaml/sort.go +++ b/providers/octodns/octoyaml/sort.go @@ -7,8 +7,8 @@ import ( "net" "sort" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/natsort" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/natsort" "github.com/miekg/dns/dnsutil" ) diff --git a/providers/octodns/octoyaml/write.go b/providers/octodns/octoyaml/write.go index 19107a245..3e0cd3002 100644 --- a/providers/octodns/octoyaml/write.go +++ b/providers/octodns/octoyaml/write.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" "github.com/miekg/dns/dnsutil" yaml "gopkg.in/yaml.v2" ) diff --git a/providers/opensrs/opensrsProvider.go b/providers/opensrs/opensrsProvider.go index f130f7e33..590d33fee 100644 --- a/providers/opensrs/opensrsProvider.go +++ b/providers/opensrs/opensrsProvider.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/providers" opensrs "github.com/philhug/opensrs-go/opensrs" ) diff --git a/providers/ovh/ovhProvider.go b/providers/ovh/ovhProvider.go index f1fe795e0..53a312921 100644 --- a/providers/ovh/ovhProvider.go +++ b/providers/ovh/ovhProvider.go @@ -6,9 +6,9 @@ import ( "sort" "strings" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" "github.com/ovh/go-ovh/ovh" ) diff --git a/providers/ovh/protocol.go b/providers/ovh/protocol.go index d4083ece9..8ed03403a 100644 --- a/providers/ovh/protocol.go +++ b/providers/ovh/protocol.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" "github.com/miekg/dns/dnsutil" ) diff --git a/providers/providers.go b/providers/providers.go index d450dd4c2..0c2c2f102 100644 --- a/providers/providers.go +++ b/providers/providers.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/StackExchange/dnscontrol/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" ) // Registrar is an interface for a domain registrar. It can return a list of needed corrections to be applied in the future. Implement this only if the provider is a "registrar" (i.e. can update the NS records of the parent to a domain). diff --git a/providers/route53/route53Provider.go b/providers/route53/route53Provider.go index 035041d36..49c1fa513 100644 --- a/providers/route53/route53Provider.go +++ b/providers/route53/route53Provider.go @@ -14,9 +14,9 @@ import ( r53 "github.com/aws/aws-sdk-go/service/route53" r53d "github.com/aws/aws-sdk-go/service/route53domains" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" ) type route53Provider struct { diff --git a/providers/softlayer/softlayerProvider.go b/providers/softlayer/softlayerProvider.go index c3e0bcc68..e077e3c13 100644 --- a/providers/softlayer/softlayerProvider.go +++ b/providers/softlayer/softlayerProvider.go @@ -11,9 +11,9 @@ import ( "github.com/softlayer/softlayer-go/services" "github.com/softlayer/softlayer-go/session" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" ) // SoftLayer is the protocol handle for this provider. diff --git a/providers/vultr/convert_test.go b/providers/vultr/convert_test.go index 88b933773..1a3bf0c53 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/v2/models" + "github.com/StackExchange/dnscontrol/v3/models" "github.com/vultr/govultr" ) diff --git a/providers/vultr/vultrProvider.go b/providers/vultr/vultrProvider.go index 27be6360f..17be19a6b 100644 --- a/providers/vultr/vultrProvider.go +++ b/providers/vultr/vultrProvider.go @@ -11,9 +11,9 @@ import ( "github.com/miekg/dns/dnsutil" "github.com/vultr/govultr" - "github.com/StackExchange/dnscontrol/v2/models" - "github.com/StackExchange/dnscontrol/v2/pkg/diff" - "github.com/StackExchange/dnscontrol/v2/providers" + "github.com/StackExchange/dnscontrol/v3/models" + "github.com/StackExchange/dnscontrol/v3/pkg/diff" + "github.com/StackExchange/dnscontrol/v3/providers" ) /*