Fix version increase logic (#346)

* Update version bump logic
* Changelog
* gofmt & goimports
* Remove leftover code
* Simplify mock expectations
* Changelog typos
* Add FIX typo to test data
* Fix test
* Reword changelog

changelog/v0.10.28/version-increase-for-v1.yaml

@@ -0,0 +1,8 @@
+changelog:
+- type: FIX
+  description: >
+    When verifying changelog entries after the v1.0.0 release, the version utils currently require a minor version bump
+    for any non-breaking change. We need to update the logic to ensure that if a changelog entry is of type
+    `BREAKING_CHANGE` we must bump the major version, if it is of type `NEW_FEATURE` we must bump the minor version,
+    and else we have to bump the patch version.
+  issueLink: https://github.com/solo-io/go-utils/issues/345

changelogutils/changelog.go

@@ -308,16 +308,18 @@ func ComputeChangelogForNonRelease(fs afero.Fs, latestTag, proposedTag, changelo
 		return nil, err
 	}
 	breakingChanges := false
+	newFeature := false
 	releaseStableApi := false
 
 	for _, file := range changelog.Files {
 		for _, entry := range file.Entries {
 			breakingChanges = breakingChanges || entry.Type.BreakingChange()
+			newFeature = newFeature || entry.Type.NewFeature()
 		}
 		releaseStableApi = releaseStableApi || file.GetReleaseStableApi()
 	}
 
-	expectedVersion := latestVersion.IncrementVersion(breakingChanges)
+	expectedVersion := latestVersion.IncrementVersion(breakingChanges, newFeature)
 	if releaseStableApi {
 		if !proposedVersion.Equals(&versionutils.StableApiVersion) {
 			return nil, errors.Errorf("Changelog indicates this is a stable API release, which should be used only to indicate the release of v1.0.0, not %s", proposedVersion)

changelogutils/entrytype.go

@@ -47,6 +47,10 @@ func (clt ChangelogEntryType) BreakingChange() bool {
 	return clt == BREAKING_CHANGE
 }
 
+func (clt ChangelogEntryType) NewFeature() bool {
+	return clt == NEW_FEATURE
+}
+
 func (clt ChangelogEntryType) MarshalJSON() ([]byte, error) {
 	if s, ok := interface{}(clt).(fmt.Stringer); ok {
 		return json.Marshal(s.String())

changelogutils/reader_test.go

@@ -423,6 +423,7 @@ changelog:
     description: foo2
     issueLink: bar2
 `
+
 	validChangelog2 = `
 changelog:
   - type: NON_USER_FACING
@@ -432,6 +433,7 @@ changelog:
     issueLink: bar4
     resolvesIssue: false
 `
+
 	validChangelog3 = `
 changelog:
   - type: DEPENDENCY_BUMP
@@ -447,6 +449,31 @@ changelog:
     issueLink: bar
 `
 
+	validNewFeatureChangelog = `
+changelog:
+  - type: NEW_FEATURE
+    description: cool new feature
+    issueLink: http://issue
+`
+
+	validNonBreakingNorNewFeatureChangelog = `
+changelog:
+  - type: NON_USER_FACING
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: foo
+    dependencyRepo: bar
+    dependencyTag: baz
+  - type: UPGRADE
+    description: foo5
+    issueLink: bar5
+  - type: HELM
+    description: foo6
+    issueLink: bar6
+  - type: FIX
+    description: foo1
+    issueLink: bar1
+`
+
 	validStableReleaseChangelog = `
 changelog:
   - type: NON_USER_FACING

changelogutils/validator.go

@@ -155,16 +155,18 @@ func (c *changelogValidator) validateVersionBump(ctx context.Context, latestTag
 		return err
 	}
 	breakingChanges := false
+	newFeature := false
 	releaseStableApi := false
 
 	for _, file := range changelog.Files {
 		for _, entry := range file.Entries {
 			breakingChanges = breakingChanges || entry.Type.BreakingChange()
+			newFeature = newFeature || entry.Type.NewFeature()
 		}
 		releaseStableApi = releaseStableApi || file.GetReleaseStableApi()
 	}
 
-	expectedVersion := latestVersion.IncrementVersion(breakingChanges)
+	expectedVersion := latestVersion.IncrementVersion(breakingChanges, newFeature)
 	if releaseStableApi {
 		if !changelog.Version.Equals(&versionutils.StableApiVersion) {
 			return InvalidUseOfStableApiError(changelog.Version.String())