From 15afbfdbbfc85575771fe6232a83561c16eaa359 Mon Sep 17 00:00:00 2001 From: "Wilson E. Husin" <14004487+wilsonehusin@users.noreply.github.com> Date: Thu, 24 Mar 2022 19:03:44 -0700 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Use=20GitHub-based=20import=20path?= =?UTF-8?q?=20(#45)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Vanity go modules are too complicated to deal with right now. --- .golangci.yaml | 2 +- cmd/bindl/main.go | 2 +- cmd/bindl/version.go | 2 +- command/cli/cli.go | 4 ++-- command/cli/generate_ignore.go | 2 +- command/cli/generate_make.go | 2 +- command/cli/get.go | 4 ++-- command/cli/list.go | 2 +- command/cli/purge.go | 2 +- command/cli/sync.go | 2 +- command/cli/verify.go | 2 +- command/command.go | 6 +++--- command/get.go | 8 ++++---- command/ignore.go | 4 ++-- command/ignore_test.go | 4 ++-- command/make.go | 4 ++-- command/purge.go | 4 ++-- command/sync.go | 6 +++--- command/verify.go | 6 +++--- config/config.go | 2 +- config/lock.go | 4 ++-- go.mod | 2 +- internal/internal.go | 2 +- internal/message.go | 2 +- program/archive_deflate.go | 2 +- program/lock.go | 4 ++-- program/lock_online_test.go | 4 ++-- program/lock_test.go | 4 ++-- program/program.go | 2 +- program/program_online_test.go | 2 +- 30 files changed, 49 insertions(+), 49 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index cf48456..7304caa 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -12,7 +12,7 @@ linters-settings: - ^print.*$ goimports: - local-prefixes: go.xargs.dev/bindl + local-prefixes: github.com/bindl-dev/bindl govet: enable: diff --git a/cmd/bindl/main.go b/cmd/bindl/main.go index cedc5ba..09c8c39 100644 --- a/cmd/bindl/main.go +++ b/cmd/bindl/main.go @@ -19,7 +19,7 @@ import ( "os" "os/signal" - "go.xargs.dev/bindl/command/cli" + "github.com/bindl-dev/bindl/command/cli" ) func main() { diff --git a/cmd/bindl/version.go b/cmd/bindl/version.go index fe63634..a65fd45 100644 --- a/cmd/bindl/version.go +++ b/cmd/bindl/version.go @@ -17,8 +17,8 @@ package main import ( "fmt" + internalversion "github.com/bindl-dev/bindl/internal/version" "github.com/spf13/cobra" - internalversion "go.xargs.dev/bindl/internal/version" ) // These variables are stamped by ldflags on build, configured through goreleaser. diff --git a/command/cli/cli.go b/command/cli/cli.go index 1eb75d2..10644c4 100644 --- a/command/cli/cli.go +++ b/command/cli/cli.go @@ -17,10 +17,10 @@ package cli import ( "runtime" + "github.com/bindl-dev/bindl/config" + "github.com/bindl-dev/bindl/internal/log" "github.com/kelseyhightower/envconfig" "github.com/spf13/cobra" - "go.xargs.dev/bindl/config" - "go.xargs.dev/bindl/internal/log" ) var All = []*cobra.Command{ diff --git a/command/cli/generate_ignore.go b/command/cli/generate_ignore.go index c982df0..33fe668 100644 --- a/command/cli/generate_ignore.go +++ b/command/cli/generate_ignore.go @@ -15,8 +15,8 @@ package cli import ( + "github.com/bindl-dev/bindl/command" "github.com/spf13/cobra" - "go.xargs.dev/bindl/command" ) var bindlGenerateIgnorePath = ".gitignore" diff --git a/command/cli/generate_make.go b/command/cli/generate_make.go index ac7cb64..2dac960 100644 --- a/command/cli/generate_make.go +++ b/command/cli/generate_make.go @@ -15,8 +15,8 @@ package cli import ( + "github.com/bindl-dev/bindl/command" "github.com/spf13/cobra" - "go.xargs.dev/bindl/command" ) var bindlGenerateMakefilePath = "Makefile.bindl" diff --git a/command/cli/get.go b/command/cli/get.go index f4a52bd..125cfef 100644 --- a/command/cli/get.go +++ b/command/cli/get.go @@ -17,8 +17,8 @@ package cli import ( "github.com/spf13/cobra" - "go.xargs.dev/bindl/command" - "go.xargs.dev/bindl/internal" + "github.com/bindl-dev/bindl/command" + "github.com/bindl-dev/bindl/internal" ) var BindlGet = &cobra.Command{ diff --git a/command/cli/list.go b/command/cli/list.go index d17f5f8..8b1af12 100644 --- a/command/cli/list.go +++ b/command/cli/list.go @@ -17,8 +17,8 @@ package cli import ( "fmt" + "github.com/bindl-dev/bindl/config" "github.com/spf13/cobra" - "go.xargs.dev/bindl/config" ) var bindlListOneline = false diff --git a/command/cli/purge.go b/command/cli/purge.go index 104ef82..749e234 100644 --- a/command/cli/purge.go +++ b/command/cli/purge.go @@ -15,8 +15,8 @@ package cli import ( + "github.com/bindl-dev/bindl/command" "github.com/spf13/cobra" - "go.xargs.dev/bindl/command" ) var bindlPurgeAll = false diff --git a/command/cli/sync.go b/command/cli/sync.go index 78e9f81..6f9f284 100644 --- a/command/cli/sync.go +++ b/command/cli/sync.go @@ -15,8 +15,8 @@ package cli import ( + "github.com/bindl-dev/bindl/command" "github.com/spf13/cobra" - "go.xargs.dev/bindl/command" ) var bindlSyncStdout bool diff --git a/command/cli/verify.go b/command/cli/verify.go index 692952c..7890488 100644 --- a/command/cli/verify.go +++ b/command/cli/verify.go @@ -15,8 +15,8 @@ package cli import ( + "github.com/bindl-dev/bindl/command" "github.com/spf13/cobra" - "go.xargs.dev/bindl/command" ) var BindlVerify = &cobra.Command{ diff --git a/command/command.go b/command/command.go index 076912b..dc78a75 100644 --- a/command/command.go +++ b/command/command.go @@ -20,9 +20,9 @@ import ( "fmt" "sync" - "go.xargs.dev/bindl/config" - "go.xargs.dev/bindl/internal" - "go.xargs.dev/bindl/program" + "github.com/bindl-dev/bindl/config" + "github.com/bindl-dev/bindl/internal" + "github.com/bindl-dev/bindl/program" ) // ErrFailExec is used as generic failure for command line interface as diff --git a/command/get.go b/command/get.go index 6287a72..3bbd879 100644 --- a/command/get.go +++ b/command/get.go @@ -20,11 +20,11 @@ import ( "path/filepath" "time" + "github.com/bindl-dev/bindl/config" + "github.com/bindl-dev/bindl/download" + "github.com/bindl-dev/bindl/internal" + "github.com/bindl-dev/bindl/program" "github.com/rs/zerolog" - "go.xargs.dev/bindl/config" - "go.xargs.dev/bindl/download" - "go.xargs.dev/bindl/internal" - "go.xargs.dev/bindl/program" ) func symlink(binDir, progDir string, p *program.Lock) error { diff --git a/command/ignore.go b/command/ignore.go index cb2f20c..d189534 100644 --- a/command/ignore.go +++ b/command/ignore.go @@ -22,8 +22,8 @@ import ( "path/filepath" "strings" - "go.xargs.dev/bindl/config" - "go.xargs.dev/bindl/internal" + "github.com/bindl-dev/bindl/config" + "github.com/bindl-dev/bindl/internal" ) func isNewline(c byte) bool { diff --git a/command/ignore_test.go b/command/ignore_test.go index 05a2404..fce9523 100644 --- a/command/ignore_test.go +++ b/command/ignore_test.go @@ -18,8 +18,8 @@ import ( "os" "testing" - "go.xargs.dev/bindl/command" - "go.xargs.dev/bindl/config" + "github.com/bindl-dev/bindl/command" + "github.com/bindl-dev/bindl/config" ) func TestUpdateIgnoreFile(t *testing.T) { diff --git a/command/make.go b/command/make.go index 7f13ef6..d03db67 100644 --- a/command/make.go +++ b/command/make.go @@ -22,8 +22,8 @@ import ( "text/template" "time" - "go.xargs.dev/bindl/config" - "go.xargs.dev/bindl/internal/version" + "github.com/bindl-dev/bindl/config" + "github.com/bindl-dev/bindl/internal/version" ) var rawMakefileTmpl = `# THIS FILE WAS GENERATED BY BINDL {{ .Version }} ON {{ .Time }} diff --git a/command/purge.go b/command/purge.go index 33c7b92..5b74995 100644 --- a/command/purge.go +++ b/command/purge.go @@ -23,8 +23,8 @@ import ( "os" "path/filepath" - "go.xargs.dev/bindl/config" - "go.xargs.dev/bindl/internal" + "github.com/bindl-dev/bindl/config" + "github.com/bindl-dev/bindl/internal" ) // Purge deletes downloaded binaries. By default, it only deletes diff --git a/command/sync.go b/command/sync.go index c683044..8a5d220 100644 --- a/command/sync.go +++ b/command/sync.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "go.xargs.dev/bindl/config" - "go.xargs.dev/bindl/internal" - "go.xargs.dev/bindl/program" + "github.com/bindl-dev/bindl/config" + "github.com/bindl-dev/bindl/internal" + "github.com/bindl-dev/bindl/program" "sigs.k8s.io/yaml" ) diff --git a/command/verify.go b/command/verify.go index 9998039..a65459a 100644 --- a/command/verify.go +++ b/command/verify.go @@ -21,9 +21,9 @@ import ( "os" "path/filepath" - "go.xargs.dev/bindl/config" - "go.xargs.dev/bindl/internal" - "go.xargs.dev/bindl/program" + "github.com/bindl-dev/bindl/config" + "github.com/bindl-dev/bindl/internal" + "github.com/bindl-dev/bindl/program" ) // Verify implements ProgramCommandFunc, therefore needs to be concurrent-safe diff --git a/config/config.go b/config/config.go index 689db73..79cf201 100644 --- a/config/config.go +++ b/config/config.go @@ -14,7 +14,7 @@ package config -import "go.xargs.dev/bindl/program" +import "github.com/bindl-dev/bindl/program" // Config is a configuration which is used to declare a project's dependencies. // By default, this is the content of bindl.yaml diff --git a/config/lock.go b/config/lock.go index b372757..995e4b9 100644 --- a/config/lock.go +++ b/config/lock.go @@ -18,8 +18,8 @@ import ( "os" "time" - "go.xargs.dev/bindl/internal" - "go.xargs.dev/bindl/program" + "github.com/bindl-dev/bindl/internal" + "github.com/bindl-dev/bindl/program" "sigs.k8s.io/yaml" ) diff --git a/go.mod b/go.mod index 89294c5..6b70241 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.xargs.dev/bindl +module github.com/bindl-dev/bindl go 1.18 diff --git a/internal/internal.go b/internal/internal.go index cf11ae3..75ecb17 100644 --- a/internal/internal.go +++ b/internal/internal.go @@ -15,8 +15,8 @@ package internal import ( + "github.com/bindl-dev/bindl/internal/log" "github.com/rs/zerolog" - "go.xargs.dev/bindl/internal/log" ) func Log() *zerolog.Logger { diff --git a/internal/message.go b/internal/message.go index 5dc1f2a..eb7b516 100644 --- a/internal/message.go +++ b/internal/message.go @@ -18,8 +18,8 @@ import ( "fmt" "os" + "github.com/bindl-dev/bindl/internal/log" "github.com/fatih/color" - "go.xargs.dev/bindl/internal/log" ) var errHeader = color.HiRedString("ERROR") diff --git a/program/archive_deflate.go b/program/archive_deflate.go index 310edc9..c24b815 100644 --- a/program/archive_deflate.go +++ b/program/archive_deflate.go @@ -23,7 +23,7 @@ import ( "io" "path/filepath" - "go.xargs.dev/bindl/internal" + "github.com/bindl-dev/bindl/internal" ) func unzip(w io.Writer, rawZip io.ReaderAt, size int64, binaryName string) error { diff --git a/program/lock.go b/program/lock.go index aa4e405..5cf7bca 100644 --- a/program/lock.go +++ b/program/lock.go @@ -23,8 +23,8 @@ import ( "sync" "text/template" - "go.xargs.dev/bindl/download" - "go.xargs.dev/bindl/internal" + "github.com/bindl-dev/bindl/download" + "github.com/bindl-dev/bindl/internal" ) // Lock is a configuration used by lockfile to explicitly state the diff --git a/program/lock_online_test.go b/program/lock_online_test.go index 8fcc1c7..dc60b6e 100644 --- a/program/lock_online_test.go +++ b/program/lock_online_test.go @@ -18,8 +18,8 @@ import ( "context" "testing" - "go.xargs.dev/bindl/download" - "go.xargs.dev/bindl/program" + "github.com/bindl-dev/bindl/download" + "github.com/bindl-dev/bindl/program" "sigs.k8s.io/yaml" ) diff --git a/program/lock_test.go b/program/lock_test.go index 2fcc592..0b5cf78 100644 --- a/program/lock_test.go +++ b/program/lock_test.go @@ -21,8 +21,8 @@ import ( "sigs.k8s.io/yaml" - "go.xargs.dev/bindl/download" - "go.xargs.dev/bindl/program" + "github.com/bindl-dev/bindl/download" + "github.com/bindl-dev/bindl/program" ) func TestProgramChecksumsYAMLUnmarshalJSON(t *testing.T) { diff --git a/program/program.go b/program/program.go index f154a6e..086a831 100644 --- a/program/program.go +++ b/program/program.go @@ -21,7 +21,7 @@ import ( "net/http" "text/template" - "go.xargs.dev/bindl/internal" + "github.com/bindl-dev/bindl/internal" ) // Base is a minimal structure which exists in every program variations diff --git a/program/program_online_test.go b/program/program_online_test.go index 8390b9b..f07a8a3 100644 --- a/program/program_online_test.go +++ b/program/program_online_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "go.xargs.dev/bindl/program" + "github.com/bindl-dev/bindl/program" "sigs.k8s.io/yaml" )