allow docker resources

Previously it looked like docker resources were supported
but they didn't work because the filename parameter
was mandatory.

Also make the tests pass on yaml.v2 tip; see go-yaml/yaml#290.

actions_test.go

@@ -597,7 +597,7 @@ snapshot:
    params:
       $schema: "http://json-schema.org/draft-03/schema#"
 `,
-		expectedError: "schema key \"$schema\" not compatible with this version of juju",
+		expectedError: `schema key "\$schema" not compatible with this version of juju`,
 	}, {
 		description: "Reject JSON-Schema containing references.",
 		yaml: `
@@ -606,7 +606,7 @@ snapshot:
    params:
       outfile: { $ref: "http://json-schema.org/draft-03/schema#" }
 `,
-		expectedError: "schema key \"$ref\" not compatible with this version of juju",
+		expectedError: `schema key "\$ref" not compatible with this version of juju`,
 	}, {
 		description: "Malformed YAML: missing key in \"outfile\".",
 		yaml: `
@@ -619,7 +619,7 @@ snapshot:
          default: foo.bz2
 `,
 
-		expectedError: "yaml: line 6: mapping values are not allowed in this context",
+		expectedError: `yaml: line [0-9]: mapping values are not allowed in this context`,
 	}, {
 		description: "Malformed JSON-Schema: $schema element misplaced.",
 		yaml: `
@@ -633,31 +633,31 @@ description: Take a snapshot of the database.
          default: foo.bz2
 `,
 
-		expectedError: "yaml: line 3: mapping values are not allowed in this context",
+		expectedError: `yaml: line [0-9]: mapping values are not allowed in this context`,
 	}, {
 		description: "Malformed Actions: hyphen at beginning of action name.",
 		yaml: `
 -snapshot:
    description: Take a snapshot of the database.
 `,
 
-		expectedError: "bad action name -snapshot",
+		expectedError: `bad action name -snapshot`,
 	}, {
 		description: "Malformed Actions: hyphen after action name.",
 		yaml: `
 snapshot-:
    description: Take a snapshot of the database.
 `,
 
-		expectedError: "bad action name snapshot-",
+		expectedError: `bad action name snapshot-`,
 	}, {
 		description: "Malformed Actions: caps in action name.",
 		yaml: `
 Snapshot:
    description: Take a snapshot of the database.
 `,
 
-		expectedError: "bad action name Snapshot",
+		expectedError: `bad action name Snapshot`,
 	}, {
 		description: `Reserved Action Name: "juju".`,
 		yaml: `
@@ -678,7 +678,7 @@ juju-run:
 snapshot:
    description: ["Take a snapshot of the database."]
 `,
-		expectedError: "value for schema key \"description\" must be a string",
+		expectedError: `value for schema key "description" must be a string`,
 	}, {
 		description: "A non-list \"required\" key",
 		yaml: `
@@ -690,23 +690,23 @@ snapshot:
          type: string
    required: "outfile"
 `,
-		expectedError: "value for schema key \"required\" must be a YAML list",
+		expectedError: `value for schema key "required" must be a YAML list`,
 	}, {
 		description: "A schema with an empty \"params\" key fails to parse",
 		yaml: `
 snapshot:
    description: Take a snapshot of the database.
    params:
 `,
-		expectedError: "params failed to parse as a map",
+		expectedError: `params failed to parse as a map`,
 	}, {
 		description: "A schema with a non-map \"params\" value fails to parse",
 		yaml: `
 snapshot:
    description: Take a snapshot of the database.
    params: ["a", "b"]
 `,
-		expectedError: "params failed to parse as a map",
+		expectedError: `params failed to parse as a map`,
 	}, {
 		description: "\"definitions\" goes against JSON-Schema definition",
 		yaml: `
@@ -720,7 +720,7 @@ snapshot:
       diskdevice: ["a"]
       something-else: {"a": "b"}
 `,
-		expectedError: "invalid params schema for action schema snapshot: definitions must be of type array of schemas",
+		expectedError: `invalid params schema for action schema snapshot: definitions must be of type array of schemas`,
 	}, {
 		description: "excess keys not in the JSON-Schema spec will be rejected",
 		yaml: `
@@ -741,15 +741,14 @@ snapshot:
       something-else: {}
    other-key: ["some", "values"],
 `,
-		expectedError: "yaml: line 16: did not find expected key",
+		expectedError: `yaml: line [0-9]+: did not find expected key`,
 	}}
 
 	for i, test := range badActionsYamlTests {
 		c.Logf("test %d: %s", i, test.description)
 		reader := bytes.NewReader([]byte(test.yaml))
 		_, err := ReadActionsYaml(reader)
-		c.Assert(err, gc.NotNil)
-		c.Check(err.Error(), gc.Equals, test.expectedError)
+		c.Check(err, gc.ErrorMatches, test.expectedError)
 	}
 }
 

config_test.go

@@ -422,7 +422,7 @@ func (s *ConfigSuite) TestDefaultType(c *gc.C) {
 	assertDefault("boolean", "true", true)
 	assertDefault("string", "golden grahams", "golden grahams")
 	assertDefault("string", `""`, "")
-	assertDefault("float", "2.2e11", 2.2e11)
+	assertDefault("float", "2.211", 2.211)
 	assertDefault("int", "99", int64(99))
 
 	assertTypeError := func(type_, str, value string) {

meta_test.go

@@ -1227,21 +1227,29 @@ resources:
     other-resource:
         type: file
         filename: other.zip
+    image-resource:
+         type: docker
+         description: "An image"
 `))
 	c.Assert(err, gc.IsNil)
 
 	c.Check(meta.Resources, jc.DeepEquals, map[string]resource.Meta{
-		"resource-name": resource.Meta{
+		"resource-name": {
 			Name:        "resource-name",
 			Type:        resource.TypeFile,
 			Path:        "filename.tgz",
 			Description: "One line that is useful when operators need to push it.",
 		},
-		"other-resource": resource.Meta{
+		"other-resource": {
 			Name: "other-resource",
 			Type: resource.TypeFile,
 			Path: "other.zip",
 		},
+		"image-resource": {
+			Name:        "image-resource",
+			Type:        resource.TypeDocker,
+			Description: "An image",
+		},
 	})
 }
 

resources.go

@@ -20,6 +20,7 @@ var resourceSchema = schema.FieldMap(
 	},
 	schema.Defaults{
 		"type":        resource.TypeFile.String(),
+		"filename":    "",
 		"description": "",
 	},
 )

resources_test.go

@@ -61,16 +61,6 @@ func (s *resourceSuite) TestSchemaUnknownType(c *gc.C) {
 	})
 }
 
-func (s *resourceSuite) TestSchemaMissingPath(c *gc.C) {
-	raw := map[interface{}]interface{}{
-		"type":        "file",
-		"description": "One line that is useful when operators need to push it.",
-	}
-	_, err := charm.ResourceSchema.Coerce(raw, nil)
-
-	c.Check(err, gc.NotNil)
-}
-
 func (s *resourceSuite) TestSchemaMissingComment(c *gc.C) {
 	raw := map[interface{}]interface{}{
 		"type":     "file",