Skip to content

Commit

Permalink
chore: clean up (#327)
Browse files Browse the repository at this point in the history
It also updates reference to private repositories
  • Loading branch information
raulb authored Apr 19, 2022
1 parent a326889 commit f98708a
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 28 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ build: docs
install:
go build -o $$(go env GOPATH)/bin/meroxa cmd/meroxa/main.go

PRIVATE_REPOS = github.com/meroxa/meroxa-go,github.com/meroxa/turbine-go
.PHONY: gomod
gomod:
GOPRIVATE=$(PRIVATE_REPOS) go mod tidy && go mod vendor
go mod tidy && go mod vendor

.PHONY: test
test:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Prerequisite Tools:

To build from source:

1. The CLI depends on [meroxa-go](github.com/meroxa/meroxa-go) (which is currently a private repo). To update vendoring the dependency, you'll need to run the following:
1. The CLI depends on [meroxa-go](github.com/meroxa/meroxa-go). To update vendoring the dependency, you'll need to run the following:

```
make gomod
Expand Down
4 changes: 0 additions & 4 deletions cmd/meroxa/root/apps/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ func (d *Deploy) Logger(logger log.Logger) {
d.logger = logger
}

// TODO: Move this to each turbine library.
func (d *Deploy) createApplication(ctx context.Context, pipelineUUID, gitSha string) error {
input := meroxa.CreateApplicationInput{
Name: d.appName,
Expand All @@ -209,7 +208,6 @@ func (d *Deploy) createApplication(ctx context.Context, pipelineUUID, gitSha str
" unrecoverable state; try deleting and re-deploying", d.appName), log.Failed)

d.logger.StopSpinnerWithStatus("\t", log.Failed)
// TODO: Rollback here?
return fmt.Errorf("unable to finish creating application")
}
}
Expand Down Expand Up @@ -278,7 +276,6 @@ func (d *Deploy) uploadSource(ctx context.Context, appPath, url string) error {
return err
}

// TODO: Remove d.tempPath for JS apps
if d.lang == Python {
output, err := turbinePY.CleanUpApp(appPath)
if err != nil {
Expand Down Expand Up @@ -412,7 +409,6 @@ func (d *Deploy) buildApp(ctx context.Context) error {
var err error

// Without the " " at the beginning of `suffix`, spinner looks next to word (only on this occurrence)
// TODO: Fix this (not having to add that extra blank space at the beginning)
d.logger.StartSpinner("\t", " Building application...")

switch d.lang {
Expand Down
4 changes: 0 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ require (
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/tidwall/gjson v1.14.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tidwall/sjson v1.2.4 // indirect
github.com/volatiletech/inflect v0.0.1 // indirect
github.com/volatiletech/randomize v0.0.1 // indirect
github.com/volatiletech/strmangle v0.0.2 // indirect
Expand Down
9 changes: 0 additions & 9 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -574,12 +574,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182aff
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
github.com/meroxa/funtime v0.0.0-20220113012133-85e6e898fc73/go.mod h1:K2y2GvcA4Cg3dJtckcwYWnwnJzF63FDdtAQI0fToU0Q=
github.com/meroxa/meroxa-go v0.0.0-20220208195203-71ddc3133fab/go.mod h1:HDFszURCM1cOpKE699o5Hs0T2tEIXqY+vFcsur3RiwY=
github.com/meroxa/meroxa-go v0.0.0-20220415221139-f31436f83dca h1:HTg9REXt9NqbX2syACtpUEwF/unzwWRjG9AkSaqcnLc=
github.com/meroxa/meroxa-go v0.0.0-20220415221139-f31436f83dca/go.mod h1:BsqYa9jqfyGOAgfkggfK567b2Ahkb+RCH3lXDQGgrh8=
github.com/meroxa/meroxa-go v0.0.0-20220419000706-05a93c79cc6e h1:z5wOdhit1nuDyevydXW4/c2dwQW2BbAamBar1vJ4nhw=
github.com/meroxa/meroxa-go v0.0.0-20220419000706-05a93c79cc6e/go.mod h1:BsqYa9jqfyGOAgfkggfK567b2Ahkb+RCH3lXDQGgrh8=
github.com/meroxa/turbine-go v0.0.0-20220418221103-f56d64003db2 h1:scBLDEdMynk5T9O6EcEMxewOTUsjgb5UcbOKx3SkT48=
github.com/meroxa/turbine-go v0.0.0-20220418221103-f56d64003db2/go.mod h1:F4ODyjX+tn5dYFRc1bQlHLUnTtlJIxs09AKHqfCD5Cg=
github.com/meroxa/turbine-go v0.0.0-20220419083802-4f83d9343ce6 h1:vMXfEM3/9+Q4wOKMoYYFbCe0d3bOW3iCiLRhW5blmgo=
github.com/meroxa/turbine-go v0.0.0-20220419083802-4f83d9343ce6/go.mod h1:F4ODyjX+tn5dYFRc1bQlHLUnTtlJIxs09AKHqfCD5Cg=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
Expand Down Expand Up @@ -797,13 +793,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG
github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/gjson v1.13.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w=
github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/tidwall/sjson v1.2.4 h1:cuiLzLnaMeBhRmEv00Lpk3tkYrcxpmbU81tAY4Dw0tc=
github.com/tidwall/sjson v1.2.4/go.mod h1:098SZ494YoMWPmMO6ct4dcFnqxwj9r/gF0Etp19pSNM=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
Expand Down
8 changes: 0 additions & 8 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,6 @@ github.com/spf13/viper
# github.com/subosito/gotenv v1.2.0
## explicit
github.com/subosito/gotenv
# github.com/tidwall/gjson v1.14.0
## explicit; go 1.12
# github.com/tidwall/match v1.1.1
## explicit; go 1.15
# github.com/tidwall/pretty v1.2.0
## explicit; go 1.16
# github.com/tidwall/sjson v1.2.4
## explicit; go 1.14
# github.com/volatiletech/inflect v0.0.1
## explicit; go 1.14
github.com/volatiletech/inflect
Expand Down

0 comments on commit f98708a

Please sign in to comment.