Merge pull request #384 from weitenghuang/fix-381

Fix empty environment variable

Author: joshwget

project/project.go

@@ -134,7 +134,7 @@ func (p *Project) CreateService(name string) (Service, error) {
 
 		for _, env := range config.Environment {
 			parts := strings.SplitN(env, "=", 2)
-			if len(parts) > 1 && parts[1] != "" {
+			if len(parts) > 1 {
 				parsedEnv = append(parsedEnv, env)
 				continue
 			} else {

project/project_test.go

@@ -153,7 +153,7 @@ func TestEnvironmentResolve(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if !reflect.DeepEqual(service.Config().Environment, yaml.MaporEqualSlice{"A=X", "A=X", "A=B"}) {
+	if !reflect.DeepEqual(service.Config().Environment, yaml.MaporEqualSlice{"A=X", "A=", "A=B"}) {
 		t.Fatal("Invalid environment", service.Config().Environment)
 	}
 }

yaml/types_yaml_test.go

@@ -135,3 +135,70 @@ func TestMaporsliceYaml(t *testing.T) {
 	assert.True(t, contains(s2.Foo, "far=1"))
 	assert.True(t, contains(s2.Foo, "qux"))
 }
+
+func TestMapWithEmptyValue(t *testing.T) {
+	str := `foo:
+  bar: baz
+  far: 1
+  qux: null
+  empty: ""
+  lookup:`
+
+	s := StructMaporslice{}
+	yaml.Unmarshal([]byte(str), &s)
+
+	assert.Equal(t, 5, len(s.Foo))
+	assert.True(t, contains(s.Foo, "bar=baz"))
+	assert.True(t, contains(s.Foo, "far=1"))
+	assert.True(t, contains(s.Foo, "qux"))
+	assert.True(t, contains(s.Foo, "empty="))
+	assert.True(t, contains(s.Foo, "lookup"))
+
+	d, err := yaml.Marshal(&s)
+	assert.Nil(t, err)
+
+	s2 := StructMaporslice{}
+	yaml.Unmarshal(d, &s2)
+
+	assert.Equal(t, 5, len(s2.Foo))
+	assert.True(t, contains(s2.Foo, "bar=baz"))
+	assert.True(t, contains(s2.Foo, "far=1"))
+	assert.True(t, contains(s2.Foo, "qux"))
+	assert.True(t, contains(s2.Foo, "empty="))
+	assert.True(t, contains(s2.Foo, "lookup"))
+}
+
+func TestSliceWithEmptyValue(t *testing.T) {
+	str := `foo:
+  - bar=baz
+  - far=1
+  - qux=null
+  - quotes=""
+  - empty=
+  - lookup`
+
+	s := StructMaporslice{}
+	yaml.Unmarshal([]byte(str), &s)
+
+	assert.Equal(t, 6, len(s.Foo))
+	assert.True(t, contains(s.Foo, "bar=baz"))
+	assert.True(t, contains(s.Foo, "far=1"))
+	assert.True(t, contains(s.Foo, "qux=null"))
+	assert.True(t, contains(s.Foo, "quotes=\"\""))
+	assert.True(t, contains(s.Foo, "empty="))
+	assert.True(t, contains(s.Foo, "lookup"))
+
+	d, err := yaml.Marshal(&s)
+	assert.Nil(t, err)
+
+	s2 := StructMaporslice{}
+	yaml.Unmarshal(d, &s2)
+
+	assert.Equal(t, 6, len(s2.Foo))
+	assert.True(t, contains(s2.Foo, "bar=baz"))
+	assert.True(t, contains(s2.Foo, "far=1"))
+	assert.True(t, contains(s2.Foo, "qux=null"))
+	assert.True(t, contains(s2.Foo, "quotes=\"\""))
+	assert.True(t, contains(s2.Foo, "empty="))
+	assert.True(t, contains(s2.Foo, "lookup"))
+}