add log streaming to bootstrap function

mantil-io · Aug 6, 2021 · 6c67b97 · 6c67b97
1 parent 0de9051
commit 6c67b97
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 14 deletions.
diff --git a/api/bootstrap/bootstrap.go b/api/bootstrap/bootstrap.go
@@ -5,6 +5,7 @@ import (
 	"log"
 
 	"github.com/atoz-technology/mantil-backend/internal/bootstrap"
+	"github.com/atoz-technology/mantil-backend/internal/stream"
 )
 
 type Bootstrap struct{}
@@ -21,7 +22,9 @@ func (f *Bootstrap) Invoke(ctx context.Context, req *BootstrapRequest) (*Bootstr
 }
 
 func (f *Bootstrap) Bootstrap(ctx context.Context, req *BootstrapRequest) (*BootstrapResponse, error) {
-	if err := bootstrap.Bootstrap("/tmp", req.Destroy); err != nil {
+	if err := stream.LambdaLogStream(ctx, func() error {
+		return bootstrap.Bootstrap("/tmp", req.Destroy)
+	}); err != nil {
 		log.Println(err)
 		return nil, err
 	}

diff --git a/api/data/data.go b/api/data/data.go
@@ -48,7 +48,7 @@ func (f *Data) isRequestValid(req *DataRequest) bool {
 
 func (f *Data) streamingLogsProject(ctx context.Context, name string) (*mantil.Project, error) {
 	var p *mantil.Project
-	err := stream.LambdaLogStream(ctx, func() error {
+	err := stream.APIGatewayLambdaLogStream(ctx, func() error {
 		var err error
 		p, err = mantil.LoadProject(name)
 		return err

diff --git a/api/deploy/deploy.go b/api/deploy/deploy.go
@@ -41,7 +41,7 @@ func (h *Deploy) Deploy(ctx context.Context, req *DeployRequest) (*DeployRespons
 	if err != nil {
 		return nil, err
 	}
-	err = stream.LambdaLogStream(ctx, d.Deploy)
+	err = stream.APIGatewayLambdaLogStream(ctx, d.Deploy)
 	if err != nil {
 		log.Println(err)
 		return nil, err

diff --git a/api/destroy/destroy.go b/api/destroy/destroy.go
@@ -35,7 +35,7 @@ func (f *Destroy) Destroy(ctx context.Context, req *DestroyRequest) (*DestroyRes
 	if p.Token != req.Token {
 		return nil, fmt.Errorf("access denied")
 	}
-	err = stream.LambdaLogStream(ctx, func() error {
+	err = stream.APIGatewayLambdaLogStream(ctx, func() error {
 		return destroy.Destroy(p, "/tmp")
 	})
 	if err != nil {

diff --git a/api/initialize/initialize.go b/api/initialize/initialize.go
@@ -44,7 +44,7 @@ func (f *Init) isRequestValid(req *InitRequest) bool {
 
 func (f *Init) streamingLogsInitProject(ctx context.Context, name string) (string, error) {
 	var token string
-	err := stream.LambdaLogStream(ctx, func() error {
+	err := stream.APIGatewayLambdaLogStream(ctx, func() error {
 		var err error
 		token, err = initialize.InitProject(name)
 		return err

diff --git a/api/security/security.go b/api/security/security.go
@@ -58,7 +58,7 @@ func (f *Security) isRequestValid(req *SecurityRequest) bool {
 
 func (f *Security) streamingLogsCredentials(ctx context.Context, p *mantil.Project) (*stsTypes.Credentials, error) {
 	var creds *stsTypes.Credentials
-	err := stream.LambdaLogStream(ctx, func() error {
+	err := stream.APIGatewayLambdaLogStream(ctx, func() error {
 		var err error
 		creds, err = security.Credentials(p)
 		return err

diff --git a/internal/assets/bindata.go b/internal/assets/bindata.go
diff --git a/internal/shell/shell.go b/internal/shell/shell.go
@@ -5,18 +5,18 @@ import (
 	"errors"
 	"io"
 	"log"
-	"os"
 	"os/exec"
 	"strings"
 )
 
 func Exec(args []string, dir string, successStatuses ...int) error {
-	var std = log.New(os.Stderr, log.Prefix(), 0)
+	// var std = log.New(os.Stderr, log.Prefix(), 0)
 	r := runner{
 		dir:     dir,
 		verbose: true,
 		output: func(format string, v ...interface{}) {
-			std.Printf(format, v...)
+			// std.Printf(format, v...)
+			log.Printf(format, v...)
 		},
 	}
 	return r.runCmd(args)

diff --git a/internal/stream/stream.go b/internal/stream/stream.go
@@ -70,7 +70,7 @@ func LogStream(subject string, callback func() error) error {
 	return nil
 }
 
-func LambdaLogStream(ctx context.Context, callback func() error) error {
+func APIGatewayLambdaLogStream(ctx context.Context, callback func() error) error {
 	var inbox string
 	lctx, ok := mgo.FromContext(ctx)
 	if !ok {
@@ -83,6 +83,19 @@ func LambdaLogStream(ctx context.Context, callback func() error) error {
 	return LogStream(inbox, callback)
 }
 
+func LambdaLogStream(ctx context.Context, callback func() error) error {
+	var inbox string
+	lctx, ok := mgo.FromContext(ctx)
+	if !ok {
+		return fmt.Errorf("error retrieving nats subject")
+	}
+	inbox = lctx.Lambda.ClientContext.Custom["logInbox"]
+	if inbox == "" {
+		return fmt.Errorf("invalid nats subject")
+	}
+	return LogStream(inbox, callback)
+}
+
 func natsAuth() nats.Option {
 	nkeySeed := "SUADEJU2KOHEGHFLBXJS4QF75E2II3PU63I3GCK4OBJLINOC7LDVEOX42A"
 	nkeyUser := "UDQPHZBVNZCJSM5JXUDICFALEQ7Y5KPPAF7KGHTH77OGG7COQOJEYBZ7"