Rename Workflow to WorkflowName

runatlantis · Mar 25, 2019 · c92ba39 · c92ba39
1 parent 252ddfd
commit c92ba39
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/server/events/yaml/parser_validator_test.go b/server/events/yaml/parser_validator_test.go
@@ -163,7 +163,7 @@ projects:
 					{
 						Dir:              ".",
 						Workspace:        "default",
-						Workflow:         nil,
+						WorkflowName:     nil,
 						TerraformVersion: nil,
 						Autoplan: valid.Autoplan{
 							WhenModified: []string{"**/*.tf*"},
@@ -296,7 +296,7 @@ workflows:
 					{
 						Dir:              ".",
 						Workspace:        "myworkspace",
-						Workflow:         String("myworkflow"),
+						WorkflowName:     String("myworkflow"),
 						TerraformVersion: tfVersion,
 						Autoplan: valid.Autoplan{
 							WhenModified: []string{"**/*.tf*"},
@@ -334,7 +334,7 @@ workflows:
 					{
 						Dir:              ".",
 						Workspace:        "myworkspace",
-						Workflow:         String("myworkflow"),
+						WorkflowName:     String("myworkflow"),
 						TerraformVersion: tfVersion,
 						Autoplan: valid.Autoplan{
 							WhenModified: []string{"**/*.tf*"},
@@ -372,7 +372,7 @@ workflows:
 					{
 						Dir:              ".",
 						Workspace:        "myworkspace",
-						Workflow:         String("myworkflow"),
+						WorkflowName:     String("myworkflow"),
 						TerraformVersion: tfVersion,
 						Autoplan: valid.Autoplan{
 							WhenModified: []string{"**/*.tf*"},
@@ -410,7 +410,7 @@ workflows:
 					{
 						Dir:              ".",
 						Workspace:        "myworkspace",
-						Workflow:         String("myworkflow"),
+						WorkflowName:     String("myworkflow"),
 						TerraformVersion: tfVersion,
 						Autoplan: valid.Autoplan{
 							WhenModified: []string{"**/*.tf*"},

diff --git a/server/events/yaml/raw/project.go b/server/events/yaml/raw/project.go
@@ -79,7 +79,7 @@ func (p Project) ToValid() valid.Project {
 		v.Workspace = *p.Workspace
 	}
 
-	v.Workflow = p.Workflow
+	v.WorkflowName = p.Workflow
 	if p.TerraformVersion != nil {
 		v.TerraformVersion, _ = version.NewVersion(*p.TerraformVersion)
 	}

diff --git a/server/events/yaml/raw/project_test.go b/server/events/yaml/raw/project_test.go
@@ -228,7 +228,7 @@ func TestProject_ToValid(t *testing.T) {
 			exp: valid.Project{
 				Dir:              ".",
 				Workspace:        "default",
-				Workflow:         nil,
+				WorkflowName:     nil,
 				TerraformVersion: nil,
 				Autoplan: valid.Autoplan{
 					WhenModified: []string{"**/*.tf*"},
@@ -255,7 +255,7 @@ func TestProject_ToValid(t *testing.T) {
 			exp: valid.Project{
 				Dir:              ".",
 				Workspace:        "myworkspace",
-				Workflow:         String("myworkflow"),
+				WorkflowName:     String("myworkflow"),
 				TerraformVersion: tfVersionPointEleven,
 				Autoplan: valid.Autoplan{
 					WhenModified: []string{"hi"},

diff --git a/server/events/yaml/valid/global.go b/server/events/yaml/valid/global.go
@@ -125,13 +125,13 @@ func (g GlobalCfg) MergeProjectCfg(log logging.SimpleLogging, repoID string, pro
 				applyReqs = proj.ApplyRequirements
 			}
 		case WorkflowKey:
-			if proj.Workflow != nil {
+			if proj.WorkflowName != nil {
 				// We iterate over the global workflows first and the repo
 				// workflows second so that repo workflows override. This is
 				// safe because at this point we know if a repo is allowed to
 				// define its own workflow. We also know that a workflow will
 				// exist with this name due to earlier validation.
-				name := *proj.Workflow
+				name := *proj.WorkflowName
 				for k, v := range g.Workflows {
 					if k == name {
 						workflow = v
@@ -236,7 +236,7 @@ func (g GlobalCfg) ValidateRepoCfg(rCfg Config, repoID string) error {
 		}
 	}
 	for _, p := range rCfg.Projects {
-		if p.Workflow != nil && !sliceContainsF(allowedOverrides, WorkflowKey) {
+		if p.WorkflowName != nil && !sliceContainsF(allowedOverrides, WorkflowKey) {
 			return fmt.Errorf("repo config not allowed to set '%s' key: server-side config needs '%s: [%s]'", WorkflowKey, AllowedOverridesKey, WorkflowKey)
 		}
 		if p.ApplyRequirements != nil && !sliceContainsF(allowedOverrides, ApplyRequirementsKey) {
@@ -260,8 +260,8 @@ func (g GlobalCfg) ValidateRepoCfg(rCfg Config, repoID string) error {
 
 	// Check if the repo has set a workflow name that doesn't exist.
 	for _, p := range rCfg.Projects {
-		if p.Workflow != nil {
-			name := *p.Workflow
+		if p.WorkflowName != nil {
+			name := *p.WorkflowName
 			if !mapContainsF(rCfg.Workflows, name) && !mapContainsF(g.Workflows, name) {
 				return fmt.Errorf("workflow %q is not defined anywhere", name)
 			}

diff --git a/server/events/yaml/valid/global_test.go b/server/events/yaml/valid/global_test.go
@@ -133,7 +133,7 @@ func TestGlobalCfg_ValidateRepoCfg(t *testing.T) {
 			rCfg: valid.Config{
 				Projects: []valid.Project{
 					{
-						Workflow: String("invalid"),
+						WorkflowName: String("invalid"),
 					},
 				},
 			},
@@ -165,9 +165,9 @@ func TestGlobalCfg_ValidateRepoCfg(t *testing.T) {
 			rCfg: valid.Config{
 				Projects: []valid.Project{
 					{
-						Dir:       ".",
-						Workspace: "default",
-						Workflow:  String("repodefined"),
+						Dir:          ".",
+						Workspace:    "default",
+						WorkflowName: String("repodefined"),
 					},
 				},
 				Workflows: map[string]valid.Workflow{
@@ -200,9 +200,9 @@ func TestGlobalCfg_ValidateRepoCfg(t *testing.T) {
 			rCfg: valid.Config{
 				Projects: []valid.Project{
 					{
-						Dir:       ".",
-						Workspace: "default",
-						Workflow:  String("default"),
+						Dir:          ".",
+						Workspace:    "default",
+						WorkflowName: String("default"),
 					},
 				},
 			},
@@ -228,9 +228,9 @@ func TestGlobalCfg_ValidateRepoCfg(t *testing.T) {
 			rCfg: valid.Config{
 				Projects: []valid.Project{
 					{
-						Dir:       ".",
-						Workspace: "default",
-						Workflow:  String("doesntexist"),
+						Dir:          ".",
+						Workspace:    "default",
+						WorkflowName: String("doesntexist"),
 					},
 				},
 			},
@@ -269,9 +269,9 @@ workflows:
       steps: [plan]`,
 			repoID: "github.com/owner/repo",
 			proj: valid.Project{
-				Dir:       ".",
-				Workspace: "default",
-				Workflow:  String("custom"),
+				Dir:          ".",
+				Workspace:    "default",
+				WorkflowName: String("custom"),
 			},
 			repoWorkflows: nil,
 			exp: valid.MergedProjectCfg{

diff --git a/server/events/yaml/valid/repo.go b/server/events/yaml/valid/repo.go
@@ -49,7 +49,7 @@ type Project struct {
 	Dir               string
 	Workspace         string
 	Name              *string
-	Workflow          *string
+	WorkflowName      *string
 	TerraformVersion  *version.Version
 	Autoplan          Autoplan
 	ApplyRequirements []string