public/atlantis
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/atlantis.git synced 2026-07-28 23:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix linting issues (#4110)

Browse Source
This commit is contained in:
Luke Massa
2024-01-02 10:54:27 -05:00
committed by GitHub
parent 310fc8a44c
commit 0b51afc4ab
4 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/core/config/parser_validator_test.go
View File

@@ -101,8 +101,7 @@ func TestParseCfgs_InvalidYAML(t *testing.T) {
r := config.ParserValidator{}
_, err = r.ParseRepoCfg(tmpDir, globalCfg, "", "")
ErrContains(t, c.expErr, err)
globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}
_, err = r.ParseGlobalCfg(confPath, valid.NewGlobalCfgFromArgs(globalCfgArgs))
ErrContains(t, c.expErr, err)
})
@@ -1138,8 +1137,7 @@ workflows:
Ok(t, err)
r := config.ParserValidator{}
globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}
_, err = r.ParseRepoCfg(tmpDir, valid.NewGlobalCfgFromArgs(globalCfgArgs), "repo_id", "branch")
ErrEquals(t, "repo config not allowed to set 'workflow' key: server-side config needs 'allowed_overrides: [workflow]'", err)
@@ -1147,15 +1145,13 @@ workflows:
func TestParseGlobalCfg_NotExist(t *testing.T) {
r := config.ParserValidator{}
globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}
_, err := r.ParseGlobalCfg("/not/exist", valid.NewGlobalCfgFromArgs(globalCfgArgs))
ErrEquals(t, "unable to read /not/exist file: open /not/exist: no such file or directory", err)
}
func TestParseGlobalCfg(t *testing.T) {
globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}
defaultCfg := valid.NewGlobalCfgFromArgs(globalCfgArgs)
preWorkflowHook := &valid.WorkflowHook{
@@ -1710,8 +1706,7 @@ func TestParserValidator_ParseGlobalCfgJSON(t *testing.T) {
},
"empty object": {
json: "{}",
exp: valid.NewGlobalCfgFromArgs(valid.GlobalCfgArgs{
}),
exp: valid.NewGlobalCfgFromArgs(valid.GlobalCfgArgs{}),
},
"setting all keys": {
json: `
@@ -1778,8 +1773,7 @@ func TestParserValidator_ParseGlobalCfgJSON(t *testing.T) {
`,
exp: valid.GlobalCfg{
Repos: []valid.Repo{
valid.NewGlobalCfgFromArgs(valid.GlobalCfgArgs{
}).Repos[0],
valid.NewGlobalCfgFromArgs(valid.GlobalCfgArgs{}).Repos[0],
{
IDRegex: regexp.MustCompile(".*"),
ApplyRequirements: []string{"mergeable", "approved"},
@@ -1799,9 +1793,8 @@ func TestParserValidator_ParseGlobalCfgJSON(t *testing.T) {
},
},
Workflows: map[string]valid.Workflow{
"default": valid.NewGlobalCfgFromArgs(valid.GlobalCfgArgs{
}).Workflows["default"],
"custom": customWorkflow,
"default": valid.NewGlobalCfgFromArgs(valid.GlobalCfgArgs{}).Workflows["default"],
"custom": customWorkflow,
},
PolicySets: valid.PolicySets{
Version: conftestVersion,
@@ -1821,8 +1814,7 @@ func TestParserValidator_ParseGlobalCfgJSON(t *testing.T) {
for name, c := range cases {
t.Run(name, func(t *testing.T) {
pv := &config.ParserValidator{}
globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}
cfg, err := pv.ParseGlobalCfgJSON(c.json, valid.NewGlobalCfgFromArgs(globalCfgArgs))
if c.expErr != "" {
ErrEquals(t, c.expErr, err)

9
server/events/project_command_builder_internal_test.go
View File

@@ -638,8 +638,7 @@ projects:
globalCfgPath := filepath.Join(tmp, "global.yaml")
Ok(t, os.WriteFile(globalCfgPath, []byte(c.globalCfg), 0600))
parser := &config.ParserValidator{}
globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}
globalCfg, err := parser.ParseGlobalCfg(globalCfgPath, valid.NewGlobalCfgFromArgs(globalCfgArgs))
Ok(t, err)
@@ -853,8 +852,7 @@ projects:
globalCfgPath := filepath.Join(tmp, "global.yaml")
Ok(t, os.WriteFile(globalCfgPath, []byte(c.globalCfg), 0600))
parser := &config.ParserValidator{}
globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}
globalCfg, err := parser.ParseGlobalCfg(globalCfgPath, valid.NewGlobalCfgFromArgs(globalCfgArgs))
Ok(t, err)
@@ -1253,8 +1251,7 @@ projects:
globalCfgPath := filepath.Join(tmp, "global.yaml")
Ok(t, os.WriteFile(globalCfgPath, []byte(globalCfg), 0600))
parser := &config.ParserValidator{}
globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}
globalCfg, err := parser.ParseGlobalCfg(globalCfgPath, valid.NewGlobalCfgFromArgs(globalCfgArgs))
Ok(t, err)

6
server/events/project_command_builder_test.go
View File

@@ -169,8 +169,7 @@ projects:
Ok(t, err)
}
globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}
builder := events.NewProjectCommandBuilder(
false,
@@ -1138,8 +1137,7 @@ func TestDefaultProjectCommandBuilder_BuildMultiApply(t *testing.T) {
logger := logging.NewNoopLogger(t)
userConfig := defaultUserConfig
globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}
scope, _, _ := metrics.NewLoggingScope(logger, "atlantis")
terraformClient := terraform_mocks.NewMockClient()

3
server/events/repo_branch_test.go
View File

@@ -67,8 +67,7 @@ projects:
err := os.WriteFile(globalYAMLPath, []byte(globalYAML), 0600)
require.NoError(t, err)
globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}
parser := &config.ParserValidator{}
global, err := parser.ParseGlobalCfg(globalYAMLPath, valid.NewGlobalCfgFromArgs(globalCfgArgs))