fix: pr comments

e2e/scenario/scenario_ubuntu2204-standalone-containerd.go

@@ -1,10 +1,6 @@
 package scenario
 
 import (
-	"encoding/json"
-	"os"
-	"strings"
-
 	"github.com/Azure/agentbaker/pkg/agent/datamodel"
 )
 
@@ -42,31 +38,17 @@ func (t *Template) ubuntu2204ContainerdVersion() *Scenario {
 				nbc.ContainerdVersion = "1.6.9"
 			},
 			LiveVMValidators: []*LiveVMValidator{
-				containerdVersionValidator(getCurrentManifestContainerdVersion()),
+				containerdVersionValidator(getContainerdManifestVersion()),
 			},
 		},
 	}
 }
 
-type Manifest struct {
-	Containerd struct {
-		Edge string `json:"edge"`
-	} `json:"containerd"`
-}
-
-func getCurrentManifestContainerdVersion() string {
-	manifestData, err := os.ReadFile("../parts/linux/cloud-init/artifacts/manifest.json")
+func getContainerdManifestVersion() string {
+	manifest, err := getVHDManifest()
 	if err != nil {
 		return ""
 	}
-	manifestDataStr := string(manifestData)
-	manifestDataStr = strings.TrimRight(manifestDataStr, "#EOF \n\r\t")
-	manifestData = []byte(manifestDataStr)
 
-	var manifest Manifest
-	err = json.Unmarshal([]byte(manifestData), &manifest)
-	if err != nil {
-		return ""
-	}
 	return manifest.Containerd.Edge
 }

e2e/scenario/validators.go

@@ -134,6 +134,7 @@ func containerdVersionValidator(version string) *LiveVMValidator {
 			if code != "0" {
 				return fmt.Errorf("validator command terminated with exit code %q but expected code 0", code)
 			}
+
 			if !strings.Contains(stdout, version) {
 				return fmt.Errorf(fmt.Sprintf("expected to find containerd version %s, but was not", version))
 			}

e2e/scenario/vhd.go

@@ -97,6 +97,28 @@ func mustGetVHDCatalogFromEmbeddedJSON(rawJSON string) VHDCatalog {
 	return catalog
 }
 
+type Manifest struct {
+	Containerd struct {
+		Edge string `json:"edge"`
+	} `json:"containerd"`
+}
+
+func getVHDManifest() (Manifest, error) {
+	manifestData, err := os.ReadFile("../parts/linux/cloud-init/artifacts/manifest.json")
+	if err != nil {
+		return Manifest{}, err
+	}
+	manifestDataStr := string(manifestData)
+	manifestDataStr = strings.TrimRight(manifestDataStr, "#EOF \n\r\t")
+	manifestData = []byte(manifestDataStr)
+
+	manifest := Manifest{}
+	if err = json.Unmarshal([]byte(manifestData), &manifest); err != nil {
+		panic(err)
+   	}
+	return manifest, nil
+}
+
 // VHDResourceID represents a resource ID pointing to a VHD in Azure. This could be theoretically
 // be the resource ID of a managed image or SIG image version, though for now this will always be a SIG image version.
 type VHDResourceID string