Bump version. Add null field checks for config creation. Updated config format

Author: edglynes

akamai-terraform-gtm.go

@@ -19,7 +19,7 @@ import (
 )
 
 var (
-	VERSION = "0.0.1-dev"
+	VERSION = "0.0.1-dev-2"
 )
 
 func main() {

command_create_domain.go

@@ -69,6 +69,36 @@ variable "groupid" {
 }
 `)
 
+var nullFieldMap = &configgtm.NullFieldMapStruct{}
+
+// retrieve Null Values for Domain
+func getDomainNullValues() configgtm.NullPerObjectAttributeStruct {
+
+        return nullFieldMap.Domain
+
+}
+
+// retrieve Null Values for Object Type
+func getNullValuesList(objType string) map[string]configgtm.NullPerObjectAttributeStruct {
+
+	switch objType {
+	case "Properties":
+		return nullFieldMap.Properties
+        case "Datacenters":
+                return nullFieldMap.Datacenters
+        case "Resources":
+                return nullFieldMap.Resources
+        case "CidrMaps":
+                return nullFieldMap.CidrMaps
+        case "GeoMaps":
+                return nullFieldMap.GeoMaps
+        case "AsMaps":
+                return nullFieldMap.AsMaps
+	}
+	
+	return map[string]configgtm.NullPerObjectAttributeStruct{}
+}
+
 // command function create-domain
 func cmdCreateDomain(c *cli.Context) error {
 
@@ -221,6 +251,12 @@ func cmdCreateDomain(c *cli.Context) error {
 			return cli.NewExitError(color.RedString("Failed to open/create config file."), 1)
 		}
 		defer domainTFfileHandle.Close()
+                //initialize Null Fields Struct
+                nullFieldMap, err = domain.NullFieldMap()
+                if err != nil {
+                        akamai.StopSpinnerFail()
+                        return cli.NewExitError(color.RedString("Failed to initialize Domain null fields map"), 1)
+                }
 		// build tf file
 		if len(tfConfig) == 0 {
 			// if tf pre existed, domain has to exist by definition

tf.go

@@ -32,15 +32,8 @@ var ignoredKeys map[string]int = map[string]int{"AsMaps": 0, "Resources": 0, "Pr
 	"WeightedHashBitsForIPv4": 0, "WeightedHashBitsForIPv6": 0}
 
 var mappedKeys map[string]string = map[string]string{"DynamicTTL": "dynamic_ttl", "StaticTTL": "static_ttl", "StaticRRSets": "static_rr_sets",
-	"TTL": "ttl", "DatacenterId": "datacenter_id", "HandoutCName": "handout_cname"}
-
-var intNullableKeys map[string]int = map[string]int{"UpperBound": 0, "DefaultTimeOutPenalty": 0, "CloneOf": 0, "Latitude": 0, "Longitude": 0,
-	"DefaultErrorPenalty": 0, "DefaultTimeoutPenalty": 0, "HealthThreshold": 0,
-	"HealthMultiplier": 0, "HealthMax": 0}
-
-var stringNotNullableKeys map[string]int = map[string]int{"Nickname": 0, "Name": 0, "Value": 0, "LoadObject": 0, "HandoutCName": 0, "Type": 0, "TestObject": 0,
-	"RequestString": 0, "ResponseString": 0, "TestObjectProtocol": 0, "TestObjectPassword": 0, "SslClientPrivateKey": 0, "SslClientCertificate": 0,
-	"HostHeader": 0, "TestObjectUsername": 0, "ResourceType": 0}
+	"TTL": "ttl", "DatacenterId": "datacenter_id", "HandoutCName": "handout_cname", "StickinessBonusPercentage": "stickiness_bonus_percentage",
+	"CName": "cname"}
 
 var tab4 = "    "
 var tab8 = "        "
@@ -66,18 +59,29 @@ var dependsClauseP1 = fmt.Sprintf(`    depends_on = [
 // process domain
 func processDomain(domain *gtm.Domain, resourceDomainName string) string {
 
+	var nullFieldsMap gtm.NullPerObjectAttributeStruct
+	coreFieldsNullMap := getDomainNullValues().CoreObjectFields
+	
 	domainBody := ""
 	domainString := gtmHeaderConfig
+
+	fmt.Println("Domain Null Map: ", nullFieldsMap)
+	fmt.Println("Domain Null Core Map: ",coreFieldsNullMap)
+
 	domElems := reflect.ValueOf(domain).Elem()
 	for i := 0; i < domElems.NumField(); i++ {
 		varName := domElems.Type().Field(i).Name
 		varType := domElems.Type().Field(i).Type
 		varValue := domElems.Field(i).Interface()
-		keyVal := fmt.Sprint(varValue)
-		key := convertKey(varName, keyVal, varType.Kind())
-		if key == "" {
-			continue
-		}
+                // Skip if field is null
+                if _, ok := coreFieldsNullMap[varName]; ok {
+                        continue
+                }
+                keyVal := fmt.Sprint(varValue)
+                key := convertKey(varName, keyVal, varType.Kind())
+                if key == "" {
+                        continue
+                }
 		if varName == "EmailNotificationList" {
 			keyVal = processStringList(domain.EmailNotificationList)
 		}
@@ -144,14 +148,6 @@ func convertKey(inKey string, keyVal string, keyKind reflect.Kind) string {
 	if _, ok := ignoredKeys[inKey]; ok {
 		return ""
 	}
-	if _, ok := intNullableKeys[inKey]; ok {
-		return ""
-	}
-	if keyKind == reflect.String && keyVal == "" {
-		if _, ok := stringNotNullableKeys[inKey]; !ok {
-			return ""
-		}
-	}
 	if val, ok := mappedKeys[inKey]; ok {
 		return val
 	}

tf_datacenter.go

@@ -32,11 +32,21 @@ resource "akamai_gtm_datacenter" `)
 // Process datacenter resources
 func processDatacenters(datacenters []*gtm.Datacenter, dcImportList map[int]string, resourceDomainName string) string {
 
+        // Get Null values list
+        var coreFieldsNullMap map[string]string
+        nullFieldsMap := getNullValuesList("Datacenters")
+
 	datacentersString := ""
 	for _, datacenter := range datacenters {
 		if _, ok := dcImportList[datacenter.DatacenterId]; !ok {
 			continue
 		}
+                // Retrieve Core null fields map
+                if dcNullFieldObjectMap, ok := nullFieldsMap[strconv.Itoa(datacenter.DatacenterId)]; ok {
+                        coreFieldsNullMap = dcNullFieldObjectMap.CoreObjectFields
+                } else {
+                        coreFieldsNullMap = map[string]string{}
+                }
 		datacenterBody := ""
 		name := ""
 		dcid := 0
@@ -46,6 +56,9 @@ func processDatacenters(datacenters []*gtm.Datacenter, dcImportList map[int]stri
 			varName := dcElems.Type().Field(i).Name
 			varType := dcElems.Type().Field(i).Type
 			varValue := dcElems.Field(i).Interface()
+                        if _, ok := coreFieldsNullMap[varName]; ok {
+                                continue
+                        }
 			keyVal := fmt.Sprint(varValue)
 			key := convertKey(varName, keyVal, varType.Kind())
 			if key == "" {
@@ -59,16 +72,13 @@ func processDatacenters(datacenters []*gtm.Datacenter, dcImportList map[int]stri
 				name = keyVal
 			}
 			if varName == "DefaultLoadObject" {
-				dlo := "["
-				dloBody := processLoadObject(varValue.(*gtm.LoadObject))
-				if dloBody == "" {
-					dlo += "]"
-				} else {
-					dlo += "{\n"
-					dlo += dloBody
-					dlo += tab4 + "}]"
+				if varValue.(*gtm.LoadObject) == nil {
+					continue
 				}
-				keyVal = dlo
+				datacenterBody += tab4 + key + " {\n"
+				datacenterBody += processLoadObject(varValue.(*gtm.LoadObject))
+				datacenterBody += tab4 + "}\n"
+				continue
 			}
 			datacenterBody += tab4 + key + " = "
 			if varType.Kind() == reflect.String {

tf_maps.go

@@ -59,9 +59,13 @@ func processCidrmaps(cidrmaps []*gtm.CidrMap, cidrImportList map[string][]int, d
 			}
 			switch varName {
 			case "DefaultDatacenter":
-				keyVal = processDefaultDatacenter(varValue.(*gtm.DatacenterBase), true)
-			case "Assignments":
-				keyVal = processCidrAssignments(varValue.([]*gtm.CidrAssignment))
+                                mapBody += tab4 + key + " {\n"
+                                mapBody += processDefaultDatacenter(varValue.(*gtm.DatacenterBase), true)
+                                mapBody += tab4 + "}\n"
+                                continue
+                        case "Assignments":
+                                mapBody += processCidrAssignments(varValue.([]*gtm.CidrAssignment))
+                                continue
 			}
 			mapBody += tab4 + key + " = "
 			if varType.Kind() == reflect.String {
@@ -115,9 +119,13 @@ func processGeomaps(geomaps []*gtm.GeoMap, geoImportList map[string][]int, dcIL
 			}
 			switch varName {
 			case "DefaultDatacenter":
-				keyVal = processDefaultDatacenter(varValue.(*gtm.DatacenterBase), true)
-			case "Assignments":
-				keyVal = processGeoAssignments(varValue.([]*gtm.GeoAssignment))
+                                mapBody += tab4 + key + " {\n"
+                                mapBody += processDefaultDatacenter(varValue.(*gtm.DatacenterBase), true)
+                                mapBody += tab4 + "}\n"
+                                continue
+                        case "Assignments":
+				mapBody += processGeoAssignments(varValue.([]*gtm.GeoAssignment))
+				continue
 			}
 			mapBody += tab4 + key + " = "
 			if varType.Kind() == reflect.String {
@@ -171,9 +179,13 @@ func processAsmaps(asmaps []*gtm.AsMap, asImportList map[string][]int, dcIL map[
 			}
 			switch varName {
 			case "DefaultDatacenter":
-				keyVal = processDefaultDatacenter(varValue.(*gtm.DatacenterBase), true)
+				mapBody += tab4 + key + " {\n"
+				mapBody += processDefaultDatacenter(varValue.(*gtm.DatacenterBase), true)
+				mapBody += tab4 + "}\n"
+				continue
 			case "Assignments":
-				keyVal = processAsAssignments(varValue.([]*gtm.AsAssignment))
+				mapBody += processAsAssignments(varValue.([]*gtm.AsAssignment))
+				continue
 			}
 			mapBody += tab4 + key + " = "
 			if varType.Kind() == reflect.String {
@@ -204,9 +216,6 @@ func processAsmaps(asmaps []*gtm.AsMap, asImportList map[string][]int, dcIL map[
 func processDefaultDatacenter(ddc *gtm.DatacenterBase, structreq bool) string {
 
 	ddcString := ""
-	if structreq {
-		ddcString += "[{\n"
-	}
 	ddcElems := reflect.ValueOf(ddc).Elem()
 	for i := 0; i < ddcElems.NumField(); i++ {
 		varName := ddcElems.Type().Field(i).Name
@@ -220,63 +229,62 @@ func processDefaultDatacenter(ddc *gtm.DatacenterBase, structreq bool) string {
 			ddcString += tab8 + key + " = " + keyVal + "\n"
 		}
 	}
-	if structreq {
-		ddcString += tab4 + "}]"
-	} else {
+	if !structreq {
 		ddcString = strings.TrimSuffix(ddcString, "\n") // remove trailing new line
 	}
+
 	return ddcString
 
 }
 
 func processCidrAssignments(assigns []*gtm.CidrAssignment) string {
 
 	if len(assigns) == 0 {
-		return "[]"
+		return ""
 	}
-	assignString := "[{\n" // assume MT
-	for ii, assign := range assigns {
+	assignString := "" 
+	for _, assign := range assigns {
 		aElems := reflect.ValueOf(assign).Elem()
-		assignString += processAssignmentsBase(aElems, "Blocks", (ii < len(assigns)-1))
+		assignString += processAssignmentsBase(aElems, "Blocks")
 	}
-	assignString += tab4 + "]"
+	
 	return assignString
 
 }
 
 func processGeoAssignments(assigns []*gtm.GeoAssignment) string {
 
 	if len(assigns) == 0 {
-		return "[]"
+		return ""
 	}
-	assignString := "[{\n" // assume MT
-	for ii, assign := range assigns {
+	assignString := "" 
+	for _, assign := range assigns {
 		aElems := reflect.ValueOf(assign).Elem()
-		assignString += processAssignmentsBase(aElems, "Countries", (ii < len(assigns)-1))
+		assignString += processAssignmentsBase(aElems, "Countries")
 	}
-	assignString += tab4 + "]"
+	
 	return assignString
 
 }
 
 func processAsAssignments(assigns []*gtm.AsAssignment) string {
 
 	if len(assigns) == 0 {
-		return "[]"
+		return ""
 	}
-	assignString := "[{\n" // assume MT
-	for ii, assign := range assigns {
+	assignString := "" 
+	for _, assign := range assigns {
 		aElems := reflect.ValueOf(assign).Elem()
-		assignString += processAssignmentsBase(aElems, "AsNumbers", (ii < len(assigns)-1))
+		assignString += processAssignmentsBase(aElems, "AsNumbers")
 	}
-	assignString += tab4 + "]"
+
 	return assignString
 
 }
 
-func processAssignmentsBase(elem reflect.Value, assignKey string, last bool) string {
+func processAssignmentsBase(elem reflect.Value, assignKey string) string {
 
-	assignStr := ""
+	assignStr := tab4 + "assignment {\n"
 	for i := 0; i < elem.NumField(); i++ {
 		varName := elem.Type().Field(i).Name
 		varType := elem.Type().Field(i).Type
@@ -302,11 +310,8 @@ func processAssignmentsBase(elem reflect.Value, assignKey string, last bool) str
 			}
 		}
 	}
-	if last {
-		assignStr += tab8 + "},\n" + tab8 + "{\n"
-	} else {
-		assignStr += tab8 + "}\n"
-	}
+	assignStr += tab4 + "}\n"
+
 	return assignStr
 
 }