chore: enable wsl linter (#417)

See #331.

Author: bfabio

.golangci.yaml

@@ -100,7 +100,7 @@ linters:
     - wastedassign
     - whitespace
     # - wrapcheck
-    # - wsl
+    - wsl
 
   # disable:
     # # Not useful

apiclient/apiclient.go

@@ -142,6 +142,7 @@ page:
 	}
 
 	publishersResponse = &PublishersPaginated{}
+
 	err = json.NewDecoder(res.Body).Decode(&publishersResponse)
 	if err != nil {
 		return nil, fmt.Errorf("can't parse GET %s response: %w", reqURL, err)
@@ -175,6 +176,7 @@ page:
 		if p.AlternativeID != "" {
 			id = p.AlternativeID
 		}
+
 		publishers = append(publishers, common.Publisher{
 			ID:            id,
 			Name:          fmt.Sprintf("%s %s", p.Description, p.Email),
@@ -259,6 +261,7 @@ func (clt APIClient) PostSoftware(url string, aliases []string, publiccodeYml st
 	}
 
 	postSoftwareResponse := &Software{}
+
 	err = json.NewDecoder(res.Body).Decode(&postSoftwareResponse)
 	if err != nil {
 		return nil, fmt.Errorf("can't parse POST /software (for %s) response: %w", url, err)

common/publisher.go

@@ -25,6 +25,7 @@ func LoadPublishers(path string) ([]Publisher, error) {
 	}
 
 	var publishers []Publisher
+
 	err = yaml.Unmarshal(data, &publishers)
 	if err != nil {
 		return nil, fmt.Errorf("error in parsing `%s': %w", path, err)

crawler/crawler.go

@@ -45,6 +45,7 @@ type Crawler struct {
 // NewCrawler initializes a new Crawler object and connects to Elasticsearch (if dryRun == false).
 func NewCrawler(dryRun bool) *Crawler {
 	var c Crawler
+
 	const channelSize = 1000
 
 	c.DryRun = dryRun
@@ -166,9 +167,11 @@ func (c *Crawler) CrawlPublishers(publishers []common.Publisher) error {
 // with a valid publiccode.yml to the repositories channel.
 func (c *Crawler) ScanPublisher(publisher common.Publisher) {
 	log.Infof("Processing publisher: %s", publisher.Name)
+
 	defer c.publishersWg.Done()
 
 	var err error
+
 	for _, u := range publisher.Organizations {
 		orgURL := (url.URL)(u)
 
@@ -186,6 +189,7 @@ func (c *Crawler) ScanPublisher(publisher common.Publisher) {
 				u.String(),
 			)
 		}
+
 		if err != nil {
 			if errors.Is(err, scanner.ErrPubliccodeNotFound) {
 				log.Warnf("[%s] %s", orgURL.String(), err.Error())
@@ -316,6 +320,7 @@ func (c *Crawler) ProcessRepo(repository common.Repository) { //nolint:maintidx
 	}
 
 	var parser *publiccode.Parser
+
 	parser, err = publiccode.NewParser(publiccode.ParserConfig{Domain: domain})
 	if err != nil {
 		logEntries = append(
@@ -356,18 +361,22 @@ func (c *Crawler) ProcessRepo(repository common.Repository) { //nolint:maintidx
 
 	if !valid {
 		logEntries = append(logEntries, fmt.Sprintf("[%s] BAD publiccode.yml: %+v\n", repository.Name, err))
+
 		metrics.GetCounter("repository_bad_publiccodeyml", c.Index).Inc()
 
 		return
 	}
+
 	logEntries = append(logEntries, fmt.Sprintf("[%s] GOOD publiccode.yml\n", repository.Name))
+
 	metrics.GetCounter("repository_good_publiccodeyml", c.Index).Inc()
 
 	if c.DryRun {
 		log.Infof("[%s]: Skipping other steps (--dry-run)", repository.Name)
 	}
 
 	var aliases []string
+
 	url := repository.CanonicalURL.String()
 
 	// If the URL of the repo we have is different from the canonical URL
@@ -384,9 +393,10 @@ func (c *Crawler) ProcessRepo(repository common.Repository) { //nolint:maintidx
 		return
 	}
 
-	// New software to add
 	if software == nil {
+		// New software to add
 		metrics.GetCounter("repository_new", c.Index).Inc()
+
 		if !c.DryRun {
 			// Add the software even if publiccode.yml is invalid, setting active to
 			// false so that we know about the new software and for example
@@ -399,21 +409,24 @@ func (c *Crawler) ProcessRepo(repository common.Repository) { //nolint:maintidx
 				return
 			}
 		}
-		// Known software
 	} else {
+		// Known software
 		for _, alias := range software.Aliases {
 			if !slices.Contains(aliases, alias) {
 				aliases = append(aliases, alias)
 			}
 		}
 
 		metrics.GetCounter("repository_known", c.Index).Inc()
+
 		if !c.DryRun {
 			_, err = c.apiClient.PatchSoftware(software.ID, url, aliases, string(publiccodeYml))
 		}
 	}
+
 	if err != nil {
 		logEntries = append(logEntries, fmt.Sprintf("[%s]: %s", repository.Name, err.Error()))
+
 		metrics.GetCounter("repository_upsert_failures", c.Index).Inc()
 	}
 
@@ -429,6 +442,7 @@ func (c *Crawler) ProcessRepo(repository common.Repository) { //nolint:maintidx
 		if viper.IsSet("ACTIVITY_DAYS") {
 			activityDays = viper.GetInt("ACTIVITY_DAYS")
 		}
+
 		activityIndex, _, err := git.CalculateRepoActivity(repository, activityDays)
 		if err != nil {
 			logEntries = append(
@@ -458,6 +472,7 @@ func (c *Crawler) crawl() error {
 	// Process the repositories in order to retrieve the files.
 	for i := range numCPUs {
 		c.repositoriesWg.Add(1)
+
 		go func(id int) {
 			log.Debugf("Starting ProcessRepositories() goroutine (#%d)", id)
 			c.ProcessRepositories(reposChan)
@@ -467,6 +482,7 @@ func (c *Crawler) crawl() error {
 	for repo := range c.repositories {
 		reposChan <- repo
 	}
+
 	close(reposChan)
 	c.repositoriesWg.Wait()
 

git/clone_repository.go

@@ -17,6 +17,7 @@ func CloneRepository(hostname, name, gitURL, index string) error {
 	if name == "" {
 		return errors.New("cannot save a file without name")
 	}
+
 	if gitURL == "" {
 		return errors.New("cannot clone a repository without git URL")
 	}

git/repo_activity.go

@@ -105,6 +105,7 @@ func CalculateRepoActivity(repository common.Repository, days int) (float64, map
 		if repoActivity > 100 {
 			repoActivity = 100
 		}
+
 		vitalityIndex[i] = repoActivity
 	}
 
@@ -132,6 +133,7 @@ func userCommunityLastDays(commits []*object.Commit) float64 {
 func activityLastDays(commits []*object.Commit) float64 {
 	numberCommits := float64(len(commits))
 	numberMerges := 0
+
 	for _, c := range commits {
 		if c.NumParents() > 1 {
 			numberMerges++
@@ -154,6 +156,7 @@ func extractAllTagsCommit(r *git.Repository) ([]*object.Commit, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	err = tagrefs.ForEach(func(t *plumbing.Reference) error {
 		if !t.Hash().IsZero() {
 			tagObject, _ := r.CommitObject(t.Hash())
@@ -179,6 +182,7 @@ func extractAllCommits(r *git.Repository) ([]*object.Commit, error) {
 
 		return nil, err
 	}
+
 	cIter, err := r.Log(&git.LogOptions{From: ref.Hash()})
 	if err != nil {
 		log.Error(err)
@@ -205,18 +209,21 @@ func calculateLongevityIndex(r *git.Repository) (float64, error) {
 
 		return 0, err
 	}
+
 	cIter, err := r.Log(&git.LogOptions{From: ref.Hash()})
 	if err != nil {
 		log.Error(err)
 
 		return 0, err
 	}
+
 	creationDate := extractOldestCommitDate(cIter)
 
 	age := time.Since(creationDate).Hours() / 24
 
 	// Git was invented in 2005. If some repo starts before, remove.
 	then := time.Date(2005, time.January, 1, 1, 0, 0, 0, time.UTC)
+
 	duration := time.Since(then).Hours()
 	if age > duration/24 {
 		return -1, errors.New("first commit is too old. Must be after the creation of git (2005)")
@@ -306,6 +313,7 @@ func extractCommitsPerDay(days int, commits []*object.Commit) map[int][]*object.
 // extractTagsPerDay returns a map of #[days] commits where a tag is created.
 func extractTagsPerDay(days int, tags []*object.Commit) map[int][]*object.Commit {
 	tagsPerDays := map[int][]*object.Commit{}
+
 	for i := range days {
 		lastDays := time.Now().AddDate(0, 0, -i)
 		// Append all the commits created before lastDays date.

internal/url.go

@@ -17,6 +17,7 @@ func (u *URL) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	if err != nil {
 		return err
 	}
+
 	*u = (URL)(*urlp)
 
 	return nil

scanner/bitbucket.go

@@ -54,12 +54,14 @@ func (scanner BitBucketScanner) ScanGroupOfRepos(
 			Ref:      r.Mainbranch.Name,
 			Path:     "publiccode.yml",
 		}
+
 		res, err := scanner.client.Repositories.Repository.GetFileContent(opt)
 		if err != nil {
 			log.Infof("[%s]: no publiccode.yml: %s", r.Full_name, err.Error())
 
 			continue
 		}
+
 		if res != nil {
 			u, err := url.Parse(fmt.Sprintf("https://bitbucket.org/%s/%s.git", owner, r.Slug))
 			if err != nil {
@@ -110,10 +112,12 @@ func (scanner BitBucketScanner) ScanRepo(
 		Ref:      "HEAD",
 		Path:     "publiccode.yml",
 	}
+
 	res, err := scanner.client.Repositories.Repository.GetFileContent(filesOpt)
 	if err != nil {
 		return fmt.Errorf("[%s]: no publiccode.yml: %w", url.String(), err)
 	}
+
 	if res != nil {
 		canonicalURL, err := url.Parse(fmt.Sprintf("https://bitbucket.org/%s/%s.git", owner, repo.Slug))
 		if err != nil {

scanner/github.go

@@ -61,6 +61,7 @@ func (scanner GitHubScanner) ScanGroupOfRepos(
 	for {
 	Retry:
 		repos, resp, err := scanner.client.Repositories.ListByOrg(scanner.ctx, orgName, opt)
+
 		var rateLimitError *github.RateLimitError
 		if errors.As(err, &rateLimitError) {
 			log.Infof("GitHub rate limit hit, sleeping until %s", resp.Rate.Reset.Time.String())
@@ -75,6 +76,7 @@ func (scanner GitHubScanner) ScanGroupOfRepos(
 
 			goto Retry
 		}
+
 		if err != nil {
 			// Try to list repos by user, for backwards compatibility.
 			log.Warnf(
@@ -157,6 +159,7 @@ Retry:
 
 		goto Retry
 	}
+
 	if err != nil {
 		return fmt.Errorf("can't get repo %s: %w", url.String(), err)
 	}
@@ -172,6 +175,7 @@ Retry:
 
 		goto Retry
 	}
+
 	if errors.As(err, &abuseRateLimitError) {
 		secondaryRateLimit(abuseRateLimitError)
 

scanner/gitlab.go

@@ -25,6 +25,7 @@ func (scanner GitLabScanner) ScanGroupOfRepos(
 	log.Debugf("GitLabScanner.ScanGroupOfRepos(%s)", url.String())
 
 	apiURL, _ := url.Parse("/api/v4")
+
 	git, err := gitlab.NewClient(os.Getenv("GITLAB_TOKEN"), gitlab.WithBaseURL(apiURL.String()))
 	if err != nil {
 		return err
@@ -51,6 +52,7 @@ func (scanner GitLabScanner) ScanGroupOfRepos(
 			if err != nil {
 				return err
 			}
+
 			for _, prj := range projects {
 				if err = addProject(nil, *prj, publisher, repositories); err != nil {
 					return err
@@ -60,6 +62,7 @@ func (scanner GitLabScanner) ScanGroupOfRepos(
 			if res.NextPage == 0 {
 				break
 			}
+
 			opts.Page = res.NextPage
 		}
 	}
@@ -74,12 +77,14 @@ func (scanner GitLabScanner) ScanRepo(
 	log.Debugf("GitLabScanner.ScanRepo(%s)", url.String())
 
 	apiURL, _ := url.Parse("/api/v4")
+
 	git, err := gitlab.NewClient(os.Getenv("GITLAB_TOKEN"), gitlab.WithBaseURL(apiURL.String()))
 	if err != nil {
 		return err
 	}
 
 	projectName := strings.Trim(url.Path, "/")
+
 	prj, _, err := git.Projects.GetProject(projectName, &gitlab.GetProjectOptions{})
 	if err != nil {
 		return err
@@ -105,6 +110,7 @@ func generateGitlabRawURL(baseURL, defaultBranch string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+
 	u.Path = path.Join(u.Path, "raw", defaultBranch, "publiccode.yml")
 
 	return u.String(), err
@@ -124,6 +130,7 @@ func addGroupProjects(
 		if err != nil {
 			return err
 		}
+
 		for _, prj := range projects {
 			err = addProject(nil, *prj, publisher, repositories)
 			if err != nil {
@@ -134,17 +141,20 @@ func addGroupProjects(
 		if res.NextPage == 0 {
 			break
 		}
+
 		opts.Page = res.NextPage
 	}
 
 	dgOpts := &gitlab.ListDescendantGroupsOptions{
 		ListOptions: gitlab.ListOptions{Page: 1},
 	}
+
 	for {
 		groups, res, err := client.Groups.ListDescendantGroups(group.ID, dgOpts)
 		if err != nil {
 			return err
 		}
+
 		for _, g := range groups {
 			err = addGroupProjects(*g, publisher, repositories, client)
 			if err != nil {
@@ -155,6 +165,7 @@ func addGroupProjects(
 		if res.NextPage == 0 {
 			break
 		}
+
 		dgOpts.Page = res.NextPage
 	}
 
@@ -176,6 +187,7 @@ func addProject(
 		if err != nil {
 			return fmt.Errorf("failed to get canonical repo URL for %s: %w", project.WebURL, err)
 		}
+
 		if originalURL == nil {
 			originalURL = canonicalURL
 		}