chore: enable some more linters (#16)

.golangci.yaml

@@ -0,0 +1,27 @@
+linters:
+  presets:
+    - bugs
+    - error
+    - import
+    - metalinter
+    - module
+    - unused
+
+  enable:
+    - testifylint
+
+  disable:
+    # preset error
+    # These should probably be cleaned up at some point if we want to publish part of this as a library.
+    - err113 # Very annoying to define static errors everywhere
+    - wrapcheck # Very annoying to wrap errors everywhere
+    # preset import
+    - depguard
+
+linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - localmodule
+

cmd/rp/cmd/run.go

@@ -51,9 +51,9 @@ func run(cmd *cobra.Command, _ []string) error {
 		BaseBranch: flagBranch,
 	}
 
-	switch flagForge {
+	switch flagForge { // nolint:gocritic // Will become a proper switch once gitlab is added
-	//case "gitlab":
+	// case "gitlab":
-	//f = rp.NewGitLab(forgeOptions)
+	// f = rp.NewGitLab(forgeOptions)
 	case "github":
 		logger.DebugContext(ctx, "using forge GitHub")
 		forge = rp.NewGitHub(logger, &rp.GitHubOptions{

forge.go

@@ -19,7 +19,7 @@ const (
 	GitHubPerPageMax    = 100
 	GitHubPRStateOpen   = "open"
 	GitHubPRStateClosed = "closed"
-	GitHubEnvAPIToken   = "GITHUB_TOKEN"
+	GitHubEnvAPIToken   = "GITHUB_TOKEN" // nolint:gosec // Not actually a hardcoded credential
 	GitHubEnvUsername   = "GITHUB_USER"
 	GitHubEnvRepository = "GITHUB_REPOSITORY"
 	GitHubLabelColor    = "dedede"

internal/markdown/extensions/section.go

@@ -12,8 +12,10 @@ import (
 	"github.com/apricote/releaser-pleaser/internal/markdown/extensions/ast"
 )
 
-var sectionStartRegex = regexp.MustCompile(`^<!-- section-start (.+) -->`)
+var (
-var sectionEndRegex = regexp.MustCompile(`^<!-- section-end (.+) -->`)
+	sectionStartRegex = regexp.MustCompile(`^<!-- section-start (.+) -->`)
+	sectionEndRegex   = regexp.MustCompile(`^<!-- section-end (.+) -->`)
+)
 
 const (
 	sectionTrigger     = "<!--"
@@ -21,8 +23,7 @@ const (
 	SectionEndFormat   = "<!-- section-end %s -->"
 )
 
-type sectionParser struct {
+type sectionParser struct{}
-}
 
 func (s *sectionParser) Open(_ gast.Node, reader text.Reader, _ parser.Context) (gast.Node, parser.State) {
 	line, _ := reader.PeekLine()
@@ -75,8 +76,7 @@ func (s *sectionParser) Trigger() []byte {
 	return []byte(sectionTrigger)
 }
 
-type section struct {
+type section struct{}
-}
 
 // Section is an extension that allow you to use group content under a shared parent ast node.
 var Section = &section{}

internal/markdown/renderer/markdown/renderer.go

@@ -331,7 +331,7 @@ func (r *Renderer) renderFencedCodeBlock(w util.BufWriter, source []byte, node a
 		return ast.WalkStop, fmt.Errorf(": %w", err)
 	}
 	if err := r.writeByte(w, '\n'); err != nil {
-		return ast.WalkStop, nil
+		return ast.WalkStop, fmt.Errorf(": %w", err)
 	}
 
 	// Write the contents of the fenced code block.

internal/testutils/git.go

@@ -11,25 +11,26 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var (
+var author = &object.Signature{
-	author = &object.Signature{
+	Name: "releaser-pleaser",
-		Name: "releaser-pleaser",
+	When: time.Date(2020, 01, 01, 01, 01, 01, 01, time.UTC),
-		When: time.Date(2020, 01, 01, 01, 01, 01, 01, time.UTC),
+}
-	}
-)
 
 type CommitOption func(*commitOptions)
+
 type commitOptions struct {
 	cleanFiles bool
 	files      []commitFile
 	tags       []string
 }
+
 type commitFile struct {
 	path    string
 	content string
 }
 
 type Commit func(*testing.T, *git.Repository) error
+
 type Repo func(*testing.T) *git.Repository
 
 func WithCommit(message string, options ...CommitOption) Commit {
@@ -83,7 +84,6 @@ func WithCommit(message string, options ...CommitOption) Commit {
 		}
 
 		return nil
-
 	}
 }
 

releasepr.go

@@ -155,6 +155,9 @@ func (pr *ReleasePullRequest) parseVersioningFlags(overrides ReleaseOverrides) R
 			overrides.NextVersionType = NextVersionTypeBeta
 		case LabelNextVersionTypeAlpha:
 			overrides.NextVersionType = NextVersionTypeAlpha
+		case LabelReleasePending, LabelReleaseTagged:
+			// These labels have no effect on the versioning.
+			break
 		}
 	}