Merge branch 'main' into feature/search-command

NiclasvanEyk · Jul 1, 2023 · 585aaaa · 585aaaa
2 parents be5572a + 18fbee5
commit 585aaaa
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/cmd/init.go b/cmd/init.go
@@ -39,7 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 `
 
-		err = os.WriteFile(changelogPath, []byte(changelogContents), 0774)
+		err = os.WriteFile(changelogPath, []byte(changelogContents), 0o774)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/insert.go b/cmd/insert.go
@@ -13,12 +13,14 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var changeTypeAdded bool
-var changeTypeChanged bool
-var changeTypeDeprecated bool
-var changeTypeRemoved bool
-var changeTypeFixed bool
-var changeTypeSecurity bool
+var (
+	changeTypeAdded      bool
+	changeTypeChanged    bool
+	changeTypeDeprecated bool
+	changeTypeRemoved    bool
+	changeTypeFixed      bool
+	changeTypeSecurity   bool
+)
 
 // insertCmd represents the insert command
 var insertCmd = &cobra.Command{
@@ -67,7 +69,7 @@ var insertCmd = &cobra.Command{
 		response = normalized(response)
 
 		newSource := changelog.AddItem(changeType, response)
-		return os.WriteFile(filename, []byte(newSource), 0774)
+		return os.WriteFile(filename, []byte(newSource), 0o774)
 	},
 }
 

diff --git a/cmd/release.go b/cmd/release.go
@@ -15,9 +15,11 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var isMajor bool
-var isMinor bool
-var isPatch bool
+var (
+	isMajor bool
+	isMinor bool
+	isPatch bool
+)
 
 // releaseCmd represents the release command
 var releaseCmd = &cobra.Command{
@@ -59,7 +61,7 @@ to quickly create a Cobra application.`,
 		bounds := nextRelease.HeadlineBounds
 		newSource := changelog.ReplacedWithinBounds(bounds, newHeadline)
 
-		err = os.WriteFile(changelogPath, []byte(newSource), 0774)
+		err = os.WriteFile(changelogPath, []byte(newSource), 0o774)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/yank.go b/cmd/yank.go
@@ -53,7 +53,7 @@ var yankCmd = &cobra.Command{
 			return err
 		}
 
-		err = os.WriteFile(changelogPath, []byte(newSource), 0774)
+		err = os.WriteFile(changelogPath, []byte(newSource), 0o774)
 		if err != nil {
 			return err
 		}

diff --git a/internal/changelog/parser.go b/internal/changelog/parser.go
@@ -164,9 +164,9 @@ func Parse(source []byte) Changelog {
 	parser := goldmark.DefaultParser()
 	root := parser.Parse(reader)
 
-	var releases = make([]Release, 0)
+	releases := make([]Release, 0)
 
-	var title = ""
+	title := ""
 	var currentRelease *Release
 	currentReleaseIsNextRelease := false
 	var nextRelease *NextRelease