diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 69db37e..8b0c0bb 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -6,16 +6,16 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [ '1.11.x', '1.12.x', '1.13.x' ] + go: [ '1.13.x', '1.14.x', '1.15.x' ] name: Vulcanizer tests against go version ${{ matrix.go }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Setup go - uses: actions/setup-go@v1 + uses: actions/setup-go@v2 with: go-version: ${{ matrix.go }} - name: Run tests run: | - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOROOT/bin v1.18.0 + curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOROOT/bin v1.31.0 sudo sysctl -w vm.max_map_count=262144 script/integration-test diff --git a/Brewfile b/Brewfile deleted file mode 100644 index d70ea43..0000000 --- a/Brewfile +++ /dev/null @@ -1 +0,0 @@ -brew 'dep' diff --git a/go.mod b/go.mod index f0a35b1..6b4dac5 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,13 @@ require ( github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect github.com/google/go-cmp v0.2.0 // indirect github.com/jeremywohl/flatten v0.0.0-20180616191615-6ba45bff2452 + github.com/mattn/go-colorable v0.1.7 // indirect github.com/mattn/go-runewidth v0.0.3 // indirect github.com/moul/http2curl v1.0.0 // indirect github.com/olekukonko/tablewriter v0.0.0-20180506121414-d4647c9c7a84 github.com/parnurzeal/gorequest v0.2.15 github.com/pkg/errors v0.8.0 // indirect + github.com/rakyll/gotest v0.0.5 // indirect github.com/smartystreets/goconvey v1.6.4 // indirect github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.5 // indirect @@ -18,5 +20,6 @@ require ( github.com/stretchr/testify v1.4.0 // indirect github.com/tidwall/gjson v1.1.3 github.com/tidwall/match v1.0.0 // indirect + golang.org/x/sys v0.0.0-20200926100807-9d91bd62050c // indirect gotest.tools v2.2.0+incompatible ) diff --git a/go.sum b/go.sum index 378d54c..b6d90e2 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,8 @@ github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 h1:pEtiCjIXx3RvGjl github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 h1:dWB6v3RcOy03t/bUadywsbyrQwCqZeNIEX6M1OtSZOM= github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= +github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= 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/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= @@ -28,6 +30,15 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= +github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8BzLR4= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -45,6 +56,8 @@ 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/rakyll/gotest v0.0.5 h1:+BrdqPxKPDaxvhtIiVzfiYXLhi4BrSOqdwaEiA7qjpk= +github.com/rakyll/gotest v0.0.5/go.mod h1:SkoesdNCWmiD4R2dljIUcfSnNdVZ12y8qK4ojDkc2Sc= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= @@ -82,6 +95,13 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200926100807-9d91bd62050c h1:38q6VNPWR010vN82/SB121GujZNIfAUb4YttE2rhGuc= +golang.org/x/sys v0.0.0-20200926100807-9d91bd62050c/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= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= diff --git a/integration_data/v5/elasticsearch.dockerfile b/integration_data/v5/elasticsearch.dockerfile index 92ffdfd..411cd60 100644 --- a/integration_data/v5/elasticsearch.dockerfile +++ b/integration_data/v5/elasticsearch.dockerfile @@ -1,4 +1,4 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.15 +FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.16 USER root diff --git a/integration_data/v6/elasticsearch.dockerfile b/integration_data/v6/elasticsearch.dockerfile index 8201944..5820fdb 100644 --- a/integration_data/v6/elasticsearch.dockerfile +++ b/integration_data/v6/elasticsearch.dockerfile @@ -1,4 +1,4 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.0 +FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.12 USER root diff --git a/integration_data/v7/elasticsearch.dockerfile b/integration_data/v7/elasticsearch.dockerfile index 038b20f..85d97ec 100644 --- a/integration_data/v7/elasticsearch.dockerfile +++ b/integration_data/v7/elasticsearch.dockerfile @@ -1,4 +1,4 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.4.2 +FROM docker.elastic.co/elasticsearch/elasticsearch:7.9.2 USER root diff --git a/pkg/cli/settings.go b/pkg/cli/settings.go index f4c5b0f..2c5968e 100644 --- a/pkg/cli/settings.go +++ b/pkg/cli/settings.go @@ -14,7 +14,7 @@ func init() { func printSettings(settings []vulcanizer.Setting, name string) { if len(settings) == 0 { - fmt.Println(fmt.Sprintf("No %s are set.\n", name)) + fmt.Printf("No %s are set.\n", name) return } diff --git a/script/bootstrap b/script/bootstrap index cd1b504..37528cf 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -3,11 +3,6 @@ if [ "$(uname -s)" = "Darwin" ]; then mkdir -p tmp - brew bundle &> tmp/brew-bundle.log || ( - echo "Failed to brew bundle:" - cat tmp/brew-bundle.log - ) - if [[ ! -x "$(which go)" ]]; then echo >&2 "vulcanizer requires an installation of Go to build." exit 1 @@ -17,6 +12,6 @@ if [ "$(uname -s)" = "Darwin" ]; then fi # Install linter. Should be universal. Version is pinned per package recommendations. -curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.15.0 +curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.31.0 script/build diff --git a/script/dep b/script/dep deleted file mode 100755 index 1ff2e3b..0000000 --- a/script/dep +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -e - -# dep gets confused if it's run when pwd is a symlink into $GOPATH. -scripts="$(dirname "$0")" -root="$(dirname "$scripts")" -cd -P "$root" - -echo Updating vendor... -dep ensure "$@"