From 8e3e3fdf7617f2d830eba5691e2b467a2984d9ae Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Thu, 20 Jan 2022 10:17:00 +0100 Subject: [PATCH] Rework how tools (gin, gotest..) are installed, refactor watch command Support newer version of gin, and add ability to use customize params, use different .env file --- Makefile | 6 ++++-- Makefile.inc | 20 ++++++++++---------- go.mod | 5 +++++ go.sum | 16 ++++++++++++++++ vendor/modules.txt | 10 ++++++++++ 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 8afc92053..785e3ff0d 100644 --- a/Makefile +++ b/Makefile @@ -53,8 +53,10 @@ DEV_MAILHOG_SMTP_ADDR ?= 1025 DEV_MAILHOG_HTTP_ADDR ?= 8025 GIN_ARG_LADDR ?= localhost -GIN_ARGS ?= --laddr $(GIN_ARG_LADDR) --immediate +GIN_ARGS ?= --laddr $(GIN_ARG_LADDR) --build cmd/corteza --immediate +GIN_CORTEZA_ENV_FILE ?= .env +GIN_CORTEZA_BIN_ARGS ?= --env-file $(GIN_CORTEZA_ENV_FILE) DOCKER ?= docker @@ -107,7 +109,7 @@ $(RELEASE_PKEY): # Development watch: $(GIN) - $(GIN) $(GIN_ARGS) --build cmd/corteza run -- serve + $(GIN) $(GIN_ARGS) -- $(GIN_CORTEZA_BIN_ARGS) serve realize: watch # BC diff --git a/Makefile.inc b/Makefile.inc index 1730fa5bf..d4a3870a2 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,5 +1,5 @@ GO = go -GOGET = $(GO) get -u +GOINSTALL = $(GO) install GOFLAGS ?= -trimpath GOPATH ?= $(HOME)/go @@ -31,31 +31,31 @@ BINS = $(GOCRITIC) $(MOCKGEN) $(GOTEST) $(STATICCHECK) $(PROTOGEN) $(GIN) $(STAT ######################################################################################################################## # Go Toolset $(GOCRITIC): - $(GOGET) github.com/go-critic/go-critic/... + $(GOINSTALL) github.com/go-critic/go-critic@latest $(MOCKGEN): - $(GOGET) github.com/golang/mock/mockgen + $(GOINSTALL) github.com/golang/mock/mockgen@latest $(STATICCHECK): - $(GOGET) honnef.co/go/tools/cmd/staticcheck + $(GOINSTALL) honnef.co/go/tools/cmd/staticcheck@latest $(PROTOGEN): - $(GOGET) github.com/golang/protobuf/protoc-gen-go + $(GOINSTALL) github.com/golang/protobuf/protoc-gen-go@latest $(PROTOGEN_GRPC): - $(GOGET) google.golang.org/grpc/cmd/protoc-gen-go-grpc + $(GOINSTALL) google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest $(GIN): - $(GOGET) github.com/codegangsta/gin + $(GOINSTALL) github.com/codegangsta/gin@latest $(GOTEST): - $(GOGET) github.com/rakyll/gotest + $(GOINSTALL) github.com/rakyll/gotest@latest $(STATIK): - $(GOGET) github.com/goware/statik + $(GOINSTALL) github.com/goware/statik@latest $(MODOUTDATED): - $(GOGET) github.com/psampaz/go-mod-outdated + $(GOINSTALL) github.com/psampaz/go-mod-outdated@latest $(CODEGEN): $(GO) build -o $@ cmd/codegen/main.go diff --git a/go.mod b/go.mod index f5d2626f1..e88ae2b8a 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ go 1.16 // replace github.com/cortezaproject/corteza-locale => ../locale require ( + github.com/0xAX/notificator v0.0.0-20210731104411-c42e3d4a43ee // indirect github.com/766b/chi-prometheus v0.0.0-20211217152057-87afa9aa2ca8 github.com/99designs/basicauth-go v0.0.0-20160802081356-2a93ba0f464d github.com/Masterminds/goutils v1.1.0 // indirect @@ -19,6 +20,8 @@ require ( github.com/SentimensRG/ctx v0.0.0-20180729130232-0bfd988c655d github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d github.com/brianvoe/gofakeit/v6 v6.12.1 + github.com/codegangsta/envy v0.0.0-20141216192214-4b78388c8ce4 // indirect + github.com/codegangsta/gin v0.0.0-20211113050330-71f90109db02 // indirect github.com/cortezaproject/corteza-locale v0.0.0-20220111135803-4fb0db6196bc github.com/crewjam/saml v0.4.6 github.com/crusttech/go-oidc v0.0.0-20180918092017-982855dad3e1 @@ -60,6 +63,7 @@ require ( github.com/lestrrat-go/strftime v1.0.5 github.com/lib/pq v1.10.4 github.com/markbates/goth v1.68.0 + github.com/mattn/go-shellwords v1.0.12 // indirect github.com/mattn/go-sqlite3 v1.14.10 github.com/microcosm-cc/bluemonday v1.0.17 github.com/minio/minio-go/v6 v6.0.57 @@ -78,6 +82,7 @@ require ( github.com/steinfletcher/apitest-jsonpath v1.7.1 github.com/stretchr/testify v1.7.0 github.com/tebeka/strftime v0.1.5 // indirect + github.com/urfave/cli v1.22.5 // indirect go.uber.org/atomic v1.9.0 go.uber.org/zap v1.20.0 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 diff --git a/go.sum b/go.sum index 49cb8ebd9..f661db023 100644 --- a/go.sum +++ b/go.sum @@ -52,6 +52,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/0xAX/notificator v0.0.0-20210731104411-c42e3d4a43ee h1:LgokYDTCpaZBHtl/oGwLxNCr3kM5Qt+Z7mInv4MqFNM= +github.com/0xAX/notificator v0.0.0-20210731104411-c42e3d4a43ee/go.mod h1:NtXa9WwQsukMHZpjNakTTz0LArxvGYdPA9CjIcUSZ6s= github.com/766b/chi-prometheus v0.0.0-20180509160047-46ac2b31aa30 h1:bNHbCMKiQxpRNe4Pk2W09N1aXXc4ICOawQFKIDEicqc= github.com/766b/chi-prometheus v0.0.0-20180509160047-46ac2b31aa30/go.mod h1:X/LhbmoBoRu8TxoGIOIraVNhfz3hhikJoaelrOuhdPY= github.com/766b/chi-prometheus v0.0.0-20211217152057-87afa9aa2ca8 h1:hK1G69lDhhrGqJbRA5i1rmT2KI/W77MSdr7hEGHqWdQ= @@ -151,6 +153,10 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/codegangsta/envy v0.0.0-20141216192214-4b78388c8ce4 h1:ihrIKrLQzm6Q6NJHBMemvaIGTFxgxQUEkn2AjN0Aulw= +github.com/codegangsta/envy v0.0.0-20141216192214-4b78388c8ce4/go.mod h1:X7wHz0C25Lga6CnJ4WAQNbUQ9P/8eWSNv8qIO71YkSM= +github.com/codegangsta/gin v0.0.0-20211113050330-71f90109db02 h1:PK8RQF5982bJELqOfaaTWs0kDqZzZGHxUTOpZWZm6fM= +github.com/codegangsta/gin v0.0.0-20211113050330-71f90109db02/go.mod h1:UBYuwaH3dMw91EZ7tGVaFF6GDj5j46S7zqB9lZPIe58= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= @@ -169,7 +175,10 @@ github.com/cortezaproject/corteza-locale v0.0.0-20220103124542-5d327f93f42c h1:V github.com/cortezaproject/corteza-locale v0.0.0-20220103124542-5d327f93f42c/go.mod h1:wsI1UftEdBqTuEDKBZmx2LfNu/kZun5pRbCAi420JCg= github.com/cortezaproject/corteza-locale v0.0.0-20220111135803-4fb0db6196bc h1:d4xI2vuPSA/U+y1JJQKC9nwk2FSnoYansUquX6IPj5E= github.com/cortezaproject/corteza-locale v0.0.0-20220111135803-4fb0db6196bc/go.mod h1:wsI1UftEdBqTuEDKBZmx2LfNu/kZun5pRbCAi420JCg= +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.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da h1:WXnT88cFG2davqSFqvaFfzkSMC0lqh/8/rKZ+z7tYvI= @@ -610,6 +619,8 @@ github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcME github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk= +github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA= github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= @@ -737,7 +748,10 @@ github.com/russellhaering/goxmldsig v1.1.0 h1:lK/zeJie2sqG52ZAlPNn1oBBqsIsEKypUU github.com/russellhaering/goxmldsig v1.1.0/go.mod h1:QK8GhXPB3+AfuCrfo0oRISa9NfzeCpWmxeGnqEpDF9o= github.com/russellhaering/goxmldsig v1.1.1 h1:vI0r2osGF1A9PLvsGdPUAGwEIrKa4Pj5sesSBsebIxM= github.com/russellhaering/goxmldsig v1.1.1/go.mod h1:gM4MDENBQf7M+V824SGfyIUVFWydB7n0KkEubVJl+Tw= +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/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc= github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk= @@ -837,6 +851,8 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU= +github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= diff --git a/vendor/modules.txt b/vendor/modules.txt index 04707eb7a..5d558b938 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,5 +1,7 @@ # cloud.google.com/go v0.99.0 cloud.google.com/go/compute/metadata +# github.com/0xAX/notificator v0.0.0-20210731104411-c42e3d4a43ee +## explicit # github.com/766b/chi-prometheus v0.0.0-20211217152057-87afa9aa2ca8 ## explicit github.com/766b/chi-prometheus @@ -46,6 +48,10 @@ github.com/brianvoe/gofakeit/v6 github.com/brianvoe/gofakeit/v6/data # github.com/cespare/xxhash/v2 v2.1.2 github.com/cespare/xxhash/v2 +# github.com/codegangsta/envy v0.0.0-20141216192214-4b78388c8ce4 +## explicit +# github.com/codegangsta/gin v0.0.0-20211113050330-71f90109db02 +## explicit # github.com/cortezaproject/corteza-locale v0.0.0-20220111135803-4fb0db6196bc ## explicit github.com/cortezaproject/corteza-locale @@ -295,6 +301,8 @@ github.com/markbates/goth/providers/linkedin github.com/markbates/goth/providers/openidConnect # github.com/mattermost/xml-roundtrip-validator v0.1.0 github.com/mattermost/xml-roundtrip-validator +# github.com/mattn/go-shellwords v1.0.12 +## explicit # github.com/mattn/go-sqlite3 v1.14.10 ## explicit github.com/mattn/go-sqlite3 @@ -395,6 +403,8 @@ github.com/stretchr/testify/assert github.com/stretchr/testify/require # github.com/tebeka/strftime v0.1.5 ## explicit +# github.com/urfave/cli v1.22.5 +## explicit # go.uber.org/atomic v1.9.0 ## explicit go.uber.org/atomic