From f7c8321a7e2e81c6b0ae8855f8452036e0c1b0ba Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Thu, 22 Aug 2019 13:59:38 -0700 Subject: [PATCH] convert alicloud s.IOOptimized into trilean in code --- builder/alicloud/ecs/run_config.go | 5 +---- builder/alicloud/ecs/step_create_instance.go | 12 +++++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/builder/alicloud/ecs/run_config.go b/builder/alicloud/ecs/run_config.go index 9feb3032d..12e982aae 100644 --- a/builder/alicloud/ecs/run_config.go +++ b/builder/alicloud/ecs/run_config.go @@ -15,7 +15,7 @@ import ( type RunConfig struct { AssociatePublicIpAddress bool `mapstructure:"associate_public_ip_address"` ZoneId string `mapstructure:"zone_id"` - RawIOOptimized config.Trilean `mapstructure:"io_optimized"` + IOOptimized config.Trilean `mapstructure:"io_optimized"` InstanceType string `mapstructure:"instance_type"` Description string `mapstructure:"description"` AlicloudSourceImage string `mapstructure:"source_image"` @@ -38,7 +38,6 @@ type RunConfig struct { // Communicator settings Comm communicator.Config `mapstructure:",squash"` SSHPrivateIp bool `mapstructure:"ssh_private_ip"` - IOOptimized *bool } func (c *RunConfig) Prepare(ctx *interpolate.Context) []error { @@ -70,7 +69,5 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error { } } - c.IOOptimized = c.RawIOOptimized.ToBoolPointer() - return errs } diff --git a/builder/alicloud/ecs/step_create_instance.go b/builder/alicloud/ecs/step_create_instance.go index 14d1ac4a2..31b4a91e7 100644 --- a/builder/alicloud/ecs/step_create_instance.go +++ b/builder/alicloud/ecs/step_create_instance.go @@ -18,7 +18,7 @@ import ( ) type stepCreateAlicloudInstance struct { - IOOptimized *bool + IOOptimized confighelper.Trilean InstanceType string UserData string UserDataFile string @@ -143,12 +143,10 @@ func (s *stepCreateAlicloudInstance) buildCreateInstanceRequest(state multistep. request.InternetChargeType = s.InternetChargeType request.InternetMaxBandwidthOut = requests.Integer(convertNumber(s.InternetMaxBandwidthOut)) - if s.IOOptimized != nil { - if *s.IOOptimized { - request.IoOptimized = IOOptimizedOptimized - } else { - request.IoOptimized = IOOptimizedNone - } + if s.IOOptimized.True() { + request.IoOptimized = IOOptimizedOptimized + } else if IOOptimized.False() { + request.IoOptimized = IOOptimizedNone } config := state.Get("config").(*Config)