Add helper to verify keys against the known set.

reedobrien · reedobrien · commit 22f83b88b140 · 2016-09-07T16:12:12.000-07:00
Refs: juju-model-defaults-collapse
diff --git a/cmd/juju/model/defaultscommand.go b/cmd/juju/model/defaultscommand.go
@@ -67,6 +67,9 @@ type defaultsCommandAPI interface {
 	// Close closes the api connection.
 	Close() error
 
+	// ModelConfig returns all known configuration attributes and values.
+	ModelGet() (map[string]interface{}, error)
+
 	// ModelDefaults returns the default config values used when creating a new model.
 	ModelDefaults() (config.ModelDefaultAttributes, error)
 
@@ -115,14 +118,6 @@ func (c *defaultsCommand) Init(args []string) error {
 		}
 		c.keys = args
 
-		for _, key := range c.keys {
-			// check if the key exists in the known config
-			// and warn the user if the key is not defined
-			if _, exists := config.ConfigDefaults()[key]; !exists {
-				logger.Warningf(
-					"key %q is not defined in the known model configuration: possible misspelling", key)
-			}
-		}
 		c.action = c.resetDefaults
 		return nil
 	}
@@ -141,15 +136,6 @@ func (c *defaultsCommand) Init(args []string) error {
 			c.values[k] = v
 		}
 
-		for key := range c.values {
-			// check if the key exists in the known config
-			// and warn the user if the key is not defined
-			if _, exists := config.ConfigDefaults()[key]; !exists {
-				logger.Warningf(
-					"key %q is not defined in the known model configuration: possible misspelling", key)
-			}
-		}
-
 		c.action = c.setDefaults
 		return nil
 
@@ -215,19 +201,51 @@ func (c *defaultsCommand) getDefaults(ctx *cmd.Context) error {
 
 func (c *defaultsCommand) setDefaults(ctx *cmd.Context) error {
 	// ctx unused in this method.
-
+	if err := c.verifyKnownKeys(); err != nil {
+		return errors.Trace(err)
+	}
 	// TODO(wallyworld) - call with cloud and region when that bit is done
 	return block.ProcessBlockedError(c.api.SetModelDefaults("", "", c.values), block.BlockChange)
 }
 
 func (c *defaultsCommand) resetDefaults(ctx *cmd.Context) error {
 	// ctx unused in this method.
-
+	if err := c.verifyKnownKeys(); err != nil {
+		return errors.Trace(err)
+	}
 	// TODO(wallyworld) - call with cloud and region when that bit is done
 	return block.ProcessBlockedError(c.api.UnsetModelDefaults("", "", c.keys...), block.BlockChange)
 
 }
 
+// verifyKnownKeys is a helper to validate the keys we are operating with
+// against the set of known attributes from the model.
+func (c *defaultsCommand) verifyKnownKeys() error {
+	known, err := c.api.ModelGet()
+	if err != nil {
+		return errors.Trace(err)
+	}
+	keys := func() []string {
+		if c.keys != nil {
+			return c.keys
+		}
+		keys := []string{}
+		for k, _ := range c.values {
+			keys = append(keys, k)
+		}
+		return keys
+	}
+	for _, key := range keys() {
+		// check if the key exists in the known config
+		// and warn the user if the key is not defined
+		if _, exists := known[key]; !exists {
+			logger.Warningf(
+				"key %q is not defined in the known model configuration: possible misspelling", key)
+		}
+	}
+	return nil
+}
+
 // formatConfigTabular writes a tabular summary of default config information.
 func formatDefaultConfigTabular(writer io.Writer, value interface{}) error {
 	defaultValues, ok := value.(config.ModelDefaultAttributes)
diff --git a/cmd/juju/model/defaultscommand_test.go b/cmd/juju/model/defaultscommand_test.go
@@ -84,9 +84,8 @@ func (s *DefaultsCommandSuite) TestDefaultsInit(c *gc.C) {
 	}
 }
 
-func (s *DefaultsCommandSuite) TestInitResetUnknownValueLogs(c *gc.C) {
-	cmd := model.NewDefaultsCommandForTest(s.fake)
-	err := testing.InitCommand(cmd, []string{"--reset", "attr", "weird"})
+func (s *DefaultsCommandSuite) TestResetUnknownValueLogs(c *gc.C) {
+	_, err := s.run(c, "--reset", "attr", "weird")
 	c.Assert(err, jc.ErrorIsNil)
 	expected := `key "weird" is not defined in the known model configuration: possible misspelling`
 	c.Check(c.GetTestLog(), jc.Contains, expected)
@@ -111,9 +110,8 @@ func (s *DefaultsCommandSuite) TestResetBlockedError(c *gc.C) {
 	c.Check(c.GetTestLog(), jc.Contains, "TestBlockedError")
 }
 
-func (s *DefaultsCommandSuite) TestInitSetUnknownValueLogs(c *gc.C) {
-	cmd := model.NewDefaultsCommandForTest(s.fake)
-	err := testing.InitCommand(cmd, []string{"weird=foo"})
+func (s *DefaultsCommandSuite) TestSetUnknownValueLogs(c *gc.C) {
+	_, err := s.run(c, "weird=foo")
 	c.Assert(err, jc.ErrorIsNil)
 	expected := `key "weird" is not defined in the known model configuration: possible misspelling`
 	c.Check(c.GetTestLog(), jc.Contains, expected)
