fix

lyft · Oct 12, 2023 · 8b426a3 · 8b426a3
1 parent f313820
commit 8b426a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/server/neptune/workflows/internal/notifier/github.go b/server/neptune/workflows/internal/notifier/github.go
@@ -57,7 +57,7 @@ func (c *GithubCheckRunCache) CreateOrUpdate(ctx workflow.Context, deploymentID
 
 	// if we haven't created one, let's do so now
 	if !ok {
-		workflow.GetLogger(ctx).Info("cache before create", "cache", c.deploymentCheckRunCache)
+		workflow.GetLogger(ctx).Info(fmt.Sprintf("cache before create: %v", c.deploymentCheckRunCache))
 		resp, err := c.load(ctx, deploymentID, request)
 		if err != nil {
 			return 0, err
@@ -67,20 +67,20 @@ func (c *GithubCheckRunCache) CreateOrUpdate(ctx workflow.Context, deploymentID
 		if resp.ID != 0 {
 			c.deploymentCheckRunCache[key] = resp.ID
 			c.deleteIfCompleted(resp.Status, key)
-			workflow.GetLogger(ctx).Info("cache after create", "cache", c.deploymentCheckRunCache)
+			workflow.GetLogger(ctx).Info(fmt.Sprintf("cache after create: %v", c.deploymentCheckRunCache))
 		}
 
 		return resp.ID, nil
 	}
 
 	// update existing checks
-	workflow.GetLogger(ctx).Info("cache before update", "cache", c.deploymentCheckRunCache)
+	workflow.GetLogger(ctx).Info(fmt.Sprintf("cache before update: %v", c.deploymentCheckRunCache))
 	resp, err := c.update(ctx, deploymentID, request, checkRunID)
 	if err != nil {
 		return 0, err
 	}
 	c.deleteIfCompleted(resp.Status, key)
-	workflow.GetLogger(ctx).Info("cache after update", "cache", c.deploymentCheckRunCache)
+	workflow.GetLogger(ctx).Info(fmt.Sprintf("cache after create: %v", c.deploymentCheckRunCache))
 
 	return checkRunID, nil
 }
@@ -106,9 +106,9 @@ func (c *GithubCheckRunCache) update(ctx workflow.Context, externalID string, re
 	}
 
 	var resp activities.UpdateCheckRunResponse
-	workflow.GetLogger(ctx).Info("executing update check run", "title", request.Title, "rev", request.Sha)
+	workflow.GetLogger(ctx).Info(fmt.Sprintf("executing update check run activity: %s %s", request.Title, request.Sha))
 	err := workflow.ExecuteActivity(ctx, c.activities.GithubUpdateCheckRun, updateCheckRunRequest).Get(ctx, &resp)
-	workflow.GetLogger(ctx).Info("update check run completed", "title", request.Title, "rev", request.Sha)
+	workflow.GetLogger(ctx).Info(fmt.Sprintf("update check run activity complete: %s %s", request.Title, request.Sha))
 	if err != nil {
 		return resp, errors.Wrapf(err, "updating check run with id: %d", checkRunID)
 	}
@@ -128,9 +128,9 @@ func (c *GithubCheckRunCache) load(ctx workflow.Context, externalID string, requ
 	}
 
 	var resp activities.CreateCheckRunResponse
-	workflow.GetLogger(ctx).Info("executing create check run", "title", request.Title, "rev", request.Sha)
+	workflow.GetLogger(ctx).Info(fmt.Sprintf("executing create check run activity: %s %s", request.Title, request.Sha))
 	err := workflow.ExecuteActivity(ctx, c.activities.GithubCreateCheckRun, createCheckRunRequest).Get(ctx, &resp)
-	workflow.GetLogger(ctx).Info("create check run completed", "title", request.Title, "rev", request.Sha)
+	workflow.GetLogger(ctx).Info(fmt.Sprintf("create check run activity complete: %s %s", request.Title, request.Sha))
 	if err != nil {
 		return resp, errors.Wrap(err, "creating check run")
 	}

diff --git a/server/neptune/workflows/internal/pr/revision/processor.go b/server/neptune/workflows/internal/pr/revision/processor.go
@@ -1,6 +1,7 @@
 package revision
 
 import (
+	"fmt"
 	"github.com/google/uuid"
 	metricNames "github.com/runatlantis/atlantis/server/metrics"
 	internalContext "github.com/runatlantis/atlantis/server/neptune/context"
@@ -147,7 +148,7 @@ func (p *Processor) awaitChildTerraformWorkflows(ctx workflow.Context, futures [
 				workflow.GetLogger(workflow.WithValue(ctx, internalContext.ErrKey, err)).Error("executing terraform workflow")
 				return
 			}
-			workflow.GetLogger(ctx).Info("child tf workflow ready", "id", resp.WorkflowState.ID)
+			workflow.GetLogger(ctx).Info(fmt.Sprintf("child tf workflow ready: %s", resp.WorkflowState.ID))
 			results = append(results, resp)
 		})
 	}

diff --git a/server/neptune/workflows/internal/pr/revision/state.go b/server/neptune/workflows/internal/pr/revision/state.go
@@ -46,7 +46,7 @@ func (s *StateReceiver) Notify(ctx workflow.Context, workflowState *state.Workfl
 		workflow.GetLogger(ctx).Warn(fmt.Sprintf("skipping notifying root %s", workflowState.ID))
 		return
 	}
-	workflow.GetLogger(ctx).Info("receiving state change signal", "root", rootInfo.Root.Name)
+	workflow.GetLogger(ctx).Info(fmt.Sprintf("receiving state change signal: %s", rootInfo.Root.Name))
 
 	for _, notifier := range s.InternalNotifiers {
 		if err := notifier.Notify(ctx, rootInfo.ToInternalInfo(), workflowState); err != nil {