Merge pull request #287 from vmware/fix/converter

Fix/converter
vmware · Oct 11, 2023 · 64281f3 · 64281f3
2 parents c7cf7b4 + ceb1408
commit 64281f3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/internal/helper/converter/construct_model.go b/internal/helper/converter/construct_model.go
@@ -79,12 +79,14 @@ func modelHandleBlockStructSlice(modelJSON *BlockToStruct, schemaData interface{
 			for elemMapKey, elemMapValue := range *elemTypeMap {
 				var schemaValue, _ = (schemaData.([]interface{}))[0].(map[string]interface{})[elemMapKey]
 
-				if _, ok := elemMapValue.(*ListToStruct); ok {
-					buildModelField(modelJSON, schemaValue, elemMapValue, arrIndexer)
-				} else {
-					for _, item := range schemaValue.([]interface{}) {
-						buildModelField(modelJSON, []interface{}{item}, elemMapValue, arrIndexer)
-						arrIndexer.IncrementLastIndex()
+				if schemaValue != nil {
+					if _, ok := elemMapValue.(*ListToStruct); ok {
+						buildModelField(modelJSON, schemaValue, elemMapValue, arrIndexer)
+					} else {
+						for _, item := range schemaValue.([]interface{}) {
+							buildModelField(modelJSON, []interface{}{item}, elemMapValue, arrIndexer)
+							arrIndexer.IncrementLastIndex()
+						}
 					}
 				}
 			}
@@ -131,7 +133,7 @@ func setModelValue(model *BlockToStruct, field string, value interface{}, arrInd
 	} else {
 		fieldPaths := strings.Split(field, ".")
 		arrIndices := arrIndexer.GetAllIndexes()
-		leafField := fieldPaths[len(fieldPaths)-1]
+		leafField := strings.ReplaceAll(fieldPaths[len(fieldPaths)-1], "[]", "")
 		arrayFields := 0
 		parentField := *model
 

diff --git a/internal/helper/converter/construct_tf_schema.go b/internal/helper/converter/construct_tf_schema.go
@@ -43,7 +43,7 @@ func buildTFValue(modelJSONData *map[string]interface{}, mapValue interface{}, a
 		modelField := mapValue.Field
 		modelValue, err = getModelValue(modelJSONData, modelField, arrIndexer)
 
-		if err != nil {
+		if err == nil {
 			tfSchemaValue = mapValue.EvalFunc(ConstructTFSchema, modelValue)
 		}
 	case string:
@@ -128,6 +128,16 @@ func tfHandleBlockStructSlice(modelJSONData *map[string]interface{}, mapValue *B
 				}
 			}
 
+			isEvaluatedField := false
+
+			for _, v := range *elemMap {
+				_, isEvaluatedField = v.(*EvaluatedField)
+			}
+
+			if isEvaluatedField {
+				break
+			}
+
 			if err == nil {
 				arrIndexer.IncrementLastIndex()
 			} else if err.Error() == arrIndexExceededMsg && i+1 < len(*mapValue) {