diff options
| author | Dave Henderson <dhenderson@gmail.com> | 2019-11-12 20:13:02 -0500 |
|---|---|---|
| committer | Dave Henderson <dhenderson@gmail.com> | 2019-11-13 07:55:09 -0500 |
| commit | 383987bf5617e5bd5a211c79e2413344f5c6113b (patch) | |
| tree | b2920f227fa5ef74d7f7022708f13610f56ee36a | |
| parent | 677ea79e35e3010ab574e617670e5240ef7a7cba (diff) | |
Export /v3 from go module
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
49 files changed, 106 insertions, 82 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 9cb43eff..e1f2723c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,7 +39,9 @@ jobs: command: | trap "go-junit-report < $CIRCLE_TEST_REPORTS/go-test.out > $CIRCLE_TEST_REPORTS/report.xml" EXIT make test | tee $CIRCLE_TEST_REPORTS/go-test.out - cc-test-reporter after-build --exit-code $? + # workaround from https://github.com/codeclimate/test-reporter/issues/378 + export PREFIX=$(basename $(go list -m)) + cc-test-reporter after-build -p $PREFIX --exit-code $? - store_test_results: path: /tmp/test-results lint: diff --git a/aws/ec2meta.go b/aws/ec2meta.go index 61a78b23..72ee6f26 100644 --- a/aws/ec2meta.go +++ b/aws/ec2meta.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/hairyhenderson/gomplate/env" + "github.com/hairyhenderson/gomplate/v3/env" ) // DefaultEndpoint - @@ -1,7 +1,7 @@ package aws import ( - b64 "github.com/hairyhenderson/gomplate/base64" + b64 "github.com/hairyhenderson/gomplate/v3/base64" "github.com/aws/aws-sdk-go/service/kms" ) diff --git a/aws/kms_test.go b/aws/kms_test.go index 9475a4bf..2338252e 100644 --- a/aws/kms_test.go +++ b/aws/kms_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/aws/aws-sdk-go/service/kms" - b64 "github.com/hairyhenderson/gomplate/base64" + b64 "github.com/hairyhenderson/gomplate/v3/base64" "github.com/stretchr/testify/assert" ) diff --git a/cmd/gomplate/main.go b/cmd/gomplate/main.go index 8a0dffb7..16f5752b 100644 --- a/cmd/gomplate/main.go +++ b/cmd/gomplate/main.go @@ -11,9 +11,9 @@ import ( "os/exec" "os/signal" - "github.com/hairyhenderson/gomplate" - "github.com/hairyhenderson/gomplate/env" - "github.com/hairyhenderson/gomplate/version" + "github.com/hairyhenderson/gomplate/v3" + "github.com/hairyhenderson/gomplate/v3/env" + "github.com/hairyhenderson/gomplate/v3/version" "github.com/spf13/cobra" ) diff --git a/coll/coll.go b/coll/coll.go index dbbbea8c..284d5f29 100644 --- a/coll/coll.go +++ b/coll/coll.go @@ -10,8 +10,8 @@ import ( "reflect" "sort" - "github.com/hairyhenderson/gomplate/conv" - iconv "github.com/hairyhenderson/gomplate/internal/conv" + "github.com/hairyhenderson/gomplate/v3/conv" + iconv "github.com/hairyhenderson/gomplate/v3/internal/conv" ) // Slice creates a slice from a bunch of arguments @@ -4,7 +4,7 @@ import ( "os" "strings" - "github.com/hairyhenderson/gomplate/data" + "github.com/hairyhenderson/gomplate/v3/data" ) // context for templates diff --git a/context_test.go b/context_test.go index 37362104..ab273749 100644 --- a/context_test.go +++ b/context_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/hairyhenderson/gomplate/data" + "github.com/hairyhenderson/gomplate/v3/data" "github.com/stretchr/testify/assert" ) diff --git a/conv/conv.go b/conv/conv.go index 20435f93..eb8695ac 100644 --- a/conv/conv.go +++ b/conv/conv.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - iconv "github.com/hairyhenderson/gomplate/internal/conv" + iconv "github.com/hairyhenderson/gomplate/v3/internal/conv" "github.com/pkg/errors" ) diff --git a/data/data.go b/data/data.go index bcc40f8a..a401fb19 100644 --- a/data/data.go +++ b/data/data.go @@ -14,7 +14,7 @@ import ( "github.com/Shopify/ejson" ejsonJson "github.com/Shopify/ejson/json" - "github.com/hairyhenderson/gomplate/env" + "github.com/hairyhenderson/gomplate/v3/env" // XXX: replace once https://github.com/BurntSushi/toml/pull/179 is merged "github.com/hairyhenderson/toml" diff --git a/data/datasource.go b/data/datasource.go index 766e667a..35dbaf0a 100644 --- a/data/datasource.go +++ b/data/datasource.go @@ -16,8 +16,8 @@ import ( "github.com/pkg/errors" - "github.com/hairyhenderson/gomplate/libkv" - "github.com/hairyhenderson/gomplate/vault" + "github.com/hairyhenderson/gomplate/v3/libkv" + "github.com/hairyhenderson/gomplate/v3/vault" ) // stdin - for overriding in tests diff --git a/data/datasource_aws_sm.go b/data/datasource_aws_sm.go index d3ea1abf..f513d060 100644 --- a/data/datasource_aws_sm.go +++ b/data/datasource_aws_sm.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/service/secretsmanager" "github.com/pkg/errors" - gaws "github.com/hairyhenderson/gomplate/aws" + gaws "github.com/hairyhenderson/gomplate/v3/aws" ) // awsSecretsManagerGetter - A subset of Secrets Manager API for use in unit testing diff --git a/data/datasource_awssmp.go b/data/datasource_awssmp.go index 00168f40..6bde06ae 100644 --- a/data/datasource_awssmp.go +++ b/data/datasource_awssmp.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/service/ssm" "github.com/pkg/errors" - gaws "github.com/hairyhenderson/gomplate/aws" + gaws "github.com/hairyhenderson/gomplate/v3/aws" ) // awssmpGetter - A subset of SSM API for use in unit testing diff --git a/data/datasource_blob.go b/data/datasource_blob.go index 4937665b..d76f0a35 100644 --- a/data/datasource_blob.go +++ b/data/datasource_blob.go @@ -10,8 +10,8 @@ import ( "path" "strings" - gaws "github.com/hairyhenderson/gomplate/aws" - "github.com/hairyhenderson/gomplate/env" + gaws "github.com/hairyhenderson/gomplate/v3/aws" + "github.com/hairyhenderson/gomplate/v3/env" "github.com/pkg/errors" "gocloud.dev/blob" diff --git a/data/datasource_consul.go b/data/datasource_consul.go index 17db1a99..e0ec623c 100644 --- a/data/datasource_consul.go +++ b/data/datasource_consul.go @@ -3,7 +3,7 @@ package data import ( "strings" - "github.com/hairyhenderson/gomplate/libkv" + "github.com/hairyhenderson/gomplate/v3/libkv" ) func readConsul(source *Source, args ...string) (data []byte, err error) { diff --git a/data/datasource_env.go b/data/datasource_env.go index 306b4f06..34b2e7d5 100644 --- a/data/datasource_env.go +++ b/data/datasource_env.go @@ -3,7 +3,7 @@ package data import ( "strings" - "github.com/hairyhenderson/gomplate/env" + "github.com/hairyhenderson/gomplate/v3/env" ) func readEnv(source *Source, args ...string) (b []byte, err error) { diff --git a/data/datasource_git.go b/data/datasource_git.go index 494989a4..3c614863 100644 --- a/data/datasource_git.go +++ b/data/datasource_git.go @@ -12,8 +12,8 @@ import ( "path/filepath" "strings" - "github.com/hairyhenderson/gomplate/base64" - "github.com/hairyhenderson/gomplate/env" + "github.com/hairyhenderson/gomplate/v3/base64" + "github.com/hairyhenderson/gomplate/v3/env" "gopkg.in/src-d/go-billy.v4" "gopkg.in/src-d/go-billy.v4/memfs" diff --git a/data/datasource_merge.go b/data/datasource_merge.go index 1457d6b7..da14f24d 100644 --- a/data/datasource_merge.go +++ b/data/datasource_merge.go @@ -3,7 +3,7 @@ package data import ( "strings" - "github.com/hairyhenderson/gomplate/coll" + "github.com/hairyhenderson/gomplate/v3/coll" "github.com/pkg/errors" ) diff --git a/data/datasource_vault.go b/data/datasource_vault.go index 18b478be..2ed7d9f8 100644 --- a/data/datasource_vault.go +++ b/data/datasource_vault.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/hairyhenderson/gomplate/vault" + "github.com/hairyhenderson/gomplate/v3/vault" ) func parseVaultParams(sourceURL *url.URL, args []string) (params map[string]interface{}, p string, err error) { diff --git a/data/datasource_vault_test.go b/data/datasource_vault_test.go index 6bb5ce83..47aff14d 100644 --- a/data/datasource_vault_test.go +++ b/data/datasource_vault_test.go @@ -4,7 +4,7 @@ import ( "net/url" "testing" - "github.com/hairyhenderson/gomplate/vault" + "github.com/hairyhenderson/gomplate/v3/vault" "github.com/stretchr/testify/assert" ) diff --git a/examples/foo.go b/examples/foo.go new file mode 100644 index 00000000..48e165d4 --- /dev/null +++ b/examples/foo.go @@ -0,0 +1,22 @@ +package main + +import ( + "fmt" + + "github.com/hairyhenderson/gomplate/v3/data" +) + +func main() { + d, err := data.NewData([]string{"ip=https://ipinfo.io"}, nil) + if err != nil { + panic(err) + } + + response, err := d.Datasource("ip") + if err != nil { + panic(err) + } + + m := response.(map[string]interface{}) + fmt.Printf("country is %s\n", m["country"]) +} @@ -3,8 +3,8 @@ package gomplate import ( "text/template" - "github.com/hairyhenderson/gomplate/data" - "github.com/hairyhenderson/gomplate/funcs" + "github.com/hairyhenderson/gomplate/v3/data" + "github.com/hairyhenderson/gomplate/v3/funcs" ) // Funcs - The function mappings are defined here! diff --git a/funcs/aws.go b/funcs/aws.go index ebc36f43..5a1556c0 100644 --- a/funcs/aws.go +++ b/funcs/aws.go @@ -3,8 +3,8 @@ package funcs import ( "sync" - "github.com/hairyhenderson/gomplate/aws" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/aws" + "github.com/hairyhenderson/gomplate/v3/conv" ) var ( diff --git a/funcs/aws_test.go b/funcs/aws_test.go index 5bd4b64e..22b6da65 100644 --- a/funcs/aws_test.go +++ b/funcs/aws_test.go @@ -3,7 +3,7 @@ package funcs import ( "testing" - "github.com/hairyhenderson/gomplate/aws" + "github.com/hairyhenderson/gomplate/v3/aws" "github.com/stretchr/testify/assert" ) diff --git a/funcs/base64.go b/funcs/base64.go index fdaae1d4..ac7cf3ee 100644 --- a/funcs/base64.go +++ b/funcs/base64.go @@ -3,8 +3,8 @@ package funcs import ( "sync" - "github.com/hairyhenderson/gomplate/base64" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/base64" + "github.com/hairyhenderson/gomplate/v3/conv" ) var ( diff --git a/funcs/coll.go b/funcs/coll.go index 62ebed61..1e110b8b 100644 --- a/funcs/coll.go +++ b/funcs/coll.go @@ -3,9 +3,9 @@ package funcs import ( "sync" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/conv" - "github.com/hairyhenderson/gomplate/coll" + "github.com/hairyhenderson/gomplate/v3/coll" "github.com/pkg/errors" ) diff --git a/funcs/conv.go b/funcs/conv.go index b5701171..210e1be6 100644 --- a/funcs/conv.go +++ b/funcs/conv.go @@ -5,8 +5,8 @@ import ( "sync" "text/template" - "github.com/hairyhenderson/gomplate/coll" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/coll" + "github.com/hairyhenderson/gomplate/v3/conv" ) var ( diff --git a/funcs/crypto.go b/funcs/crypto.go index f1123874..d1bd7c9d 100644 --- a/funcs/crypto.go +++ b/funcs/crypto.go @@ -10,10 +10,10 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/conv" "github.com/pkg/errors" - "github.com/hairyhenderson/gomplate/crypto" + "github.com/hairyhenderson/gomplate/v3/crypto" ) var ( diff --git a/funcs/data.go b/funcs/data.go index 1ecacae5..b13619e3 100644 --- a/funcs/data.go +++ b/funcs/data.go @@ -3,8 +3,8 @@ package funcs import ( "sync" - "github.com/hairyhenderson/gomplate/conv" - "github.com/hairyhenderson/gomplate/data" + "github.com/hairyhenderson/gomplate/v3/conv" + "github.com/hairyhenderson/gomplate/v3/data" ) var ( diff --git a/funcs/env.go b/funcs/env.go index bf602006..2a6866c9 100644 --- a/funcs/env.go +++ b/funcs/env.go @@ -3,8 +3,8 @@ package funcs import ( "sync" - "github.com/hairyhenderson/gomplate/conv" - "github.com/hairyhenderson/gomplate/env" + "github.com/hairyhenderson/gomplate/v3/conv" + "github.com/hairyhenderson/gomplate/v3/env" ) var ( diff --git a/funcs/file.go b/funcs/file.go index dc74717f..5831ffd2 100644 --- a/funcs/file.go +++ b/funcs/file.go @@ -4,8 +4,8 @@ import ( "os" "sync" - "github.com/hairyhenderson/gomplate/conv" - "github.com/hairyhenderson/gomplate/file" + "github.com/hairyhenderson/gomplate/v3/conv" + "github.com/hairyhenderson/gomplate/v3/file" "github.com/spf13/afero" ) diff --git a/funcs/filepath.go b/funcs/filepath.go index 8ee9dc1f..afaeff73 100644 --- a/funcs/filepath.go +++ b/funcs/filepath.go @@ -4,7 +4,7 @@ import ( "path/filepath" "sync" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/conv" ) var ( diff --git a/funcs/math.go b/funcs/math.go index 4c9df163..e0acdceb 100644 --- a/funcs/math.go +++ b/funcs/math.go @@ -6,9 +6,9 @@ import ( "strconv" "sync" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/conv" - "github.com/hairyhenderson/gomplate/math" + "github.com/hairyhenderson/gomplate/v3/math" ) var ( diff --git a/funcs/net.go b/funcs/net.go index bd81a5c0..fba46045 100644 --- a/funcs/net.go +++ b/funcs/net.go @@ -4,9 +4,9 @@ import ( stdnet "net" "sync" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/conv" - "github.com/hairyhenderson/gomplate/net" + "github.com/hairyhenderson/gomplate/v3/net" ) var ( diff --git a/funcs/path.go b/funcs/path.go index 255acef9..4a6ad870 100644 --- a/funcs/path.go +++ b/funcs/path.go @@ -4,7 +4,7 @@ import ( "path" "sync" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/conv" ) var ( diff --git a/funcs/random.go b/funcs/random.go index 0e3e7a0c..aea2787f 100644 --- a/funcs/random.go +++ b/funcs/random.go @@ -5,9 +5,9 @@ import ( "sync" "unicode/utf8" - "github.com/hairyhenderson/gomplate/conv" - iconv "github.com/hairyhenderson/gomplate/internal/conv" - "github.com/hairyhenderson/gomplate/random" + "github.com/hairyhenderson/gomplate/v3/conv" + iconv "github.com/hairyhenderson/gomplate/v3/internal/conv" + "github.com/hairyhenderson/gomplate/v3/random" "github.com/pkg/errors" ) diff --git a/funcs/regexp.go b/funcs/regexp.go index 344b5cf8..b987132d 100644 --- a/funcs/regexp.go +++ b/funcs/regexp.go @@ -5,8 +5,8 @@ import ( "github.com/pkg/errors" - "github.com/hairyhenderson/gomplate/conv" - "github.com/hairyhenderson/gomplate/regexp" + "github.com/hairyhenderson/gomplate/v3/conv" + "github.com/hairyhenderson/gomplate/v3/regexp" ) var ( diff --git a/funcs/strings.go b/funcs/strings.go index 0380575f..9023012a 100644 --- a/funcs/strings.go +++ b/funcs/strings.go @@ -12,13 +12,13 @@ import ( "unicode/utf8" "github.com/Masterminds/goutils" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/conv" "github.com/pkg/errors" "strings" "github.com/gosimple/slug" - gompstrings "github.com/hairyhenderson/gomplate/strings" + gompstrings "github.com/hairyhenderson/gomplate/v3/strings" ) var ( diff --git a/funcs/test.go b/funcs/test.go index ed80e6dc..265ede10 100644 --- a/funcs/test.go +++ b/funcs/test.go @@ -3,10 +3,10 @@ package funcs import ( "sync" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/conv" "github.com/pkg/errors" - "github.com/hairyhenderson/gomplate/test" + "github.com/hairyhenderson/gomplate/v3/test" ) var ( diff --git a/funcs/time.go b/funcs/time.go index d1030cab..f56a8e30 100644 --- a/funcs/time.go +++ b/funcs/time.go @@ -7,8 +7,8 @@ import ( "sync" gotime "time" - "github.com/hairyhenderson/gomplate/conv" - "github.com/hairyhenderson/gomplate/time" + "github.com/hairyhenderson/gomplate/v3/conv" + "github.com/hairyhenderson/gomplate/v3/time" ) var ( diff --git a/funcs/uuid.go b/funcs/uuid.go index f4578d17..3634a837 100644 --- a/funcs/uuid.go +++ b/funcs/uuid.go @@ -3,7 +3,7 @@ package funcs import ( "sync" - "github.com/hairyhenderson/gomplate/conv" + "github.com/hairyhenderson/gomplate/v3/conv" "github.com/google/uuid" ) @@ -1,4 +1,4 @@ -module github.com/hairyhenderson/gomplate +module github.com/hairyhenderson/gomplate/v3 go 1.13 diff --git a/gomplate.go b/gomplate.go index a7dcb19d..91e6bc91 100644 --- a/gomplate.go +++ b/gomplate.go @@ -12,7 +12,7 @@ import ( "text/template" "time" - "github.com/hairyhenderson/gomplate/data" + "github.com/hairyhenderson/gomplate/v3/data" "github.com/pkg/errors" "github.com/spf13/afero" ) diff --git a/gomplate_test.go b/gomplate_test.go index 9cd8362f..6ce37ed3 100644 --- a/gomplate_test.go +++ b/gomplate_test.go @@ -11,10 +11,10 @@ import ( "text/template" - "github.com/hairyhenderson/gomplate/aws" - "github.com/hairyhenderson/gomplate/conv" - "github.com/hairyhenderson/gomplate/data" - "github.com/hairyhenderson/gomplate/env" + "github.com/hairyhenderson/gomplate/v3/aws" + "github.com/hairyhenderson/gomplate/v3/conv" + "github.com/hairyhenderson/gomplate/v3/data" + "github.com/hairyhenderson/gomplate/v3/env" "github.com/stretchr/testify/assert" ) diff --git a/libkv/boltdb.go b/libkv/boltdb.go index 5d597e67..2401274a 100644 --- a/libkv/boltdb.go +++ b/libkv/boltdb.go @@ -7,8 +7,8 @@ import ( "github.com/docker/libkv" "github.com/docker/libkv/store" "github.com/docker/libkv/store/boltdb" - "github.com/hairyhenderson/gomplate/conv" - "github.com/hairyhenderson/gomplate/env" + "github.com/hairyhenderson/gomplate/v3/conv" + "github.com/hairyhenderson/gomplate/v3/env" "github.com/pkg/errors" ) diff --git a/libkv/consul.go b/libkv/consul.go index 0d9d1cfc..aeb6de7f 100644 --- a/libkv/consul.go +++ b/libkv/consul.go @@ -13,9 +13,9 @@ import ( "github.com/docker/libkv" "github.com/docker/libkv/store" "github.com/docker/libkv/store/consul" - "github.com/hairyhenderson/gomplate/conv" - "github.com/hairyhenderson/gomplate/env" - "github.com/hairyhenderson/gomplate/vault" + "github.com/hairyhenderson/gomplate/v3/conv" + "github.com/hairyhenderson/gomplate/v3/env" + "github.com/hairyhenderson/gomplate/v3/vault" consulapi "github.com/hashicorp/consul/api" ) @@ -14,8 +14,8 @@ import ( "text/template" "time" - "github.com/hairyhenderson/gomplate/conv" - "github.com/hairyhenderson/gomplate/env" + "github.com/hairyhenderson/gomplate/v3/conv" + "github.com/hairyhenderson/gomplate/v3/env" ) func bindPlugins(plugins []string, funcMap template.FuncMap) error { diff --git a/template.go b/template.go index d6452b7f..775b75cd 100644 --- a/template.go +++ b/template.go @@ -9,10 +9,10 @@ import ( "path/filepath" "text/template" - "github.com/hairyhenderson/gomplate/tmpl" + "github.com/hairyhenderson/gomplate/v3/tmpl" - "github.com/hairyhenderson/gomplate/conv" - "github.com/hairyhenderson/gomplate/env" + "github.com/hairyhenderson/gomplate/v3/conv" + "github.com/hairyhenderson/gomplate/v3/env" "github.com/pkg/errors" "github.com/spf13/afero" diff --git a/vault/auth.go b/vault/auth.go index b3b909e6..6c5ed409 100644 --- a/vault/auth.go +++ b/vault/auth.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/hairyhenderson/gomplate/aws" - "github.com/hairyhenderson/gomplate/conv" - "github.com/hairyhenderson/gomplate/env" + "github.com/hairyhenderson/gomplate/v3/aws" + "github.com/hairyhenderson/gomplate/v3/conv" + "github.com/hairyhenderson/gomplate/v3/env" "github.com/pkg/errors" ) |
