add namespace to deduplication tuple

novas0x2a · novas0x2a · commit 4e2fbc45ff5e · 2018-04-13T13:16:46.000-07:00
helm charts can deploy to multiple namespaces at once, so compare on
(namespace, name, kind, version) instead of just (name, kind, version).
diff --git a/manifest/parse.go b/manifest/parse.go
@@ -22,12 +22,13 @@ type metadata struct {
 	ApiVersion string `yaml:"apiVersion"`
 	Kind       string
 	Metadata   struct {
-		Name string
+		Namespace string
+		Name      string
 	}
 }
 
 func (m metadata) String() string {
-	return fmt.Sprintf("%s, %s (%s)", m.Metadata.Name, m.Kind, m.ApiVersion)
+	return fmt.Sprintf("%s, %s, %s (%s)", m.Metadata.Namespace, m.Metadata.Name, m.Kind, m.ApiVersion)
 }
 
 func scanYamlSpecs(data []byte, atEOF bool) (advance int, token []byte, err error) {

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,13 @@ type metadata struct {`
`22`	`22`	ApiVersion string `yaml:"apiVersion"`
`23`	`23`	`Kind string`
`24`	`24`	`Metadata struct {`
`25`		`- Name string`
	`25`	`+ Namespace string`
	`26`	`+ Name string`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`func (m metadata) String() string {`
`30`		`- return fmt.Sprintf("%s, %s (%s)", m.Metadata.Name, m.Kind, m.ApiVersion)`
	`31`	`+ return fmt.Sprintf("%s, %s, %s (%s)", m.Metadata.Namespace, m.Metadata.Name, m.Kind, m.ApiVersion)`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`func scanYamlSpecs(data []byte, atEOF bool) (advance int, token []byte, err error) {`