remove old workflow mode that is not platform (pr)

lyft · Jul 19, 2024 · d4b57a6 · d4b57a6
1 parent 3aaf0d7
commit d4b57a6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 43 deletions.
diff --git a/server/config/raw/project.go b/server/config/raw/project.go
@@ -93,7 +93,7 @@ func (p Project) ToValid(defaultWorkflowModeType valid.WorkflowModeType) valid.P
 	v.DeploymentWorkflowName = p.DeploymentWorkflowName
 	v.WorkflowModeType = defaultWorkflowModeType
 	if p.WorkflowModeType != nil {
-		v.WorkflowModeType = toWorkflowModeType(*p.WorkflowModeType)
+		v.WorkflowModeType = toWorkflowModeType()
 	}
 	if p.TerraformVersion != nil {
 		v.TerraformVersion, _ = version.NewVersion(*p.TerraformVersion)

diff --git a/server/config/raw/project_test.go b/server/config/raw/project_test.go
@@ -268,7 +268,7 @@ func TestProject_ToValid(t *testing.T) {
 				},
 				ApplyRequirements: nil,
 				Name:              nil,
-				WorkflowModeType:  valid.DefaultWorkflowMode,
+				WorkflowModeType:  valid.PlatformWorkflowMode,
 			},
 		},
 		{
@@ -314,7 +314,7 @@ func TestProject_ToValid(t *testing.T) {
 					WhenModified: []string{"**/*.tf*", "**/terragrunt.hcl"},
 					Enabled:      true,
 				},
-				WorkflowModeType: valid.DefaultWorkflowMode,
+				WorkflowModeType: valid.PlatformWorkflowMode,
 			},
 		},
 		// Directories.
@@ -330,7 +330,7 @@ func TestProject_ToValid(t *testing.T) {
 					WhenModified: []string{"**/*.tf*", "**/terragrunt.hcl"},
 					Enabled:      true,
 				},
-				WorkflowModeType: valid.DefaultWorkflowMode,
+				WorkflowModeType: valid.PlatformWorkflowMode,
 			},
 		},
 		{
@@ -345,7 +345,7 @@ func TestProject_ToValid(t *testing.T) {
 					WhenModified: []string{"**/*.tf*", "**/terragrunt.hcl"},
 					Enabled:      true,
 				},
-				WorkflowModeType: valid.DefaultWorkflowMode,
+				WorkflowModeType: valid.PlatformWorkflowMode,
 			},
 		},
 		{
@@ -360,7 +360,7 @@ func TestProject_ToValid(t *testing.T) {
 					WhenModified: []string{"**/*.tf*", "**/terragrunt.hcl"},
 					Enabled:      true,
 				},
-				WorkflowModeType: valid.DefaultWorkflowMode,
+				WorkflowModeType: valid.PlatformWorkflowMode,
 			},
 		},
 		{
@@ -376,7 +376,7 @@ func TestProject_ToValid(t *testing.T) {
 					WhenModified: []string{"**/*.tf*", "**/terragrunt.hcl"},
 					Enabled:      true,
 				},
-				WorkflowModeType: valid.DefaultWorkflowMode,
+				WorkflowModeType: valid.PlatformWorkflowMode,
 			},
 		},
 		{
@@ -391,7 +391,7 @@ func TestProject_ToValid(t *testing.T) {
 					WhenModified: []string{"**/*.tf*", "**/terragrunt.hcl"},
 					Enabled:      true,
 				},
-				WorkflowModeType: valid.DefaultWorkflowMode,
+				WorkflowModeType: valid.PlatformWorkflowMode,
 			},
 		},
 		{
@@ -406,7 +406,7 @@ func TestProject_ToValid(t *testing.T) {
 					WhenModified: []string{"**/*.tf*", "**/terragrunt.hcl"},
 					Enabled:      true,
 				},
-				WorkflowModeType: valid.DefaultWorkflowMode,
+				WorkflowModeType: valid.PlatformWorkflowMode,
 			},
 		},
 		{
@@ -421,7 +421,7 @@ func TestProject_ToValid(t *testing.T) {
 					WhenModified: []string{"**/*.tf*", "**/terragrunt.hcl"},
 					Enabled:      true,
 				},
-				WorkflowModeType: valid.DefaultWorkflowMode,
+				WorkflowModeType: valid.PlatformWorkflowMode,
 			},
 		},
 
@@ -438,13 +438,13 @@ func TestProject_ToValid(t *testing.T) {
 					WhenModified: []string{"**/*.tf*", "**/terragrunt.hcl"},
 					Enabled:      true,
 				},
-				WorkflowModeType: valid.DefaultWorkflowMode,
+				WorkflowModeType: valid.PlatformWorkflowMode,
 			},
 		},
 	}
 	for _, c := range cases {
 		t.Run(c.description, func(t *testing.T) {
-			Equals(t, c.exp, c.input.ToValid(valid.DefaultWorkflowMode))
+			Equals(t, c.exp, c.input.ToValid(valid.PlatformWorkflowMode))
 		})
 	}
 }
diff --git a/server/config/raw/repo_cfg.go b/server/config/raw/repo_cfg.go
@@ -41,12 +41,12 @@ func (r RepoCfg) Validate() error {
 	return validation.ValidateStruct(&r,
 		validation.Field(&r.Version, validation.By(equals2)),
 		validation.Field(&r.Projects),
-		validation.Field(&r.WorkflowModeType, validation.In("pr", "platform")),
+		validation.Field(&r.WorkflowModeType, validation.In("platform")),
 	)
 }
 
 func (r RepoCfg) ToValid() valid.RepoCfg {
-	workflowModeType := toWorkflowModeType(r.WorkflowModeType)
+	workflowModeType := toWorkflowModeType()
 
 	var validProjects []valid.Project
 	for _, p := range r.Projects {
@@ -72,11 +72,7 @@ func (r RepoCfg) ToValid() valid.RepoCfg {
 	}
 }
 
-func toWorkflowModeType(workflowModeType string) valid.WorkflowModeType {
+func toWorkflowModeType() valid.WorkflowModeType {
 	result := valid.PlatformWorkflowMode
-	switch workflowModeType {
-	case "pr":
-		result = valid.DefaultWorkflowMode
-	}
 	return result
 }
diff --git a/server/config/valid/global_cfg.go b/server/config/valid/global_cfg.go
@@ -41,7 +41,6 @@ type WorkflowModeType int
 
 const (
 	PlatformWorkflowMode WorkflowModeType = iota
-	DefaultWorkflowMode
 )
 
 type BackendType string

diff --git a/server/legacy/events/project_command_runner_test.go b/server/legacy/events/project_command_runner_test.go
@@ -558,7 +558,7 @@ func TestDefaultProjectCommandRunner_ApplyDiverged(t *testing.T) {
 	}
 	prjCtx := command.ProjectContext{
 		ApplyRequirements: []string{"undiverged"},
-		WorkflowModeType:  valid.DefaultWorkflowMode,
+		WorkflowModeType:  valid.PlatformWorkflowMode,
 	}
 	tmp, cleanup := TempDir(t)
 	defer cleanup()

diff --git a/server/legacy/lyft/command/feature_runner_test.go b/server/legacy/lyft/command/feature_runner_test.go
@@ -97,9 +97,6 @@ func (b *TestMultiBuilder) BuildApplyCommands(ctx *command.Context, comment *com
 		{
 			WorkflowModeType: valid.PlatformWorkflowMode,
 		},
-		{
-			WorkflowModeType: valid.DefaultWorkflowMode,
-		},
 	}, nil
 }
 
@@ -148,7 +145,7 @@ func TestPlatformModeRunner_allocatesButNotPlatformMode(t *testing.T) {
 	}
 
 	builder := &TestBuilder{
-		Type: valid.DefaultWorkflowMode,
+		Type: valid.PlatformWorkflowMode,
 	}
 	runner := &testCMDRunner{
 		t:           t,
@@ -303,15 +300,6 @@ func TestPlatformModeProjectRunner_plan(t *testing.T) {
 			},
 			prModeRunner: &testRunner{},
 		},
-		{
-			description:      "allocated and platform mode not enabled",
-			shouldAllocate:   true,
-			workflowModeType: valid.DefaultWorkflowMode,
-			platformRunner:   &testRunner{},
-			prModeRunner: &testRunner{
-				expectedPlanResult: expectedResult,
-			},
-		},
 	}
 
 	for _, c := range cases {
@@ -365,15 +353,6 @@ func TestPlatformModeProjectRunner_policyCheck(t *testing.T) {
 			},
 			prModeRunner: &testRunner{},
 		},
-		{
-			description:      "allocated and platform mode not enabled",
-			shouldAllocate:   true,
-			workflowModeType: valid.DefaultWorkflowMode,
-			platformRunner:   &testRunner{},
-			prModeRunner: &testRunner{
-				expectedPolicyCheckResult: expectedResult,
-			},
-		},
 	}
 
 	for _, c := range cases {
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,6 @@ type WorkflowModeType int @@
     const (
     	PlatformWorkflowMode WorkflowModeType = iota
-    	DefaultWorkflowMode
     )
     type BackendType string
@@ Expand Down @@