diff --git a/.gitignore b/.gitignore index 35fe49811..6c0d49eed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ main-packr.go packrd -/commit0 +/zero .history/ tmp .vscode example/ test-reports/ -.circleci/config-compiled.yml \ No newline at end of file +.circleci/config-compiled.yml diff --git a/Dockerfile b/Dockerfile index 361d5cb5b..a911294ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,15 +22,15 @@ RUN chmod +x /usr/local/bin/* && \ # Hydrate the dependency cache. This way, if the go.mod or go.sum files do not # change we can cache the depdency layer without having to reinstall them. -WORKDIR /tmp/commit0 +WORKDIR /tmp/zero COPY go.mod go.sum ./ RUN go mod download COPY . . RUN make build && \ - mv commit0 /usr/local/bin && \ - upx --lzma /usr/local/bin/commit0 + mv zero /usr/local/bin && \ + upx --lzma /usr/local/bin/zero FROM alpine:3.10 ENV \ @@ -45,4 +45,4 @@ COPY --from=builder /usr/local/bin /usr/local/bin COPY --from=builder /go/src/github.com/grpc-ecosystem/grpc-gateway ${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway WORKDIR /project -ENTRYPOINT ["/usr/local/bin/commit0"] +ENTRYPOINT ["/usr/local/bin/zero"] diff --git a/Makefile b/Makefile index 4826a56a6..812cb702c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = 0.0.1 BUILD ?=$(shell git rev-parse --short HEAD) -PKG ?=github.com/commitdev/commit0 +PKG ?=github.com/commitdev/zero BUILD_ARGS=-v -ldflags=all="-X ${PKG}/cmd.appVersion=${VERSION} -X ${PKG}/cmd.appBuild=${BUILD}" check: @@ -10,24 +10,24 @@ fmt: go fmt ./... build-docker-local: - docker build . -t commit0:v0 + docker build . -t zero:v0 build-example-docker: clean-example mkdir -p example - docker run -v "$(shell pwd)/example:/project" --user $(shell id -u):$(shell id -g) commit0:v0 create "hello-world" - docker run -v "$(shell pwd)/example/hello-world:/project" --user $(shell id -u):$(shell id -g) commit0:v0 generate -l go + docker run -v "$(shell pwd)/example:/project" --user $(shell id -u):$(shell id -g) zero:v0 create "hello-world" + docker run -v "$(shell pwd)/example/hello-world:/project" --user $(shell id -u):$(shell id -g) zero:v0 generate -l go build: - go build ${BUILD_ARGS} + go build ${BUILD_ARGS} # Installs the CLI int your GOPATH install-go: - go build -o ${GOPATH}/bin/commit0 + go build -o ${GOPATH}/bin/zero # CI Commands used on CircleCI ci-docker-build: - docker build . -t commitdev/commit0:${VERSION_TAG} -t commitdev/commit0:latest - + docker build . -t commitdev/zero:${VERSION_TAG} -t commitdev/zero:latest + ci-docker-push: echo "${DOCKERHUB_PASS}" | docker login -u commitdev --password-stdin - docker push commitdev/commit0:${VERSION_TAG} + docker push commitdev/zero:${VERSION_TAG} diff --git a/OLD-README.md b/OLD-README.md index a3831b672..715bda511 100644 --- a/OLD-README.md +++ b/OLD-README.md @@ -13,30 +13,30 @@ Status: Proof of Concept ## About Commit0 Commit0 is a project skaffolding framework and ecosystem created to: -1. Maximize knowledge sharing across an organization +1. Maximize knowledge sharing across an organization 2. Easily maintain a state of the art and easily reusable implementations of production grade solutions to recurring problems 3. Re-create the seamless deployment experience offered by PaaS solutions but with a fully open source stack that follows industry best practices With Commit0: - Easily deploy and integrate various boilerplate solutions -- Instantly integrate commonly used open source microservices for authentication, user management, file encryption, image resizing etc. +- Instantly integrate commonly used open source microservices for authentication, user management, file encryption, image resizing etc. - Get a simple Push-To-Deploy workflow that you are accustomed to with popular PaaS solutions [TODO] - There's no vendor lock-in. It's all implemented with open source tools and deployed to your own cloud provider. -## Commit0 Generator CLI -Commit0 CLI is an opinionated, yet fully modular code generation tool with declarative syntax that allows developers to easily integrate user prompts and interactions. +## Commit0 Generator CLI +Commit0 CLI is an opinionated, yet fully modular code generation tool with declarative syntax that allows developers to easily integrate user prompts and interactions. -Problems we encountered: +Problems we encountered: - It was tedious to create reusable templates and hard to maintain - Lack of standardization and integration interface between the templates - Difficult to integrate individually templated codebases -How we aim to address those issues: +How we aim to address those issues: - Make templating behaviour simple and declarative - Clear strategy and guideline around what are clear and reusable templates - Standardize how templated code should get dependent parameters and start up -This is inspired by: +This is inspired by: - [Yeoman Generator](https://github.com/yeoman/generator) - [JHipster](https://github.com/jhipster/generator-jhipster) - [Boilr](https://github.com/tmrts/boilr) @@ -83,18 +83,18 @@ This is a guide on how to configure your project manually with a single file `co * [output](#template-output) ## Commit0.yaml -Your project config file. It describes the project +Your project config file. It describes the project Example: ``` name: newProject -context: +context: cognitoPoolID: xxx -modules: - - source: "github.com/commitdev/commit0-aws-eks-stack" +modules: + - source: "github.com/commitdev/commit0-aws-eks-stack" output: "infrastructure" - - source: "github.com/zthomas/react-mui-kit" + - source: "github.com/zthomas/react-mui-kit" output: "web-app" -``` +``` ## Name Name of your project. This will be used to name the github repos as well as in other parts of the generated code. @@ -105,7 +105,7 @@ Required | True Type | String ## Context -A key value map of global context parameters to use in the templates. +A key value map of global context parameters to use in the templates. []() | | --- | --- @@ -159,13 +159,13 @@ The module config file. You can configure how the templating engine should proce Example: ``` name: react-mui-kit -template: +template: extension: '.tmplt' - delimiters: + delimiters: - '<%' - '%>' output: web-app -``` +``` ## Name Name of your module. This will be used as the default module directory as well as a display name in the prompts. @@ -207,7 +207,7 @@ Required | False Type | Map[String] ## Output -The default template output directory that you want the template engine to write to. This will be overwritten by the +The default template output directory that you want the template engine to write to. This will be overwritten by the []() | | --- | --- @@ -268,7 +268,7 @@ cd test-app To run a single test for development ``` -go test -run TestGenerateModules "github.com/commitdev/commit0/internal/generate" -v +go test -run TestGenerateModules "github.com/commitdev/zero/internal/generate" -v ``` ### Building locally diff --git a/cmd/apply.go b/cmd/apply.go new file mode 100644 index 000000000..89e384c32 --- /dev/null +++ b/cmd/apply.go @@ -0,0 +1,22 @@ +package cmd + +import ( + "github.com/commitdev/zero/configs" + "github.com/spf13/cobra" +) + +var applyConfigPath string + +func init() { + applyCmd.PersistentFlags().StringVarP(&applyConfigPath, "config", "c", configs.CommitYml, "config path") + + rootCmd.AddCommand(applyCmd) +} + +var applyCmd = &cobra.Command{ + Use: "apply", + Short: "Execute modules to create projects, infrastructure, etc.", + Run: func(cmd *cobra.Command, args []string) { + + }, +} diff --git a/cmd/check.go b/cmd/check.go index d2f9fa68f..e3e5c082e 100644 --- a/cmd/check.go +++ b/cmd/check.go @@ -73,6 +73,12 @@ func getSemver(req requirement, out []byte) (*semver.Version, error) { fmt.Sprintf("Try running %s %s locally and checking it works.", req.command, strings.Join(req.args, " ")), } } + + // Default patch version number to 0 if it doesn't exist + if v[3] == "" { + v[3] = "0" + } + versionString := fmt.Sprintf("%s.%s.%s", v[1], v[2], v[3]) version, err := semver.NewVersion(versionString) if err != nil { @@ -125,7 +131,7 @@ var checkCmd = &cobra.Command{ name: "jq\t\t", command: "jq", args: []string{"--version"}, - regexStr: `jq-(0|[1-9]\d*)\.(0|[1-9]\d*)-(0|[1-9]\d*)`, + regexStr: `jq-(0|[1-9]\d*)\.(0|[1-9]\d*)\-?(0|[1-9]\d*)?`, minVersion: "1.5.0", docsURL: "https://stedolan.github.io/jq/download/", }, diff --git a/cmd/create.go b/cmd/create.go index 9fe0cb3aa..6e1fdf6f6 100644 --- a/cmd/create.go +++ b/cmd/create.go @@ -1,27 +1,27 @@ package cmd import ( - "github.com/commitdev/commit0/internal/config" - "github.com/commitdev/commit0/internal/context" - "github.com/commitdev/commit0/pkg/util/exit" + "github.com/commitdev/zero/configs" + "github.com/commitdev/zero/internal/config" + "github.com/commitdev/zero/internal/generate" "github.com/spf13/cobra" ) +var createConfigPath string + func init() { + createCmd.PersistentFlags().StringVarP(&createConfigPath, "config", "c", configs.CommitYml, "config path") + rootCmd.AddCommand(createCmd) } var createCmd = &cobra.Command{ Use: "create", - Short: "Create new project with provided name.", + Short: "Create directories and render templates based on included modules.", Run: func(cmd *cobra.Command, args []string) { - if len(args) < 1 { - exit.Fatal("Project name cannot be empty!") - } - projectName := args[0] - context.Create(projectName, "./") + cfg := config.LoadGeneratorConfig(createConfigPath) - config.CreateExample(projectName) + generate.GenerateModules(cfg) }, } diff --git a/cmd/generate.go b/cmd/generate.go deleted file mode 100644 index 966237bdf..000000000 --- a/cmd/generate.go +++ /dev/null @@ -1,27 +0,0 @@ -package cmd - -import ( - "github.com/commitdev/commit0/configs" - "github.com/commitdev/commit0/internal/config" - "github.com/commitdev/commit0/internal/generate" - "github.com/spf13/cobra" -) - -var configPath string - -func init() { - generateCmd.PersistentFlags().StringVarP(&configPath, "config", "c", configs.CommitYml, "config path") - - rootCmd.AddCommand(generateCmd) -} - -var generateCmd = &cobra.Command{ - Use: "generate", - Short: "Generate idl & application folders", - Run: func(cmd *cobra.Command, args []string) { - - cfg := config.LoadGeneratorConfig(configPath) - - generate.GenerateModules(cfg) - }, -} diff --git a/cmd/init.go b/cmd/init.go new file mode 100644 index 000000000..7a359f1e0 --- /dev/null +++ b/cmd/init.go @@ -0,0 +1,27 @@ +package cmd + +import ( + "github.com/commitdev/zero/internal/config" + "github.com/commitdev/zero/internal/context" + "github.com/commitdev/zero/pkg/util/exit" + "github.com/spf13/cobra" +) + +func init() { + rootCmd.AddCommand(initCmd) +} + +var initCmd = &cobra.Command{ + Use: "init", + Short: "Create new project with provided name and initialize configuration based on user input.", + Run: func(cmd *cobra.Command, args []string) { + if len(args) < 1 { + exit.Fatal("Project name cannot be empty!") + } + + projectName := args[0] + context.Create(projectName, "./") + + config.CreateExample(projectName) + }, +} diff --git a/cmd/create_test.go b/cmd/init_test.go similarity index 87% rename from cmd/create_test.go rename to cmd/init_test.go index cab15ff2e..dfde5e131 100644 --- a/cmd/create_test.go +++ b/cmd/init_test.go @@ -4,7 +4,7 @@ import ( "testing" ) -func TestCreateWorks(t *testing.T) { +func TestInitWorks(t *testing.T) { // @TODO : Figure out a way to test this // tmpdir, err := ioutil.TempDir("", "commit0-") // if err != nil { @@ -25,6 +25,6 @@ func TestCreateWorks(t *testing.T) { // } // if st.Size() == 0 { - // t.Fatalf("commit0.yml is empty") + // t.Fatalf("zero.yml is empty") // } } diff --git a/cmd/version.go b/cmd/version.go index 8423b7d06..4cc76ac50 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -17,7 +17,7 @@ func init() { var versionCmd = &cobra.Command{ Use: "version", - Short: "Print the version number of commit0", + Short: "Print the version number of zero", Run: func(cmd *cobra.Command, args []string) { fmt.Printf("version: %v\n", appVersion) fmt.Printf("build: %v\n", appBuild) diff --git a/cmd/commit0.go b/cmd/zero.go similarity index 78% rename from cmd/commit0.go rename to cmd/zero.go index 87b7ed383..70dc15647 100644 --- a/cmd/commit0.go +++ b/cmd/zero.go @@ -8,8 +8,8 @@ import ( ) var rootCmd = &cobra.Command{ - Use: "commit0", - Short: "Commit0 is a modular service generator.", + Use: "zero", + Short: "zero gets you to writing code quicker.", Long: `TODO`, Run: func(cmd *cobra.Command, args []string) { }, diff --git a/cmd/commit0_ui.go b/cmd/zero_ui.go similarity index 53% rename from cmd/commit0_ui.go rename to cmd/zero_ui.go index e01efe69f..0054ce6fa 100644 --- a/cmd/commit0_ui.go +++ b/cmd/zero_ui.go @@ -1,17 +1,17 @@ package cmd import ( - "github.com/commitdev/commit0/internal/api" + "github.com/commitdev/zero/internal/api" "github.com/spf13/cobra" ) func init() { - rootCmd.AddCommand(commit0api) + rootCmd.AddCommand(zeroApi) } -var commit0api = &cobra.Command{ +var zeroApi = &cobra.Command{ Use: "ui", - Short: "Run Commit0 Api", + Short: "Run zero Api", Run: func(cmd *cobra.Command, args []string) { api.Commit0Api() }, diff --git a/configs/configs.go b/configs/configs.go index 77c8be2da..abe94de90 100644 --- a/configs/configs.go +++ b/configs/configs.go @@ -2,7 +2,7 @@ package configs const ( TemplatesDir = "tmp/templates" - CommitYml = "commit0.yml" - IgnoredPaths = "(?i)commit0.module.yml|.git/" + CommitYml = "zero.yml" + IgnoredPaths = "(?i)zero.module.yml|.git/" TemplateExtn = ".tmpl" ) diff --git a/go.mod b/go.mod index dc96bf4f2..68bc11780 100644 --- a/go.mod +++ b/go.mod @@ -1,29 +1,21 @@ -module github.com/commitdev/commit0 +module github.com/commitdev/zero go 1.12 require ( github.com/aws/aws-sdk-go v1.25.33 - github.com/chzyer/logex v1.1.10 // indirect - github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect - github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect + github.com/commitdev/commit0 v0.0.0-20200522203431-5176cd09c654 github.com/coreos/go-semver v0.2.0 github.com/google/uuid v1.1.1 github.com/gorilla/handlers v1.4.2 github.com/gorilla/mux v1.7.3 github.com/hashicorp/go-getter v1.4.0 - github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a // indirect - github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect github.com/k0kubun/pp v3.0.1+incompatible - github.com/kr/pretty v0.1.0 // indirect github.com/kyokomi/emoji v2.1.0+incompatible github.com/logrusorgru/aurora v0.0.0-20191017060258-dc85c304c434 - github.com/lunixbochs/vtclean v1.0.0 // indirect github.com/manifoldco/promptui v0.3.0 - github.com/mattn/go-colorable v0.1.2 // indirect - github.com/spf13/cobra v0.0.5 - github.com/stretchr/testify v1.4.0 // indirect - golang.org/x/sys v0.0.0-20191010194322-b09406accb47 // indirect - gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect + github.com/spf13/cobra v0.0.6 + github.com/stretchr/testify v1.5.1 // indirect + golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect gopkg.in/yaml.v2 v2.2.5 ) diff --git a/go.sum b/go.sum index dc0a80f90..bef983030 100644 --- a/go.sum +++ b/go.sum @@ -9,13 +9,19 @@ cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbf cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.25.33 h1:8muvpP+Bq5e0CDkM9PDZ6tN74fVUq5v3zSCRaZ93ykM= github.com/aws/aws-sdk-go v1.25.33/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -24,19 +30,35 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/commitdev/commit0 v0.0.0-20200522203431-5176cd09c654 h1:tAJNsBPx6E9YcuMizzh5v52/z+fV15YxZiODicCU0Qs= +github.com/commitdev/commit0 v0.0.0-20200522203431-5176cd09c654/go.mod h1:6gD/1wuBnjZ9aVnf3Tp0zdmAVO/2w9lRe6W/gnR/emc= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= 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= github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -62,6 +84,10 @@ github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YAR github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw= @@ -79,13 +105,19 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/k0kubun/pp v3.0.1+incompatible h1:3tqvf7QgUnZ5tXO6pNAZlrvHgl6DvifjDrd9g2S9Z40= github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -107,35 +139,66 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= 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/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v0.0.6 h1:breEStsVwemnKh2/s6gMvSdMEkwW0sK8vGStnlVBMCs= +github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +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/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok= github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -150,6 +213,8 @@ golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -157,9 +222,12 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2eP golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= @@ -170,6 +238,9 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -188,6 +259,7 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -221,12 +293,18 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2El google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= diff --git a/internal/api/README.md b/internal/api/README.md index fdbdc8443..960291a9d 100644 --- a/internal/api/README.md +++ b/internal/api/README.md @@ -1,8 +1,8 @@ -# Commit0 Api +# zero Api ## Usage - To run: - `commit0 api` + `zero api` - Endpoint: - POST `localhost:8080/{version}/generate` - Post request body json example: diff --git a/internal/api/generate_api.go b/internal/api/generate_api.go index 772d9ae6a..337b31390 100644 --- a/internal/api/generate_api.go +++ b/internal/api/generate_api.go @@ -5,7 +5,7 @@ import ( "log" "net/http" - "github.com/commitdev/commit0/internal/config" + "github.com/commitdev/zero/internal/config" "github.com/gorilla/handlers" "github.com/gorilla/mux" ) diff --git a/internal/config/create_example.go b/internal/config/create_example.go index f166c5dc2..958e37bbe 100644 --- a/internal/config/create_example.go +++ b/internal/config/create_example.go @@ -5,13 +5,13 @@ import ( "io/ioutil" "path" - "github.com/commitdev/commit0/pkg/util/exit" + "github.com/commitdev/zero/pkg/util/exit" ) const exampleConfig = `name: %s # Context is normally populated automatically but could be used to inject global params -context: +context: # module can be in any format the go-getter supports (path, github, url, etc.) # supports https://github.com/hashicorp/go-getter#url-format @@ -20,13 +20,13 @@ context: # - output: "github-actions" modules: - - source: "github.com/commitdev/commit0-aws-eks-stack"` + - source: "github.com/commitdev/zero-aws-eks-stack"` func CreateExample(projectName string) { content := []byte(fmt.Sprintf(exampleConfig, projectName)) - err := ioutil.WriteFile(path.Join(projectName, "commit0.yml"), content, 0644) + err := ioutil.WriteFile(path.Join(projectName, "zero.yml"), content, 0644) if err != nil { - exit.Fatal("Failed to create example commit.yml") + exit.Fatal("Failed to create example zero.yml") } } diff --git a/internal/context/create.go b/internal/context/create.go index 5ca990dba..6dc11a4f0 100644 --- a/internal/context/create.go +++ b/internal/context/create.go @@ -10,10 +10,10 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sts" - "github.com/commitdev/commit0/internal/config" - project "github.com/commitdev/commit0/pkg/credentials" - "github.com/commitdev/commit0/pkg/util/exit" - "github.com/commitdev/commit0/pkg/util/flog" + "github.com/commitdev/zero/internal/config" + project "github.com/commitdev/zero/pkg/credentials" + "github.com/commitdev/zero/pkg/util/exit" + "github.com/commitdev/zero/pkg/util/flog" "github.com/manifoldco/promptui" ) diff --git a/internal/generate/generate_infrastructure.go b/internal/generate/generate_infrastructure.go index bbe4abf91..9ae697f47 100644 --- a/internal/generate/generate_infrastructure.go +++ b/internal/generate/generate_infrastructure.go @@ -5,11 +5,11 @@ import ( "os/exec" "path/filepath" - "github.com/commitdev/commit0/internal/config" - "github.com/commitdev/commit0/internal/util" - "github.com/commitdev/commit0/pkg/credentials" - project "github.com/commitdev/commit0/pkg/credentials" - "github.com/commitdev/commit0/pkg/util/flog" + "github.com/commitdev/zero/internal/config" + "github.com/commitdev/zero/internal/util" + "github.com/commitdev/zero/pkg/credentials" + project "github.com/commitdev/zero/pkg/credentials" + "github.com/commitdev/zero/pkg/util/flog" ) // @TODO: These are specific to a k8s version. If we make the version a config option we will need to change this diff --git a/internal/generate/generate_modules.go b/internal/generate/generate_modules.go index 05f91fff3..e7e15be9c 100644 --- a/internal/generate/generate_modules.go +++ b/internal/generate/generate_modules.go @@ -9,15 +9,15 @@ import ( "sync" "text/template" - "github.com/commitdev/commit0/internal/config" - "github.com/commitdev/commit0/internal/module" - "github.com/commitdev/commit0/internal/util" - "github.com/commitdev/commit0/pkg/util/exit" - "github.com/commitdev/commit0/pkg/util/flog" + "github.com/commitdev/zero/internal/config" + "github.com/commitdev/zero/internal/module" + "github.com/commitdev/zero/internal/util" + "github.com/commitdev/zero/pkg/util/exit" + "github.com/commitdev/zero/pkg/util/flog" "github.com/k0kubun/pp" - "github.com/commitdev/commit0/configs" - "github.com/commitdev/commit0/pkg/util/fs" + "github.com/commitdev/zero/configs" + "github.com/commitdev/zero/pkg/util/fs" ) func GenerateModules(cfg *config.GeneratorConfig) { diff --git a/internal/generate/generate_test.go b/internal/generate/generate_test.go index 17f51b5fe..c48b8afd5 100644 --- a/internal/generate/generate_test.go +++ b/internal/generate/generate_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - config "github.com/commitdev/commit0/internal/config" + config "github.com/commitdev/zero/internal/config" ) func setupTeardown(t *testing.T) func(t *testing.T) { diff --git a/internal/module/module.go b/internal/module/module.go index 8483c4f86..fa7bd054b 100644 --- a/internal/module/module.go +++ b/internal/module/module.go @@ -9,9 +9,9 @@ import ( "regexp" "sync" - "github.com/commitdev/commit0/configs" - "github.com/commitdev/commit0/internal/config" - "github.com/commitdev/commit0/internal/util" + "github.com/commitdev/zero/configs" + "github.com/commitdev/zero/internal/config" + "github.com/commitdev/zero/internal/util" "github.com/hashicorp/go-getter" "github.com/manifoldco/promptui" ) @@ -45,7 +45,7 @@ func NewTemplateModule(moduleCfg config.ModuleInstance) (*TemplateModule, error) } } - configPath := path.Join(sourcePath, "commit0.module.yml") + configPath := path.Join(sourcePath, "zero-module.yml") moduleConfig := config.LoadModuleConfig(configPath) templateModule.Config = *moduleConfig diff --git a/main.go b/main.go index ac8280fc1..4910fd34e 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,6 @@ package main -import "github.com/commitdev/commit0/cmd" +import "github.com/commitdev/zero/cmd" func main() { cmd.Execute() diff --git a/pkg/credentials/credentials.go b/pkg/credentials/credentials.go index 41c1ace5a..6738b95fb 100644 --- a/pkg/credentials/credentials.go +++ b/pkg/credentials/credentials.go @@ -11,7 +11,7 @@ import ( "regexp" "github.com/aws/aws-sdk-go/aws/credentials" - "github.com/commitdev/commit0/internal/config" + "github.com/commitdev/zero/internal/config" "github.com/manifoldco/promptui" "gopkg.in/yaml.v2" ) diff --git a/pkg/util/exit/exit.go b/pkg/util/exit/exit.go index c86fc5a2d..a90a35a21 100644 --- a/pkg/util/exit/exit.go +++ b/pkg/util/exit/exit.go @@ -3,7 +3,7 @@ package exit import ( "os" - "github.com/commitdev/commit0/pkg/util/flog" + "github.com/commitdev/zero/pkg/util/flog" ) const ( diff --git a/tests/integration/ci/ci_test.go b/tests/integration/ci/ci_test.go index 9cae66178..6d927a747 100644 --- a/tests/integration/ci/ci_test.go +++ b/tests/integration/ci/ci_test.go @@ -8,9 +8,9 @@ package ci_test // "sync" // "testing" -// "github.com/commitdev/commit0/internal/config" -// "github.com/commitdev/commit0/internal/generate/ci" -// "github.com/commitdev/commit0/internal/templator" +// "github.com/commitdev/zero/internal/config" +// "github.com/commitdev/zero/internal/generate/ci" +// "github.com/commitdev/zero/internal/templator" // "github.com/gobuffalo/packr/v2" // )