From 0b51afc4ab3496b70f36f758adcd9e7ad9beaeb2 Mon Sep 17 00:00:00 2001 From: Luke Massa Date: Tue, 2 Jan 2024 10:54:27 -0500 Subject: [PATCH] chore: fix linting issues (#4110) --- server/core/config/parser_validator_test.go | 26 +++++++------------ .../project_command_builder_internal_test.go | 9 +++---- server/events/project_command_builder_test.go | 6 ++--- server/events/repo_branch_test.go | 3 +-- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/server/core/config/parser_validator_test.go b/server/core/config/parser_validator_test.go index fce1152c7..5825d5ea5 100644 --- a/server/core/config/parser_validator_test.go +++ b/server/core/config/parser_validator_test.go @@ -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) diff --git a/server/events/project_command_builder_internal_test.go b/server/events/project_command_builder_internal_test.go index 8432979ce..98ded0aa9 100644 --- a/server/events/project_command_builder_internal_test.go +++ b/server/events/project_command_builder_internal_test.go @@ -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) diff --git a/server/events/project_command_builder_test.go b/server/events/project_command_builder_test.go index 9264fdce2..1937f990f 100644 --- a/server/events/project_command_builder_test.go +++ b/server/events/project_command_builder_test.go @@ -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() diff --git a/server/events/repo_branch_test.go b/server/events/repo_branch_test.go index fa02bb6fa..4a6bb9e92 100644 --- a/server/events/repo_branch_test.go +++ b/server/events/repo_branch_test.go @@ -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))