Merge branch 'master' into HARV-5764

Author: matttrach

rancher2/schema_cluster_eks_config_v2.go

@@ -51,14 +51,12 @@ func clusterEKSConfigV2NodeGroupsLaunchTemplateFields() map[string]*schema.Schem
 		},
 		"name": {
 			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
+			Required:    true,
 			Description: "The EKS node group launch template name",
 		},
 		"version": {
 			Type:        schema.TypeInt,
-			Optional:    true,
-			Computed:    true,
+			Required:    true,
 			Description: "The EKS node group launch template version",
 		},
 	}

rancher2/structure_cluster_eks_config_v2.go

@@ -6,21 +6,19 @@ import (
 
 // Flatteners
 
-func flattenClusterEKSConfigV2NodeGroupsLaunchTemplate(in *managementClient.LaunchTemplate, p []interface{}) []interface{} {
+func flattenClusterEKSConfigV2NodeGroupsLaunchTemplate(in *managementClient.LaunchTemplate) []interface{} {
 	if in == nil {
 		return nil
 	}
 	obj := map[string]interface{}{}
-	if len(p) != 0 && p[0] != nil {
-		obj = p[0].(map[string]interface{})
-	}
+
 	if in.ID != nil && len(*in.ID) > 0 {
 		obj["id"] = *in.ID
 	}
 	if in.Name != nil && len(*in.Name) > 0 {
 		obj["name"] = *in.Name
 	}
-	if in.Version != nil {
+	if in.Version != nil && *in.Version > 0 {
 		obj["version"] = int(*in.Version)
 	}
 
@@ -63,11 +61,7 @@ func flattenClusterEKSConfigV2NodeGroups(input []managementClient.NodeGroup, p [
 			obj["labels"] = toMapInterface(in.Labels)
 		}
 		if in.LaunchTemplate != nil {
-			v, ok := obj["launch_template"].([]interface{})
-			if !ok {
-				v = []interface{}{}
-			}
-			obj["launch_template"] = flattenClusterEKSConfigV2NodeGroupsLaunchTemplate(in.LaunchTemplate, v)
+			obj["launch_template"] = flattenClusterEKSConfigV2NodeGroupsLaunchTemplate(in.LaunchTemplate)
 		}
 		if in.MaxSize != nil {
 			obj["max_size"] = int(*in.MaxSize)