From eb9515f87e1fd01565aa56900a58949e683fbbab Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Tue, 23 Nov 2021 15:20:58 +0100 Subject: [PATCH 1/2] this error is mainly ignored, and I think it would be better to panic in this case --- packer/registry/image/image.go | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/packer/registry/image/image.go b/packer/registry/image/image.go index c71574f2a..977ea32b4 100644 --- a/packer/registry/image/image.go +++ b/packer/registry/image/image.go @@ -118,10 +118,6 @@ func FromArtifact(a packer.Artifact, opts ...ArtifactOverrideFunc) (*Image, erro // used to override the ProviderName for an existing Image. func WithProvider(name string) func(*Image) error { return func(img *Image) error { - if img == nil { - return errors.New("no go on empty image") - } - img.ProviderName = name return nil } @@ -131,10 +127,6 @@ func WithProvider(name string) func(*Image) error { // used to override the ImageId for an existing Image. func WithID(id string) func(*Image) error { return func(img *Image) error { - if img == nil { - return errors.New("no go on empty image") - } - img.ImageID = id return nil } @@ -144,10 +136,6 @@ func WithID(id string) func(*Image) error { // used to override the SourceImageId for an existing Image. func WithSourceID(id string) func(*Image) error { return func(img *Image) error { - if img == nil { - return errors.New("no go on empty image") - } - img.SourceImageID = id return nil } @@ -157,10 +145,6 @@ func WithSourceID(id string) func(*Image) error { // used to override the ProviderRegion for an existing Image. func WithRegion(region string) func(*Image) error { return func(img *Image) error { - if img == nil { - return errors.New("no go on empty image") - } - img.ProviderRegion = region return nil } From 52e55e764fbcafc422ecdaf280333c74c8d2aa72 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Tue, 23 Nov 2021 15:23:09 +0100 Subject: [PATCH 2/2] don't error if no source image id was not passed --- packer/registry/image/image.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packer/registry/image/image.go b/packer/registry/image/image.go index 977ea32b4..9c86e16b4 100644 --- a/packer/registry/image/image.go +++ b/packer/registry/image/image.go @@ -50,10 +50,6 @@ func (i *Image) Validate() error { return errors.New("error registry image does not contain a valid ProviderName") } - if i.SourceImageID == "" { - return errors.New("error registry image does not contain a valid SourceImageID") - } - return nil } @@ -70,7 +66,6 @@ func (i *Image) String() string { // calling f(k,v). The func f is responsible for type asserting the expected type for the key and value before // trying to create an Image from it. func FromMappedData(mappedData interface{}, f func(key, value interface{}) (*Image, error)) ([]*Image, error) { - mapValue := reflect.ValueOf(mappedData) if mapValue.Kind() != reflect.Map { return nil, errors.New("error the incoming mappedData does not appear to be a map; found type to be" + mapValue.Kind().String())