feat: fix apps deploy

cmd/meroxa/root/apps/common.go

@@ -5,11 +5,11 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"github.com/meroxa/cli/cmd/meroxa/global"
 	"io"
 	"os"
 	"os/exec"
 	"path"
-	"path/filepath"
 	"strings"
 	"time"
 
@@ -33,7 +33,7 @@ func buildGoApp(ctx context.Context, l log.Logger, appPath, appName string, plat
 	}
 
 	if platform {
-		cmd = exec.Command("go", "build", "--tags", "platform", "-o", "./"+appPath, "./"+appPath+"/...") //nolint:gosec
+		cmd = exec.Command("go", "build", "--tags", "platform", "-o", appName, "./...") //nolint:gosec
 	} else {
 		cmd = exec.Command("go", "build", "-o", appName, "./...")
 	}
@@ -48,11 +48,21 @@ func buildGoApp(ctx context.Context, l log.Logger, appPath, appName string, plat
 	return nil
 }
 
-func deployApp(ctx context.Context, l log.Logger, projPath, projName string, imageName string) error {
+func deployApp(ctx context.Context, l log.Logger, appPath, appName string, imageName string) error {
 	l.Info(ctx, "deploying app...\n")
-	cmd := exec.Command(projPath+"/"+projName, "--deploy", "--imagename", imageName)
+
+	cmd := exec.Command(appPath+"/"+appName, "--deploy", "--imagename", imageName)
+	accessToken, refreshToken, err := global.GetUserToken()
+	if err != nil {
+		return err
+	}
+	cmd.Env = os.Environ()
+	cmd.Env = append(cmd.Env, fmt.Sprintf("MEROXA_ACCESS_TOKEN=%s", accessToken))
+	cmd.Env = append(cmd.Env, fmt.Sprintf("MEROXA_REFRESH_TOKEN=%s", refreshToken))
+
 	stdout, err := cmd.CombinedOutput()
 	if err != nil {
+		l.Errorf(ctx, string(stdout))
 		return err
 	}
 
@@ -67,29 +77,25 @@ func buildImage(ctx context.Context, l log.Logger, path string, imageName string
 	if err != nil {
 		l.Errorf(ctx, "unable to init docker client; %s", err)
 	}
+
+	// Generate dockerfile
+	err = turbine.CreateDockerfile(path)
+	if err != nil {
+		return err
+	}
+
 	// Read local Dockerfile
 	tar, err := archive.TarWithOptions(path, &archive.TarOptions{
 		Compression:     archive.Uncompressed,
-		ExcludePatterns: []string{"simple", ".git", "fixtures"},
+		ExcludePatterns: []string{".git", "fixtures"},
 	})
 	if err != nil {
 		l.Errorf(ctx, "unable to create tar; %s", err)
 	}
 
-	//err = os.Chdir(path)
-	//if err != nil {
-	//	return err
-	//}
-
-	// Generate dockerfile
-	err = turbine.CreateDockerfile(path)
-	if err != nil {
-		return err
-	}
-
 	buildOptions := types.ImageBuildOptions{
 		Context:    tar,
-		Dockerfile: filepath.Join(path, "Dockerfile"),
+		Dockerfile: "Dockerfile",
 		Remove:     true,
 		Tags:       []string{imageName}}
 

cmd/meroxa/root/apps/deploy.go

@@ -100,7 +100,7 @@ func (d *Deploy) deployGoApp(ctx context.Context) error {
 		d.logger.Errorf(ctx, "unable to push image; %q\n%s", fqImageName, err)
 	}
 
-	err = buildGoApp(ctx, d.logger, appPath, "", true)
+	err = buildGoApp(ctx, d.logger, appPath, appName, true)
 	if err != nil {
 		return err
 	}
@@ -126,6 +126,7 @@ func (d *Deploy) deployJSApp(ctx context.Context) error {
 
 	stdout, err := cmd.CombinedOutput()
 	if err != nil {
+		d.logger.Error(ctx, string(stdout))
 		return err
 	}
 	d.logger.Info(ctx, string(stdout))