From 3eb5112294a0d2dd560fe7ed5fafb7c90268c860 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 4 Aug 2019 22:41:07 -0700 Subject: [PATCH] *: use a go vanity import path Ensure the project has independence from GitHub over the long term. --- Dockerfile | 2 +- autocert/autocert.go | 2 +- autocert/autocert_test.go | 2 +- gitcache/gitcache.go | 4 ++-- gitcache/gitcache_test.go | 2 +- go.mod | 2 +- rget/cmd/github.go | 2 +- rget/cmd/root.go | 6 +++--- rget/cmd/server.go | 8 ++++---- rget/cmd/submit.go | 4 ++-- rget/github/publish-release-sums.go | 6 +++--- rget/main.go | 4 ++-- rgethash/sgethash.go | 8 ++++---- rgethash/sgethash_test.go | 8 ++++---- rgetserver/rgetserver.go | 10 +++++----- 15 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Dockerfile b/Dockerfile index a37d5aa..ad75a8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Start by building the application. FROM golang:1.12 as build -WORKDIR /go/src/github.com/merklecounty/rget +WORKDIR /go/src/go.merklecounty.com/rget COPY . . ENV GO111MODULE=on diff --git a/autocert/autocert.go b/autocert/autocert.go index e28870b..af61e03 100644 --- a/autocert/autocert.go +++ b/autocert/autocert.go @@ -6,7 +6,7 @@ // and any other ACME-based CA. // // This package is a work in progress and makes no API stability promises. -package autocert +package autocert // import "go.merklecounty.com/rget/autocert" import ( "bytes" diff --git a/autocert/autocert_test.go b/autocert/autocert_test.go index 700b330..2389b29 100644 --- a/autocert/autocert_test.go +++ b/autocert/autocert_test.go @@ -31,7 +31,7 @@ import ( "testing" "time" - "github.com/merklecounty/rget/autocert/internal/acmetest" + "go.merklecounty.com/rget/autocert/internal/acmetest" "golang.org/x/crypto/acme" ) diff --git a/gitcache/gitcache.go b/gitcache/gitcache.go index a37de66..f5688a4 100644 --- a/gitcache/gitcache.go +++ b/gitcache/gitcache.go @@ -1,4 +1,4 @@ -package gitcache +package gitcache // import "go.merklecounty.com/rget/gitcache" import ( "context" @@ -14,7 +14,7 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/object" "gopkg.in/src-d/go-git.v4/plumbing/transport" - "github.com/merklecounty/rget/autocert" + "go.merklecounty.com/rget/autocert" ) type GitCache struct { diff --git a/gitcache/gitcache_test.go b/gitcache/gitcache_test.go index d4434e4..f50ff4a 100644 --- a/gitcache/gitcache_test.go +++ b/gitcache/gitcache_test.go @@ -10,7 +10,7 @@ import ( "gopkg.in/src-d/go-git.v4" - "github.com/merklecounty/rget/internal/testutil" + "go.merklecounty.com/rget/internal/testutil" ) func TestPrefix(t *testing.T) { diff --git a/go.mod b/go.mod index 2b7801a..9beb47f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/merklecounty/rget +module go.merklecounty.com/rget go 1.12 diff --git a/rget/cmd/github.go b/rget/cmd/github.go index 75170c5..da2173f 100644 --- a/rget/cmd/github.go +++ b/rget/cmd/github.go @@ -17,7 +17,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/merklecounty/rget/rget/github" + "go.merklecounty.com/rget/rget/github" ) // githubCmd represents the github command diff --git a/rget/cmd/root.go b/rget/cmd/root.go index b0586fa..f90deb2 100644 --- a/rget/cmd/root.go +++ b/rget/cmd/root.go @@ -36,9 +36,9 @@ import ( "github.com/google/certificate-transparency-go/x509" "github.com/google/certificate-transparency-go/x509util" - "github.com/merklecounty/rget/rgetct" - "github.com/merklecounty/rget/rgethash" - "github.com/merklecounty/rget/rgetwellknown" + "go.merklecounty.com/rget/rgetct" + "go.merklecounty.com/rget/rgethash" + "go.merklecounty.com/rget/rgetwellknown" ) var cfgFile string diff --git a/rget/cmd/server.go b/rget/cmd/server.go index 3b8c513..545965a 100644 --- a/rget/cmd/server.go +++ b/rget/cmd/server.go @@ -27,10 +27,10 @@ import ( "github.com/spf13/cobra" githttp "gopkg.in/src-d/go-git.v4/plumbing/transport/http" - "github.com/merklecounty/rget/autocert" - "github.com/merklecounty/rget/gitcache" - "github.com/merklecounty/rget/rgethash" - "github.com/merklecounty/rget/rgetserver" + "go.merklecounty.com/rget/autocert" + "go.merklecounty.com/rget/gitcache" + "go.merklecounty.com/rget/rgethash" + "go.merklecounty.com/rget/rgetserver" ) // serverCmd represents the server command diff --git a/rget/cmd/submit.go b/rget/cmd/submit.go index 787613c..b3d3e18 100644 --- a/rget/cmd/submit.go +++ b/rget/cmd/submit.go @@ -21,8 +21,8 @@ import ( "net/url" "os" - "github.com/merklecounty/rget/rgetgithub" - "github.com/merklecounty/rget/rgetwellknown" + "go.merklecounty.com/rget/rgetgithub" + "go.merklecounty.com/rget/rgetwellknown" "github.com/spf13/cobra" ) diff --git a/rget/github/publish-release-sums.go b/rget/github/publish-release-sums.go index b3defde..890369e 100644 --- a/rget/github/publish-release-sums.go +++ b/rget/github/publish-release-sums.go @@ -12,9 +12,9 @@ import ( "github.com/spf13/cobra" "golang.org/x/oauth2" - "github.com/merklecounty/rget/rgetgithub" - "github.com/merklecounty/rget/rgethash" - "github.com/merklecounty/rget/rgetwellknown" + "go.merklecounty.com/rget/rgetgithub" + "go.merklecounty.com/rget/rgethash" + "go.merklecounty.com/rget/rgetwellknown" ) var publishReleaseSumsCmd = &cobra.Command{ diff --git a/rget/main.go b/rget/main.go index 24fa977..20a2b2d 100644 --- a/rget/main.go +++ b/rget/main.go @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package main +package main // import "go.merklecounty.com/rget" -import "github.com/merklecounty/rget/rget/cmd" +import "go.merklecounty.com/rget/rget/cmd" func main() { cmd.Execute() diff --git a/rgethash/sgethash.go b/rgethash/sgethash.go index 1e5cb9d..2c6b155 100644 --- a/rgethash/sgethash.go +++ b/rgethash/sgethash.go @@ -1,4 +1,4 @@ -package rgethash +package rgethash // import "go.merklecounty.com/rget/rgethash" import ( "bufio" @@ -16,9 +16,9 @@ import ( "github.com/google/trillian/merkle/rfc6962" "golang.org/x/net/context/ctxhttp" - "github.com/merklecounty/rget/autocert" - "github.com/merklecounty/rget/gitcache" - "github.com/merklecounty/rget/rgetwellknown" + "go.merklecounty.com/rget/autocert" + "go.merklecounty.com/rget/gitcache" + "go.merklecounty.com/rget/rgetwellknown" ) type URLSum struct { diff --git a/rgethash/sgethash_test.go b/rgethash/sgethash_test.go index 2d1f3c0..21f94ca 100644 --- a/rgethash/sgethash_test.go +++ b/rgethash/sgethash_test.go @@ -8,10 +8,10 @@ import ( "reflect" "testing" - "github.com/merklecounty/rget/autocert" - "github.com/merklecounty/rget/gitcache" - "github.com/merklecounty/rget/internal/testutil" - "github.com/merklecounty/rget/rgetwellknown" + "go.merklecounty.com/rget/autocert" + "go.merklecounty.com/rget/gitcache" + "go.merklecounty.com/rget/internal/testutil" + "go.merklecounty.com/rget/rgetwellknown" ) func TestDomain(t *testing.T) { diff --git a/rgetserver/rgetserver.go b/rgetserver/rgetserver.go index 1e48779..ba1ddd2 100644 --- a/rgetserver/rgetserver.go +++ b/rgetserver/rgetserver.go @@ -1,4 +1,4 @@ -package rgetserver +package rgetserver // import "go.merklecounty.com/rgetserver" import ( "context" @@ -11,9 +11,9 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/merklecounty/rget/gitcache" - "github.com/merklecounty/rget/rgethash" - "github.com/merklecounty/rget/rgetwellknown" + "go.merklecounty.com/rget/gitcache" + "go.merklecounty.com/rget/rgethash" + "go.merklecounty.com/rget/rgetwellknown" ) type Server struct { @@ -48,7 +48,7 @@ func init() {

Merkle County