fix lint (#1781)

* add comments to ignore deprecated BuiltinConfigs field * fix linting
replicatedhq · Jan 31, 2025 · 5ab49b7 · 5ab49b7
1 parent 4cdd659
commit 5ab49b7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/cmd/buildtools/metadata.go b/cmd/buildtools/metadata.go
@@ -43,6 +43,7 @@ var metadataExtractHelmChartImagesCommand = &cli.Command{
 
 		repos := metadata.Configs.Repositories
 		charts := metadata.Configs.Charts
+		//nolint:staticcheck // SA1019 explanation Using deprecated BuiltinConfigs for backwards compatibility
 		for _, chart := range metadata.BuiltinConfigs {
 			repos = append(repos, chart.Repositories...)
 			charts = append(charts, chart.Charts...)

diff --git a/cmd/installer/cli/install2.go b/cmd/installer/cli/install2.go
@@ -83,8 +83,8 @@ func Install2Cmd(ctx context.Context, name string) *cobra.Command {
 	var flags Install2CmdFlags
 
 	cmd := &cobra.Command{
-		Use:     "install",
-		Short:   fmt.Sprintf("Experimental installer for %s", name),
+		Use:   "install",
+		Short: fmt.Sprintf("Experimental installer for %s", name),
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			if err := preRunInstall2(cmd, &flags); err != nil {
 				return err

diff --git a/e2e/version_test.go b/e2e/version_test.go
@@ -133,25 +133,31 @@ func TestVersion(t *testing.T) {
 	}
 
 	expectedBuiltinConfigsCharts := []string{"velero", "seaweedfs", "registry", "registry-ha"}
+	//nolint:staticcheck // SA1019 explanation Using deprecated BuiltinConfigs for testing
 	if len(parsed.BuiltinConfigs) != len(expectedBuiltinConfigsCharts) {
 		t.Log(output)
+		//nolint:staticcheck // SA1019 explanation Using deprecated BuiltinConfigs for testing
 		t.Fatalf("found %d builtin charts in metadata, expected %d", len(parsed.BuiltinConfigs), len(expectedBuiltinConfigsCharts))
 	}
 	for _, expectedName := range expectedBuiltinConfigsCharts {
+		//nolint:staticcheck // SA1019 explanation Using deprecated BuiltinConfigs for testing
 		if _, ok := parsed.BuiltinConfigs[expectedName]; !ok {
 			t.Errorf("failed to find builtin chart %s in 'metadata' output", expectedName)
 			failed = true
 		}
 	}
 
 	expectedVeleroCharts := []string{"velero"}
+	//nolint:staticcheck // SA1019 explanation Using deprecated BuiltinConfigs for testing
 	if len(parsed.BuiltinConfigs["velero"].Charts) != len(expectedVeleroCharts) {
 		t.Log(output)
+		//nolint:staticcheck // SA1019 explanation Using deprecated BuiltinConfigs for testing
 		t.Fatalf("found %d velero charts in metadata, expected %d", len(parsed.BuiltinConfigs["velero"].Charts), len(expectedVeleroCharts))
 	}
 
 	for _, expectedName := range expectedVeleroCharts {
 		foundName := false
+		//nolint:staticcheck // SA1019 explanation Using deprecated BuiltinConfigs for testing
 		for _, foundChart := range parsed.BuiltinConfigs["velero"].Charts {
 			if foundChart.Name == expectedName {
 				foundName = true

diff --git a/operator/pkg/cli/upgrade_job.go b/operator/pkg/cli/upgrade_job.go
@@ -62,7 +62,7 @@ func UpgradeJobCmd() *cobra.Command {
 
 			if err := performUpgrade(cmd.Context(), kcli, in); err != nil {
 				// if this is the last attempt, mark the installation as failed
-				if err := maybeMarkAsFailed(cmd.Context(), kcli, in, err); err != nil {
+				if err := maybeMarkAsFailed(cmd.Context(), kcli, in); err != nil {
 					fmt.Printf("Failed to mark installation as failed: %v", err)
 				}
 				return err
@@ -124,7 +124,7 @@ func attemptUpgrade(ctx context.Context, kcli client.Client, in *ecv1beta1.Insta
 	return nil
 }
 
-func maybeMarkAsFailed(ctx context.Context, kcli client.Client, in *ecv1beta1.Installation, err error) error {
+func maybeMarkAsFailed(ctx context.Context, kcli client.Client, in *ecv1beta1.Installation) error {
 	lastAttempt, err := isLastAttempt(ctx, kcli)
 	if err != nil {
 		return fmt.Errorf("check if last attempt: %w", err)