fixes #658 (#659)

enable Unmarshalling of "Images" in duffle.json

pkg/bundle/bundle.go

@@ -83,14 +83,14 @@ type ImagePlatform struct {
 
 // Image describes a container image in the bundle
 type Image struct {
-	BaseImage
+	BaseImage   `mapstructure:",squash"`
 	Description string        `json:"description" mapstructure:"description"` //TODO: change? see where it's being used? change to description?
 	Refs        []LocationRef `json:"refs" mapstructure:"refs"`
 }
 
 // InvocationImage contains the image type and location for the installation of a bundle
 type InvocationImage struct {
-	BaseImage
+	BaseImage `mapstructure:",squash"`
 }
 
 // Location provides the location where a value should be written in

pkg/duffle/manifest/manifest_test.go

@@ -54,6 +54,15 @@ func TestLoad(t *testing.T) {
 				t.Errorf("expected a component named cnab but got %v", m.InvocationImages)
 			}
 
+			if len(m.Images) != 1 {
+				t.Errorf("exp 1 but was \"%v\"", len(m.Images))
+			}
+
+			img := m.Images["istio"]
+			if !strings.EqualFold(img.ImageType, "docker") {
+				t.Errorf("exp docker but was \"%v\"", img.ImageType)
+			}
+
 			if len(m.Parameters) != 1 {
 				t.Fatalf("expected 1 parameter but got %d", len(m.Parameters))
 			}

pkg/duffle/manifest/testdata/duffle.json

@@ -9,6 +9,14 @@
       }
     }
   },
+  "images": {
+    "istio": {
+      "description": "istio images",
+      "imageType": "docker",
+      "image": "docker.io/istio/citadel:1.0.2",
+      "digest": "sha256:ca4050c9fed3a2ddcaef32140686613c4110ed728f53262d0a23a7e17da73111"
+    }
+  },
   "parameters": {
     "foo": {
       "type": "string"

pkg/duffle/manifest/testdata/duffle.toml

@@ -4,6 +4,12 @@ name = "testbundle"
         name = "cnab"
         builder = "docker"
         configuration = { registry = "microsoft" }
+[images]
+[images.istio]
+    description = "istio images"
+    imageType = "docker"
+    image = "docker.io/istio/citadel:1.0.2"
+    digest = "sha256:ca4050c9fed3a2ddcaef32140686613c4110ed728f53262d0a23a7e17da73111"
 [parameters.foo]
     type = "string"
 

pkg/duffle/manifest/testdata/duffle.yaml

@@ -5,6 +5,12 @@ invocationImages:
     builder: docker
     configuration:
       registry: microsoft
+images:
+  istio:
+    description: "istio images"
+    imageType: "docker"
+    image: "docker.io/istio/citadel:1.0.2"
+    digest: "sha256:ca4050c9fed3a2ddcaef32140686613c4110ed728f53262d0a23a7e17da73111"
 parameters:
   foo:
     type: string