Merge pull request #71 from sl1pm4t/issue-48

Fix panic processing Replication Controller

hcl_writer.go

@@ -2,11 +2,12 @@ package main
 
 import (
 	"fmt"
+	"reflect"
+	"strconv"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/sl1pm4t/k2tf/pkg/k8sutils"
 	"github.com/sl1pm4t/k2tf/pkg/tfkschema"
-	"reflect"
-	"strconv"
 
 	"k8s.io/apimachinery/pkg/util/intstr"
 
@@ -216,7 +217,9 @@ func (w *ObjectWalker) closeBlock() *hclBlock {
 				parent.hasValue = true
 
 				if current.isMap {
-					parent.SetAttributeValue(current.name, cty.MapVal(current.hclMap))
+					if len(current.hclMap) > 0 {
+						parent.SetAttributeValue(current.name, cty.MapVal(current.hclMap))
+					}
 
 				} else if !current.inlined {
 					parent.AppendBlock(current.hcl)

hcl_writer_test.go

@@ -128,6 +128,11 @@ func TestWriteObject(t *testing.T) {
 			"kubernetes_stateful_set",
 			0,
 		},
+		{
+			"issue-48",
+			"kubernetes_replication_controller",
+			0,
+		},
 	}
 
 	for _, tt := range tests {

input_test.go

@@ -18,12 +18,12 @@ func Test_readFilesInput(t *testing.T) {
 		{
 			"test-fixtures",
 			"test-fixtures",
-			19,
+			20,
 		},
 		{
 			"test-fixtures/",
 			"test-fixtures/",
-			19,
+			20,
 		},
 		{
 			"test-fixtures/nested/server-clusterrole.yaml",

test-fixtures/issue-48.tf.golden

@@ -0,0 +1,23 @@
+resource "kubernetes_replication_controller" "echoheaders" {
+  metadata {
+    name      = "echoheaders"
+    namespace = "platform"
+  }
+  spec {
+    replicas = 1
+    template {
+      metadata {
+        labels = { app = "echoheaders" }
+      }
+      spec {
+        container {
+          name  = "echoheaders"
+          image = "k8s.gcr.io/echoserver:1.10"
+          port {
+            container_port = 8080
+          }
+        }
+      }
+    }
+  }
+}

test-fixtures/issue-48.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: echoheaders
+  namespace: platform
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: echoheaders
+    spec:
+      selector:
+        app: echoheaders
+      containers:
+        - name: echoheaders
+          image: k8s.gcr.io/echoserver:1.10
+          ports:
+            - containerPort: 8080