diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml index a2567f1e..b4fb4f8f 100644 --- a/.github/workflows/container-build.yml +++ b/.github/workflows/container-build.yml @@ -26,11 +26,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the latest SHA for this branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 if: github.event_name != 'workflow_dispatch' - name: Checkout the specified tag - uses: actions/checkout@v2 + uses: actions/checkout@v4 if: github.event_name == 'workflow_dispatch' with: ref: ${{ github.event.inputs.tag }} diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml index 0e1d8a24..933521f0 100644 --- a/.github/workflows/contributors.yml +++ b/.github/workflows/contributors.yml @@ -7,7 +7,7 @@ jobs: contributors: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: wow-actions/contributors-list@v1 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad2c1290..ff0ab2d9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,23 +12,15 @@ jobs: steps: # Install golang - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v4 with: - go-version: '^1.16' + go-version: '^1.21' # Install external go modules before cloning - run: go install github.com/laher/goxc@latest # Checkout code - - uses: actions/checkout@v2 - - # Install golang deps, using a cache - - uses: actions/cache@v2 - with: - path: ~/go/pkg/mod - key: ubuntu-latest-1.16-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ubuntu-latest-1.16-go- + - uses: actions/checkout@v4 # build binaries for all supported environments - run: sudo apt update && sudo apt install -y make diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 5d381c75..52920e02 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -6,19 +6,14 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - golang-version: [1.13, 1.14, 1.15, 1.16, 1.17] + golang-version: ['1.21'] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup golang v${{ matrix.golang-version }} - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: "^${{ matrix.golang-version }}" - - uses: actions/cache@v2 - with: - path: ~/go/pkg/mod - key: ${{ matrix.os }}-${{ matrix.golang-version }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ matrix.os }}-${{ matrix.golang-version }}-go- + go-version: '^${{ matrix.golang-version }}' - run: mkdir cmd/test_artifacts + - run: go version - run: go test -v ./... diff --git a/.gitignore b/.gitignore index 5fe9ea0d..3ce03543 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,17 @@ ############################## ########### Custom ########### ############################## -.vscode/ build test_artifacts # IDEs +.vscode/ .vscode *.sublime-* .idea .editorconfig .swp +*.code-workspace # OS files *.DS_Store diff --git a/CONTRIBUTORS.svg b/CONTRIBUTORS.svg index b356c3c2..b8813609 100644 --- a/CONTRIBUTORS.svg +++ b/CONTRIBUTORS.svg @@ -25,120 +25,126 @@ + + + Almenon + + + fbad - + IndraGunawan - + mmalecki - + tufitko - + - + arthur-lecle... - + bencmbrook - + chkelly - + raizyr - + GenPage - + emedvedev - + gmaghera - + gmpify - + shemul - + maitreya-sou... - + m0ps - + mhennecke - + dennislapche... - + jgravois - + scream314 - + tafkam diff --git a/Makefile b/Makefile index 5fc66944..678fc8c3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=1.16.0 +VERSION=1.21.0 PATH_BUILD=build/ FILE_COMMAND=terragrunt-atlantis-config FILE_ARCH=darwin_amd64 diff --git a/README.md b/README.md index f83c4b6b..3a8ced68 100644 --- a/README.md +++ b/README.md @@ -191,11 +191,11 @@ You can install this tool locally to checkout what kinds of config it will gener Recommended: Install any version via go install: ```bash -go install github.com/transcend-io/terragrunt-atlantis-config@v1.16.0 +go install github.com/transcend-io/terragrunt-atlantis-config@v1.21.0 ``` -This module officially supports golang versions v1.13, v1.14, v1.15, and v1.16, tested on CircleCI with each build -This module also officially supports both Windows and Nix-based file formats, tested on CircleCI with each build +This module officially supports golang version v1.21, tested on Github with each build. +This module also officially supports both Windows and Nix-based file formats, tested on Github with each build. Usage Examples (see below sections for all options): diff --git a/cmd/generate.go b/cmd/generate.go index 0836f3e8..1837c35f 100644 --- a/cmd/generate.go +++ b/cmd/generate.go @@ -193,7 +193,7 @@ func getDependencies(path string, terragruntOptions *options.TerragruntOptions) } // Check if the path begins with a drive letter, denoting Windows - isWindowsPath, err := regexp.MatchString(`^[A-Z]:`, parsedSource) + isWindowsPath, err := regexp.MatchString(`^[A-Za-z]:`, parsedSource) if err != nil { return nil, err } diff --git a/go.mod b/go.mod index 822d6eee..11cfbdd1 100644 --- a/go.mod +++ b/go.mod @@ -1,23 +1,114 @@ module github.com/transcend-io/terragrunt-atlantis-config -go 1.16 +go 1.21 require ( - github.com/bmatcuk/doublestar v1.3.1 // indirect github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 - github.com/go-errors/errors v1.1.1 // indirect github.com/gruntwork-io/terragrunt v0.36.6 github.com/hashicorp/go-getter v1.5.11 github.com/hashicorp/hcl/v2 v2.11.1 github.com/hashicorp/terraform-config-inspect v0.0.0-20210625153042-09f34846faab - github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c // indirect - github.com/imdario/mergo v0.3.12 // indirect - github.com/mattn/go-zglob v0.0.2 // indirect github.com/sirupsen/logrus v1.6.0 github.com/spf13/cobra v0.0.5 github.com/stretchr/testify v1.7.0 - github.com/urfave/cli v1.22.4 // indirect github.com/zclconf/go-cty v1.8.3 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c +) + +require ( + cloud.google.com/go v0.93.3 // indirect + cloud.google.com/go/storage v1.16.0 // indirect + filippo.io/age v1.0.0-beta7 // indirect + github.com/Azure/azure-sdk-for-go v52.5.0+incompatible // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.11.18 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect + github.com/Azure/go-autorest/autorest/azure/auth v0.5.7 // indirect + github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect + github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/agext/levenshtein v1.2.3 // indirect + github.com/apparentlymart/go-cidr v1.1.0 // indirect + github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/aws/aws-sdk-go v1.41.7 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/blang/semver v3.5.1+incompatible // indirect + github.com/bmatcuk/doublestar v1.3.1 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/creack/pty v1.1.11 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dimchansky/utfbom v1.1.1 // indirect + github.com/fatih/color v1.9.0 // indirect + github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect + github.com/go-errors/errors v1.1.1 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf // indirect + github.com/google/uuid v1.2.0 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-retryablehttp v0.6.7 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect + github.com/hashicorp/go-sockaddr v1.0.2 // indirect + github.com/hashicorp/go-uuid v1.0.2 // indirect + github.com/hashicorp/go-version v1.3.0 // indirect + github.com/hashicorp/hcl v1.0.1-vault // indirect + github.com/hashicorp/terraform v0.15.3 // indirect + github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect + github.com/hashicorp/vault/api v1.0.5-0.20210210214158-405eced08457 // indirect + github.com/hashicorp/vault/sdk v0.1.14-0.20210322210658-b52b8b8c1264 // indirect + github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/klauspost/compress v1.13.4 // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect + github.com/lib/pq v1.8.0 // indirect + github.com/mattn/go-colorable v0.1.7 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mattn/go-zglob v0.0.2 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-testing-interface v1.14.1 // indirect + github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/mitchellh/mapstructure v1.3.3 // indirect + github.com/pierrec/lz4 v2.5.2+incompatible // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/russross/blackfriday/v2 v2.0.1 // indirect + github.com/ryanuber/go-glob v1.0.0 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/ulikunitz/xz v0.5.10 // indirect + github.com/urfave/cli v1.22.4 // indirect + github.com/zclconf/go-cty-yaml v1.0.2 // indirect + go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a // indirect + go.mozilla.org/sops/v3 v3.7.0 // indirect + go.opencensus.io v0.23.0 // indirect + golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect + golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect + golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect + golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect + google.golang.org/api v0.54.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8 // indirect + google.golang.org/grpc v1.40.0 // indirect + google.golang.org/protobuf v1.27.1 // indirect gopkg.in/ini.v1 v1.57.0 // indirect + gopkg.in/square/go-jose.v2 v2.5.1 // indirect + gopkg.in/urfave/cli.v1 v1.20.0 // indirect + gopkg.in/yaml.v2 v2.3.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107172259-749611fa9fcc // indirect ) diff --git a/go.sum b/go.sum index 2318af4a..ba87397e 100644 --- a/go.sum +++ b/go.sum @@ -170,7 +170,6 @@ github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:o github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFUye+ZcSR6opIgz9Co7WcDx6ZcY+RjfFHoA0I= github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-shquot v0.0.1/go.mod h1:lw58XsE5IgUXZ9h0cxnypdx31p9mPFIVEQ9P3c7MlrU= -github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= @@ -252,7 +251,6 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= @@ -809,7 +807,6 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= -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/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= diff --git a/main.go b/main.go index 1cb3942d..5b226c55 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import "github.com/transcend-io/terragrunt-atlantis-config/cmd" // This variable is set at build time using -ldflags parameters. // But we still set a default here for those using plain `go get` downloads // For more info, see: http://stackoverflow.com/a/11355611/483528 -var VERSION string = "1.16.0" +var VERSION string = "1.21.0" func main() { cmd.Execute(VERSION)