Move to version array

Author: bfoley13

pkg/config/draftconfig.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"io/fs"
+	"slices"
 
 	"github.com/Azure/draft/pkg/config/transformers"
 	"github.com/Azure/draft/pkg/config/validators"
@@ -34,7 +35,7 @@ type DraftConfig struct {
 	DisplayName         string                         `yaml:"displayName"`
 	Description         string                         `yaml:"description"`
 	Type                string                         `yaml:"type"`
-	Versions            string                         `yaml:"versions"`
+	Versions            []string                       `yaml:"versions"`
 	DefaultVersion      string                         `yaml:"defaultVersion"`
 	Variables           []*BuilderVar                  `yaml:"variables"`
 	FileNameOverrideMap map[string]string              `yaml:"filenameOverrideMap"`
@@ -232,13 +233,8 @@ func (d *DraftConfig) ApplyDefaultVariablesForVersion(version string) error {
 		return fmt.Errorf("invalid version: %w", err)
 	}
 
-	expectedConfigVersionRange, err := semver.ParseRange(d.Versions)
-	if err != nil {
-		return fmt.Errorf("invalid config version range: %w", err)
-	}
-
-	if !expectedConfigVersionRange(v) {
-		return fmt.Errorf("version %s is outside of config version range %s", version, d.Versions)
+	if !slices.Contains(d.Versions, version) {
+		return fmt.Errorf("invalid config version range: %s", version)
 	}
 
 	for _, variable := range d.Variables {
@@ -376,11 +372,16 @@ func (d *DraftConfig) DeepCopy() *DraftConfig {
 		DisplayName:         d.DisplayName,
 		Description:         d.Description,
 		Type:                d.Type,
-		Versions:            d.Versions,
+		Versions:            make([]string, len(d.Versions)),
 		DefaultVersion:      d.DefaultVersion,
 		Variables:           make([]*BuilderVar, len(d.Variables)),
 		FileNameOverrideMap: make(map[string]string),
 	}
+
+	for i, version := range d.Versions {
+		newConfig.Versions[i] = version
+	}
+
 	for i, variable := range d.Variables {
 		newConfig.Variables[i] = variable.DeepCopy()
 	}

pkg/config/draftconfig_template_test.go

@@ -121,12 +121,10 @@ func loadTemplatesWithValidation() error {
 			return fmt.Errorf("template %s has an invalid type: %s", path, currTemplate.Type)
 		}
 
-		if _, err := semver.ParseRange(currTemplate.Versions); err != nil {
-			return fmt.Errorf("template %s has an invalid version range: %s", path, currTemplate.Versions)
-		}
-
-		if _, err := GetValidTemplateVersions(currTemplate.Versions); err != nil {
-			return fmt.Errorf("template %s has an invalid or unboud version range %s: %w", path, currTemplate.Versions, err)
+		for _, version := range currTemplate.Versions {
+			if _, err := semver.Parse(version); err != nil {
+				return fmt.Errorf("template %s has an invalid version: %s", path, version)
+			}
 		}
 
 		referenceVarMap := map[string]*BuilderVar{}

pkg/config/draftconfig_test.go

@@ -211,7 +211,7 @@ func TestApplyDefaultVariablesForVersion(t *testing.T) {
 			testName: "excludeOutOfVersionRangeVariables",
 			version:  "0.0.1",
 			draftConfig: DraftConfig{
-				Versions: ">=0.0.1 <=0.0.2",
+				Versions: []string{"0.0.1", "0.0.2"},
 				Variables: []*BuilderVar{
 					{
 						Name:     "var1",
@@ -239,7 +239,7 @@ func TestApplyDefaultVariablesForVersion(t *testing.T) {
 			testName: "emptyInputVersion",
 			version:  "",
 			draftConfig: DraftConfig{
-				Versions: ">=0.0.1 <=0.0.2",
+				Versions: []string{"0.0.1", "0.0.2"},
 				Variables: []*BuilderVar{
 					{
 						Name:     "var1",
@@ -265,7 +265,7 @@ func TestApplyDefaultVariablesForVersion(t *testing.T) {
 			testName: "inputVersionOutOfRange",
 			version:  "0.0.3",
 			draftConfig: DraftConfig{
-				Versions: ">=0.0.1 <=0.0.2",
+				Versions: []string{"0.0.1", "0.0.2"},
 				Variables: []*BuilderVar{
 					{
 						Name:     "var1",
@@ -285,13 +285,13 @@ func TestApplyDefaultVariablesForVersion(t *testing.T) {
 					},
 				},
 			},
-			wantErrMsg: "version 0.0.3 is outside of config version range >=0.0.1 <=0.0.2",
+			wantErrMsg: "invalid config version range: 0.0.3",
 		},
 		{
 			testName: "overwriteDevfaultValue",
 			version:  "0.0.2",
 			draftConfig: DraftConfig{
-				Versions: ">=0.0.1 <=0.0.2",
+				Versions: []string{"0.0.1", "0.0.2"},
 				Variables: []*BuilderVar{
 					{
 						Name:     "var1",
@@ -320,7 +320,7 @@ func TestApplyDefaultVariablesForVersion(t *testing.T) {
 			testName: "referenceVarOverwrite",
 			version:  "0.0.2",
 			draftConfig: DraftConfig{
-				Versions: ">=0.0.1 <=0.0.2",
+				Versions: []string{"0.0.1", "0.0.2"},
 				Variables: []*BuilderVar{
 					{
 						Name:     "var1",

pkg/config/draftconfig_utils.go

@@ -5,6 +5,7 @@ import (
 	"io/fs"
 	"path/filepath"
 	"runtime"
+	"slices"
 	"strings"
 
 	"github.com/Azure/draft/pkg/config"
@@ -90,18 +91,13 @@ func loadTemplates() error {
 }
 
 // IsValidVersion checks if a version is valid for a given version range
-func IsValidVersion(versionRange, version string) bool {
-	v, err := semver.Parse(version)
+func IsValidVersion(versions []string, version string) bool {
+	_, err := semver.Parse(version)
 	if err != nil {
 		return false
 	}
 
-	expectedRange, err := semver.ParseRange(versionRange)
-	if err != nil {
-		return false
-	}
-
-	return expectedRange(v)
+	return slices.Contains(versions, version)
 }
 
 func sanatizeTemplateSrcDir(src string) string {

pkg/config/draftconfig_utils_test.go

@@ -1,6 +1,6 @@
 templateName: "app-routing-ingress"
 description: "This template is used to create an ingress resource for use with the app-routing addon in AKS"
-versions: "0.0.1"
+versions: ["0.0.1"]
 defaultVersion: "0.0.1"
 type: "manifest"
 variables: