Skip to content

Commit

Permalink
fix(apps): pass path to turbine-js (#266)
Browse files Browse the repository at this point in the history 
* fix: passes path to turbine-js

* do not lint on this line

* fix: fix order for name and path

* chore: update to latest turbine

* fix: remove gosec nolint

* chore: fix go.mod

Co-authored-by: Raúl Barroso <[email protected]>
  • Loading branch information
@brettgoulder @raulb
brettgoulder and raulb authored Mar 1, 2022
1 parent 5a2fe3f commit bce61d9
Show file tree
Hide file tree
Showing 57 changed files with 60 additions and 60 deletions.
6 changes: 3 additions & 3 deletions cmd/meroxa/root/apps/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,17 @@ func (i *Init) Execute(ctx context.Context) error {

i.path = turbineCLI.GetPath(i.flags.Path)

i.logger.Infof(ctx, "Initializing application %q in %q...", name, i.path)
switch lang {
case "go", GoLang:
i.logger.Infof(ctx, "Initializing application %q in %q...", name, i.path)
err := turbine.Init(i.path, name)
err := turbine.Init(name, i.path)
if err != nil {
return err
}
i.logger.Infof(ctx, "Application successfully initialized!\n"+
"You can start interacting with Meroxa in your app located at \"%s/%s\"", i.path, name)
case "js", JavaScript, NodeJs:
cmd := exec.Command("npx", "turbine", "generate", name)
cmd := exec.Command("npx", "turbine", "generate", name, i.path)
stdout, err := cmd.CombinedOutput()
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-api.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-auth-login.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-auth-logout.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-auth-whoami.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-auth.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-billing.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-completion.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-config-describe.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-config.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connect.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-create.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-describe.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-list.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-logs.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-remove.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-update.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-endpoints-create.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-endpoints-describe.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-endpoints-list.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-endpoints-remove.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-endpoints.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-create.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-describe.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-list.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-remove.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-repair.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-update.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-login.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-logout.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-open-billing.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-open.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines-create.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines-describe.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines-list.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines-remove.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines-update.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-create.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-describe.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-list.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-remove.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-rotate-tunnel-key.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-update.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-validate.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-transforms-list.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-transforms.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-version.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-whoami.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa.1
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Feb 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
require (
github.com/docker/docker v20.10.12+incompatible
github.com/mattn/go-shellwords v1.0.12
github.com/meroxa/turbine v0.0.0-20220228183508-b7c450743ad1
github.com/meroxa/turbine v0.0.0-20220301211444-5662995ad65f
)

require github.com/cristalhq/jwt/v3 v3.1.0 // indirect
Expand Down
Loading

0 comments on commit bce61d9

Please sign in to comment.