fix: Add a few more tests and remove newlines

runatlantis · Nov 3, 2023 · 01866d3 · 01866d3
1 parent 7d39931
commit 01866d3
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 2 deletions.
diff --git a/server/core/config/valid/global_cfg_test.go b/server/core/config/valid/global_cfg_test.go
@@ -679,7 +679,6 @@ policies:
     - name: good-policy
       source: local
       path: rel/path/to/source
-
 `,
 			repoID: "github.com/owner/repo",
 			proj: valid.Project{

diff --git a/server/core/config/valid/repo_cfg_test.go b/server/core/config/valid/repo_cfg_test.go
@@ -216,3 +216,110 @@ func TestConfig_FindProjectsByDir(t *testing.T) {
 		})
 	}
 }
+
+func TestConfig_AutoDiscoverEnabled(t *testing.T) {
+	cases := []struct {
+		description         string
+		repoAutoDiscover    valid.AutoDiscoverMode
+		defaultAutoDiscover valid.AutoDiscoverMode
+		projects            []valid.Project
+		expEnabled          bool
+	}{
+		{
+			description:         "repo disabled autodiscover default enabled",
+			repoAutoDiscover:    valid.AutoDiscoverDisabledMode,
+			defaultAutoDiscover: valid.AutoDiscoverEnabledMode,
+			expEnabled:          false,
+		},
+		{
+			description:         "repo disabled autodiscover default disabled",
+			repoAutoDiscover:    valid.AutoDiscoverDisabledMode,
+			defaultAutoDiscover: valid.AutoDiscoverDisabledMode,
+			expEnabled:          false,
+		},
+		{
+			description:         "repo enabled autodiscover default enabled",
+			repoAutoDiscover:    valid.AutoDiscoverEnabledMode,
+			defaultAutoDiscover: valid.AutoDiscoverEnabledMode,
+			expEnabled:          true,
+		},
+		{
+			description:         "repo enabled autodiscover default disabled",
+			repoAutoDiscover:    valid.AutoDiscoverEnabledMode,
+			defaultAutoDiscover: valid.AutoDiscoverDisabledMode,
+			expEnabled:          true,
+		},
+		{
+			description:         "repo set auto autodiscover with no projects default enabled",
+			repoAutoDiscover:    valid.AutoDiscoverAutoMode,
+			defaultAutoDiscover: valid.AutoDiscoverEnabledMode,
+			expEnabled:          true,
+		},
+		{
+			description:         "repo set auto autodiscover with no projects default disabled",
+			repoAutoDiscover:    valid.AutoDiscoverAutoMode,
+			defaultAutoDiscover: valid.AutoDiscoverDisabledMode,
+			expEnabled:          true,
+		},
+		{
+			description:         "repo set auto autodiscover with a project default enabled",
+			repoAutoDiscover:    valid.AutoDiscoverAutoMode,
+			defaultAutoDiscover: valid.AutoDiscoverEnabledMode,
+			projects:            []valid.Project{{}},
+			expEnabled:          false,
+		},
+		{
+			description:         "repo set auto autodiscover with a project default disabled",
+			repoAutoDiscover:    valid.AutoDiscoverAutoMode,
+			defaultAutoDiscover: valid.AutoDiscoverDisabledMode,
+			projects:            []valid.Project{{}},
+			expEnabled:          false,
+		},
+		{
+			description:         "repo unset autodiscover with no projects default enabled",
+			defaultAutoDiscover: valid.AutoDiscoverEnabledMode,
+			expEnabled:          true,
+		},
+		{
+			description:         "repo unset autodiscover with no projects default disabled",
+			defaultAutoDiscover: valid.AutoDiscoverDisabledMode,
+			expEnabled:          false,
+		},
+		{
+			description:         "repo unset autodiscover with no projects default auto",
+			defaultAutoDiscover: valid.AutoDiscoverAutoMode,
+			expEnabled:          true,
+		},
+		{
+			description:         "repo unset autodiscover with a project default enabled",
+			projects:            []valid.Project{{}},
+			defaultAutoDiscover: valid.AutoDiscoverEnabledMode,
+			expEnabled:          true,
+		},
+		{
+			description:         "repo unset autodiscover with a project default disabled",
+			projects:            []valid.Project{{}},
+			defaultAutoDiscover: valid.AutoDiscoverDisabledMode,
+			expEnabled:          false,
+		},
+		{
+			description:         "repo unset autodiscover with a project default auto",
+			projects:            []valid.Project{{}},
+			defaultAutoDiscover: valid.AutoDiscoverAutoMode,
+			expEnabled:          false,
+		},
+	}
+	for _, c := range cases {
+		t.Run(c.description, func(t *testing.T) {
+			r := valid.RepoCfg{
+				Projects:     c.projects,
+				AutoDiscover: nil,
+			}
+			if c.repoAutoDiscover != "" {
+				r.AutoDiscover = &valid.AutoDiscover{c.repoAutoDiscover}
+			}
+			enabled := r.AutoDiscoverEnabled(c.defaultAutoDiscover)
+			Equals(t, c.expEnabled, enabled)
+		})
+	}
+}
diff --git a/server/events/project_command_builder.go b/server/events/project_command_builder.go
@@ -829,7 +829,6 @@ func (p *DefaultProjectCommandBuilder) buildProjectCommandCtx(ctx *command.Conte
 	}
 	var projCtxs []command.ProjectContext
 	var projCfg valid.MergedProjectCfg
-
 	automerge := p.EnableAutoMerge
 	parallelApply := p.EnableParallelApply
 	parallelPlan := p.EnableParallelPlan

diff --git a/server/events/project_command_builder_test.go b/server/events/project_command_builder_test.go
@@ -982,6 +982,7 @@ projects:
 - name: project1-custom-name
   dir: project1`,
 			ModifiedFiles: []string{"project1/main.tf", "project2/main.tf"},
+			// project2 is autodiscovered, whereas project1 is not
 			Exp: []expCtxFields{
 				{
 					ProjectName: "project1-custom-name",