From 5142e1a2525088055927792667aeaae911e92a1c Mon Sep 17 00:00:00 2001 From: danmx Date: Sat, 6 Jun 2020 00:30:36 +0200 Subject: [PATCH 1/4] update(bazel): to version 3.2.0 Signed-off-by: danmx --- .bazelversion | 2 +- .drone.yml | 14 +++++++------- CHANGELOG.md | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.bazelversion b/.bazelversion index fd2a018..944880f 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.1.0 +3.2.0 diff --git a/.drone.yml b/.drone.yml index 3b48a30..d283409 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ platform: steps: - name: test - image: l.gcr.io/google/bazel:3.1.0 + image: l.gcr.io/google/bazel:3.2.0 commands: - bazel test --config cross:linux_amd64 //... volumes: @@ -16,7 +16,7 @@ steps: path: /root/.cache/bazel/ - name: coverage - image: l.gcr.io/google/bazel:3.1.0 + image: l.gcr.io/google/bazel:3.2.0 commands: - bazel coverage --config cross:linux_amd64 //... - bazel build --config cross:linux_amd64 :concat-cov @@ -37,7 +37,7 @@ steps: path: /root/.cache/bazel/ - name: build-dev - image: l.gcr.io/google/bazel:3.1.0 + image: l.gcr.io/google/bazel:3.2.0 commands: - bazel build --config cross:linux_amd64 :dev - bazel build --config cross:darwin_amd64 :dev @@ -55,7 +55,7 @@ steps: - push - name: docker-dev - image: l.gcr.io/google/bazel:3.1.0 + image: l.gcr.io/google/bazel:3.2.0 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - bazel run --config cross:linux_amd64 :push-dev-image @@ -72,7 +72,7 @@ steps: - push - name: pkg-release - image: l.gcr.io/google/bazel:3.1.0 + image: l.gcr.io/google/bazel:3.2.0 commands: - bazel build --config cross:linux_amd64 :sigil_linux-amd64 - bazel build --config cross:darwin_amd64 :sigil_darwin-amd64 @@ -90,7 +90,7 @@ steps: - tag - name: docker-release - image: l.gcr.io/google/bazel:3.1.0 + image: l.gcr.io/google/bazel:3.2.0 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - bazel run --config cross:linux_amd64 :push-release-image @@ -135,6 +135,6 @@ volumes: --- kind: signature -hmac: 0d2d3791d4d75820a8a37000ac4e2547d6b6b4c4cdd4bb9546eef6e41610c5a7 +hmac: 3834f48378948f1a4eda7285a0e55e0522039b1bea2471750bb1bc55044d8fb9 ... diff --git a/CHANGELOG.md b/CHANGELOG.md index df1ce33..8f4fe82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ ## [Unreleased] +### Build +- **deps:** bump github.com/aws/aws-sdk-go from 1.31.7 to 1.31.11 +- **deps:** bump github.com/aws/aws-sdk-go from 1.31.1 to 1.31.7 +- **deps:** bump github.com/stretchr/testify from 1.5.1 to 1.6.0 + +### Chore +- **deps:** update dependency io_bazel_rules_go to v0.23.3 +- **deps:** update dependency io_bazel_rules_docker to v0.14.3 +- **deps:** update dependency bazel_gazelle to v0.21.1 +- **deps:** update golang.org/x/crypto commit hash to 70a84ac +- **deps:** add renovate.json + +### Update +- **bazel:** to version 3.2.0 + ## [0.5.1] - 2020-05-23 From ab3b3841b3a528c239d5204878179efff003976e Mon Sep 17 00:00:00 2001 From: danmx Date: Sat, 6 Jun 2020 00:51:54 +0200 Subject: [PATCH 2/4] update(deps): Go dependecies in bazel Signed-off-by: danmx --- CHANGELOG.md | 18 +++++++++++++++++- go.sum | 9 +-------- tools/repositories.bzl | 18 ++++++++++++------ 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f4fe82..789d130 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ ## [Unreleased] +### Chore +- **deps:** update module stretchr/testify to v1.6.1 + +### Update +- **bazel:** to version 3.2.0 +- **deps:** Go dependecies in bazel + + + +## [0.5.2] - 2020-06-06 ### Build - **deps:** bump github.com/aws/aws-sdk-go from 1.31.7 to 1.31.11 - **deps:** bump github.com/aws/aws-sdk-go from 1.31.1 to 1.31.7 @@ -12,9 +22,14 @@ - **deps:** update dependency bazel_gazelle to v0.21.1 - **deps:** update golang.org/x/crypto commit hash to 70a84ac - **deps:** add renovate.json +- **release:** 0.5.2 + +### Fix +- **ssh:** error handling ### Update - **bazel:** to version 3.2.0 +- **deps:** Go dependecies in bazel @@ -153,7 +168,8 @@ ## 0.0.1 - 2019-03-18 -[Unreleased]: https://github.com/danmx/sigil/compare/0.5.1...HEAD +[Unreleased]: https://github.com/danmx/sigil/compare/0.5.2...HEAD +[0.5.2]: https://github.com/danmx/sigil/compare/0.5.1...0.5.2 [0.5.1]: https://github.com/danmx/sigil/compare/0.5.0...0.5.1 [0.5.0]: https://github.com/danmx/sigil/compare/0.4.1...0.5.0 [0.4.1]: https://github.com/danmx/sigil/compare/0.4.0...0.4.1 diff --git a/go.sum b/go.sum index d8febb5..1d94b3f 100644 --- a/go.sum +++ b/go.sum @@ -21,10 +21,6 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.31.1 h1:5tv3VtTS/IM1yZ6lxMQQVmH28SkkR3b3w+6u+9rcLx4= -github.com/aws/aws-sdk-go v1.31.1/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.31.7 h1:TCA+pXKvzDMA3vVqhK21cCy5GarC8pTQb/DrVOWI3iY= -github.com/aws/aws-sdk-go v1.31.7/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.31.11 h1:Uz7VGg3giOV9Z4SlLdXO6RHafArHbK59vSc6mnzYjGU= github.com/aws/aws-sdk-go v1.31.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -206,8 +202,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho= -github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -226,8 +221,6 @@ golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200420104511-884d27f42877 h1:IhZPbxNd1UjBCaD5AfpSSbJTRlp+ZSuyuH5uoksNS04= -golang.org/x/crypto v0.0.0-20200420104511-884d27f42877/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM= golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= diff --git a/tools/repositories.bzl b/tools/repositories.bzl index ecdae6f..f9fbebd 100644 --- a/tools/repositories.bzl +++ b/tools/repositories.bzl @@ -28,8 +28,8 @@ def go_repositories(): go_repository( name = "com_github_aws_aws_sdk_go", importpath = "github.com/aws/aws-sdk-go", - sum = "h1:5tv3VtTS/IM1yZ6lxMQQVmH28SkkR3b3w+6u+9rcLx4=", - version = "v1.31.1", + sum = "h1:Uz7VGg3giOV9Z4SlLdXO6RHafArHbK59vSc6mnzYjGU=", + version = "v1.31.11", ) go_repository( name = "com_github_beorn7_perks", @@ -478,8 +478,8 @@ def go_repositories(): go_repository( name = "com_github_stretchr_testify", importpath = "github.com/stretchr/testify", - sum = "h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=", - version = "v1.5.1", + sum = "h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=", + version = "v1.6.1", ) go_repository( name = "com_github_subosito_gotenv", @@ -574,8 +574,8 @@ def go_repositories(): go_repository( name = "org_golang_x_crypto", importpath = "golang.org/x/crypto", - sum = "h1:IhZPbxNd1UjBCaD5AfpSSbJTRlp+ZSuyuH5uoksNS04=", - version = "v0.0.0-20200420104511-884d27f42877", + sum = "h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM=", + version = "v0.0.0-20200604202706-70a84ac30bf9", ) go_repository( name = "org_golang_x_lint", @@ -1016,3 +1016,9 @@ def go_repositories(): sum = "h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=", version = "v0.0.0-20190717185122-a985d3407aa7", ) + go_repository( + name = "in_gopkg_yaml_v3", + importpath = "gopkg.in/yaml.v3", + sum = "h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=", + version = "v3.0.0-20200313102051-9f266ea9e77c", + ) From f4343c5ddfabf101b4bbf148eb7dc4ab66f1347d Mon Sep 17 00:00:00 2001 From: danmx Date: Sat, 6 Jun 2020 00:52:56 +0200 Subject: [PATCH 3/4] fix(ssh): error handling Signed-off-by: danmx --- CHANGELOG.md | 3 +++ pkg/ssh/ssh.go | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 789d130..01bea4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ### Chore - **deps:** update module stretchr/testify to v1.6.1 +### Fix +- **ssh:** error handling + ### Update - **bazel:** to version 3.2.0 - **deps:** Go dependecies in bazel diff --git a/pkg/ssh/ssh.go b/pkg/ssh/ssh.go index b3d928e..e05851a 100644 --- a/pkg/ssh/ssh.go +++ b/pkg/ssh/ssh.go @@ -38,8 +38,8 @@ func Start(input *StartInput) error { return input.start(new(aws.Provider)) } -func (input *StartInput) start(provider aws.CloudSSH) (err error) { - err = provider.NewWithConfig(&aws.Config{ +func (input *StartInput) start(provider aws.CloudSSH) error { + err := provider.NewWithConfig(&aws.Config{ Region: *input.Region, Profile: *input.Profile, MFAToken: *input.MFAToken, @@ -52,7 +52,7 @@ func (input *StartInput) start(provider aws.CloudSSH) (err error) { if *input.GenKeyPair { privKeyBlob, errKey := rsa.GenerateKey(rand.Reader, 4092) if errKey != nil { - return err + return errKey } pubKeyBlob := privKeyBlob.PublicKey if errPubPEM := savePublicPEMKey(pubKey, &pubKeyBlob); errPubPEM != nil { From fedf882f755ad148079984664c51459a6ae2df1a Mon Sep 17 00:00:00 2001 From: danmx Date: Sat, 6 Jun 2020 00:53:40 +0200 Subject: [PATCH 4/4] chore(release): 0.5.2 Signed-off-by: danmx --- CHANGELOG.md | 13 ++----------- tools/get_workspace_status.sh | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01bea4c..0e4495c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,6 @@ ## [Unreleased] -### Chore -- **deps:** update module stretchr/testify to v1.6.1 - -### Fix -- **ssh:** error handling - -### Update -- **bazel:** to version 3.2.0 -- **deps:** Go dependecies in bazel - ## [0.5.2] - 2020-06-06 @@ -20,11 +10,12 @@ - **deps:** bump github.com/stretchr/testify from 1.5.1 to 1.6.0 ### Chore +- **deps:** add renovate.json +- **deps:** update module stretchr/testify to v1.6.1 - **deps:** update dependency io_bazel_rules_go to v0.23.3 - **deps:** update dependency io_bazel_rules_docker to v0.14.3 - **deps:** update dependency bazel_gazelle to v0.21.1 - **deps:** update golang.org/x/crypto commit hash to 70a84ac -- **deps:** add renovate.json - **release:** 0.5.2 ### Fix diff --git a/tools/get_workspace_status.sh b/tools/get_workspace_status.sh index cb3d4bf..01c3795 100755 --- a/tools/get_workspace_status.sh +++ b/tools/get_workspace_status.sh @@ -3,7 +3,7 @@ set -eu appName="sigil" -appVersion="${VERSION:-0.5.1}" +appVersion="${VERSION:-0.5.2}" gitCommit="${GIT_COMMIT:-$(git rev-parse HEAD)}" gitBranch="${GIT_BRANCH:-$(git rev-parse --abbrev-ref HEAD)}"