test

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

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/server/neptune/temporalworker/server.go b/server/neptune/temporalworker/server.go
@@ -276,6 +276,7 @@ func (s Server) Start() error {
 			Interceptors: []interceptor.WorkerInterceptor{
 				temporal.NewWorkerInterceptor(),
 			},
+			EnableLoggingInReplay: true,
 		})
 		prWorker.RegisterActivity(s.GithubActivities)
 		prWorker.RegisterActivity(s.TerraformActivities)

diff --git a/server/neptune/workflows/internal/notifier/github.go b/server/neptune/workflows/internal/notifier/github.go
@@ -57,6 +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)
 		resp, err := c.load(ctx, deploymentID, request)
 		if err != nil {
 			return 0, err
@@ -66,17 +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)
 		}
 
 		return resp.ID, nil
 	}
 
 	// update existing checks
+	workflow.GetLogger(ctx).Info("cache before update", "cache", 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)
 
 	return checkRunID, nil
 }
@@ -102,7 +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)
 	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)
 	if err != nil {
 		return resp, errors.Wrapf(err, "updating check run with id: %d", checkRunID)
 	}
@@ -122,7 +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)
 	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)
 	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
@@ -147,6 +147,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)
 			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,6 +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)
 
 	for _, notifier := range s.InternalNotifiers {
 		if err := notifier.Notify(ctx, rootInfo.ToInternalInfo(), workflowState); err != nil {

diff --git a/server/neptune/workflows/internal/terraform/workflow.go b/server/neptune/workflows/internal/terraform/workflow.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/runatlantis/atlantis/server/neptune/workflows/activities/conftest"
 	"net/url"
+	"strings"
 	"time"
 
 	key "github.com/runatlantis/atlantis/server/neptune/context"
@@ -145,6 +146,9 @@ func (r *Runner) Plan(ctx workflow.Context, root *terraform.LocalRoot, serverURL
 	if err := r.Store.UpdatePlanJobWithStatus(state.InProgressJobStatus); err != nil {
 		return response, newUpdateJobError(err, "unable to update job with in-progress status")
 	}
+	if strings.HasSuffix(root.Path, "simple") {
+		_ = workflow.Sleep(ctx, 20*time.Second)
+	}
 
 	response, err = r.JobRunner.Plan(ctx, root, jobID.String(), r.Request.WorkflowMode)