From 420d0ebe3eb356b4ea589df06db028cd89e75c84 Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Fri, 19 Oct 2018 23:21:10 -0700 Subject: [PATCH] fix artifact generation --- builder/oracle/classic/artifact.go | 3 --- builder/oracle/classic/builder.go | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/builder/oracle/classic/artifact.go b/builder/oracle/classic/artifact.go index 82987be1a..96fea768f 100644 --- a/builder/oracle/classic/artifact.go +++ b/builder/oracle/classic/artifact.go @@ -2,8 +2,6 @@ package classic import ( "fmt" - - "github.com/hashicorp/go-oracle-terraform/compute" ) // Artifact is an artifact implementation that contains Image List @@ -12,7 +10,6 @@ type Artifact struct { MachineImageName string MachineImageFile string ImageListVersion int - driver *compute.ComputeClient } // BuilderId uniquely identifies the builder. diff --git a/builder/oracle/classic/builder.go b/builder/oracle/classic/builder.go index 07f85f883..0106d96f7 100644 --- a/builder/oracle/classic/builder.go +++ b/builder/oracle/classic/builder.go @@ -165,9 +165,8 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe return nil, rawErr.(error) } - // TODO fix me // If there is no snapshot, then just return - if _, ok := state.GetOk("snapshot"); !ok { + if _, ok := state.GetOk("machine_image"); !ok { return nil, nil } @@ -176,7 +175,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe ImageListVersion: state.Get("image_list_version").(int), MachineImageName: state.Get("machine_image_name").(string), MachineImageFile: state.Get("machine_image_file").(string), - driver: client, } return artifact, nil