From c3ffb3dc227524042a5105b3ef3f43ff1f610c4c Mon Sep 17 00:00:00 2001 From: js-g Date: Sat, 17 Oct 2020 14:24:45 -0400 Subject: [PATCH] feat (builder/oracle-oci): add launch mode property to image --- builder/oracle/oci/config.go | 1 + builder/oracle/oci/config.hcl2spec.go | 2 ++ builder/oracle/oci/driver_oci.go | 1 + 3 files changed, 4 insertions(+) diff --git a/builder/oracle/oci/config.go b/builder/oracle/oci/config.go index cc47c893e..052e07ab2 100644 --- a/builder/oracle/oci/config.go +++ b/builder/oracle/oci/config.go @@ -83,6 +83,7 @@ type Config struct { BaseImageFilter ListImagesRequest `mapstructure:"base_image_filter"` ImageName string `mapstructure:"image_name"` ImageCompartmentID string `mapstructure:"image_compartment_ocid"` + LaunchMode string `mapstructure:"image_launch_mode"` // Instance InstanceName *string `mapstructure:"instance_name"` diff --git a/builder/oracle/oci/config.hcl2spec.go b/builder/oracle/oci/config.hcl2spec.go index 99603843e..7610fa4e0 100644 --- a/builder/oracle/oci/config.hcl2spec.go +++ b/builder/oracle/oci/config.hcl2spec.go @@ -81,6 +81,7 @@ type FlatConfig struct { BaseImageFilter *FlatListImagesRequest `mapstructure:"base_image_filter" cty:"base_image_filter" hcl:"base_image_filter"` ImageName *string `mapstructure:"image_name" cty:"image_name" hcl:"image_name"` ImageCompartmentID *string `mapstructure:"image_compartment_ocid" cty:"image_compartment_ocid" hcl:"image_compartment_ocid"` + LaunchMode *string `mapstructure:"image_launch_mode" cty:"image_launch_mode" hcl:"image_launch_mode"` InstanceName *string `mapstructure:"instance_name" cty:"instance_name" hcl:"instance_name"` InstanceTags map[string]string `mapstructure:"instance_tags" cty:"instance_tags" hcl:"instance_tags"` InstanceDefinedTags map[string]map[string]interface{} `mapstructure:"instance_defined_tags" cty:"instance_defined_tags" hcl:"instance_defined_tags"` @@ -179,6 +180,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "base_image_filter": &hcldec.BlockSpec{TypeName: "base_image_filter", Nested: hcldec.ObjectSpec((*FlatListImagesRequest)(nil).HCL2Spec())}, "image_name": &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false}, "image_compartment_ocid": &hcldec.AttrSpec{Name: "image_compartment_ocid", Type: cty.String, Required: false}, + "image_launch_mode": &hcldec.AttrSpec{Name: "image_launch_mode", Type: cty.String, Required: false}, "instance_name": &hcldec.AttrSpec{Name: "instance_name", Type: cty.String, Required: false}, "instance_tags": &hcldec.AttrSpec{Name: "instance_tags", Type: cty.Map(cty.String), Required: false}, "instance_defined_tags": &hcldec.AttrSpec{Name: "instance_defined_tags", Type: cty.Map(cty.String), Required: false}, diff --git a/builder/oracle/oci/driver_oci.go b/builder/oracle/oci/driver_oci.go index 0178741ea..bd3cb24be 100644 --- a/builder/oracle/oci/driver_oci.go +++ b/builder/oracle/oci/driver_oci.go @@ -145,6 +145,7 @@ func (d *driverOCI) CreateImage(ctx context.Context, id string) (core.Image, err DisplayName: &d.cfg.ImageName, FreeformTags: d.cfg.Tags, DefinedTags: d.cfg.DefinedTags, + LaunchMode: core.CreateImageDetailsLaunchModeEnum(d.cfg.LaunchMode), }}) if err != nil {