Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fix linting issues #4110

Merged
merged 1 commit into from
Jan 2, 2024
Merged

chore: fix linting issues #4110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 9 additions & 17 deletions server/core/config/parser_validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})
Expand Down Expand Up @@ -1138,24 +1137,21 @@ 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)
}

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{
Expand Down Expand Up @@ -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: `
Expand Down Expand Up @@ -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"},
Expand All @@ -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,
Expand All @@ -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)
Expand Down
9 changes: 3 additions & 6 deletions server/events/project_command_builder_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions server/events/project_command_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,7 @@ projects:
Ok(t, err)
}

globalCfgArgs := valid.GlobalCfgArgs{
}
globalCfgArgs := valid.GlobalCfgArgs{}

builder := events.NewProjectCommandBuilder(
false,
Expand Down Expand Up @@ -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()
Expand Down
3 changes: 1 addition & 2 deletions server/events/repo_branch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down