feat(turbine): Supply Git SHA when creating an application and displa…

…y it (#274)
meroxa · Mar 14, 2022 · a0fcd03 · a0fcd03
1 parent 86f40b3
commit a0fcd03
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/cmd/meroxa/root/apps/deploy.go b/cmd/meroxa/root/apps/deploy.go
@@ -22,12 +22,13 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/meroxa/meroxa-go/pkg/meroxa"
+	"github.com/volatiletech/null/v8"
 
 	"github.com/meroxa/cli/cmd/meroxa/builder"
 	turbineCLI "github.com/meroxa/cli/cmd/meroxa/turbine_cli"
 	"github.com/meroxa/cli/config"
 	"github.com/meroxa/cli/log"
+	"github.com/meroxa/meroxa-go/pkg/meroxa"
 )
 
 const (
@@ -127,6 +128,8 @@ func (d *Deploy) createApplication(ctx context.Context) error {
 	input := meroxa.CreateApplicationInput{
 		Name:     appName,
 		Language: d.lang,
+		GitSha:   "hardcoded",
+		Pipeline: meroxa.EntityIdentifier{Name: null.StringFrom("default")},
 	}
 	d.logger.Infof(ctx, "Creating application %q with language %q...", input.Name, d.lang)
 

diff --git a/cmd/meroxa/root/apps/deploy_test.go b/cmd/meroxa/root/apps/deploy_test.go
@@ -8,6 +8,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/volatiletech/null/v8"
+
 	"github.com/meroxa/meroxa-go/pkg/meroxa"
 	turbine "github.com/meroxa/turbine/init"
 
@@ -77,11 +79,14 @@ func TestCreateApplication(t *testing.T) {
 	ai := &meroxa.CreateApplicationInput{
 		Name:     name,
 		Language: lang,
+		GitSha:   "hardcoded",
+		Pipeline: meroxa.EntityIdentifier{Name: null.StringFrom("default")},
 	}
 
 	a := &meroxa.Application{
 		Name:     name,
 		Language: lang,
+		GitSha:   "hardcoded",
 	}
 
 	client.

diff --git a/utils/display.go b/utils/display.go
@@ -818,6 +818,7 @@ func AppsTable(apps []*meroxa.Application, hideHeaders bool) string {
 				{Align: simpletable.AlignCenter, Text: "UUID"},
 				{Align: simpletable.AlignCenter, Text: "NAME"},
 				{Align: simpletable.AlignCenter, Text: "LANGUAGE"},
+				{Align: simpletable.AlignCenter, Text: "GIT SHA"},
 				{Align: simpletable.AlignCenter, Text: "STATE"},
 			},
 		}
@@ -828,6 +829,7 @@ func AppsTable(apps []*meroxa.Application, hideHeaders bool) string {
 			{Align: simpletable.AlignRight, Text: app.UUID},
 			{Align: simpletable.AlignCenter, Text: app.Name},
 			{Align: simpletable.AlignCenter, Text: app.Language},
+			{Align: simpletable.AlignCenter, Text: app.GitSha},
 			{Align: simpletable.AlignCenter, Text: string(app.Status.State)},
 		}
 
@@ -838,6 +840,10 @@ func AppsTable(apps []*meroxa.Application, hideHeaders bool) string {
 	return table.String()
 }
 
+func PrintAppsTable(apps []*meroxa.Application, hideHeaders bool) {
+	fmt.Println(AppsTable(apps, hideHeaders))
+}
+
 func AppTable(app *meroxa.Application) string {
 	mainTable := simpletable.New()
 	mainTable.Body.Cells = [][]*simpletable.Cell{
@@ -853,6 +859,10 @@ func AppTable(app *meroxa.Application) string {
 			{Align: simpletable.AlignRight, Text: "Language:"},
 			{Text: app.Language},
 		},
+		{
+			{Align: simpletable.AlignRight, Text: "Git SHA:"},
+			{Text: app.GitSha},
+		},
 		{
 			{Align: simpletable.AlignRight, Text: "Created At:"},
 			{Text: app.CreatedAt.String()},
@@ -924,10 +934,6 @@ func AppTable(app *meroxa.Application) string {
 	return mainTable.String()
 }
 
-func PrintAppsTable(apps []*meroxa.Application, hideHeaders bool) {
-	fmt.Println(AppsTable(apps, hideHeaders))
-}
-
 func truncateString(oldString string, l int) string {
 	str := oldString