diff --git a/.github/actions/setup-terraform-backend-git/Dockerfile b/.github/actions/setup-terraform-backend-git/Dockerfile index b2064e7..3d3a279 100644 --- a/.github/actions/setup-terraform-backend-git/Dockerfile +++ b/.github/actions/setup-terraform-backend-git/Dockerfile @@ -1,6 +1,6 @@ # The action uses an own Dockerfile on purpose because the root Dockerfile takes way too long to build for an action -FROM alpine:3.10 +FROM alpine:3.15 RUN apk add --no-cache \ bash \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 950ed53..14f0083 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ name: Create Release jobs: build: name: Build - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 strategy: matrix: os: [linux, darwin, windows] @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v1 with: - go-version: '1.14' + go-version: '1.17' - name: Checkout Code uses: actions/checkout@v2 - name: Add Windows Exe File Extension diff --git a/CHANGELOG.md b/CHANGELOG.md index 771e39a..2b8dda5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Use cross-platform detection for SSH-agent, now supports Pageant on Windows #21 (Authored-by: [@blaubaer](https://github.com/blaubaer)) +- Use cross-platform detection for SSH-agent, now supports Pageant on Windows [#21](https://github.com/plumber-cd/terraform-backend-git/pull/21) (Authored-by: [@blaubaer](https://github.com/blaubaer)) +- Updated dependencies, fixed CVE-2020-16845 +- Updated to use Go 1.17, and Ubuntu 20.04 builder +- Updated Alpine 3.15 ## [0.0.16] - 2021-02-08 diff --git a/go.mod b/go.mod index 2c3b046..7c1b53d 100644 --- a/go.mod +++ b/go.mod @@ -1,23 +1,45 @@ module github.com/plumber-cd/terraform-backend-git -go 1.13 +go 1.17 require ( - github.com/Microsoft/go-winio v0.5.1 // indirect - github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f // indirect - github.com/felixge/httpsnoop v1.0.2 // indirect github.com/go-git/go-billy/v5 v5.3.1 github.com/go-git/go-git/v5 v5.4.2 github.com/gorilla/handlers v1.5.1 - github.com/kevinburke/ssh_config v1.1.0 // indirect github.com/mitchellh/go-homedir v1.1.0 - github.com/sergi/go-diff v1.2.0 // indirect - github.com/spf13/afero v1.8.0 // indirect github.com/spf13/cobra v1.3.0 github.com/spf13/viper v1.10.1 github.com/xanzy/ssh-agent v0.3.1 golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce - golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 +) + +require ( + github.com/Microsoft/go-winio v0.5.1 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f // indirect + github.com/acomagu/bufpipe v1.0.3 // indirect + github.com/emirpasic/gods v1.12.0 // indirect + github.com/felixge/httpsnoop v1.0.2 // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/kevinburke/ssh_config v1.1.0 // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect + github.com/sergi/go-diff v1.2.0 // indirect + github.com/spf13/afero v1.8.0 // indirect + github.com/spf13/cast v1.4.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d // indirect golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect + golang.org/x/text v0.3.7 // indirect + gopkg.in/ini.v1 v1.66.2 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 2d8f2db..d375bb6 100644 --- a/go.sum +++ b/go.sum @@ -128,7 +128,6 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= @@ -697,7 +696,6 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=