From 4873df03e91975cd77a9800d85ee4071581e42a5 Mon Sep 17 00:00:00 2001 From: nitrocode <7775707+nitrocode@users.noreply.github.com> Date: Tue, 20 Dec 2022 09:39:22 -0600 Subject: [PATCH 1/3] Use google/shlex --- go.mod | 2 +- go.sum | 4 ++-- server/core/config/parser_validator.go | 2 +- server/events/comment_parser.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 33ef92394f..a7b42f5ba3 100644 --- a/go.mod +++ b/go.mod @@ -10,12 +10,12 @@ require ( github.com/briandowns/spinner v1.19.0 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/elazarl/go-bindata-assetfs v1.0.1 - github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 github.com/go-ozzo/ozzo-validation v3.6.0+incompatible github.com/go-redis/redis/v9 v9.0.0-rc.2 github.com/go-test/deep v1.1.0 github.com/golang-jwt/jwt/v4 v4.4.3 github.com/google/go-github/v31 v31.0.0 + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.5.0 diff --git a/go.sum b/go.sum index fde9cd361d..ef1de1e0b5 100644 --- a/go.sum +++ b/go.sum @@ -123,8 +123,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BMXYYRWTLOJKlh+lOBt6nUQgXAfB7oVIQt5cNreqSLI= -github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:rZfgFAXFS/z/lEd6LJmf9HVZ1LkgYiHx5pHhV5DR16M= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= @@ -227,6 +225,8 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= diff --git a/server/core/config/parser_validator.go b/server/core/config/parser_validator.go index 96f707e6bf..dbf30f70f2 100644 --- a/server/core/config/parser_validator.go +++ b/server/core/config/parser_validator.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - shlex "github.com/flynn-archive/go-shlex" + shlex "github.com/google/shlex" validation "github.com/go-ozzo/ozzo-validation" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/core/config/raw" diff --git a/server/events/comment_parser.go b/server/events/comment_parser.go index 3dcdcc6f9f..e4fe0e1ef7 100644 --- a/server/events/comment_parser.go +++ b/server/events/comment_parser.go @@ -23,7 +23,7 @@ import ( "strings" "text/template" - "github.com/flynn-archive/go-shlex" + "github.com/google/shlex" "github.com/runatlantis/atlantis/server/events/command" "github.com/runatlantis/atlantis/server/events/models" "github.com/spf13/pflag" From b40d4044a2bf3c117a71be58e9e4a0e76fe24d76 Mon Sep 17 00:00:00 2001 From: nitrocode <7775707+nitrocode@users.noreply.github.com> Date: Tue, 20 Dec 2022 09:44:42 -0600 Subject: [PATCH 2/3] Use google/shlex (fix test) --- server/core/config/parser_validator_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/core/config/parser_validator_test.go b/server/core/config/parser_validator_test.go index c3eb9b28e9..33ca99e3d4 100644 --- a/server/core/config/parser_validator_test.go +++ b/server/core/config/parser_validator_test.go @@ -1729,7 +1729,7 @@ func TestParseRepoCfg_V2ShellParsing(t *testing.T) { }, { in: "echo 'a b", - expV2Err: "unable to parse \"echo 'a b\": EOF found when expecting closing quote.", + expV2Err: "unable to parse \"echo 'a b\": EOF found when expecting closing quote", }, { in: `mkdir a/b/c || printf \'your main.tf file does not provide default region.\\ncheck\'`, From 7c8027750d9feeaeac68b7b7eee1e8c999e49f14 Mon Sep 17 00:00:00 2001 From: nitrocode <7775707+nitrocode@users.noreply.github.com> Date: Tue, 20 Dec 2022 09:49:56 -0600 Subject: [PATCH 3/3] Run gofmt -s -w --- server/core/config/parser_validator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/core/config/parser_validator.go b/server/core/config/parser_validator.go index dbf30f70f2..eed480e09b 100644 --- a/server/core/config/parser_validator.go +++ b/server/core/config/parser_validator.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - shlex "github.com/google/shlex" validation "github.com/go-ozzo/ozzo-validation" + shlex "github.com/google/shlex" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/core/config/raw" "github.com/runatlantis/atlantis/server/core/config/valid"