CI: azstemcell - parameterize os version validation

Author: aramprice

ci/azstemcell/main.go

@@ -17,6 +17,7 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"strings"
 	"time"
 )
@@ -316,25 +317,25 @@ func DownloadVHD(dirname string) (string, error) {
 	return destinationFile, nil
 }
 
-// Main and flag validation
-
+// Main and flag validation - add env keys first so that flags take precedence
 var (
-	// Add env keys first so that flags take precedence
 	VhdURL      = os.Getenv("AZURE_VHD_URL")      // vhd
 	VhdURLFile  = os.Getenv("AZURE_VHD_URL_FILE") // vhdfile
 	Version     = os.Getenv("AZURE_VERSION")      // version
 	VersionFile = os.Getenv("AZURE_VERSION_FILE") // versionfile
 	WindowsOS   = os.Getenv("AZURE_WINDOWS_OS")   // os
 	Destination = os.Getenv("AZURE_DESTINATION")  // dest
 	WorkDir     = os.Getenv("AZURE_TEMP_DIR")     // temp
+
+	supportedWindowsVersions = []string{"2019"}
 )
 
 func parseFlags() error {
 	flag.StringVar(&VhdURL, "vhd", "", "URL to VHD with SAS token, env: AZURE_VHD_URL")
 	flag.StringVar(&VhdURLFile, "vhdfile", "", "File containing the VHD URL with SAS token, env: AZURE_VHD_URL_FILE")
 	flag.StringVar(&Version, "version", "", "Stemcell version, env: AZURE_VERSION")
 	flag.StringVar(&VersionFile, "versionfile", "", "File containing the stemcell version, env: AZURE_VERSION_FILE")
-	flag.StringVar(&WindowsOS, "os", "", "Windows version (2019), env: AZURE_WINDOWS_OS")
+	flag.StringVar(&WindowsOS, "os", "", "Windows version (e.g 2135), env: AZURE_WINDOWS_OS")
 	flag.StringVar(&Destination, "dest", "", "Destination directory if not provided the current working directory will be used, env: AZURE_DESTINATION")
 	flag.StringVar(&WorkDir, "temp", "", "Temporary directory (must be capable of storing +130GB of data), env: AZURE_TEMP_DIR")
 
@@ -401,14 +402,12 @@ func validateFlags() []error {
 	if WindowsOS == "" {
 		add(errors.New("missing required argument: [os]"))
 	}
-	switch strings.ToLower(WindowsOS) {
-	case "2019":
-	// Ok
-	case "windows2019":
-		WindowsOS = strings.TrimPrefix(WindowsOS, "windows")
-	default:
-		add(fmt.Errorf("OS version must be 2019 have: %s", WindowsOS))
+
+	WindowsOS = strings.TrimPrefix(WindowsOS, "windows")
+	if !slices.Contains(supportedWindowsVersions, WindowsOS) {
+		add(fmt.Errorf("OS version must be one of %v, got: %s", supportedWindowsVersions, WindowsOS))
 	}
+
 	if Destination == "" {
 		add(errors.New("missing required argument: [dest]"))
 	}

ci/azstemcell/main_test.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -14,7 +13,7 @@ func TestCreateManifest(t *testing.T) {
 	const expected = `---
 name: bosh-azure-hyperv-windows2019-go_agent
 version: '10.0.17763.410'
-bosh_protocol: 1
+api_version: 3
 sha1: 478da1732dba66e67e6a657fdf03b5614c513b04
 operating_system: windows2019
 cloud_properties:
@@ -31,7 +30,7 @@ cloud_properties:
   root_device_name: "/dev/sda1"
 `
 
-	tmpdir, err := ioutil.TempDir("", "")
+	tmpdir, err := os.MkdirTemp("", "")
 	if err != nil {
 		t.Fatal(err)
 	}