Merge pull request #24 from metal-stack/versions-without-leading-v

Allow version tags not to start with "v".

pkg/webhooks/github/actions/release_vector.go

@@ -100,9 +100,12 @@ func (r *ReleaseVector) AddToRelaseVector(ctx context.Context, p *ReleaseVectorP
 		r.logger.Debugw("skip adding new version to release vector because not a release vector repo", "repo", p.RepositoryName, "release", p.TagName)
 		return nil
 	}
+
 	tag := p.TagName
-	if !strings.HasPrefix(tag, "v") {
-		r.logger.Debugw("skip adding new version to release vector because not starting with v", "repo", p.RepositoryName, "release", tag)
+	trimmed := strings.TrimPrefix(tag, "v")
+	_, err := semver.Make(trimmed)
+	if err != nil {
+		r.logger.Infow("skip adding new version to release vector because not a valid semver release tag", "repo", p.RepositoryName, "release", tag, "parse-error", err)
 		return nil
 	}
 
@@ -112,11 +115,6 @@ func (r *ReleaseVector) AddToRelaseVector(ctx context.Context, p *ReleaseVectorP
 	lock.Lock()
 	defer once.Do(func() { lock.Unlock() })
 
-	version, err := semver.Make(tag[1:])
-	if err != nil {
-		return errors.Wrap(err, "not a valid semver release tag")
-	}
-
 	token, err := r.client.GitToken(ctx)
 	if err != nil {
 		return errors.Wrap(err, "error creating git token")
@@ -142,7 +140,7 @@ func (r *ReleaseVector) AddToRelaseVector(ctx context.Context, p *ReleaseVectorP
 	}
 
 	for _, patch := range patches {
-		err = patch.Apply(reader, writer, version.String())
+		err = patch.Apply(reader, writer, tag)
 		if err != nil {
 			return errors.Wrap(err, "error applying release updates")
 		}

pkg/webhooks/modifiers/file-patchers/yaml_path_patch.go

@@ -62,9 +62,9 @@ func (p YAMLPathPatch) Apply(cn ContentReader, cw ContentWriter, newValue string
 	}
 
 	if p.versionCompare {
-		newValue = strings.TrimPrefix(newValue, "v")
+		trimmedValue := strings.TrimPrefix(newValue, "v")
 
-		newVersion, err := semver.Parse(newValue)
+		newVersion, err := semver.Parse(trimmedValue)
 		if err != nil {
 			return err
 		}
@@ -86,8 +86,6 @@ func (p YAMLPathPatch) Apply(cn ContentReader, cw ContentWriter, newValue string
 				return nil
 			}
 		}
-
-		newValue = "v" + newValue
 	}
 
 	if p.template != nil {

pkg/webhooks/modifiers/file-patchers/yaml_path_patch_test.go

@@ -96,33 +96,25 @@ func TestYAMLPathVersionPatches_Apply(t *testing.T) {
 		{
 			name:     "replace a path with version comparison",
 			p:        YAMLPathPatch{file: "example.yaml", yamlPath: "a", versionCompare: true},
-			newValue: "0.0.2",
+			newValue: "v0.0.2",
 			input:    "a: v0.0.1",
 			output:   "a: v0.0.2\n",
 			wantErr:  false,
 		},
 		{
 			name:     "replace a path with version comparison when there was no semantic version before",
 			p:        YAMLPathPatch{file: "example.yaml", yamlPath: "a", versionCompare: true},
-			newValue: "0.0.2",
+			newValue: "v0.0.2",
 			input:    "a: bla",
 			output:   "a: v0.0.2\n",
 			wantErr:  false,
 		},
-		{
-			name:     "replace a path without original prefix with version comparison",
-			p:        YAMLPathPatch{file: "example.yaml", yamlPath: "a", versionCompare: true},
-			newValue: "0.0.2",
-			input:    "a: 0.0.1",
-			output:   "a: v0.0.2\n",
-			wantErr:  false,
-		},
 		{
 			name:     "replace a path with no prefix with version comparison",
 			p:        YAMLPathPatch{file: "example.yaml", yamlPath: "a", versionCompare: true},
 			newValue: "0.0.2",
 			input:    "a: 0.0.1",
-			output:   "a: v0.0.2\n",
+			output:   "a: 0.0.2\n",
 			wantErr:  false,
 		},
 		{
@@ -144,25 +136,25 @@ func TestYAMLPathVersionPatches_Apply(t *testing.T) {
 		{
 			name:     "replace with a template and version comparison",
 			p:        YAMLPathPatch{file: "example.yaml", yamlPath: "a", template: &tpl, versionCompare: true},
-			newValue: "0.0.2",
+			newValue: "v0.0.2",
 			input:    "a: http://server.io/v0.0.1.exe",
 			output:   "a: http://server.io/v0.0.2.exe\n",
 			wantErr:  false,
 		},
 		{
 			name:     "change nothing on lower version with template",
 			p:        YAMLPathPatch{file: "example.yaml", yamlPath: "a", template: &tpl, versionCompare: true},
-			newValue: "0.0.2",
+			newValue: "v0.0.2",
 			input:    "a: http://server.io/v0.0.3.exe",
 			output:   "a: http://server.io/v0.0.3.exe\n",
 			wantErr:  false,
 		},
 		{
-			name:     "replace with a template and version comparison when there was no semantic version before",
+			name:     "replace with a template and version comparison when there is no semantic version",
 			p:        YAMLPathPatch{file: "example.yaml", yamlPath: "a", template: &tpl, versionCompare: true},
 			newValue: "0.0.2",
 			input:    "a: http://server.io/bla.exe",
-			output:   "a: http://server.io/v0.0.2.exe\n",
+			output:   "a: http://server.io/0.0.2.exe\n",
 			wantErr:  false,
 		},
 	}