diff --git a/.circleci/config.yml b/.circleci/config.yml index a6bd2724..14b84dfe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,37 +14,41 @@ jobs: test: machine: enabled: true - working_directory: /home/circleci/.go_workspace/src/github.com/helm/chart-testing + image: circleci/classic:201808-01 steps: + - checkout - run: name: Install tools command: | - mkdir /home/circleci/.go_workspace/bin - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh + # We need to install Golang 1.13 because the CircleCI machine image has an outdated version. + # We need to use a CircleCI machine in order to be able to run kind. + curl -sSLO https://dl.google.com/go/go1.13.4.linux-amd64.tar.gz + sudo rm -r /usr/local/go + sudo tar -C /usr/local -xzf go1.13.4.linux-amd64.tar.gz + curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl chmod +x ./kubectl sudo mv ./kubectl /usr/local/bin/kubectl + curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash curl -sSLo kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.5.1/kind-linux-amd64" chmod +x kind sudo mv kind /usr/local/bin/kind - - checkout - run: name: Test command: | - dep ensure -v + go mod download ./e2e-kind.sh build: docker: - - image: golang:1.12.4-alpine3.9 - working_directory: /go/src/github.com/helm/chart-testing + - image: golang:1.13-alpine3.10 steps: - setup_remote_docker - run: name: Install tools command: | apk add bash build-base ca-certificates curl docker git openssh - curl -SLO https://github.com/goreleaser/goreleaser/releases/download/v0.102.0/goreleaser_Linux_x86_64.tar.gz + curl -SLO https://github.com/goreleaser/goreleaser/releases/download/v0.120.5/goreleaser_Linux_x86_64.tar.gz mkdir -p /usr/local/goreleaser tar -xzf goreleaser_Linux_x86_64.tar.gz -C /usr/local/goreleaser ln -s /usr/local/goreleaser/goreleaser /usr/local/bin/goreleaser diff --git a/.goreleaser.yml b/.goreleaser.yml index 0e8950f3..27748a4b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,4 +1,7 @@ project_name: chart-testing +before: + hooks: + - go mod download builds: - main: ct/main.go binary: ct @@ -16,15 +19,15 @@ builds: -X github.com/helm/chart-testing/ct/cmd.Version={{ .Tag }} -X github.com/helm/chart-testing/ct/cmd.GitCommit={{ .Commit }} -X github.com/helm/chart-testing/ct/cmd.BuildDate={{ .Date }} -archive: - format_overrides: - - goos: windows - format: zip - files: - - LICENSE - - README.md - - etc/chart_schema.yaml - - etc/lintconf.yaml +archives: + - format_overrides: + - goos: windows + format: zip + files: + - LICENSE + - README.md + - etc/chart_schema.yaml + - etc/lintconf.yaml checksum: name_template: 'checksums.txt' snapshot: diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index ba7d19dd..00000000 --- a/Gopkg.lock +++ /dev/null @@ -1,284 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - branch = "master" - digest = "1:6b250e53b3b7b9abd7e62f55875c234d2f8b77b846bff200fecafa2dc09af09a" - name = "github.com/MakeNowJust/heredoc" - packages = ["."] - pruneopts = "" - revision = "e9091a26100e9cfb2b6a8f470085bfa541931a91" - -[[projects]] - digest = "1:b856d8248663c39265a764561c1a1a149783f6cc815feb54a1f3a591b91f6eca" - name = "github.com/Masterminds/semver" - packages = ["."] - pruneopts = "" - revision = "c7af12943936e8c39859482e61f0574c2fd7fc75" - version = "v1.4.2" - -[[projects]] - digest = "1:982e2547680f9fd2212c6443ab73ea84eef40ee1cdcecb61d997de838445214c" - name = "github.com/cpuguy83/go-md2man" - packages = ["md2man"] - pruneopts = "" - revision = "20f5889cbdc3c73dbd2862796665e7c465ade7d1" - version = "v1.0.8" - -[[projects]] - digest = "1:0deddd908b6b4b768cfc272c16ee61e7088a60f7fe2f06c547bd3d8e1f8b8e77" - name = "github.com/davecgh/go-spew" - packages = ["spew"] - pruneopts = "" - revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" - version = "v1.1.1" - -[[projects]] - digest = "1:eb53021a8aa3f599d29c7102e65026242bdedce998a54837dc67f14b6a97c5fd" - name = "github.com/fsnotify/fsnotify" - packages = ["."] - pruneopts = "" - revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9" - version = "v1.4.7" - -[[projects]] - digest = "1:8e3bd93036b4a925fe2250d3e4f38f21cadb8ef623561cd80c3c50c114b13201" - name = "github.com/hashicorp/errwrap" - packages = ["."] - pruneopts = "" - revision = "8a6fb523712970c966eefc6b39ed2c5e74880354" - version = "v1.0.0" - -[[projects]] - digest = "1:05334858a0cfb538622a066e065287f63f42bee26a7fda93a789674225057201" - name = "github.com/hashicorp/go-cleanhttp" - packages = ["."] - pruneopts = "" - revision = "e8ab9daed8d1ddd2d3c4efba338fe2eeae2e4f18" - version = "v0.5.0" - -[[projects]] - digest = "1:72308fdd6d5ef61106a95be7ca72349a5565809042b6426a3cfb61d99483b824" - name = "github.com/hashicorp/go-multierror" - packages = ["."] - pruneopts = "" - revision = "886a7fbe3eb1c874d46f623bfa70af45f425b3d1" - version = "v1.0.0" - -[[projects]] - digest = "1:776139dc18d63ef223ffaca5d8e9a3057174890f84393d3c881e934100b66dbc" - name = "github.com/hashicorp/go-retryablehttp" - packages = ["."] - pruneopts = "" - revision = "73489d0a1476f0c9e6fb03f9c39241523a496dfd" - version = "v0.5.2" - -[[projects]] - digest = "1:d14365c51dd1d34d5c79833ec91413bfbb166be978724f15701e17080dc06dec" - name = "github.com/hashicorp/hcl" - packages = [ - ".", - "hcl/ast", - "hcl/parser", - "hcl/printer", - "hcl/scanner", - "hcl/strconv", - "hcl/token", - "json/parser", - "json/scanner", - "json/token", - ] - pruneopts = "" - revision = "8cb6e5b959231cc1119e43259c4a608f9c51a241" - version = "v1.0.0" - -[[projects]] - digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" - name = "github.com/inconshreveable/mousetrap" - packages = ["."] - pruneopts = "" - revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" - version = "v1.0" - -[[projects]] - digest = "1:961dc3b1d11f969370533390fdf203813162980c858e1dabe827b60940c909a5" - name = "github.com/magiconair/properties" - packages = ["."] - pruneopts = "" - revision = "c2353362d570a7bfa228149c62842019201cfb71" - version = "v1.8.0" - -[[projects]] - digest = "1:096a8a9182648da3d00ff243b88407838902b6703fc12657f76890e08d1899bf" - name = "github.com/mitchellh/go-homedir" - packages = ["."] - pruneopts = "" - revision = "ae18d6b8b3205b561c79e8e5f69bff09736185f4" - version = "v1.0.0" - -[[projects]] - digest = "1:bcc46a0fbd9e933087bef394871256b5c60269575bb661935874729c65bbbf60" - name = "github.com/mitchellh/mapstructure" - packages = ["."] - pruneopts = "" - revision = "3536a929edddb9a5b34bd6861dc4a9647cb459fe" - version = "v1.1.2" - -[[projects]] - digest = "1:894aef961c056b6d85d12bac890bf60c44e99b46292888bfa66caf529f804457" - name = "github.com/pelletier/go-toml" - packages = ["."] - pruneopts = "" - revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194" - version = "v1.2.0" - -[[projects]] - digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "" - revision = "645ef00459ed84a119197bfb8d8205042c6df63d" - version = "v0.8.0" - -[[projects]] - digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411" - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - pruneopts = "" - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" - -[[projects]] - digest = "1:2761e287c811d0948d47d0252b82281eca3801eb3c9d5f9530956643d5b9f430" - name = "github.com/russross/blackfriday" - packages = ["."] - pruneopts = "" - revision = "05f3235734ad95d0016f6a23902f06461fcf567a" - version = "v1.5.2" - -[[projects]] - digest = "1:d0431c2fd72e39ee43ea7742322abbc200c3e704c9102c5c3c2e2e667095b0ca" - name = "github.com/spf13/afero" - packages = [ - ".", - "mem", - ] - pruneopts = "" - revision = "d40851caa0d747393da1ffb28f7f9d8b4eeffebd" - version = "v1.1.2" - -[[projects]] - digest = "1:ae3493c780092be9d576a1f746ab967293ec165e8473425631f06658b6212afc" - name = "github.com/spf13/cast" - packages = ["."] - pruneopts = "" - revision = "8c9545af88b134710ab1cd196795e7f2388358d7" - version = "v1.3.0" - -[[projects]] - digest = "1:a1403cc8a94b8d7956ee5e9694badef0e7b051af289caad1cf668331e3ffa4f6" - name = "github.com/spf13/cobra" - packages = [ - ".", - "doc", - ] - pruneopts = "" - revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" - version = "v0.0.3" - -[[projects]] - digest = "1:9ceffa4ab5f7195ecf18b3a7fff90c837a9ed5e22e66d18069e4bccfe1f52aa0" - name = "github.com/spf13/jwalterweatherman" - packages = ["."] - pruneopts = "" - revision = "4a4406e478ca629068e7768fc33f3f044173c0a6" - version = "v1.0.0" - -[[projects]] - digest = "1:cbaf13cdbfef0e4734ed8a7504f57fe893d471d62a35b982bf6fb3f036449a66" - name = "github.com/spf13/pflag" - packages = ["."] - pruneopts = "" - revision = "298182f68c66c05229eb03ac171abe6e309ee79a" - version = "v1.0.3" - -[[projects]] - digest = "1:1ed7a19588d3b74fc6a45fe89f95aa980a34870342fb9c3183b19cad08b18a1e" - name = "github.com/spf13/viper" - packages = ["."] - pruneopts = "" - revision = "2c12c60302a5a0e62ee102ca9bc996277c2f64f5" - version = "v1.2.1" - -[[projects]] - digest = "1:711eebe744c0151a9d09af2315f0bb729b2ec7637ef4c410fa90a18ef74b65b6" - name = "github.com/stretchr/objx" - packages = ["."] - pruneopts = "" - revision = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c" - version = "v0.1.1" - -[[projects]] - digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75" - name = "github.com/stretchr/testify" - packages = [ - "assert", - "mock", - "require", - ] - pruneopts = "" - revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" - version = "v1.2.2" - -[[projects]] - branch = "master" - digest = "1:ff65401e40494de90fddaecf09b2954179d872a45d9c68b9b31da60f35e4ea73" - name = "golang.org/x/sys" - packages = ["unix"] - pruneopts = "" - revision = "7e31e0c00fa05cb5fbf4347b585621d6709e19a4" - -[[projects]] - digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4" - name = "golang.org/x/text" - packages = [ - "internal/gen", - "internal/triegen", - "internal/ucd", - "transform", - "unicode/cldr", - "unicode/norm", - ] - pruneopts = "" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" - -[[projects]] - digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "" - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - version = "v2.2.1" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/MakeNowJust/heredoc", - "github.com/Masterminds/semver", - "github.com/hashicorp/go-multierror", - "github.com/hashicorp/go-retryablehttp", - "github.com/mitchellh/go-homedir", - "github.com/pkg/errors", - "github.com/spf13/cobra", - "github.com/spf13/cobra/doc", - "github.com/spf13/pflag", - "github.com/spf13/viper", - "github.com/stretchr/testify/assert", - "github.com/stretchr/testify/mock", - "github.com/stretchr/testify/require", - "gopkg.in/yaml.v2", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index ffdcd39c..00000000 --- a/Gopkg.toml +++ /dev/null @@ -1,36 +0,0 @@ - -[[constraint]] - name = "github.com/Masterminds/semver" - version = "v1.4.2" - -[[constraint]] - name = "github.com/mitchellh/go-homedir" - version = "v1.0.0" - -[[constraint]] - name = "github.com/pkg/errors" - version = "v0.8.0" - -[[constraint]] - name = "github.com/spf13/cobra" - version = "v0.0.3" - -[[constraint]] - name = "github.com/spf13/pflag" - version = "v1.0.2" - -[[constraint]] - name = "github.com/spf13/viper" - version = "v1.2.0" - -[[constraint]] - name = "github.com/stretchr/testify" - version = "v1.2.2" - -[[constraint]] - name = "gopkg.in/yaml.v2" - version = "v2.2.1" - -[[constraint]] - name = "github.com/hashicorp/go-retryablehttp" - version = "v0.5.2" diff --git a/README.md b/README.md index 03a5b871..88617625 100644 --- a/README.md +++ b/README.md @@ -36,10 +36,10 @@ available tags [here](https://quay.io/repository/helmpack/chart-testing?tab=tags ### From Source -To install from head with [Go](https://golang.org) 1.12.4 or higher: +To install from head with [Go](https://golang.org) 1.13 or higher: ```cli -go get github.com/helm/chart-testing/ct +go get github.com/helm/chart-testing/v3/ct ``` This will put `ct` in `$(go env GOPATH)/bin`. You may need to add that directory to your `$PATH` as shown [here](https://golang.org/doc/code.html#GOPATH) if you encounter the error `ct: command not found` after installation. @@ -132,9 +132,10 @@ helm-repo-extra-args: ## Building from Source -`ct` is built using Go 1.12.4. Older versions may work but have not been tested. +`ct` is built using Go 1.13 or higher. -`build.sh` is used to build and release the tool. It uses [Goreleaser](https://goreleaser.com/) under the covers. +`build.sh` is used to build and release the tool. +It uses [Goreleaser](https://goreleaser.com/) under the covers. Note: on MacOS you will need `GNU Coreutils readlink`. You can install it with: diff --git a/build.sh b/build.sh index dbc587e2..e4d94d9f 100755 --- a/build.sh +++ b/build.sh @@ -21,7 +21,7 @@ set -o pipefail readonly SCRIPT_DIR=$(dirname "$(readlink -f "$0")") show_help() { -cat << EOF + cat << EOF Usage: $(basename "$0") Build ct using Goreleaser. @@ -40,14 +40,14 @@ main() { while :; do case "${1:-}" in - -h|--help) + -h | --help) show_help exit ;; - -d|--debug) + -d | --debug) debug=true ;; - -r|--release) + -r | --release) release=true ;; *) @@ -61,17 +61,17 @@ main() { local goreleaser_args=(--rm-dist) if [[ -n "$debug" ]]; then - goreleaser_args+=( --debug) + goreleaser_args+=(--debug) set -x fi if [[ -z "$release" ]]; then - goreleaser_args+=( --snapshot) + goreleaser_args+=(--snapshot) fi pushd "$SCRIPT_DIR" > /dev/null - dep ensure -v + go mod download go test ./... goreleaser "${goreleaser_args[@]}" diff --git a/ct/cmd/docGen.go b/ct/cmd/docGen.go index 1ee869d4..03e62821 100644 --- a/ct/cmd/docGen.go +++ b/ct/cmd/docGen.go @@ -16,10 +16,11 @@ package cmd import ( "fmt" + "os" + "github.com/MakeNowJust/heredoc" "github.com/spf13/cobra" "github.com/spf13/cobra/doc" - "os" ) func newGenerateDocsCmd() *cobra.Command { diff --git a/ct/cmd/install.go b/ct/cmd/install.go index e42bded7..18555adf 100644 --- a/ct/cmd/install.go +++ b/ct/cmd/install.go @@ -19,8 +19,8 @@ import ( "os" "github.com/MakeNowJust/heredoc" - "github.com/helm/chart-testing/pkg/chart" - "github.com/helm/chart-testing/pkg/config" + "github.com/helm/chart-testing/v3/pkg/chart" + "github.com/helm/chart-testing/v3/pkg/config" "github.com/spf13/cobra" flag "github.com/spf13/pflag" diff --git a/ct/cmd/lint.go b/ct/cmd/lint.go index ded1e677..f6da796f 100644 --- a/ct/cmd/lint.go +++ b/ct/cmd/lint.go @@ -19,8 +19,8 @@ import ( "os" "github.com/MakeNowJust/heredoc" - "github.com/helm/chart-testing/pkg/chart" - "github.com/helm/chart-testing/pkg/config" + "github.com/helm/chart-testing/v3/pkg/chart" + "github.com/helm/chart-testing/v3/pkg/config" "github.com/spf13/cobra" flag "github.com/spf13/pflag" ) diff --git a/ct/cmd/lintAndInstall.go b/ct/cmd/lintAndInstall.go index c8fd3d46..42cba135 100644 --- a/ct/cmd/lintAndInstall.go +++ b/ct/cmd/lintAndInstall.go @@ -18,8 +18,8 @@ import ( "fmt" "os" - "github.com/helm/chart-testing/pkg/chart" - "github.com/helm/chart-testing/pkg/config" + "github.com/helm/chart-testing/v3/pkg/chart" + "github.com/helm/chart-testing/v3/pkg/config" "github.com/spf13/cobra" ) diff --git a/ct/cmd/listChanged.go b/ct/cmd/listChanged.go index 404aa352..84d19b1a 100644 --- a/ct/cmd/listChanged.go +++ b/ct/cmd/listChanged.go @@ -20,8 +20,8 @@ import ( "github.com/MakeNowJust/heredoc" - "github.com/helm/chart-testing/pkg/chart" - "github.com/helm/chart-testing/pkg/config" + "github.com/helm/chart-testing/v3/pkg/chart" + "github.com/helm/chart-testing/v3/pkg/config" "github.com/spf13/cobra" ) diff --git a/ct/cmd/version.go b/ct/cmd/version.go index 680887a1..d13a4f52 100644 --- a/ct/cmd/version.go +++ b/ct/cmd/version.go @@ -16,6 +16,7 @@ package cmd import ( "fmt" + "github.com/spf13/cobra" ) diff --git a/ct/main.go b/ct/main.go index ac34dee9..66323402 100644 --- a/ct/main.go +++ b/ct/main.go @@ -15,7 +15,7 @@ package main import ( - "github.com/helm/chart-testing/ct/cmd" + "github.com/helm/chart-testing/v3/ct/cmd" ) func main() { diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..b4e7d4d2 --- /dev/null +++ b/go.mod @@ -0,0 +1,25 @@ +module github.com/helm/chart-testing/v3 + +go 1.13 + +require ( + github.com/BurntSushi/toml v0.3.1 // indirect + github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e + github.com/Masterminds/semver v1.4.2 + github.com/cpuguy83/go-md2man v1.0.8 // indirect + github.com/hashicorp/go-multierror v1.0.0 + github.com/hashicorp/go-retryablehttp v0.5.2 + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/mitchellh/go-homedir v1.0.0 + github.com/mitchellh/mapstructure v1.1.2 // indirect + github.com/pkg/errors v0.8.0 + github.com/russross/blackfriday v1.5.2 // indirect + github.com/spf13/cast v1.3.0 // indirect + github.com/spf13/cobra v0.0.3 + github.com/spf13/pflag v1.0.3 + github.com/spf13/viper v1.2.1 + github.com/stretchr/objx v0.1.1 // indirect + github.com/stretchr/testify v1.4.0 + golang.org/x/sys v0.0.0-20190422165155-953cdadca894 // indirect + gopkg.in/yaml.v2 v2.2.2 +) diff --git a/go.sum b/go.sum new file mode 100644 index 00000000..ad7147ae --- /dev/null +++ b/go.sum @@ -0,0 +1,69 @@ +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm7f2FFYv7sjY7NPFi3cPkS3tv1CcrFBWA= +github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= +github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= +github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/cpuguy83/go-md2man v1.0.8 h1:DwoNytLphI8hzS2Af4D0dfaEaiSq2bN05mEm4R6vf8M= +github.com/cpuguy83/go-md2man v1.0.8/go.mod h1:N6JayAiVKtlHSnuTCeuLSQVs75hb8q+dYQLjr7cDsKY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-retryablehttp v0.5.2 h1:AoISa4P4IsW0/m4T6St8Yw38gTl5GtBAgfkhYh1xAz4= +github.com/hashicorp/go-retryablehttp v0.5.2/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mitchellh/go-homedir v1.0.0 h1:vKb8ShqSby24Yrqr/yDYkuFz8d0WUjys40rvnGC8aR0= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.2.1 h1:bIcUwXqLseLF3BDAZduuNfekWG87ibtFxi59Bq+oI9M= +github.com/spf13/viper v1.2.1/go.mod h1:P4AexN0a+C9tGAnUFNwDMYYZv3pjFuvmeiMyKRaNVlI= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/pkg/chart/chart.go b/pkg/chart/chart.go index 16aaf972..04f1ce09 100644 --- a/pkg/chart/chart.go +++ b/pkg/chart/chart.go @@ -20,10 +20,10 @@ import ( "path/filepath" "strings" - "github.com/helm/chart-testing/pkg/config" - "github.com/helm/chart-testing/pkg/exec" - "github.com/helm/chart-testing/pkg/tool" - "github.com/helm/chart-testing/pkg/util" + "github.com/helm/chart-testing/v3/pkg/config" + "github.com/helm/chart-testing/v3/pkg/exec" + "github.com/helm/chart-testing/v3/pkg/tool" + "github.com/helm/chart-testing/v3/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/chart/chart_test.go b/pkg/chart/chart_test.go index cc9c1e2d..8d6847f7 100644 --- a/pkg/chart/chart_test.go +++ b/pkg/chart/chart_test.go @@ -19,8 +19,8 @@ import ( "strings" "testing" - "github.com/helm/chart-testing/pkg/config" - "github.com/helm/chart-testing/pkg/util" + "github.com/helm/chart-testing/v3/pkg/config" + "github.com/helm/chart-testing/v3/pkg/util" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/pkg/chart/integration_test.go b/pkg/chart/integration_test.go index c5569999..163774ba 100644 --- a/pkg/chart/integration_test.go +++ b/pkg/chart/integration_test.go @@ -21,10 +21,10 @@ import ( "strings" "testing" - "github.com/helm/chart-testing/pkg/config" - "github.com/helm/chart-testing/pkg/exec" - "github.com/helm/chart-testing/pkg/tool" - "github.com/helm/chart-testing/pkg/util" + "github.com/helm/chart-testing/v3/pkg/config" + "github.com/helm/chart-testing/v3/pkg/exec" + "github.com/helm/chart-testing/v3/pkg/tool" + "github.com/helm/chart-testing/v3/pkg/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/config/config.go b/pkg/config/config.go index 6fcc9ef0..94e7df35 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -22,7 +22,7 @@ import ( "github.com/mitchellh/go-homedir" - "github.com/helm/chart-testing/pkg/util" + "github.com/helm/chart-testing/v3/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" flag "github.com/spf13/pflag" diff --git a/pkg/exec/exec.go b/pkg/exec/exec.go index 9e1a0f4f..6220fbd1 100644 --- a/pkg/exec/exec.go +++ b/pkg/exec/exec.go @@ -17,12 +17,13 @@ package exec import ( "bufio" "fmt" - "github.com/helm/chart-testing/pkg/util" - "github.com/pkg/errors" "io" "os" "os/exec" "strings" + + "github.com/helm/chart-testing/v3/pkg/util" + "github.com/pkg/errors" ) type ProcessExecutor struct { diff --git a/pkg/tool/git.go b/pkg/tool/git.go index 2e499bde..361a6888 100644 --- a/pkg/tool/git.go +++ b/pkg/tool/git.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/helm/chart-testing/pkg/exec" + "github.com/helm/chart-testing/v3/pkg/exec" "github.com/pkg/errors" ) diff --git a/pkg/tool/helm.go b/pkg/tool/helm.go index 6093f62e..f76a0a70 100644 --- a/pkg/tool/helm.go +++ b/pkg/tool/helm.go @@ -17,7 +17,7 @@ package tool import ( "fmt" - "github.com/helm/chart-testing/pkg/exec" + "github.com/helm/chart-testing/v3/pkg/exec" ) type Helm struct { diff --git a/pkg/tool/kubectl.go b/pkg/tool/kubectl.go index 68728209..609d347f 100644 --- a/pkg/tool/kubectl.go +++ b/pkg/tool/kubectl.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/go-retryablehttp" - "github.com/helm/chart-testing/pkg/exec" + "github.com/helm/chart-testing/v3/pkg/exec" "github.com/pkg/errors" ) diff --git a/pkg/tool/linter.go b/pkg/tool/linter.go index f8d9b1ba..503c1715 100644 --- a/pkg/tool/linter.go +++ b/pkg/tool/linter.go @@ -14,7 +14,7 @@ package tool -import "github.com/helm/chart-testing/pkg/exec" +import "github.com/helm/chart-testing/v3/pkg/exec" type Linter struct { exec exec.ProcessExecutor