Merge branch 'kubevirt:main' into add-charts-repo

Author: lerrigatto

.golangci.yaml

@@ -8,11 +8,11 @@ linters:
   disable-all: true
   enable:
   - gocyclo
-#  - staticcheck
+  - staticcheck
   - unused
-#  - ineffassign
-#  - govet
-#  - gosimple
+  - govet
+  - ineffassign
+  - gosimple
 #  - errcheck
 #linters-settings:
 #  gocyclo:

Makefile

@@ -4,10 +4,6 @@ flake-issue-creator := robots/cmd/flake-issue-creator
 querier := robots/cmd/release-querier
 kubevirtci := robots/cmd/kubevirtci-bumper
 
-ifndef GOLANGCI_LINT_VERSION
-	GOLANGCI_LINT_VERSION=v1.62.2
-	export GOLANGCI_LINT_VERSION
-endif
 ifndef ARTIFACTS
 	ARTIFACTS=/tmp/artifacts
 	export ARTIFACTS

docs/labels.md

@@ -123,6 +123,7 @@ larger set of contributors to apply/remove them.
 | <a id="release-note" href="#release-note">`release-note`</a> | Denotes a PR that will be considered when it comes time to generate release notes.| prow |  [release-note](https://prow.ci.kubevirt.io/command-help#release-note) |
 | <a id="release-note-action-required" href="#release-note-action-required">`release-note-action-required`</a> | Denotes a PR that introduces potentially breaking changes that require user action.| prow |  [releasenote](https://prow.ci.kubevirt.io/command-help#releasenote) |
 | <a id="release-note-none" href="#release-note-none">`release-note-none`</a> | Denotes a PR that doesn't merit a release note.| prow |  [release-note](https://prow.ci.kubevirt.io/command-help#release-note) |
+| <a id="approved-vep" href="#approved-vep">`approved-vep`</a> | Indicates that a PR is tied to an approved VEP and is prioritized.| approvers |  [label](https://prow.ci.kubevirt.io/command-help#label) |
 
 ## Labels that apply to kubevirt/containerized-data-importer, only for PRs
 

external-plugins/botreview/review/result.go

@@ -77,14 +77,14 @@ func (r *BasicReviewResult) String() string {
 		return r.approveComment
 	} else {
 		comment := r.disapproveComment
-		comment += fmt.Sprintf("\n\n<details>\n")
+		comment += "\n\n<details>\n"
 		for fileName, hunks := range r.notMatchingHunks {
 			comment += fmt.Sprintf("\n_%s_", fileName)
 			for _, hunk := range hunks {
 				comment += fmt.Sprintf("\n\n~~~diff\n%s\n~~~", string(hunk.Body))
 			}
 		}
-		comment += fmt.Sprintf("\n\n</details>\n")
+		comment += "\n\n</details>\n"
 		return comment
 	}
 }
@@ -113,11 +113,11 @@ func (r *BasicReviewResult) ShortString() string {
 		return r.approveComment
 	} else {
 		comment := r.disapproveComment
-		comment += fmt.Sprintf("\n  <details>")
+		comment += "\n  <details>"
 		for fileName := range r.notMatchingHunks {
 			comment += fmt.Sprintf("\n  * `%s`", fileName)
 		}
-		comment += fmt.Sprintf("\n  </details>")
+		comment += "\n  </details>"
 		return comment
 	}
 }

external-plugins/botreview/review/review.go

@@ -169,8 +169,8 @@ func (r *Reviewer) AttachReviewComments(botReviewResults []BotReviewResult, gith
 		if reviewResult.ShouldNotMergeReason() != "" {
 			shouldNotMergeReasons = append(shouldNotMergeReasons, reviewResult.ShouldNotMergeReason())
 		}
-		botReviewComments = append(botReviewComments, fmt.Sprintf("%s", reviewResult))
-		shortBotReviewComments = append(shortBotReviewComments, fmt.Sprintf(reviewResult.ShortString()))
+		botReviewComments = append(botReviewComments, reviewResult.String())
+		shortBotReviewComments = append(shortBotReviewComments, reviewResult.ShortString())
 	}
 	approveLabels := unapprovePRComment
 	if isApproved {

external-plugins/phased/plugin/handler/handler.go

@@ -3,13 +3,14 @@ package handler
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
-	pi_github "kubevirt.io/project-infra/robots/pkg/github"
-	kubeVirtLabels "kubevirt.io/project-infra/robots/pkg/github/labels"
+	"io"
 	"net/http"
 	"os"
 	"os/exec"
 
+	pi_github "kubevirt.io/project-infra/robots/pkg/github"
+	kubeVirtLabels "kubevirt.io/project-infra/robots/pkg/github/labels"
+
 	"github.com/sirupsen/logrus"
 	"sigs.k8s.io/prow/pkg/config"
 	gitv2 "sigs.k8s.io/prow/pkg/git/v2"
@@ -166,9 +167,7 @@ func (h *GitHubEventsHandler) loadPresubmits(pr github.PullRequest) ([]config.Pr
 		if index != orgRepo {
 			continue
 		}
-		for _, job := range jobs {
-			presubmits = append(presubmits, job)
-		}
+		presubmits = append(presubmits, jobs...)
 	}
 
 	return presubmits, nil
@@ -203,7 +202,7 @@ func catFile(log *logrus.Logger, gitDir, file, refspec string) ([]byte, int) {
 }
 
 func writeTempFile(log *logrus.Logger, basedir string, content []byte) (string, error) {
-	tmpfile, err := ioutil.TempFile(basedir, "job-config")
+	tmpfile, err := os.CreateTemp(basedir, "job-config")
 	if err != nil {
 		log.WithError(err).Errorf("Could not create temp file for job config.")
 		return "", err
@@ -229,7 +228,7 @@ func fetchRemoteFile(url string) ([]byte, error) {
 		return nil, fmt.Errorf("HTTP request failed with status: %v", resp.Status)
 	}
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
@@ -338,7 +337,7 @@ func loadConfigBytes(h *GitHubEventsHandler, org, repo string) ([]byte, []byte,
 }
 
 func (h *GitHubEventsHandler) loadProwConfig(prFullName string) (*config.Config, error) {
-	tmpdir, err := ioutil.TempDir("", "prow-configs")
+	tmpdir, err := os.MkdirTemp("", "prow-configs")
 	if err != nil {
 		log.WithError(err).Error("Could not create a temp directory to store configs.")
 		return nil, err

external-plugins/rehearse/plugin/handler/handler.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
@@ -148,7 +147,7 @@ func (h *GitHubEventsHandler) handleIssueComment(log *logrus.Entry, event *githu
 	if err != nil {
 		log.WithError(err).Errorf("Could not get PR number %d", event.Issue.Number)
 	}
-	repoClient, err := h.getRebasedRepoClient(log, pr, err, org, repo)
+	repoClient, err := h.getRebasedRepoClient(log, pr, org, repo)
 	if err != nil {
 		log.WithError(err).Error("could not get repo client")
 		return
@@ -309,7 +308,7 @@ func (h *GitHubEventsHandler) handlePullRequestUpdateEvent(log *logrus.Entry, ev
 	if err != nil {
 		log.WithError(err).Errorf("Could not get PR number %d", event.PullRequest.Number)
 	}
-	repoClient, err := h.getRebasedRepoClient(log, pr, err, org, repo)
+	repoClient, err := h.getRebasedRepoClient(log, pr, org, repo)
 	if err != nil {
 		log.WithError(err).Error("could not get repo client")
 		return
@@ -342,7 +341,7 @@ func (h *GitHubEventsHandler) handleRehearsalForPR(log *logrus.Entry, pr *github
 		log.WithError(err).Errorf("Could not parse repo name: %s", pr.Base.Repo.FullName)
 		return
 	}
-	repoClient, err := h.getRebasedRepoClient(log, pr, err, org, repo)
+	repoClient, err := h.getRebasedRepoClient(log, pr, org, repo)
 	if err != nil {
 		log.WithError(err).Error("could not get repo client")
 		return
@@ -443,7 +442,7 @@ func (h *GitHubEventsHandler) handleRehearsalForPR(log *logrus.Entry, pr *github
 	}
 }
 
-func (h *GitHubEventsHandler) getRebasedRepoClient(log *logrus.Entry, pr *github.PullRequest, err error, org string, repo string) (gitv2.RepoClient, error) {
+func (h *GitHubEventsHandler) getRebasedRepoClient(log *logrus.Entry, pr *github.PullRequest, org string, repo string) (gitv2.RepoClient, error) {
 	log.Debugln("Generating git client")
 	rebasedRepoClient, err := h.gitClientFactory.ClientFor(org, repo)
 	if err != nil {
@@ -518,7 +517,10 @@ func (h *GitHubEventsHandler) generateProwJobs(
 	var jobs []prowapi.ProwJob
 
 	for path, headConfig := range headConfigs {
-		baseConfig, _ := baseConfigs[path]
+		baseConfig, ok := baseConfigs[path]
+		if !ok {
+			log.Errorf("Path %s not found in base configs", path)
+		}
 		jobs = append(jobs, h.generatePresubmits(headConfig, baseConfig, pr, eventGUID)...)
 	}
 
@@ -594,7 +596,7 @@ func (h *GitHubEventsHandler) loadConfigsAtRef(
 	changedJobConfigs []string, git gitv2.RepoClient, ref string) (map[string]*config.Config, error) {
 	configs := map[string]*config.Config{}
 
-	tmpdir, err := ioutil.TempDir("", "prow-configs")
+	tmpdir, err := os.MkdirTemp("", "prow-configs")
 	if err != nil {
 		log.WithError(err).Error("Could not create a temp directory to store configs.")
 		return nil, err
@@ -643,7 +645,7 @@ func (h *GitHubEventsHandler) loadConfigsAtRef(
 		// directories as we do here
 		// thus we need to reset the SourcePath to the original value for each job config
 		for _, presubmits := range pc.PresubmitsStatic {
-			for index, _ := range presubmits {
+			for index := range presubmits {
 				presubmits[index].JobBase.SourcePath = path.Join(git.Directory(), changedJobConfig)
 			}
 		}
@@ -697,7 +699,7 @@ func catFile(log *logrus.Logger, gitDir, file, refspec string) ([]byte, int) {
 }
 
 func writeTempFile(log *logrus.Logger, basedir string, content []byte) (string, error) {
-	tmpfile, err := ioutil.TempFile(basedir, "job-config")
+	tmpfile, err := os.CreateTemp(basedir, "job-config")
 	if err != nil {
 		log.WithError(err).Errorf("Could not create temp file for job config.")
 		return "", err

external-plugins/rehearse/plugin/rehearse_test.go

@@ -138,6 +138,7 @@ var _ = Describe("Rehearse", func() {
 							},
 						},
 					})
+					Expect(err).ShouldNot(HaveOccurred())
 					err = gitrepo.AddCommit("foo", "bar", map[string][]byte{
 						"jobs-config.yaml": headConfig,
 					})
@@ -618,6 +619,7 @@ var _ = Describe("Rehearse", func() {
 							},
 						},
 					})
+					Expect(err).ShouldNot(HaveOccurred())
 					err = gitrepo.AddCommit("foo", "bar", map[string][]byte{
 						"jobs-config.yaml": headConfig,
 					})
@@ -798,6 +800,7 @@ var _ = Describe("Rehearse", func() {
 							},
 						},
 					})
+					Expect(err).ShouldNot(HaveOccurred())
 					err = gitrepo.AddCommit("foo", "bar", map[string][]byte{
 						"jobs-config.yaml": headConfig,
 					})
@@ -1014,6 +1017,7 @@ var _ = Describe("Rehearse", func() {
 							},
 						},
 					})
+					Expect(err).ShouldNot(HaveOccurred())
 					err = gitrepo.AddCommit("foo", "bar", map[string][]byte{
 						"jobs-config.yaml": headConfig,
 					})
@@ -1311,6 +1315,7 @@ var _ = Describe("Rehearse", func() {
 							},
 						},
 					})
+					Expect(err).ShouldNot(HaveOccurred())
 					err = gitrepo.AddCommit("foo", "bar", map[string][]byte{
 						"jobs-config.yaml": headConfig,
 					})
@@ -1457,6 +1462,7 @@ var _ = Describe("Rehearse", func() {
 							},
 						},
 					})
+					Expect(err).ShouldNot(HaveOccurred())
 					err = gitrepo.AddCommit("foo", "bar", map[string][]byte{
 						"jobs-config.yaml": headConfig,
 					})
@@ -1628,6 +1634,7 @@ var _ = Describe("Rehearse", func() {
 							},
 						},
 					})
+					Expect(err).ShouldNot(HaveOccurred())
 					err = gitrepo.AddCommit("foo", "bar", map[string][]byte{
 						"jobs-config.yaml": headConfig,
 					})

external-plugins/release-blocker/server.go

@@ -284,13 +284,11 @@ func (s *Server) handleIssueComment(l *logrus.Entry, ic github.IssueCommentEvent
 	if ic.Action != github.IssueCommentActionCreated {
 		return nil
 	}
-
 	org := ic.Repo.Owner.Login
 	repo := ic.Repo.Name
 	num := ic.Issue.Number
 	commentAuthor := ic.Comment.User.Login
 
-	needsLabel := true
 	targetBranch := ""
 
 	l = l.WithFields(logrus.Fields{
@@ -303,10 +301,8 @@ func (s *Server) handleIssueComment(l *logrus.Entry, ic github.IssueCommentEvent
 	matches := releaseBlockRe.FindAllStringSubmatch(ic.Comment.Body, -1)
 
 	if len(cancelMatches) == 1 && len(cancelMatches[0]) == 2 {
-		needsLabel = false
 		targetBranch = strings.TrimSpace(cancelMatches[0][1])
 	} else if len(matches) == 1 && len(matches[0]) == 2 {
-		needsLabel = true
 		targetBranch = strings.TrimSpace(matches[0][1])
 	} else {
 		// no matches
@@ -333,6 +329,7 @@ func (s *Server) handleIssueComment(l *logrus.Entry, ic github.IssueCommentEvent
 		WithField("target_branch", targetBranch).
 		Debug("release-blocker request.")
 
+	needsLabel := len(cancelMatches) != 1 || len(cancelMatches[0]) != 2
 	resp, err := s.handleLabel(targetBranch, org, repo, num, needsLabel)
 	if err != nil {
 		s.log.WithFields(l.Data).WithError(err)

external-plugins/test-subset/plugin/handler/handler.go

@@ -30,6 +30,7 @@ func init() {
 	log = logrus.New()
 	log.SetOutput(os.Stdout)
 	log.SetFormatter(&logrus.JSONFormatter{})
+	log.SetLevel(logrus.DebugLevel)
 }
 
 type GitHubEvent struct {