Fixing a panic on v2 networking

Make sure the NeworkConfig are never nil in the NetworkConfigs map.

Signed-off-by: Vincent Demeester <[email protected]>

Author: vdemeester

config/merge_test.go

@@ -405,3 +405,18 @@ services:
 		}
 	}
 }
+
+func TestParseNetworks(t *testing.T) {
+	composeFile := []byte(`networks:
+  public:`)
+
+	networkConfigs, err := ParseNetworks(composeFile)
+	if err != nil {
+		t.Fatal(err)
+	}
+	for key, networkConfig := range networkConfigs {
+		if networkConfig == nil {
+			t.Fatalf("networkConfig %s was nil, shouldn't be", key)
+		}
+	}
+}

config/merge_v2.go

@@ -88,6 +88,12 @@ func ParseNetworks(bytes []byte) (map[string]*NetworkConfig, error) {
 		return nil, err
 	}
 
+	for key, value := range networkConfigs {
+		if value == nil {
+			networkConfigs[key] = &NetworkConfig{}
+		}
+	}
+
 	return networkConfigs, nil
 }
 

yaml/network_test.go

@@ -102,6 +102,16 @@ func TestUnmarshalNetworks(t *testing.T) {
 				},
 			},
 		},
+		{
+			yaml: `network1:`,
+			expected: &Networks{
+				Networks: []*Network{
+					{
+						Name: "network1",
+					},
+				},
+			},
+		},
 		{
 			yaml: `network1: {}`,
 			expected: &Networks{