From 420beb333bfa47d1ea3a31d114e63c9af064b1aa Mon Sep 17 00:00:00 2001 From: Gennady Lipenkov Date: Wed, 8 Jul 2020 19:32:20 +0300 Subject: [PATCH] make inner image accessible from other packages --- builder/yandex/artifact.go | 12 ++++++------ builder/yandex/artifact_test.go | 4 ++-- builder/yandex/builder.go | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/builder/yandex/artifact.go b/builder/yandex/artifact.go index 62b09b26f..fe3786906 100644 --- a/builder/yandex/artifact.go +++ b/builder/yandex/artifact.go @@ -9,7 +9,7 @@ import ( type Artifact struct { config *Config driver Driver - image *compute.Image + Image *compute.Image // StateData should store data such as GeneratedData // to be shared with post-processors @@ -22,7 +22,7 @@ func (*Artifact) BuilderId() string { } func (a *Artifact) Id() string { - return a.image.Id + return a.Image.Id } func (*Artifact) Files() []string { @@ -31,7 +31,7 @@ func (*Artifact) Files() []string { //revive:enable:var-naming func (a *Artifact) String() string { - return fmt.Sprintf("A disk image was created: %v (id: %v) with family name %v", a.image.Name, a.image.Id, a.image.Family) + return fmt.Sprintf("A disk image was created: %v (id: %v) with family name %v", a.Image.Name, a.Image.Id, a.Image.Family) } func (a *Artifact) State(name string) interface{} { @@ -41,14 +41,14 @@ func (a *Artifact) State(name string) interface{} { switch name { case "ImageID": - return a.image.Id + return a.Image.Id case "FolderID": - return a.image.FolderId + return a.Image.FolderId } return nil } func (a *Artifact) Destroy() error { - return a.driver.DeleteImage(a.image.Id) + return a.driver.DeleteImage(a.Image.Id) } diff --git a/builder/yandex/artifact_test.go b/builder/yandex/artifact_test.go index a9831cbf5..7cc5301be 100644 --- a/builder/yandex/artifact_test.go +++ b/builder/yandex/artifact_test.go @@ -18,7 +18,7 @@ func TestArtifact_Id(t *testing.T) { FolderId: "test-folder-id", } a := &Artifact{ - image: i} + Image: i} expected := "test-id-value" if a.Id() != expected { @@ -34,7 +34,7 @@ func TestArtifact_String(t *testing.T) { Family: "test-family", } a := &Artifact{ - image: i} + Image: i} expected := "A disk image was created: test-name (id: test-id-value) with family name test-family" if a.String() != expected { diff --git a/builder/yandex/builder.go b/builder/yandex/builder.go index 74e701fd9..126eafd61 100644 --- a/builder/yandex/builder.go +++ b/builder/yandex/builder.go @@ -91,7 +91,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } artifact := &Artifact{ - image: image.(*compute.Image), + Image: image.(*compute.Image), config: &b.config, driver: driver, StateData: map[string]interface{}{"generated_data": state.Get("generated_data")},