Warn on infrastructure-roles.yaml format violations (zalando#177)

sdudoladov · alexeyklyukin · commit 3c178f68df37 · 2017-12-15T17:21:41.000+01:00
Emit a warning if there are unprocessed entries in the infrastructure-roles secret.
diff --git a/manifests/infrastructure-roles.yaml b/manifests/infrastructure-roles.yaml
@@ -1,5 +1,9 @@
 apiVersion: v1
 data:
+  # required format (w/o quotes): 'propertyNumber: value'
+  # allowed properties: 'user', 'password', 'inrole'
+  # numbers >= 1 are mandatory
+  
   # robot_zmon_acid_monitoring
   user1: cm9ib3Rfem1vbl9hY2lkX21vbml0b3Jpbmc=
   # robot_zmon
diff --git a/pkg/controller/util.go b/pkg/controller/util.go
@@ -137,13 +137,21 @@ Users:
 					c.logger.Warningf("unknown key %q", p)
 				}
 			}
+
+			delete(data, key)
 		}
 
 		if t.Name != "" {
 			result[t.Name] = t
 		}
 	}
 
+	if len(data) != 0 {
+		c.logger.Warningf("%d unprocessed entries in the infrastructure roles' secret", len(data))
+		c.logger.Info(`infrastructure role entries should be in the {key}{id} format, where {key} can be either of "user", "password", "inrole" and the {id} a monotonically increasing integer starting with 1`)
+		c.logger.Debugf("unprocessed entries: %#v", data)
+	}
+
 	return result, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -137,13 +137,21 @@ Users:`
`137`	`137`	`c.logger.Warningf("unknown key %q", p)`
`138`	`138`	`}`
`139`	`139`	`}`
	`140`	`+`
	`141`	`+ delete(data, key)`
`140`	`142`	`}`
`141`	`143`
`142`	`144`	`if t.Name != "" {`
`143`	`145`	`result[t.Name] = t`
`144`	`146`	`}`
`145`	`147`	`}`
`146`	`148`
	`149`	`+ if len(data) != 0 {`
	`150`	`+ c.logger.Warningf("%d unprocessed entries in the infrastructure roles' secret", len(data))`
	`151`	+ c.logger.Info(`infrastructure role entries should be in the {key}{id} format, where {key} can be either of "user", "password", "inrole" and the {id} a monotonically increasing integer starting with 1`)
	`152`	`+ c.logger.Debugf("unprocessed entries: %#v", data)`
	`153`	`+ }`
	`154`	`+`
`147`	`155`	`return result, nil`
`148`	`156`	`}`
`149`	`157`