From 3bd2a8169fb98f1ccef6c4f7059a7df013fdfc4e Mon Sep 17 00:00:00 2001
From: Alison Burgess <alburgess@microsoft.com>
Date: Wed, 17 Apr 2024 14:17:54 -0700
Subject: [PATCH] reorganize

---
 pkg/agent/datamodel/sig_config.go | 50 +++++++++++++++----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkg/agent/datamodel/sig_config.go b/pkg/agent/datamodel/sig_config.go
index 2c1c473d823..08f0d412254 100644
--- a/pkg/agent/datamodel/sig_config.go
+++ b/pkg/agent/datamodel/sig_config.go
@@ -85,6 +85,31 @@ func processComponents(components Components) {
 	}
 }
 
+func getCachedVersionsFromManifestJSON(manifestFilePath string) Manifest {
+	data, err := os.ReadFile(manifestFilePath)
+	if err != nil {
+		panic(err)
+	}
+	data = bytes.ReplaceAll(data, []byte("#EOF"), []byte(""))
+	var manifest Manifest
+	if err = json.Unmarshal(data, &manifest); err != nil {
+		panic(err)
+	}
+	return manifest
+}
+
+func getCachedVersionsFromComponentsJSON(componentsFilePath string) Components {
+	data, err := os.ReadFile(componentsFilePath)
+	if err != nil {
+		panic(err)
+	}
+	var components Components
+	if err = json.Unmarshal(data, &components); err != nil {
+		panic(err)
+	}
+	return components
+}
+
 type Manifest struct {
 	Containerd struct {
 		Edge     string            `json:"edge"`
@@ -114,19 +139,6 @@ type ProcessedManifest struct {
 	Installed map[string]string
 }
 
-func getCachedVersionsFromManifestJSON(manifestFilePath string) Manifest {
-	data, err := os.ReadFile(manifestFilePath)
-	if err != nil {
-		panic(err)
-	}
-	data = bytes.ReplaceAll(data, []byte("#EOF"), []byte(""))
-	var manifest Manifest
-	if err = json.Unmarshal(data, &manifest); err != nil {
-		panic(err)
-	}
-	return manifest
-}
-
 type Components struct {
 	ContainerImages []struct {
 		DownloadURL           string   `json:"downloadURL"`
@@ -149,18 +161,6 @@ type ContainerImage struct {
 	PrefetchOptimizations PrefetchOptimizations
 }
 
-func getCachedVersionsFromComponentsJSON(componentsFilePath string) Components {
-	data, err := os.ReadFile(componentsFilePath)
-	if err != nil {
-		panic(err)
-	}
-	var components Components
-	if err = json.Unmarshal(data, &components); err != nil {
-		panic(err)
-	}
-	return components
-}
-
 // SIGAzureEnvironmentSpecConfig is the overall configuration differences in different cloud environments.
 /* TODO(tonyxu) merge this with AzureEnvironmentSpecConfig from aks-engine(pkg/api/azenvtypes.go) once
 it's moved into AKS RP. */