From e43b98554522c1cc1a38547472b439cc49d9cd80 Mon Sep 17 00:00:00 2001
From: Cari Dean <cdean@pivotal.io>
Date: Thu, 26 Aug 2021 07:54:07 -0700
Subject: [PATCH] Update failing test expectations and fix typos Signed-off-by:
 Garrett Cheadle <gcheadle@vmware.com>

---
 pkg/kbld/config/config.go      | 8 ++++----
 pkg/kbld/image/preresolved.go  | 3 +--
 pkg/kbld/image/resolved.go     | 2 +-
 pkg/kbld/image/tag_selected.go | 2 +-
 pkg/kbld/image/tagged.go       | 2 +-
 test/e2e/lock_output_test.go   | 5 ++---
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkg/kbld/config/config.go b/pkg/kbld/config/config.go
index 299fa2f6..d0743a87 100644
--- a/pkg/kbld/config/config.go
+++ b/pkg/kbld/config/config.go
@@ -68,13 +68,13 @@ type ImageOverride struct {
 	NewImage     string                     `json:"newImage"`
 	Preresolved  bool                       `json:"preresolved,omitempty"`
 	TagSelection *versions.VersionSelection `json:"tagSelection,omitempty"`
-	ImageMetas   []ImageMeta
+	ImageMetas   []ImageMeta                `json:",omitempty"`
 }
 
 type ImageMeta struct {
-	URL  string `json:"URL"`
-	Type string `json:"Type"`
-	Tag  string `json:"Tag"`
+	URL  string `json:"URL,omitempty"`
+	Type string `json:"Type,omitempty"`
+	Tag  string `json:"Tag,omitempty"`
 }
 
 type ImageDestination struct {
diff --git a/pkg/kbld/image/preresolved.go b/pkg/kbld/image/preresolved.go
index a86fe8de..37a5ada8 100644
--- a/pkg/kbld/image/preresolved.go
+++ b/pkg/kbld/image/preresolved.go
@@ -28,8 +28,7 @@ func (i PreresolvedImage) URL() (string, []Meta, error) {
 	if len(i.metas) > 0 {
 		var givenMetas []Meta
 		for _, m := range i.metas {
-			//TODO: should we change Type to 'preresolved' or keep whatever is given from lockfile?
-			givenMetas = append(givenMetas, PreresolvedImageSourceURL{Type: m.Type, URL: m.URL, Tag: m.Tag})
+			givenMetas = append(givenMetas, PreresolvedImageSourceURL{Type: "preresolved", URL: m.URL, Tag: m.Tag})
 		}
 		return i.url, givenMetas, nil
 	}
diff --git a/pkg/kbld/image/resolved.go b/pkg/kbld/image/resolved.go
index bd7913b3..bcd1365f 100644
--- a/pkg/kbld/image/resolved.go
+++ b/pkg/kbld/image/resolved.go
@@ -10,7 +10,7 @@ import (
 	ctlreg "github.com/k14s/kbld/pkg/kbld/registry"
 )
 
-// ResolvedImage respresents an image that will be resolved into url+digest
+// ResolvedImage represents an image that will be resolved into url+digest
 type ResolvedImage struct {
 	url      string
 	registry ctlreg.Registry
diff --git a/pkg/kbld/image/tag_selected.go b/pkg/kbld/image/tag_selected.go
index 230d2687..1db2ffcb 100644
--- a/pkg/kbld/image/tag_selected.go
+++ b/pkg/kbld/image/tag_selected.go
@@ -11,7 +11,7 @@ import (
 	versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
 )
 
-// TagSelectedImage respresents an image that will be resolved into url+digest
+// TagSelectedImage represents an image that will be resolved into url+digest
 type TagSelectedImage struct {
 	url       string
 	selection *versions.VersionSelection
diff --git a/pkg/kbld/image/tagged.go b/pkg/kbld/image/tagged.go
index eff4bf20..5efd6cd7 100644
--- a/pkg/kbld/image/tagged.go
+++ b/pkg/kbld/image/tagged.go
@@ -9,7 +9,7 @@ import (
 	ctlreg "github.com/k14s/kbld/pkg/kbld/registry"
 )
 
-// TaggedImage respresents an image that will be tagged when its URL is requested
+// TaggedImage represents an image that will be tagged when its URL is requested
 type TaggedImage struct {
 	image    Image
 	imgDst   ctlconf.ImageDestination
diff --git a/test/e2e/lock_output_test.go b/test/e2e/lock_output_test.go
index d8481ef7..f93efc70 100644
--- a/test/e2e/lock_output_test.go
+++ b/test/e2e/lock_output_test.go
@@ -20,14 +20,14 @@ images:
     kbld.carvel.dev/id: nginx:1.14.2
     kbld.carvel.dev/metas: |
       - Tag: 1.14.2
-        Type: resolved
+        Type: preresolved
         URL: nginx:1.14.2
   image: index.docker.io/library/nginx@sha256:f7988fb6c02e0ce69257d9bd9cf37ae20a60f1df7563c3a2a6abe24160306b8d
 - annotations:
     kbld.carvel.dev/id: sample-app
     kbld.carvel.dev/metas: |
       - Tag: 1.15.1
-        Type: resolved
+        Type: preresolved
         URL: nginx:1.15.1
   image: index.docker.io/library/nginx@sha256:4a5573037f358b6cdfa2f3e8a9c33a5cf11bcd1675ca72ca76fbe5bd77d0d682
 kind: ImagesLock
@@ -233,7 +233,6 @@ images:
 	})
 
 	expectedOut := `---
----
 images:
 - image: index.docker.io/library/nginx@sha256:f7988fb6c02e0ce69257d9bd9cf37ae20a60f1df7563c3a2a6abe24160306b8d
 - image: index.docker.io/library/nginx@sha256:4a5573037f358b6cdfa2f3e8a9c33a5cf11bcd1675ca72ca76fbe5bd77d0d682