Skip to content

Commit

Permalink
Move tkn-hub into api for easier vendoring into tkn cmd
Browse files Browse the repository at this point in the history 
With cli being a separate module, adding hub/cli into `tkn` is
quite difficult because of the `require`

```
require api => ../api
```

Thus we are moving `tkn-hub` cli into `api/cmd` so that `tkn`
just needs to add `api` as dependency and depend on `hub/api/pkg/cli/*`

Signed-off-by: Sunil Thaha <[email protected]>
  • Loading branch information
@sthaha @tekton-robot
sthaha authored and tekton-robot committed Oct 19, 2020
1 parent daf460a commit d9a3216
Show file tree
Hide file tree
Showing 26 changed files with 35 additions and 645 deletions.
4 changes: 2 additions & 2 deletions cli/cmd/tkn-hub/main.go → api/cmd/tkn-hub/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package main
import (
"os"

"github.com/tektoncd/hub/cli/pkg/app"
"github.com/tektoncd/hub/cli/pkg/cmd"
"github.com/tektoncd/hub/api/pkg/cli/app"
"github.com/tektoncd/hub/api/pkg/cli/cmd"
)

func main() {
Expand Down
4 changes: 4 additions & 0 deletions api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ require (
github.com/joho/godotenv v1.3.0
github.com/lib/pq v1.3.0
github.com/mitchellh/go-homedir v1.1.0
github.com/spf13/cobra v1.0.0
github.com/spf13/viper v1.7.0
github.com/stretchr/testify v1.5.1
github.com/tektoncd/pipeline v0.15.2
Expand Down Expand Up @@ -40,3 +41,6 @@ replace (
k8s.io/code-generator => k8s.io/code-generator v0.17.6
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29
)

// Use the same Cobra as upstream tkn cli
replace github.com/spf13/cobra => github.com/chmouel/cobra v0.0.0-20200107083527-379e7a80af0c
14 changes: 3 additions & 11 deletions api/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
github.com/chmouel/cobra v0.0.0-20200107083527-379e7a80af0c h1:8YsovAhAya2jnvoIn5aCqyu2E/Zl1+3KBP5tpNXL+H8=
github.com/chmouel/cobra v0.0.0-20200107083527-379e7a80af0c/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
Expand Down Expand Up @@ -240,7 +242,6 @@ github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kw
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/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
Expand All @@ -249,7 +250,6 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
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/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
Expand Down Expand Up @@ -684,6 +684,7 @@ github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/influxdb v0.0.0-20161215172503-049f9b42e9a5/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=
github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0=
Expand Down Expand Up @@ -1042,11 +1043,6 @@ github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
Expand All @@ -1057,7 +1053,6 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
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/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
Expand Down Expand Up @@ -1103,7 +1098,6 @@ github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaoz
github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig=
github.com/tsenart/vegeta v12.7.1-0.20190725001342-b5f4fca92137+incompatible/go.mod h1:Smz/ZWfhKRcyDDChZkG3CyTHdj87lHzio/HOCkbndXM=
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.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
Expand Down Expand Up @@ -1195,7 +1189,6 @@ golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnf
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
Expand Down Expand Up @@ -1339,7 +1332,6 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h
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-20181122145206-62eef0e2fa9b/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-20190209173611-3b5209105503/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-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down
2 changes: 1 addition & 1 deletion cli/pkg/app/app.go → api/pkg/cli/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package app
import (
"io"

hub "github.com/tektoncd/hub/cli/pkg/hub"
"github.com/tektoncd/hub/api/pkg/cli/hub"
)

type Stream struct {
Expand Down
13 changes: 8 additions & 5 deletions cli/pkg/cmd/root.go → api/pkg/cli/cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package cmd
import (
"github.com/spf13/cobra"

"github.com/tektoncd/hub/cli/pkg/app"
"github.com/tektoncd/hub/cli/pkg/cmd/search"
"github.com/tektoncd/hub/cli/pkg/hub"
"github.com/tektoncd/hub/api/pkg/cli/app"
"github.com/tektoncd/hub/api/pkg/cli/cmd/search"
"github.com/tektoncd/hub/api/pkg/cli/hub"
)

// Root represents the base command when called without any subcommands
Expand All @@ -28,8 +28,11 @@ func Root(cli app.CLI) *cobra.Command {
apiURL := ""

cmd := &cobra.Command{
Use: "tkn-hub",
Short: "CLI for tekton hub",
Use: "hub",
Annotations: map[string]string{
"commandType": "main",
},
Short: "Interact with tekton hub",
Long: ``,
SilenceUsage: true,
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
Expand Down
21 changes: 12 additions & 9 deletions cli/pkg/cmd/search/search.go → api/pkg/cli/cmd/search/search.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (

"github.com/spf13/cobra"

"github.com/tektoncd/hub/cli/pkg/app"
"github.com/tektoncd/hub/cli/pkg/flag"
"github.com/tektoncd/hub/cli/pkg/formatter"
"github.com/tektoncd/hub/cli/pkg/hub"
"github.com/tektoncd/hub/cli/pkg/printer"
"github.com/tektoncd/hub/api/pkg/cli/app"
"github.com/tektoncd/hub/api/pkg/cli/flag"
"github.com/tektoncd/hub/api/pkg/cli/formatter"
"github.com/tektoncd/hub/api/pkg/cli/hub"
"github.com/tektoncd/hub/api/pkg/cli/printer"
)

const resTemplate = `{{- $rl := len .Resources }}{{ if eq $rl 0 -}}
Expand All @@ -34,7 +34,7 @@ NAME KIND DESCRIPTION TAGS
{{ range $_, $r := .Resources -}}
{{ formatName $r.Name $r.LatestVersion.Version }} {{ $r.Kind }} {{ formatDesc $r.LatestVersion.Description }} {{ formatTags $r.Tags }}
{{ end }}
{{- end -}}
{{- end -}}
`

var (
Expand All @@ -61,9 +61,12 @@ func Command(cli app.CLI) *cobra.Command {
opts := &options{cli: cli}

cmd := &cobra.Command{
Use: "search",
Short: "Search resource by combination of its name, kind, and tags",
Long: ``,
Use: "search",
Short: "Search resource by combination of its name, kind, and tags",
Long: ``,
Annotations: map[string]string{
"commandType": "main",
},
SilenceUsage: true,
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
Expand Down
4 changes: 2 additions & 2 deletions cli/pkg/cmd/search/search_test.go → api/pkg/cli/cmd/search/search_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"github.com/stretchr/testify/assert"
goa "goa.design/goa/v3/pkg"
"gopkg.in/h2non/gock.v1"
"gotest.tools/golden"
"gotest.tools/v3/golden"

res "github.com/tektoncd/hub/api/gen/resource"
"github.com/tektoncd/hub/cli/pkg/test"
"github.com/tektoncd/hub/api/pkg/cli/test"
)

const api string = "http://test.hub.cli"
Expand Down
0 ...rch/testdata/TestSearch_JSONFormat.golden → ...rch/testdata/TestSearch_JSONFormat.golden
View file
File renamed without changes.
0 ...ch/testdata/TestSearch_TableFormat.golden → ...ch/testdata/TestSearch_TableFormat.golden
View file
File renamed without changes.
0 cli/pkg/flag/kind.go → api/pkg/cli/flag/kind.go
View file
File renamed without changes.
0 cli/pkg/flag/kind_test.go → api/pkg/cli/flag/kind_test.go
View file
File renamed without changes.
0 cli/pkg/flag/validate.go → api/pkg/cli/flag/validate.go
View file
File renamed without changes.
0 cli/pkg/flag/validate_test.go → api/pkg/cli/flag/validate_test.go
View file
File renamed without changes.
0 cli/pkg/formatter/field.go → api/pkg/cli/formatter/field.go
View file
File renamed without changes.
0 cli/pkg/formatter/field_test.go → api/pkg/cli/formatter/field_test.go
View file
File renamed without changes.
0 cli/pkg/formatter/json.go → api/pkg/cli/formatter/json.go
View file
File renamed without changes.
0 cli/pkg/formatter/json_test.go → api/pkg/cli/formatter/json_test.go
View file
File renamed without changes.
0 cli/pkg/hub/hub.go → api/pkg/cli/hub/hub.go
View file
File renamed without changes.
0 cli/pkg/hub/hub_test.go → api/pkg/cli/hub/hub_test.go
View file
File renamed without changes.
0 cli/pkg/hub/search.go → api/pkg/cli/hub/search.go
View file
File renamed without changes.
0 cli/pkg/hub/search_test.go → api/pkg/cli/hub/search_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cli/pkg/printer/print.go → api/pkg/cli/printer/print.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"text/tabwriter"
"text/template"

formatter "github.com/tektoncd/hub/cli/pkg/formatter"
"github.com/tektoncd/hub/api/pkg/cli/formatter"
)

type Printer struct {
Expand Down
4 changes: 2 additions & 2 deletions cli/pkg/test/config.go → api/pkg/cli/test/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package test
import (
"io"

"github.com/tektoncd/hub/cli/pkg/app"
"github.com/tektoncd/hub/cli/pkg/hub"
"github.com/tektoncd/hub/api/pkg/cli/app"
"github.com/tektoncd/hub/api/pkg/cli/hub"
)

type cli struct {
Expand Down
14 changes: 0 additions & 14 deletions cli/go.mod
View file

This file was deleted.

Loading

0 comments on commit d9a3216

Please sign in to comment.