Skip to content

Commit 745499c

Browse files
authored
Enable more of staticheck linter rules (#3360)
## Changes Enable all rules except one (ST1003) which produces too many changes so deserves its own PR. Some had autofix, some were fixed with cursor. ## Why No reason to keep them disabled. I think they were disabled originally to minimize changes to original PR. ## Tests Existing tests.
1 parent beb8f01 commit 745499c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+225
-237
lines changed

.golangci.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,6 @@ linters:
4949
- all
5050
# disabled checks:
5151
- -ST1003
52-
- -ST1016
53-
- -ST1005
54-
- -ST1023
55-
- -QF1001
56-
- -QF1003
57-
- -QF1007
58-
- -QF1008
59-
- -QF1009
60-
- -QF1011
61-
- -QF1012
6252
testifylint:
6353
enable-all: true
6454
disable:

acceptance/bundle/run/scripts/basic/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ hello
99
}
1010

1111
>>> [CLI] bundle run foo arg1 arg2
12-
Error: additional arguments are not supported for scripts. Got: [arg1 arg2]. We recommend using environment variables to pass runtime arguments to a script. For example: FOO=bar databricks bundle run my_script.
12+
Error: additional arguments are not supported for scripts. Got: [arg1 arg2]. We recommend using environment variables to pass runtime arguments to a script. For example: FOO=bar databricks bundle run my_script
1313

1414
Exit code: 1

acceptance/bundle/scripts/restricted-execution/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ postdeploy value_from_env
1919

2020
=== With DATABRICKS_BUNDLE_RESTRICTED_CODE_EXECUTION=1, no envs are accessible
2121
>>> DATABRICKS_BUNDLE_RESTRICTED_CODE_EXECUTION=1 errcode [CLI] bundle deploy
22-
Error: failed to execute script: Running scripts is not allowed when DATABRICKS_BUNDLE_RESTRICTED_CODE_EXECUTION is set
22+
Error: failed to execute script: running scripts is not allowed when DATABRICKS_BUNDLE_RESTRICTED_CODE_EXECUTION is set
2323

2424

2525
Exit code: 1

bundle/bundle.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ func (b *Bundle) OpenResourceDatabase(ctx context.Context) error {
372372

373373
err = b.ResourceDatabase.Open(statePath)
374374
if err != nil {
375-
return fmt.Errorf("Failed to open/create resoruce database in %s: %s", statePath, err)
375+
return fmt.Errorf("failed to open/create resoruce database in %s: %s", statePath, err)
376376
}
377377

378378
return nil

bundle/config/mutator/resolve_variable_references_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestResolveVariableReferencesWithSourceLinkedDeployment(t *testing.T) {
2020
true,
2121
func(t *testing.T, b *bundle.Bundle) {
2222
// Variables that use workspace file path should have SyncRootValue during resolution phase
23-
require.Equal(t, "sync/root/path", b.Config.Resources.Pipelines["pipeline1"].CreatePipeline.Configuration["source"])
23+
require.Equal(t, "sync/root/path", b.Config.Resources.Pipelines["pipeline1"].Configuration["source"])
2424

2525
// The file path itself should remain the same
2626
require.Equal(t, "file/path", b.Config.Workspace.FilePath)
@@ -29,7 +29,7 @@ func TestResolveVariableReferencesWithSourceLinkedDeployment(t *testing.T) {
2929
{
3030
false,
3131
func(t *testing.T, b *bundle.Bundle) {
32-
require.Equal(t, "file/path", b.Config.Resources.Pipelines["pipeline1"].CreatePipeline.Configuration["source"])
32+
require.Equal(t, "file/path", b.Config.Resources.Pipelines["pipeline1"].Configuration["source"])
3333
require.Equal(t, "file/path", b.Config.Workspace.FilePath)
3434
},
3535
},

bundle/config/mutator/resourcemutator/apply_target_mode_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,16 +197,16 @@ func TestProcessTargetModeDevelopment(t *testing.T) {
197197
// Pipeline 1
198198
assert.Equal(t, "[dev lennart] pipeline1", b.Config.Resources.Pipelines["pipeline1"].Name)
199199
assert.False(t, b.Config.Resources.Pipelines["pipeline1"].Continuous)
200-
assert.True(t, b.Config.Resources.Pipelines["pipeline1"].CreatePipeline.Development)
200+
assert.True(t, b.Config.Resources.Pipelines["pipeline1"].Development)
201201

202202
// Experiment 1
203203
assert.Equal(t, "/Users/[email protected]/[dev lennart] experiment1", b.Config.Resources.Experiments["experiment1"].Name)
204-
assert.Contains(t, b.Config.Resources.Experiments["experiment1"].Experiment.Tags, ml.ExperimentTag{Key: "dev", Value: "lennart"})
204+
assert.Contains(t, b.Config.Resources.Experiments["experiment1"].Tags, ml.ExperimentTag{Key: "dev", Value: "lennart"})
205205
assert.Equal(t, "dev", b.Config.Resources.Experiments["experiment1"].Experiment.Tags[0].Key)
206206

207207
// Experiment 2
208208
assert.Equal(t, "[dev lennart] experiment2", b.Config.Resources.Experiments["experiment2"].Name)
209-
assert.Contains(t, b.Config.Resources.Experiments["experiment2"].Experiment.Tags, ml.ExperimentTag{Key: "dev", Value: "lennart"})
209+
assert.Contains(t, b.Config.Resources.Experiments["experiment2"].Tags, ml.ExperimentTag{Key: "dev", Value: "lennart"})
210210

211211
// Model 1
212212
assert.Equal(t, "[dev lennart] model1", b.Config.Resources.Models["model1"].Name)
@@ -282,7 +282,7 @@ func TestProcessTargetModeDefault(t *testing.T) {
282282
require.NoError(t, diags.Error())
283283
assert.Equal(t, "job1", b.Config.Resources.Jobs["job1"].Name)
284284
assert.Equal(t, "pipeline1", b.Config.Resources.Pipelines["pipeline1"].Name)
285-
assert.False(t, b.Config.Resources.Pipelines["pipeline1"].CreatePipeline.Development)
285+
assert.False(t, b.Config.Resources.Pipelines["pipeline1"].Development)
286286
assert.Equal(t, "servingendpoint1", b.Config.Resources.ModelServingEndpoints["servingendpoint1"].Name)
287287
assert.Equal(t, "registeredmodel1", b.Config.Resources.RegisteredModels["registeredmodel1"].Name)
288288
assert.Equal(t, "qualityMonitor1", b.Config.Resources.QualityMonitors["qualityMonitor1"].TableName)
@@ -446,5 +446,5 @@ func TestPipelinesDevelopmentDisabled(t *testing.T) {
446446
diags := bundle.ApplySeq(context.Background(), b, ApplyTargetMode(), ApplyPresets())
447447
require.NoError(t, diags.Error())
448448

449-
assert.False(t, b.Config.Resources.Pipelines["pipeline1"].CreatePipeline.Development)
449+
assert.False(t, b.Config.Resources.Pipelines["pipeline1"].Development)
450450
}

bundle/config/mutator/resourcemutator/capture_schema_dependency_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ func TestCaptureSchemaDependencyForVolume(t *testing.T) {
8080
d := bundle.Apply(context.Background(), b, CaptureSchemaDependency())
8181
require.Nil(t, d)
8282

83-
assert.Equal(t, "${resources.schemas.schema1.name}", b.Config.Resources.Volumes["volume1"].CreateVolumeRequestContent.SchemaName)
84-
assert.Equal(t, "${resources.schemas.schema2.name}", b.Config.Resources.Volumes["volume2"].CreateVolumeRequestContent.SchemaName)
85-
assert.Equal(t, "${resources.schemas.schema3.name}", b.Config.Resources.Volumes["volume3"].CreateVolumeRequestContent.SchemaName)
86-
assert.Equal(t, "foobar", b.Config.Resources.Volumes["volume4"].CreateVolumeRequestContent.SchemaName)
87-
assert.Equal(t, "schemaX", b.Config.Resources.Volumes["volume5"].CreateVolumeRequestContent.SchemaName)
83+
assert.Equal(t, "${resources.schemas.schema1.name}", b.Config.Resources.Volumes["volume1"].SchemaName)
84+
assert.Equal(t, "${resources.schemas.schema2.name}", b.Config.Resources.Volumes["volume2"].SchemaName)
85+
assert.Equal(t, "${resources.schemas.schema3.name}", b.Config.Resources.Volumes["volume3"].SchemaName)
86+
assert.Equal(t, "foobar", b.Config.Resources.Volumes["volume4"].SchemaName)
87+
assert.Equal(t, "schemaX", b.Config.Resources.Volumes["volume5"].SchemaName)
8888

8989
assert.Nil(t, b.Config.Resources.Volumes["nilVolume"])
9090
// assert.Nil(t, b.Config.Resources.Volumes["emptyVolume"].CreateVolumeRequestContent)
@@ -179,7 +179,7 @@ func TestCaptureSchemaDependencyForPipelinesWithTarget(t *testing.T) {
179179
assert.Equal(t, "", b.Config.Resources.Pipelines["pipeline7"].Schema)
180180

181181
assert.Nil(t, b.Config.Resources.Pipelines["nilPipeline"])
182-
assert.Empty(t, b.Config.Resources.Pipelines["emptyPipeline"].CreatePipeline.Catalog)
182+
assert.Empty(t, b.Config.Resources.Pipelines["emptyPipeline"].Catalog)
183183

184184
for _, k := range []string{"pipeline1", "pipeline2", "pipeline3", "pipeline4", "pipeline5", "pipeline6", "pipeline7"} {
185185
assert.Empty(t, b.Config.Resources.Pipelines[k].Target)

bundle/config/mutator/resourcemutator/validate_target_mode_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func TestProcessTargetModeProduction(t *testing.T) {
102102

103103
assert.Equal(t, "job1", b.Config.Resources.Jobs["job1"].Name)
104104
assert.Equal(t, "pipeline1", b.Config.Resources.Pipelines["pipeline1"].Name)
105-
assert.False(t, b.Config.Resources.Pipelines["pipeline1"].CreatePipeline.Development)
105+
assert.False(t, b.Config.Resources.Pipelines["pipeline1"].Development)
106106
assert.Equal(t, "servingendpoint1", b.Config.Resources.ModelServingEndpoints["servingendpoint1"].Name)
107107
assert.Equal(t, "registeredmodel1", b.Config.Resources.RegisteredModels["registeredmodel1"].Name)
108108
assert.Equal(t, "qualityMonitor1", b.Config.Resources.QualityMonitors["qualityMonitor1"].TableName)

bundle/config/mutator/rewrite_workspace_prefix_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ func TestNoWorkspacePrefixUsed(t *testing.T) {
7676
delete(expectedErrors, d.Summary)
7777
}
7878

79-
require.Equal(t, "${workspace.root_path}/file1.py", b.Config.Resources.Jobs["test_job"].JobSettings.Tasks[0].SparkPythonTask.PythonFile)
80-
require.Equal(t, "${workspace.file_path}/notebook1", b.Config.Resources.Jobs["test_job"].JobSettings.Tasks[1].NotebookTask.NotebookPath)
79+
require.Equal(t, "${workspace.root_path}/file1.py", b.Config.Resources.Jobs["test_job"].Tasks[0].SparkPythonTask.PythonFile)
80+
require.Equal(t, "${workspace.file_path}/notebook1", b.Config.Resources.Jobs["test_job"].Tasks[1].NotebookTask.NotebookPath)
8181
require.Equal(t, "${workspace.artifact_path}/jar1.jar", b.Config.Resources.Jobs["test_job"].JobSettings.Tasks[1].Libraries[0].Jar)
82-
require.Equal(t, "${workspace.file_path}/notebook2", b.Config.Resources.Jobs["test_job"].JobSettings.Tasks[2].NotebookTask.NotebookPath)
82+
require.Equal(t, "${workspace.file_path}/notebook2", b.Config.Resources.Jobs["test_job"].Tasks[2].NotebookTask.NotebookPath)
8383
require.Equal(t, "${workspace.artifact_path}/jar2.jar", b.Config.Resources.Jobs["test_job"].JobSettings.Tasks[2].Libraries[0].Jar)
8484
}

bundle/config/mutator/translate_paths_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -786,13 +786,13 @@ func TestTranslatePathJobEnvironments(t *testing.T) {
786786
diags := bundle.ApplySeq(context.Background(), b, mutator.NormalizePaths(), mutator.TranslatePaths())
787787
require.NoError(t, diags.Error())
788788

789-
assert.Equal(t, "./job/dist/env1.whl", b.Config.Resources.Jobs["job"].JobSettings.Environments[0].Spec.Dependencies[0])
790-
assert.Equal(t, "./dist/env2.whl", b.Config.Resources.Jobs["job"].JobSettings.Environments[0].Spec.Dependencies[1])
791-
assert.Equal(t, "simplejson", b.Config.Resources.Jobs["job"].JobSettings.Environments[0].Spec.Dependencies[2])
792-
assert.Equal(t, "/Workspace/Users/[email protected]/test.whl", b.Config.Resources.Jobs["job"].JobSettings.Environments[0].Spec.Dependencies[3])
793-
assert.Equal(t, "--extra-index-url https://name:[email protected]/api/v4/projects/9876/packages/pypi/simple foobar", b.Config.Resources.Jobs["job"].JobSettings.Environments[0].Spec.Dependencies[4])
794-
assert.Equal(t, "foobar --extra-index-url https://name:[email protected]/api/v4/projects/9876/packages/pypi/simple", b.Config.Resources.Jobs["job"].JobSettings.Environments[0].Spec.Dependencies[5])
795-
assert.Equal(t, "https://[email protected]/packages/pypi/simple", b.Config.Resources.Jobs["job"].JobSettings.Environments[0].Spec.Dependencies[6])
789+
assert.Equal(t, "./job/dist/env1.whl", b.Config.Resources.Jobs["job"].Environments[0].Spec.Dependencies[0])
790+
assert.Equal(t, "./dist/env2.whl", b.Config.Resources.Jobs["job"].Environments[0].Spec.Dependencies[1])
791+
assert.Equal(t, "simplejson", b.Config.Resources.Jobs["job"].Environments[0].Spec.Dependencies[2])
792+
assert.Equal(t, "/Workspace/Users/[email protected]/test.whl", b.Config.Resources.Jobs["job"].Environments[0].Spec.Dependencies[3])
793+
assert.Equal(t, "--extra-index-url https://name:[email protected]/api/v4/projects/9876/packages/pypi/simple foobar", b.Config.Resources.Jobs["job"].Environments[0].Spec.Dependencies[4])
794+
assert.Equal(t, "foobar --extra-index-url https://name:[email protected]/api/v4/projects/9876/packages/pypi/simple", b.Config.Resources.Jobs["job"].Environments[0].Spec.Dependencies[5])
795+
assert.Equal(t, "https://[email protected]/packages/pypi/simple", b.Config.Resources.Jobs["job"].Environments[0].Spec.Dependencies[6])
796796
}
797797

798798
func TestTranslatePathWithComplexVariables(t *testing.T) {

0 commit comments

Comments
 (0)