Use struct to represent bosh runtime config

[#151624389]

Signed-off-by: Andrew Crump <acrump@pivotal.io>

Author: davewalter

acceptance/main_test.go

@@ -542,14 +542,14 @@ releases:
 runtime_configs:
   - name: MY-RUNTIME-CONFIG
     runtime_config: |
+      releases:
+      - name: cf
+        version: "235"
       addons:
       - jobs:
         - name: MY-RUNTIME-CONFIG-JOB
           release: cf
         name: MY-ADDON-NAME
-      releases:
-      - name: cf
-        version: "235"
 `))
 		})
 

builder/metadata_builder.go

@@ -33,6 +33,12 @@ type MetadataStemcellCriteria struct {
 	RequiresCPI bool `yaml:"requires_cpi"`
 }
 
+type BoshRuntimeConfigFields map[string]interface{}
+type BoshRuntimeConfig struct {
+	Releases    []map[string]string     `yaml:",omitempty"`
+	OtherFields BoshRuntimeConfigFields `yaml:",inline"`
+}
+
 type releaseManifestReader interface {
 	Read(path string) (ReleaseManifest, error)
 }
@@ -112,42 +118,40 @@ func (m MetadataBuilder) Build(releaseTarballs []string, pathToStemcell, pathToH
 
 func (m MetadataBuilder) updateRuntimeConfigReleaseVersions(handcraft Handcraft, releases []MetadataRelease) (Handcraft, error) {
 	if opsmanRuntimeConfigs, ok := handcraft["runtime_configs"]; ok {
-		for _, opsmanRuntimeConfig := range opsmanRuntimeConfigs.([]interface{}) {
-			runtimeConfig := opsmanRuntimeConfig.(map[interface{}]interface{})
-			var rc map[string]interface{}
-			err := yaml.Unmarshal([]byte(runtimeConfig["runtime_config"].(string)), &rc)
+		for _, orc := range opsmanRuntimeConfigs.([]interface{}) {
+			opsmanRuntimeConfig := orc.(map[interface{}]interface{})
+			var boshRuntimeConfig BoshRuntimeConfig
+			err := yaml.Unmarshal([]byte(opsmanRuntimeConfig["runtime_config"].(string)), &boshRuntimeConfig)
 			if err != nil {
 				return Handcraft{}, fmt.Errorf("runtime config %s contains malformed yaml: %s",
-					runtimeConfig["name"], err)
+					opsmanRuntimeConfig["name"], err)
 			}
 
-			if runtimeConfigReleases, ok := rc["releases"]; ok {
-				for _, runtimeConfigRelease := range runtimeConfigReleases.([]interface{}) {
-					rcr := runtimeConfigRelease.(map[interface{}]interface{})
-
+			if len(boshRuntimeConfig.Releases) > 0 {
+				for _, runtimeConfigRelease := range boshRuntimeConfig.Releases {
 					found := false
 
 					for _, release := range releases {
-						if release.Name == rcr["name"].(string) {
+						if release.Name == runtimeConfigRelease["name"] {
 							m.logger.Printf("Injecting version %s into runtime config release %s", release.Version, release.Name)
-							rcr["version"] = release.Version
+							runtimeConfigRelease["version"] = release.Version
 							found = true
 						}
 					}
 
 					if !found {
 						return Handcraft{}, fmt.Errorf("runtime config %s references unknown release %s",
-							runtimeConfig["name"], rcr["name"])
+							opsmanRuntimeConfig["name"], runtimeConfigRelease["name"])
 					}
 				}
 			}
 
-			newYAML, err := yaml.Marshal(rc)
+			newYAML, err := yaml.Marshal(boshRuntimeConfig)
 			if err != nil {
-				panic(err)
+				return Handcraft{}, err // untested
 			}
 
-			runtimeConfig["runtime_config"] = string(newYAML)
+			opsmanRuntimeConfig["runtime_config"] = string(newYAML)
 		}
 	}
 

builder/metadata_builder_test.go

@@ -100,14 +100,14 @@ addons:
 				"runtime_configs": []interface{}{
 					map[interface{}]interface{}{
 						"name": "MY-RUNTIME-CONFIG",
-						"runtime_config": `addons:
+						"runtime_config": `releases:
+- name: release-1
+  version: version-1
+addons:
 - jobs:
   - name: MY-RUNTIME-CONFIG-JOB
     release: release-1
   name: MY-ADDON-NAME
-releases:
-- name: release-1
-  version: version-1
 `,
 					},
 				},