From 0a00b813abf0ff99c46b33615bdda651b8dce15f Mon Sep 17 00:00:00 2001 From: Diana Doherty Date: Mon, 14 Aug 2023 15:57:13 -0400 Subject: [PATCH] Fix function always getting executed for turbine go --- cmd/meroxa/turbine/golang/deploy.go | 3 +-- cmd/meroxa/turbine/golang/run.go | 1 + go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/meroxa/turbine/golang/deploy.go b/cmd/meroxa/turbine/golang/deploy.go index b39efe8aa..cc4d3e1f9 100644 --- a/cmd/meroxa/turbine/golang/deploy.go +++ b/cmd/meroxa/turbine/golang/deploy.go @@ -45,8 +45,7 @@ func (t *turbineGoCLI) StartGrpcServer(ctx context.Context, gitSha string) (func "run", "./...", "build", - "-gitsha", - gitSha, + "-gitsha", gitSha, "-turbine-core-server", grpcListenAddress, "-app-path", t.appPath, }...) diff --git a/cmd/meroxa/turbine/golang/run.go b/cmd/meroxa/turbine/golang/run.go index 84771a956..fa9170b10 100644 --- a/cmd/meroxa/turbine/golang/run.go +++ b/cmd/meroxa/turbine/golang/run.go @@ -17,6 +17,7 @@ func (t *turbineGoCLI) Run(ctx context.Context) error { "-gitsha", "devel", "-turbine-core-server", grpcListenAddress, "-app-path", t.appPath, + "-run-process", }...) cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr diff --git a/go.mod b/go.mod index bd417dea5..56695dad5 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( require ( github.com/briandowns/spinner v1.23.0 github.com/mattn/go-shellwords v1.0.12 - github.com/meroxa/turbine-core v0.0.0-20230808162125-33f70f75883e + github.com/meroxa/turbine-core v0.0.0-20230815153536-e0c914b74ea1 github.com/stretchr/testify v1.8.4 github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1 golang.org/x/mod v0.12.0 diff --git a/go.sum b/go.sum index d39d7ec79..93a800cae 100644 --- a/go.sum +++ b/go.sum @@ -187,8 +187,8 @@ github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebG github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/meroxa/meroxa-go v0.0.0-20230630181637-7cfd524c070a h1:Kd/d630d6ykAagdSGwc47zVenqYRYILTm7O70NmyFz8= github.com/meroxa/meroxa-go v0.0.0-20230630181637-7cfd524c070a/go.mod h1:c1rom/GgYA74PAHorffVlOWCaUhMc5DFbAvt1UwD76Y= -github.com/meroxa/turbine-core v0.0.0-20230808162125-33f70f75883e h1:iKQYPOfVZNQLu5JPKmBIS+23yMOXe13MUjDyDWLqmI0= -github.com/meroxa/turbine-core v0.0.0-20230808162125-33f70f75883e/go.mod h1:tKaTgZPdjOIJk9MM0HwOa4QC++DRAxcAmDwIblb6M5U= +github.com/meroxa/turbine-core v0.0.0-20230815153536-e0c914b74ea1 h1:4tx5X9TVepTLVYP2ZOokKwkCSBldtGZh69kArXZaI9c= +github.com/meroxa/turbine-core v0.0.0-20230815153536-e0c914b74ea1/go.mod h1:03beJfCWdChsKHzbhiDlOcYKyAKkrtoC3y8ualUFOrI= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20170819232839-0fbfe93532da h1:qiPWuGGr+1GQE6s9NPSK8iggR/6x/V+0snIoOPYsBgc= diff --git a/vendor/modules.txt b/vendor/modules.txt index c3e732747..33624112a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -111,7 +111,7 @@ github.com/mattn/go-shellwords ## explicit; go 1.20 github.com/meroxa/meroxa-go/pkg/meroxa github.com/meroxa/meroxa-go/pkg/mock -# github.com/meroxa/turbine-core v0.0.0-20230808162125-33f70f75883e +# github.com/meroxa/turbine-core v0.0.0-20230815153536-e0c914b74ea1 ## explicit; go 1.20 github.com/meroxa/turbine-core/lib/go/github.com/meroxa/turbine/core github.com/meroxa/turbine-core/pkg/app