From: Yolanda Robla <yroblamo@redhat.com>
Date: Mon, 11 Mar 2019 16:21:55 +0000 (+0100)
Subject: Add better assertions wheh constructing settings
X-Git-Tag: akraino_r1~30
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=d60b1c03a04645468a3fa204ea7ed915fe3cef45;p=kni%2Finstaller.git

Add better assertions wheh constructing settings

Change-Id: I3894788a7dd7e429ef1b57b13ebeeadbbe795cef
---

diff --git a/pkg/generator/generator.go b/pkg/generator/generator.go
index 6478b8b..fd3a40a 100644
--- a/pkg/generator/generator.go
+++ b/pkg/generator/generator.go
@@ -151,14 +151,24 @@ func (g Generator) GenerateInstallConfig() {
 	}
 
 	// Prepare the vars to be executed in the template
-	var settings = map[string]string{
-		"baseDomain":          parsedSettings["baseDomain"].(string),
-		"clusterName":         parsedSettings["clusterName"].(string),
-		"clusterCIDR":         parsedSettings["clusterCIDR"].(string),
-		"clusterSubnetLength": fmt.Sprintf("%d", parsedSettings["clusterSubnetLength"].(int)),
-		"machineCIDR":         parsedSettings["machineCIDR"].(string),
-		"serviceCIDR":         parsedSettings["serviceCIDR"].(string),
-		"SDNType":             parsedSettings["SDNType"].(string),
+	var settings = make(map[string]string)
+	var mandatorySettings = map[string]string{
+		"baseDomain":          "string",
+		"clusterName":         "string",
+		"clusterCIDR":         "string",
+		"clusterSubnetLength": "int",
+		"machineCIDR":         "string",
+		"serviceCIDR":         "string",
+		"SDNType":             "string",
+	}
+	for key, value := range mandatorySettings {
+		if _, ok := parsedSettings[key]; ok {
+			if value == "int" {
+				settings[key] = fmt.Sprintf("%d", parsedSettings[key].(int))
+			} else {
+				settings[key] = parsedSettings[key].(string)
+			}
+		}
 	}
 	// Settings depending on provider
 	providerSettings := [2]string{"libvirtURI", "AWSRegion"}