eksconfig/env: ensure "Parameters" not overwritten in env parsing

gyuho · gyuho · commit 1835591f4c56 · 2020-04-02T11:48:52.000-07:00
Signed-off-by: Gyuho Lee &lt;leegyuho@amazon.com&gt;
diff --git a/eksconfig/env.go b/eksconfig/env.go
@@ -57,7 +57,12 @@ func (cfg *Config) UpdateFromEnvs() (err error) {
 		return err
 	}
 	if av, ok := vv.(*Config); ok {
+		before := cfg.Parameters
 		cfg = av
+		after := cfg.Parameters
+		if !reflect.DeepEqual(before, after) {
+			return fmt.Errorf("Parameters overwritten [before %+v, after %+v]", before, after)
+		}
 	} else {
 		return fmt.Errorf("expected *Config, got %T", vv)
 	}

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,12 @@ func (cfg *Config) UpdateFromEnvs() (err error) {`
`57`	`57`	`return err`
`58`	`58`	`}`
`59`	`59`	`if av, ok := vv.(*Config); ok {`
	`60`	`+ before := cfg.Parameters`
`60`	`61`	`cfg = av`
	`62`	`+ after := cfg.Parameters`
	`63`	`+ if !reflect.DeepEqual(before, after) {`
	`64`	`+ return fmt.Errorf("Parameters overwritten [before %+v, after %+v]", before, after)`
	`65`	`+ }`
`61`	`66`	`} else {`
`62`	`67`	`return fmt.Errorf("expected *Config, got %T", vv)`
`63`	`68`	`}`