Golangci-lint update to 1.24 and migration from version 1 -> 2

Author: deepsm007

.golangci.yml

@@ -1,38 +1,50 @@
-run:
-  timeout: 10m
-
+version: "2"
 linters:
+  default: none
   enable:
-    - unused
-    - gosimple
-    - gofmt
-    - govet
-    - staticcheck
-    - unparam
-    - unconvert
+    - bodyclose
     - errcheck
+    - errorlint
+    - govet
     - ineffassign
     - misspell
-    - bodyclose
-    - errorlint
-  disable-all: true
-
-linters-settings:
-  errorlint:
-    errorf: true
-    errorf-multi: false
-    asserts: false
-    comparison: false
-  misspell:
-    ignore-words:
-    - creater
-
-issues:
-  exclude-rules:
-  - linters:
-    - unparam
-    text: \(\*leaseStep\)\.Provides\$1 - result 1 \(error\) is always nil
-  - linters:
     - staticcheck
-    # Code has a "Deprecated:" comment
-    text: "SA1019:"
+    - unconvert
+    - unparam
+    - unused
+  settings:
+    errorlint:
+      errorf: true
+      errorf-multi: false
+      asserts: false
+      comparison: false
+    misspell:
+      ignore-rules:
+        - creater
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - unparam
+        text: \(\*leaseStep\)\.Provides\$1 - result 1 \(error\) is always nil
+      - linters:
+          - staticcheck
+        text: 'SA1019:'
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

cmd/applyconfig/applyconfig.go

@@ -188,10 +188,10 @@ func makeOcApply(kubeConfig, context, path, user string, dry dryRunMethod, apply
 		cmd.Args = append(cmd.Args, "--dry-run=server", "--validate=true")
 	case dryClient:
 		cmd.Args = append(cmd.Args, "--dry-run=client")
-	default:
-		panic(fmt.Sprintf("BUG: Unknown dry run method '%s' received, this should never happen", string(dry)))
 	case dryNone:
 		// No additional args needed
+	default:
+		panic(fmt.Sprintf("BUG: Unknown dry run method '%s' received, this should never happen", string(dry)))
 	}
 
 	fileName := filepath.Base(path)

cmd/autoconfigbrancher/main.go

@@ -51,7 +51,7 @@ type options struct {
 func parseOptions() options {
 	var o options
 	fs := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
-	o.FutureOptions.Bind(fs)
+	o.Bind(fs)
 	fs.StringVar(&o.githubLogin, "github-login", githubLogin, "The GitHub username to use.")
 	fs.StringVar(&o.gitName, "git-name", "", "The name to use on the git commit. Requires --git-email. If not specified, uses the system default.")
 	fs.StringVar(&o.gitEmail, "git-email", "", "The email to use on the git commit. Requires --git-name. If not specified, uses the system default.")
@@ -135,11 +135,11 @@ func main() {
 		logrus.WithError(fmt.Errorf("version %s split by dot doesn't have two elements", o.CurrentRelease)).Fatal("Failed to parse the current version")
 	}
 
-	if err := secret.Add(o.GitHubOptions.TokenPath); err != nil {
+	if err := secret.Add(o.TokenPath); err != nil {
 		logrus.WithError(err).Fatal("Failed to start secrets agent")
 	}
 
-	gc, err := o.GitHubOptions.GitHubClient(!o.Confirm)
+	gc, err := o.GitHubClient(!o.Confirm)
 	if err != nil {
 		logrus.WithError(err).Fatal("error getting GitHub client")
 	}
@@ -292,7 +292,7 @@ func main() {
 func runSteps(steps []step, author string, stdout, stderr io.Writer) (needsPushing bool, err error) {
 	startCommitOut, err := exec.Command("git", "rev-parse", "HEAD").CombinedOutput()
 	if err != nil {
-		return false, fmt.Errorf("failed to execute `git rev-parse HEAD`: %w\noutput:%s\n", err, string(startCommitOut))
+		return false, fmt.Errorf("failed to execute `git rev-parse HEAD`: %w\noutput:%s", err, string(startCommitOut))
 	}
 	startCommitSHA := strings.TrimSpace(string(startCommitOut))
 
@@ -313,7 +313,7 @@ func runSteps(steps []step, author string, stdout, stderr io.Writer) (needsPushi
 
 	overallDiff, err := exec.Command("git", "diff", startCommitSHA).CombinedOutput()
 	if err != nil {
-		return false, fmt.Errorf("failed to check the overall diff: %w, out:\n%s\n", err, string(overallDiff))
+		return false, fmt.Errorf("failed to check the overall diff: %w, out:\n%s", err, string(overallDiff))
 	}
 	if strings.TrimSpace(string(overallDiff)) == "" {
 		logrus.Info("Empty overall diff")

cmd/autoperibolossync/main.go

@@ -91,7 +91,7 @@ func validateOptions(o options) error {
 	if o.peribolosConfig == "" {
 		return errors.New("--peribolos-config is not specified")
 	}
-	return o.GitHubOptions.Validate(o.dryRun)
+	return o.Validate(o.dryRun)
 }
 
 func main() {
@@ -100,11 +100,11 @@ func main() {
 		logrus.WithError(err).Fatal("Invalid arguments.")
 	}
 
-	if err := secret.Add(o.GitHubOptions.TokenPath); err != nil {
+	if err := secret.Add(o.TokenPath); err != nil {
 		logrus.WithError(err).Fatal("Failed to start secrets agent")
 	}
 
-	gc, err := o.GitHubOptions.GitHubClient(o.dryRun)
+	gc, err := o.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("error getting GitHub client")
 	}
@@ -150,7 +150,7 @@ func main() {
 	}
 
 	title := fmt.Sprintf("%s %s", matchTitle, time.Now().Format(time.RFC1123))
-	if err := bumper.GitCommitAndPush(fmt.Sprintf("https://%s:%[email protected]/%s/%s.git", o.githubLogin, string(secret.GetTokenGenerator(o.GitHubOptions.TokenPath)()), o.githubLogin, githubRepo), remoteBranch, o.gitName, o.gitEmail, title, stdout, stderr, o.dryRun); err != nil {
+	if err := bumper.GitCommitAndPush(fmt.Sprintf("https://%s:%[email protected]/%s/%s.git", o.githubLogin, string(secret.GetTokenGenerator(o.TokenPath)()), o.githubLogin, githubRepo), remoteBranch, o.gitName, o.gitEmail, title, stdout, stderr, o.dryRun); err != nil {
 		logrus.WithError(err).Fatal("Failed to push changes.")
 	}
 

cmd/autopublicizeconfig/main.go

@@ -60,7 +60,7 @@ func parseOptions() options {
 	fs.StringVar(&o.releaseRepoPath, "release-repo-path", "", "Path to a openshift/release repository directory")
 
 	o.AddFlags(fs)
-	o.WhitelistOptions.Bind(fs)
+	o.Bind(fs)
 
 	if err := fs.Parse(os.Args[1:]); err != nil {
 		logrus.WithError(err).Errorf("cannot parse args: '%s'", os.Args[1:])
@@ -97,17 +97,17 @@ func main() {
 		logrus.WithError(err).Fatal("Invalid arguments.")
 	}
 
-	if err := secret.Add(o.GitHubOptions.TokenPath); err != nil {
+	if err := secret.Add(o.TokenPath); err != nil {
 		logrus.WithError(err).Fatal("Failed to start secrets agent")
 	}
 
-	gc, err := o.GitHubOptions.GitHubClient(o.dryRun)
+	gc, err := o.GitHubClient(o.dryRun)
 	if err != nil {
 		logrus.WithError(err).Fatal("error getting GitHub client")
 	}
 
 	logrus.Info("Getting repositories that exists in the whitelist or promote official images")
-	orgRepos, err := getReposForPrivateOrg(o.releaseRepoPath, o.WhitelistOptions.WhitelistConfig.Whitelist)
+	orgRepos, err := getReposForPrivateOrg(o.releaseRepoPath, o.WhitelistConfig.Whitelist)
 	if err != nil {
 		logrus.WithError(err).Fatal("couldn't get the list of org/repos that promote official images")
 	}
@@ -157,7 +157,7 @@ func main() {
 
 	logrus.Info("Preparing pull request")
 	title := fmt.Sprintf("%s %s", matchTitle, time.Now().Format(time.RFC1123))
-	if err := bumper.GitCommitAndPush(fmt.Sprintf("https://%s:%[email protected]/%s/%s.git", o.githubLogin, string(secret.GetTokenGenerator(o.GitHubOptions.TokenPath)()), o.githubLogin, githubRepo), remoteBranch, o.gitName, o.gitEmail, title, stdout, stderr, o.dryRun); err != nil {
+	if err := bumper.GitCommitAndPush(fmt.Sprintf("https://%s:%[email protected]/%s/%s.git", o.githubLogin, string(secret.GetTokenGenerator(o.TokenPath)()), o.githubLogin, githubRepo), remoteBranch, o.gitName, o.gitEmail, title, stdout, stderr, o.dryRun); err != nil {
 		logrus.WithError(err).Fatal("Failed to push changes.")
 	}
 

cmd/autotestgridgenerator/main.go

@@ -52,15 +52,15 @@ func parseOptions() options {
 	fs.StringVar(&o.upstreamBranch, "upstream-branch", upstreamBranch, "The repository branch name where the PR will be created.")
 
 	o.GitAuthorOptions.AddFlags(fs)
-	o.PRCreationOptions.GitHubOptions.AddFlags(fs)
+	o.GitHubOptions.AddFlags(fs)
 	if err := fs.Parse(os.Args[1:]); err != nil {
 		logrus.WithError(err).Errorf("cannot parse args: '%s'", os.Args[1:])
 	}
 	return o
 }
 
 func validateOptions(o options) error {
-	if err := o.GitAuthorOptions.Validate(); err != nil {
+	if err := o.Validate(); err != nil {
 		return err
 	}
 	return o.GitHubOptions.Validate(false)
@@ -71,7 +71,7 @@ func main() {
 	if err := validateOptions(o); err != nil {
 		logrus.WithError(err).Fatal("Invalid arguments.")
 	}
-	if err := o.PRCreationOptions.Finalize(); err != nil {
+	if err := o.Finalize(); err != nil {
 		logrus.WithError(err).Fatal("failed to finalize PR creation options")
 	}
 
@@ -96,7 +96,7 @@ func main() {
 		logrus.WithError(err).Fatalf("failed to run %s", fullCommand)
 	}
 	title := fmt.Sprintf("%s at %s", matchTitle, time.Now().Format(time.RFC1123))
-	err = o.PRCreationOptions.UpsertPR(o.workingDir, o.githubOrg, githubRepo, o.upstreamBranch, title, prcreation.PrAssignee(o.assign), prcreation.MatchTitle(matchTitle))
+	err = o.UpsertPR(o.workingDir, o.githubOrg, githubRepo, o.upstreamBranch, title, prcreation.PrAssignee(o.assign), prcreation.MatchTitle(matchTitle))
 	if err != nil {
 		logrus.WithError(err).Fatalf("failed to upsert PR")
 	}

cmd/blocking-issue-creator/main.go

@@ -50,7 +50,7 @@ func gatherOptions() options {
 	fs.BoolVar(&o.dryRun, "dry-run", true, "Dry run for testing. Uses API tokens but does not mutate.")
 
 	o.github.AddFlags(fs)
-	o.FutureOptions.Bind(fs)
+	o.Bind(fs)
 
 	if err := fs.Parse(os.Args[1:]); err != nil {
 		logrus.WithError(err).Fatal("could not parse input")

cmd/blocking-issue-creator/main_test.go

@@ -21,7 +21,7 @@ type fakeGithubClient struct {
 
 func (f fakeGithubClient) FindIssues(query, sortVerb string, asc bool) ([]github.Issue, error) {
 	var issues []github.Issue
-	for _, issue := range f.FakeClient.Issues {
+	for _, issue := range f.Issues {
 		issues = append(issues, *issue)
 	}
 	sort.Slice(issues, func(i, j int) bool { return issues[i].ID < issues[j].ID })
@@ -222,7 +222,7 @@ func TestManageIssues(t *testing.T) {
 			fgh := fakeGithubClient{
 				FakeClient: fakegithub.NewFakeClient(),
 			}
-			fgh.FakeClient.Issues = tc.issues
+			fgh.Issues = tc.issues
 
 			if err := manageIssues(fgh, "", tc.repoInfo, tc.branches, logrus.WithField("id", tc.id)); err != nil {
 				t.Fatal(err)

cmd/branchingconfigmanagers/frequency-reducer/main.go

@@ -25,7 +25,7 @@ type options struct {
 
 func (o options) validate() error {
 	var errs []error
-	if err := o.ConfirmableOptions.Validate(); err != nil {
+	if err := o.Validate(); err != nil {
 		errs = append(errs, err)
 	}
 
@@ -53,7 +53,7 @@ func main() {
 		logrus.Fatalf("Not valid --current-release: %v", err)
 	}
 
-	if err := o.ConfirmableOptions.Complete(); err != nil {
+	if err := o.Complete(); err != nil {
 		logrus.Fatalf("Couldn't complete the config options: %v", err)
 	}
 
@@ -75,11 +75,11 @@ func updateIntervalFieldsForMatchedSteps(
 	configuration *config.DataWithInfo,
 	version ocplifecycle.MajorMinor,
 ) {
-	testVersion, err := ocplifecycle.ParseMajorMinor(extractVersion(configuration.Info.Metadata.Branch))
+	testVersion, err := ocplifecycle.ParseMajorMinor(extractVersion(configuration.Info.Branch))
 	if err != nil {
 		return
 	}
-	if configuration.Info.Metadata.Org == "openshift" || configuration.Info.Metadata.Org == "openshift-priv" {
+	if configuration.Info.Org == "openshift" || configuration.Info.Org == "openshift-priv" {
 		for _, test := range configuration.Configuration.Tests {
 			if !strings.Contains(test.As, "mirror-nightly-image") && !strings.Contains(test.As, "promote-") {
 				if test.Cron != nil {

cmd/branchingconfigmanagers/tide-config-manager/main.go

@@ -334,7 +334,7 @@ func (gae *generalAvailabilityEvent) ensureStaffEngApprovedLabel(q *prowconfig.T
 			branches.Insert(gae.openshiftFuture)
 		}
 
-		if !(branches.Equal(sets.New[string](gae.releaseFuture)) || branches.Equal(sets.New[string](gae.openshiftFuture)) || branches.Equal(gae.openshiftReleaseBranchesPlus1)) {
+		if !branches.Equal(sets.New[string](gae.releaseFuture)) && !branches.Equal(sets.New[string](gae.openshiftFuture)) && !branches.Equal(gae.openshiftReleaseBranchesPlus1) {
 			fmt.Printf("Suspicious staff-eng-approved query: %s\n", q.Repos)
 		}
 	}