Fix crash when deferencing nil pointer in v1beta1.IngressRule (#967)

Author: alexsomesan

kubernetes/structure_ingress_spec.go

@@ -10,29 +10,34 @@ import (
 
 func flattenIngressRule(in []v1beta1.IngressRule) []interface{} {
 	att := make([]interface{}, len(in), len(in))
-	for i, n := range in {
-		// rulePrefix := fmt.Sprintf("rule.%d.")
+	for i, r := range in {
 		m := make(map[string]interface{})
 
-		m["host"] = n.Host
+		m["host"] = r.Host
+		m["http"] = flattenIngressRuleHttp(r.HTTP)
+		att[i] = m
+	}
+	return att
+}
 
-		httpAtt := make(map[string]interface{})
-		pathAtts := make([]interface{}, len(n.HTTP.Paths), len(n.HTTP.Paths))
-		for i, p := range n.HTTP.Paths {
-			path := map[string]interface{}{
-				"path":    p.Path,
-				"backend": flattenIngressBackend(&p.Backend),
-			}
-			pathAtts[i] = path
-		}
-		httpAtt["path"] = pathAtts
-		m["http"] = []interface{}{
-			httpAtt,
+func flattenIngressRuleHttp(in *v1beta1.HTTPIngressRuleValue) []interface{} {
+	if in == nil {
+		return []interface{}{}
+	}
+	pathAtts := make([]interface{}, len(in.Paths), len(in.Paths))
+	for i, p := range in.Paths {
+		path := map[string]interface{}{
+			"path":    p.Path,
+			"backend": flattenIngressBackend(&p.Backend),
 		}
+		pathAtts[i] = path
+	}
 
-		att[i] = m
+	httpAtt := map[string]interface{}{
+		"path": pathAtts,
 	}
-	return att
+
+	return []interface{}{httpAtt}
 }
 
 func flattenIngressBackend(in *v1beta1.IngressBackend) []interface{} {

kubernetes/structure_ingress_spec_test.go

@@ -0,0 +1,78 @@
+package kubernetes
+
+import (
+	"reflect"
+	"testing"
+
+	"k8s.io/api/extensions/v1beta1"
+	"k8s.io/apimachinery/pkg/util/intstr"
+)
+
+// Test Flatteners
+func TestFlattenIngressRule(t *testing.T) {
+	r := v1beta1.HTTPIngressRuleValue{
+		Paths: []v1beta1.HTTPIngressPath{
+			{
+				Path: "/foo/bar",
+				Backend: v1beta1.IngressBackend{
+					ServiceName: "foo",
+					ServicePort: intstr.FromInt(1234),
+				},
+			},
+		},
+	}
+
+	in := []v1beta1.IngressRule{
+		{
+			Host: "the-app-name.staging.live.domain-replaced.tld",
+			IngressRuleValue: v1beta1.IngressRuleValue{
+				HTTP: (*v1beta1.HTTPIngressRuleValue)(nil),
+			},
+		},
+		{
+			Host: "",
+			IngressRuleValue: v1beta1.IngressRuleValue{
+				HTTP: (*v1beta1.HTTPIngressRuleValue)(&r),
+			},
+		},
+	}
+	out := []interface{}{
+		map[string]interface{}{
+			"host": "the-app-name.staging.live.domain-replaced.tld",
+			"http": []interface{}{},
+		},
+		map[string]interface{}{
+			"host": "",
+			"http": []interface{}{
+				map[string]interface{}{
+					"path": []interface{}{
+						map[string]interface{}{
+							"path": "/foo/bar",
+							"backend": []interface{}{
+								map[string]interface{}{
+									"service_name": "foo",
+									"service_port": "1234",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	flatRules := flattenIngressRule(in)
+
+	if len(flatRules) < len(out) {
+		t.Error("Failed to flatten ingress rules")
+	}
+
+	for i, v := range flatRules {
+		control := v.(map[string]interface{})
+		sample := out[i]
+
+		if !reflect.DeepEqual(control, sample) {
+			t.Errorf("Unexpected result:\n\tWant:%s\n\tGot:%s\n", control, sample)
+		}
+	}
+}