Orca 845 (#89)

* Current progress * Websocket implementation * Fixing routes * Adding url * Fixed websocket connection * Progress 7/9 * Added some channel logic * Changes to models.go * Working on log streaming for plan * Beginning tests/Having errors * Log Streaming Logic * fixed test * Added Testing * Fixed websocket connection * Async implementation and test error fixes * Changes to variables in tests * Debugging * Fixed UI in webpage terminal * Fixing Run make-test coverage * Fixing tests * Testing * Deleted txt.act files * Fixing broken tests * Changes to terraform_client testing * Fixed tests in terraform_client_internal_test.go * Fixed failing test * Deleted lines causing test to fail * Reformating * More Reformatting * Run make check-lint corrections * Added error check * Fixing check-lint test * Suggested changes prior to merge Co-authored-by: Isata Sankoh <[email protected]>
lyft · Dec 9, 2021 · 1f17490 · 1f17490
1 parent 6e9e4ba
commit 1f17490
Show file tree

Hide file tree

Showing 68 changed files with 1,220 additions and 1,643 deletions.
diff --git a/server/controllers/events/events_controller_e2e_test.go b/server/controllers/events/events_controller_e2e_test.go
@@ -816,6 +816,7 @@ func setupE2E(t *testing.T, repoDir string) (events_controllers.VCSEventsControl
 	e2eStatusUpdater := &events.DefaultCommitStatusUpdater{Client: e2eVCSClient, TitleBuilder: vcs.StatusTitleBuilder{TitlePrefix: "atlantis"}}
 	e2eGithubGetter := mocks.NewMockGithubPullGetter()
 	e2eGitlabGetter := mocks.NewMockGitlabMergeRequestGetter()
+	tempchan := make(chan *models.TerraformOutputLine)
 
 	// Real dependencies.
 	logger := logging.NewNoopLogger(t)
@@ -830,7 +831,7 @@ func setupE2E(t *testing.T, repoDir string) (events_controllers.VCSEventsControl
 		GithubUser: "github-user",
 		GitlabUser: "gitlab-user",
 	}
-	terraformClient, err := terraform.NewClient(logger, binDir, cacheDir, "", "", "", "default-tf-version", "https://releases.hashicorp.com", &NoopTFDownloader{}, false)
+	terraformClient, err := terraform.NewClient(logger, binDir, cacheDir, "", "", "", "default-tf-version", "https://releases.hashicorp.com", &NoopTFDownloader{}, false, tempchan)
 	Ok(t, err)
 	boltdb, err := db.New(dataDir)
 	Ok(t, err)
@@ -934,12 +935,14 @@ func setupE2E(t *testing.T, repoDir string) (events_controllers.VCSEventsControl
 			TerraformExecutor: terraformClient,
 			DefaultTFVersion:  defaultTFVersion,
 		},
-		WorkingDir:       workingDir,
-		Webhooks:         &mockWebhookSender{},
-		WorkingDirLocker: locker,
+		PullApprovedChecker: e2eVCSClient,
+		WorkingDir:          workingDir,
+		Webhooks:            &mockWebhookSender{},
+		WorkingDirLocker:    locker,
 		AggregateApplyRequirements: &events.AggregateApplyRequirements{
 			WorkingDir: workingDir,
 		},
+		TerraformOutputChan: tempchan,
 	}
 
 	dbUpdater := &events.DBUpdater{
@@ -1053,6 +1056,11 @@ func setupE2E(t *testing.T, repoDir string) (events_controllers.VCSEventsControl
 	repoAllowlistChecker, err := events.NewRepoAllowlistChecker("*")
 	Ok(t, err)
 
+	go func() {
+		for range tempchan {
+		}
+	}()
+
 	ctrl := events_controllers.VCSEventsController{
 		TestingMode:   true,
 		CommandRunner: commandRunner,

diff --git a/server/controllers/events/testfixtures/test-repos/automerge/exp-output-apply-dir1.txt.act b/server/controllers/events/testfixtures/test-repos/automerge/exp-output-apply-dir1.txt.act
diff --git a/server/controllers/events/testfixtures/test-repos/automerge/exp-output-apply-dir2.txt.act b/server/controllers/events/testfixtures/test-repos/automerge/exp-output-apply-dir2.txt.act
diff --git a/server/controllers/events/testfixtures/test-repos/automerge/exp-output-autoplan.txt.act b/server/controllers/events/testfixtures/test-repos/automerge/exp-output-autoplan.txt.act
diff --git a/...ntrollers/events/testfixtures/test-repos/modules-yaml/exp-output-apply-production.txt.act b/...ntrollers/events/testfixtures/test-repos/modules-yaml/exp-output-apply-production.txt.act
diff --git a/.../controllers/events/testfixtures/test-repos/modules-yaml/exp-output-apply-staging.txt.act b/.../controllers/events/testfixtures/test-repos/modules-yaml/exp-output-apply-staging.txt.act
diff --git a/server/controllers/events/testfixtures/test-repos/modules-yaml/exp-output-autoplan.txt.act b/server/controllers/events/testfixtures/test-repos/modules-yaml/exp-output-autoplan.txt.act
diff --git a/...er/controllers/events/testfixtures/test-repos/modules/exp-output-apply-production.txt.act b/...er/controllers/events/testfixtures/test-repos/modules/exp-output-apply-production.txt.act
diff --git a/server/controllers/events/testfixtures/test-repos/modules/exp-output-apply-staging.txt.act b/server/controllers/events/testfixtures/test-repos/modules/exp-output-apply-staging.txt.act
diff --git a/...ntrollers/events/testfixtures/test-repos/modules/exp-output-autoplan-only-staging.txt.act b/...ntrollers/events/testfixtures/test-repos/modules/exp-output-autoplan-only-staging.txt.act
diff --git a/server/controllers/events/testfixtures/test-repos/modules/exp-output-plan-production.txt.act b/server/controllers/events/testfixtures/test-repos/modules/exp-output-plan-production.txt.act
diff --git a/server/controllers/events/testfixtures/test-repos/modules/exp-output-plan-staging.txt.act b/server/controllers/events/testfixtures/test-repos/modules/exp-output-plan-staging.txt.act
diff --git a/...events/testfixtures/test-repos/server-side-cfg/exp-output-apply-default-workspace.txt.act b/...events/testfixtures/test-repos/server-side-cfg/exp-output-apply-default-workspace.txt.act