Revert "feat: Add project depends on functionality (#3821)" (#3825)

This reverts commit cf2b791.

server/core/config/raw/project.go

@@ -31,7 +31,6 @@ type Project struct {
 	PlanRequirements          []string  `yaml:"plan_requirements,omitempty"`
 	ApplyRequirements         []string  `yaml:"apply_requirements,omitempty"`
 	ImportRequirements        []string  `yaml:"import_requirements,omitempty"`
-	DependsOn                 []string  `yaml:"depends_on,omitempty"`
 	DeleteSourceBranchOnMerge *bool     `yaml:"delete_source_branch_on_merge,omitempty"`
 	RepoLocking               *bool     `yaml:"repo_locking,omitempty"`
 	ExecutionOrderGroup       *int      `yaml:"execution_order_group,omitempty"`
@@ -75,17 +74,12 @@ func (p Project) Validate() error {
 		return errors.Wrapf(err, "parsing: %s", branch)
 	}
 
-	Dependencies := func(value interface{}) error {
-		return nil
-	}
-
 	return validation.ValidateStruct(&p,
 		validation.Field(&p.Dir, validation.Required, validation.By(hasDotDot)),
 		validation.Field(&p.PlanRequirements, validation.By(validPlanReq)),
 		validation.Field(&p.ApplyRequirements, validation.By(validApplyReq)),
 		validation.Field(&p.ImportRequirements, validation.By(validImportReq)),
 		validation.Field(&p.TerraformVersion, validation.By(VersionValidator)),
-		validation.Field(&p.DependsOn, validation.By(Dependencies)),
 		validation.Field(&p.Name, validation.By(validName)),
 		validation.Field(&p.Branch, validation.By(branchValid)),
 	)
@@ -129,8 +123,6 @@ func (p Project) ToValid() valid.Project {
 
 	v.Name = p.Name
 
-	v.DependsOn = p.DependsOn
-
 	if p.DeleteSourceBranchOnMerge != nil {
 		v.DeleteSourceBranchOnMerge = p.DeleteSourceBranchOnMerge
 	}

server/core/config/valid/global_cfg.go

@@ -17,7 +17,10 @@ const PoliciesPassedCommandReq = "policies_passed"
 const PlanRequirementsKey = "plan_requirements"
 const ApplyRequirementsKey = "apply_requirements"
 const ImportRequirementsKey = "import_requirements"
+const PreWorkflowHooksKey = "pre_workflow_hooks"
 const WorkflowKey = "workflow"
+const PostWorkflowHooksKey = "post_workflow_hooks"
+const AllowedWorkflowsKey = "allowed_workflows"
 const AllowedOverridesKey = "allowed_overrides"
 const AllowCustomWorkflowsKey = "allow_custom_workflows"
 const DefaultWorkflowName = "default"
@@ -89,7 +92,6 @@ type MergedProjectCfg struct {
 	ImportRequirements        []string
 	Workflow                  Workflow
 	AllowedWorkflows          []string
-	DependsOn                 []string
 	RepoRelDir                string
 	Workspace                 string
 	Name                      string
@@ -388,7 +390,6 @@ func (g GlobalCfg) MergeProjectCfg(log logging.SimpleLogging, repoID string, pro
 		Workflow:                  workflow,
 		RepoRelDir:                proj.Dir,
 		Workspace:                 proj.Workspace,
-		DependsOn:                 proj.DependsOn,
 		Name:                      proj.GetName(),
 		AutoplanEnabled:           proj.Autoplan.Enabled,
 		TerraformVersion:          proj.TerraformVersion,

server/core/config/valid/repo_cfg.go

@@ -132,7 +132,6 @@ type Project struct {
 	PlanRequirements          []string
 	ApplyRequirements         []string
 	ImportRequirements        []string
-	DependsOn                 []string
 	DeleteSourceBranchOnMerge *bool
 	RepoLocking               *bool
 	ExecutionOrderGroup       int

server/events/command/project_context.go

@@ -57,13 +57,6 @@ type ProjectContext struct {
 	// If the pull request branch is from the same repository then HeadRepo will
 	// be the same as BaseRepo.
 	HeadRepo models.Repo
-	// DependsOn are a list of project that this project relies on
-	// their apply status. These projects must be applied first.
-	//
-	// Atlantis uses this information to valid the apply
-	// orders and to warn the user if they're applying a project that
-	// depends on other projects.
-	DependsOn []string
 	// Log is a logger that's been set up for this context.
 	Log logging.SimpleLogging
 	// Scope is the scope for reporting stats setup for this context
@@ -74,8 +67,6 @@ type ProjectContext struct {
 	ProjectPlanStatus models.ProjectPlanStatus
 	// ProjectPolicyStatus is the status of policy sets of the current project prior to this command.
 	ProjectPolicyStatus []models.PolicySetStatus
-	// PullStatus is the current status of a pull request that is in progress.
-	PullStatus *models.PullStatus
 	// Pull is the pull request we're responding to.
 	Pull models.PullRequest
 	// ProjectName is the name of the project set in atlantis.yaml. If there was

server/events/command_requirement_handler.go

@@ -1,17 +1,13 @@
 package events
 
 import (
-	"fmt"
-
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
 	"github.com/runatlantis/atlantis/server/events/command"
-	"github.com/runatlantis/atlantis/server/events/models"
 )
 
 //go:generate pegomock generate --package mocks -o mocks/mock_command_requirement_handler.go CommandRequirementHandler
 type CommandRequirementHandler interface {
-	ValidateProjectDependencies(ctx command.ProjectContext) (string, error)
 	ValidatePlanProject(repoDir string, ctx command.ProjectContext) (string, error)
 	ValidateApplyProject(repoDir string, ctx command.ProjectContext) (string, error)
 	ValidateImportProject(repoDir string, ctx command.ProjectContext) (string, error)
@@ -69,20 +65,6 @@ func (a *DefaultCommandRequirementHandler) ValidateApplyProject(repoDir string,
 	return "", nil
 }
 
-func (a *DefaultCommandRequirementHandler) ValidateProjectDependencies(ctx command.ProjectContext) (failure string, err error) {
-	for _, dependOnProject := range ctx.DependsOn {
-
-		for _, project := range ctx.PullStatus.Projects {
-
-			if project.ProjectName == dependOnProject && project.Status != models.AppliedPlanStatus {
-				return fmt.Sprintf("Can't apply your project unless you apply its dependencies: [%s]", project.ProjectName), nil
-			}
-		}
-	}
-
-	return "", nil
-}
-
 func (a *DefaultCommandRequirementHandler) ValidateImportProject(repoDir string, ctx command.ProjectContext) (failure string, err error) {
 	for _, req := range ctx.ImportRequirements {
 		switch req {

server/events/command_requirement_handler_test.go

@@ -207,113 +207,6 @@ func TestAggregateApplyRequirements_ValidateApplyProject(t *testing.T) {
 	}
 }
 
-func TestRequirements_ValidateProjectDependencies(t *testing.T) {
-	tests := []struct {
-		name        string
-		ctx         command.ProjectContext
-		setup       func(workingDir *mocks.MockWorkingDir)
-		wantFailure string
-		wantErr     assert.ErrorAssertionFunc
-	}{
-		{
-			name:    "pass no dependencies",
-			ctx:     command.ProjectContext{},
-			wantErr: assert.NoError,
-		},
-		{
-			name: "pass all dependencies applied",
-			ctx: command.ProjectContext{
-				DependsOn: []string{"project1"},
-				PullStatus: &models.PullStatus{
-					Projects: []models.ProjectStatus{
-						{
-							ProjectName: "project1",
-							Status:      models.AppliedPlanStatus,
-						},
-					},
-				},
-			},
-			wantErr: assert.NoError,
-		},
-		{
-			name: "Fail all dependencies are not applied",
-			ctx: command.ProjectContext{
-				DependsOn: []string{"project1", "project2"},
-				PullStatus: &models.PullStatus{
-					Projects: []models.ProjectStatus{
-						{
-							ProjectName: "project1",
-							Status:      models.PlannedPlanStatus,
-						},
-						{
-							ProjectName: "project2",
-							Status:      models.ErroredApplyStatus,
-						},
-					},
-				},
-			},
-			wantFailure: "Can't apply your project unless you apply its dependencies: [project1]",
-			wantErr:     assert.NoError,
-		},
-		{
-			name: "Fail one of dependencies is not applied",
-			ctx: command.ProjectContext{
-				DependsOn: []string{"project1", "project2"},
-				PullStatus: &models.PullStatus{
-					Projects: []models.ProjectStatus{
-						{
-							ProjectName: "project1",
-							Status:      models.AppliedPlanStatus,
-						},
-						{
-							ProjectName: "project2",
-							Status:      models.ErroredApplyStatus,
-						},
-					},
-				},
-			},
-			wantFailure: "Can't apply your project unless you apply its dependencies: [project2]",
-			wantErr:     assert.NoError,
-		},
-		{
-			name: "Fail one of dependencies is not applied",
-			ctx: command.ProjectContext{
-				DependsOn: []string{"project1", "project2", "project3"},
-				PullStatus: &models.PullStatus{
-					Projects: []models.ProjectStatus{
-						{
-							ProjectName: "project1",
-							Status:      models.AppliedPlanStatus,
-						},
-						{
-							ProjectName: "project2",
-							Status:      models.ErroredApplyStatus,
-						},
-						{
-							ProjectName: "project3",
-							Status:      models.PlannedPlanStatus,
-						},
-					},
-				},
-			},
-			wantFailure: "Can't apply your project unless you apply its dependencies: [project2]",
-			wantErr:     assert.NoError,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			RegisterMockTestingT(t)
-			workingDir := mocks.NewMockWorkingDir()
-			a := &events.DefaultCommandRequirementHandler{WorkingDir: workingDir}
-			gotFailure, err := a.ValidateProjectDependencies(tt.ctx)
-			if !tt.wantErr(t, err, fmt.Sprintf("ValidateProjectDependencies(%v)", tt.ctx)) {
-				return
-			}
-			assert.Equalf(t, tt.wantFailure, gotFailure, "ValidateProjectDependencies(%v)", tt.ctx)
-		})
-	}
-}
-
 func TestAggregateApplyRequirements_ValidateImportProject(t *testing.T) {
 	repoDir := "repoDir"
 	fullRequirements := []string{

server/events/project_command_context_builder.go

@@ -144,7 +144,6 @@ func (cb *DefaultProjectCommandContextBuilder) BuildProjectContext(
 		abortOnExcecutionOrderFail,
 		ctx.Scope,
 		ctx.PullRequestStatus,
-		ctx.PullStatus,
 	)
 
 	projectCmds = append(projectCmds, projectCmdContext)
@@ -216,7 +215,6 @@ func (cb *PolicyCheckProjectCommandContextBuilder) BuildProjectContext(
 			abortOnExcecutionOrderFail,
 			ctx.Scope,
 			ctx.PullRequestStatus,
-			ctx.PullStatus,
 		))
 	}
 
@@ -240,8 +238,7 @@ func newProjectCommandContext(ctx *command.Context,
 	verbose bool,
 	abortOnExcecutionOrderFail bool,
 	scope tally.Scope,
-	pullReqStatus models.PullReqStatus,
-	pullStatus *models.PullStatus,
+	pullStatus models.PullReqStatus,
 ) command.ProjectContext {
 
 	var projectPlanStatus models.ProjectPlanStatus
@@ -278,7 +275,6 @@ func newProjectCommandContext(ctx *command.Context,
 		ParallelApplyEnabled:       parallelApplyEnabled,
 		ParallelPlanEnabled:        parallelPlanEnabled,
 		ParallelPolicyCheckEnabled: parallelPlanEnabled,
-		DependsOn:                  projCfg.DependsOn,
 		AutoplanEnabled:            projCfg.AutoplanEnabled,
 		Steps:                      steps,
 		HeadRepo:                   ctx.HeadRepo,
@@ -301,8 +297,7 @@ func newProjectCommandContext(ctx *command.Context,
 		PolicySets:                 policySets,
 		PolicySetTarget:            ctx.PolicySet,
 		ClearPolicyApproval:        ctx.ClearPolicyApproval,
-		PullReqStatus:              pullReqStatus,
-		PullStatus:                 pullStatus,
+		PullReqStatus:              pullStatus,
 		JobID:                      uuid.New().String(),
 		ExecutionOrderGroup:        projCfg.ExecutionOrderGroup,
 		AbortOnExcecutionOrderFail: abortOnExcecutionOrderFail,

server/events/project_command_runner.go

@@ -607,11 +607,6 @@ func (p *DefaultProjectCommandRunner) doApply(ctx command.ProjectContext) (apply
 		return "", failure, err
 	}
 
-	failure, err = p.CommandRequirementHandler.ValidateProjectDependencies(ctx)
-	if failure != "" || err != nil {
-		return "", failure, err
-	}
-
 	// Acquire internal lock for the directory we're going to operate in.
 	unlockFn, err := p.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, ctx.Workspace, ctx.RepoRelDir)
 	if err != nil {