Moving config files to core/config (runatlantis#2036)

* Moving config files to core/config

* fix package names

* fix package dependencies

* linting fixes

* more linting fixes

* ran golangci-lint run --fix

cmd/server.go

@@ -24,8 +24,8 @@ import (
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/pkg/errors"
 	"github.com/runatlantis/atlantis/server"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	"github.com/runatlantis/atlantis/server/events/vcs/bitbucketcloud"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
 	"github.com/runatlantis/atlantis/server/logging"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

server/controllers/events/events_controller_e2e_test.go

@@ -18,6 +18,8 @@ import (
 	. "github.com/petergtz/pegomock"
 	"github.com/runatlantis/atlantis/server"
 	events_controllers "github.com/runatlantis/atlantis/server/controllers/events"
+	"github.com/runatlantis/atlantis/server/core/config"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	"github.com/runatlantis/atlantis/server/core/db"
 	"github.com/runatlantis/atlantis/server/core/locking"
 	"github.com/runatlantis/atlantis/server/core/runtime"
@@ -32,8 +34,6 @@ import (
 	"github.com/runatlantis/atlantis/server/events/vcs"
 	vcsmocks "github.com/runatlantis/atlantis/server/events/vcs/mocks"
 	"github.com/runatlantis/atlantis/server/events/webhooks"
-	"github.com/runatlantis/atlantis/server/events/yaml"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
 	handlermocks "github.com/runatlantis/atlantis/server/handlers/mocks"
 	"github.com/runatlantis/atlantis/server/logging"
 	. "github.com/runatlantis/atlantis/testing"
@@ -868,7 +868,7 @@ func setupE2E(t *testing.T, repoDir string) (events_controllers.VCSEventsControl
 
 	defaultTFVersion := terraformClient.DefaultVersion()
 	locker := events.NewDefaultWorkingDirLocker()
-	parser := &yaml.ParserValidator{}
+	parser := &config.ParserValidator{}
 
 	globalCfgArgs := valid.GlobalCfgArgs{
 		AllowRepoCfg: true,

server/events/yaml/parser_validator.go → server/core/config/parser_validator.go

@@ -1,4 +1,4 @@
-package yaml
+package config
 
 import (
 	"encoding/json"
@@ -10,8 +10,8 @@ import (
 	shlex "github.com/flynn-archive/go-shlex"
 	validation "github.com/go-ozzo/ozzo-validation"
 	"github.com/pkg/errors"
-	"github.com/runatlantis/atlantis/server/events/yaml/raw"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/raw"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	yaml "gopkg.in/yaml.v2"
 )
 

server/events/yaml/parser_validator_test.go → server/core/config/parser_validator_test.go

@@ -1,4 +1,4 @@
-package yaml_test
+package config_test
 
 import (
 	"fmt"
@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/go-version"
-	"github.com/runatlantis/atlantis/server/events/yaml"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
 )
 
@@ -24,7 +24,7 @@ var globalCfgArgs = valid.GlobalCfgArgs{
 var globalCfg = valid.NewGlobalCfgFromArgs(globalCfgArgs)
 
 func TestHasRepoCfg_DirDoesNotExist(t *testing.T) {
-	r := yaml.ParserValidator{}
+	r := config.ParserValidator{}
 	exists, err := r.HasRepoCfg("/not/exist")
 	Ok(t, err)
 	Equals(t, false, exists)
@@ -33,7 +33,7 @@ func TestHasRepoCfg_DirDoesNotExist(t *testing.T) {
 func TestHasRepoCfg_FileDoesNotExist(t *testing.T) {
 	tmpDir, cleanup := TempDir(t)
 	defer cleanup()
-	r := yaml.ParserValidator{}
+	r := config.ParserValidator{}
 	exists, err := r.HasRepoCfg(tmpDir)
 	Ok(t, err)
 	Equals(t, false, exists)
@@ -45,21 +45,21 @@ func TestHasRepoCfg_InvalidFileExtension(t *testing.T) {
 	_, err := os.Create(filepath.Join(tmpDir, "atlantis.yml"))
 	Ok(t, err)
 
-	r := yaml.ParserValidator{}
+	r := config.ParserValidator{}
 	_, err = r.HasRepoCfg(tmpDir)
 	ErrContains(t, "found \"atlantis.yml\" as config file; rename using the .yaml extension - \"atlantis.yaml\"", err)
 }
 
 func TestParseRepoCfg_DirDoesNotExist(t *testing.T) {
-	r := yaml.ParserValidator{}
+	r := config.ParserValidator{}
 	_, err := r.ParseRepoCfg("/not/exist", globalCfg, "")
 	Assert(t, os.IsNotExist(err), "exp not exist err")
 }
 
 func TestParseRepoCfg_FileDoesNotExist(t *testing.T) {
 	tmpDir, cleanup := TempDir(t)
 	defer cleanup()
-	r := yaml.ParserValidator{}
+	r := config.ParserValidator{}
 	_, err := r.ParseRepoCfg(tmpDir, globalCfg, "")
 	Assert(t, os.IsNotExist(err), "exp not exist err")
 }
@@ -70,7 +70,7 @@ func TestParseRepoCfg_BadPermissions(t *testing.T) {
 	err := os.WriteFile(filepath.Join(tmpDir, "atlantis.yaml"), nil, 0000)
 	Ok(t, err)
 
-	r := yaml.ParserValidator{}
+	r := config.ParserValidator{}
 	_, err = r.ParseRepoCfg(tmpDir, globalCfg, "")
 	ErrContains(t, "unable to read atlantis.yaml file: ", err)
 }
@@ -104,7 +104,7 @@ func TestParseCfgs_InvalidYAML(t *testing.T) {
 			confPath := filepath.Join(tmpDir, "atlantis.yaml")
 			err := os.WriteFile(confPath, []byte(c.input), 0600)
 			Ok(t, err)
-			r := yaml.ParserValidator{}
+			r := config.ParserValidator{}
 			_, err = r.ParseRepoCfg(tmpDir, globalCfg, "")
 			ErrContains(t, c.expErr, err)
 			globalCfgArgs := valid.GlobalCfgArgs{
@@ -1070,7 +1070,7 @@ workflows:
 			err := os.WriteFile(filepath.Join(tmpDir, "atlantis.yaml"), []byte(c.input), 0600)
 			Ok(t, err)
 
-			r := yaml.ParserValidator{}
+			r := config.ParserValidator{}
 			act, err := r.ParseRepoCfg(tmpDir, globalCfg, "")
 			if c.expErr != "" {
 				ErrEquals(t, c.expErr, err)
@@ -1098,7 +1098,7 @@ workflows:
 	err := os.WriteFile(filepath.Join(tmpDir, "atlantis.yaml"), []byte(repoCfg), 0600)
 	Ok(t, err)
 
-	r := yaml.ParserValidator{}
+	r := config.ParserValidator{}
 	globalCfgArgs := valid.GlobalCfgArgs{
 		AllowRepoCfg:  false,
 		MergeableReq:  false,
@@ -1111,7 +1111,7 @@ workflows:
 }
 
 func TestParseGlobalCfg_NotExist(t *testing.T) {
-	r := yaml.ParserValidator{}
+	r := config.ParserValidator{}
 	globalCfgArgs := valid.GlobalCfgArgs{
 		AllowRepoCfg:  false,
 		MergeableReq:  false,
@@ -1481,7 +1481,7 @@ workflows:
 
 	for name, c := range cases {
 		t.Run(name, func(t *testing.T) {
-			r := yaml.ParserValidator{}
+			r := config.ParserValidator{}
 			tmp, cleanup := TempDir(t)
 			defer cleanup()
 			path := filepath.Join(tmp, "conf.yaml")
@@ -1682,7 +1682,7 @@ func TestParserValidator_ParseGlobalCfgJSON(t *testing.T) {
 	}
 	for name, c := range cases {
 		t.Run(name, func(t *testing.T) {
-			pv := &yaml.ParserValidator{}
+			pv := &config.ParserValidator{}
 			globalCfgArgs := valid.GlobalCfgArgs{
 				AllowRepoCfg:  false,
 				MergeableReq:  false,
@@ -1749,7 +1749,7 @@ func TestParseRepoCfg_V2ShellParsing(t *testing.T) {
 			Ok(t, os.WriteFile(v2Path, []byte("version: 2\n"+cfg), 0600))
 			Ok(t, os.WriteFile(v3Path, []byte("version: 3\n"+cfg), 0600))
 
-			p := &yaml.ParserValidator{}
+			p := &config.ParserValidator{}
 			globalCfgArgs := valid.GlobalCfgArgs{
 				AllowRepoCfg:  true,
 				MergeableReq:  false,

server/events/yaml/raw/autoplan.go → server/core/config/raw/autoplan.go

@@ -1,7 +1,7 @@
 package raw
 
 import (
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 )
 
 // DefaultAutoPlanWhenModified is the default element in the when_modified

server/events/yaml/raw/autoplan_test.go → server/core/config/raw/autoplan_test.go

@@ -3,8 +3,8 @@ package raw_test
 import (
 	"testing"
 
-	"github.com/runatlantis/atlantis/server/events/yaml/raw"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/raw"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
 	yaml "gopkg.in/yaml.v2"
 )

server/events/yaml/raw/global_cfg.go → server/core/config/raw/global_cfg.go

@@ -7,7 +7,7 @@ import (
 
 	validation "github.com/go-ozzo/ozzo-validation"
 	"github.com/pkg/errors"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 )
 
 // GlobalCfg is the raw schema for server-side repo config.

server/events/yaml/raw/policies.go → server/core/config/raw/policies.go

@@ -3,7 +3,7 @@ package raw
 import (
 	validation "github.com/go-ozzo/ozzo-validation"
 	"github.com/hashicorp/go-version"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 )
 
 // PolicySets is the raw schema for repo-level atlantis.yaml config.

server/events/yaml/raw/policies_test.go → server/core/config/raw/policies_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/go-version"
-	"github.com/runatlantis/atlantis/server/events/yaml/raw"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/raw"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
 	yaml "gopkg.in/yaml.v2"
 )

server/events/yaml/raw/project.go → server/core/config/raw/project.go

@@ -9,7 +9,7 @@ import (
 	validation "github.com/go-ozzo/ozzo-validation"
 	version "github.com/hashicorp/go-version"
 	"github.com/pkg/errors"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 )
 
 const (

server/events/yaml/raw/project_test.go → server/core/config/raw/project_test.go

@@ -5,8 +5,8 @@ import (
 
 	validation "github.com/go-ozzo/ozzo-validation"
 	version "github.com/hashicorp/go-version"
-	"github.com/runatlantis/atlantis/server/events/yaml/raw"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/raw"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
 	yaml "gopkg.in/yaml.v2"
 )

server/events/yaml/raw/repo_cfg.go → server/core/config/raw/repo_cfg.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	validation "github.com/go-ozzo/ozzo-validation"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 )
 
 // DefaultAutomerge is the default setting for automerge.

server/events/yaml/raw/repo_cfg_test.go → server/core/config/raw/repo_cfg_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	validation "github.com/go-ozzo/ozzo-validation"
-	"github.com/runatlantis/atlantis/server/events/yaml/raw"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/raw"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
 	yaml "gopkg.in/yaml.v2"
 )

server/events/yaml/raw/stage.go → server/core/config/raw/stage.go

@@ -2,7 +2,7 @@ package raw
 
 import (
 	validation "github.com/go-ozzo/ozzo-validation"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 )
 
 type Stage struct {

server/events/yaml/raw/stage_test.go → server/core/config/raw/stage_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	validation "github.com/go-ozzo/ozzo-validation"
-	"github.com/runatlantis/atlantis/server/events/yaml/raw"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/raw"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
 	yaml "gopkg.in/yaml.v2"
 )

server/events/yaml/raw/step.go → server/core/config/raw/step.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	validation "github.com/go-ozzo/ozzo-validation"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 )
 
 const (

server/events/yaml/raw/step_test.go → server/core/config/raw/step_test.go

@@ -3,8 +3,8 @@ package raw_test
 import (
 	"testing"
 
-	"github.com/runatlantis/atlantis/server/events/yaml/raw"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/raw"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
 	yaml "gopkg.in/yaml.v2"
 )

server/events/yaml/raw/workflow.go → server/core/config/raw/workflow.go

@@ -2,7 +2,7 @@ package raw
 
 import (
 	validation "github.com/go-ozzo/ozzo-validation"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 )
 
 type Workflow struct {

server/events/yaml/raw/workflow_step.go → server/core/config/raw/workflow_step.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	validation "github.com/go-ozzo/ozzo-validation"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 )
 
 // WorkflowHook represents a single action/command to perform. In YAML,

server/events/yaml/raw/workflow_step_test.go → server/core/config/raw/workflow_step_test.go

@@ -3,8 +3,8 @@ package raw_test
 import (
 	"testing"
 
-	"github.com/runatlantis/atlantis/server/events/yaml/raw"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/raw"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
 	yaml "gopkg.in/yaml.v2"
 )

server/events/yaml/raw/workflow_test.go → server/core/config/raw/workflow_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	validation "github.com/go-ozzo/ozzo-validation"
-	"github.com/runatlantis/atlantis/server/events/yaml/raw"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/raw"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
 	yaml "gopkg.in/yaml.v2"
 )

server/events/yaml/valid/global_cfg_test.go → server/core/config/valid/global_cfg_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/hashicorp/go-version"
 	"github.com/mohae/deepcopy"
-	"github.com/runatlantis/atlantis/server/events/yaml"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	"github.com/runatlantis/atlantis/server/logging"
 	. "github.com/runatlantis/atlantis/testing"
 )
@@ -669,7 +669,7 @@ policies:
 					ApprovedReq:   false,
 					UnDivergedReq: false,
 				}
-				global, err = (&yaml.ParserValidator{}).ParseGlobalCfg(path, valid.NewGlobalCfgFromArgs(globalCfgArgs))
+				global, err = (&config.ParserValidator{}).ParseGlobalCfg(path, valid.NewGlobalCfgFromArgs(globalCfgArgs))
 				Ok(t, err)
 			} else {
 				globalCfgArgs := valid.GlobalCfgArgs{
@@ -841,7 +841,7 @@ repos:
 					UnDivergedReq: false,
 				}
 
-				global, err = (&yaml.ParserValidator{}).ParseGlobalCfg(path, valid.NewGlobalCfgFromArgs(globalCfgArgs))
+				global, err = (&config.ParserValidator{}).ParseGlobalCfg(path, valid.NewGlobalCfgFromArgs(globalCfgArgs))
 				Ok(t, err)
 			} else {
 				globalCfgArgs := valid.GlobalCfgArgs{

server/events/yaml/valid/repo_cfg_test.go → server/core/config/valid/repo_cfg_test.go

@@ -5,7 +5,7 @@ import (
 
 	validation "github.com/go-ozzo/ozzo-validation"
 	version "github.com/hashicorp/go-version"
-	"github.com/runatlantis/atlantis/server/events/yaml/valid"
+	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
 )