From 5505de2c3c437c3de4f2fd086c181a648ea2478c Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sat, 28 Mar 2020 11:34:45 -0500 Subject: [PATCH] Fix terraform json field tags In preparation for the Terraform 0.12 support I noticed these inconsistencies. I dont think it has any impact on functionality, I'm just trying to minimize the diff of the 0.12 PR --- upup/pkg/fi/cloudup/alitasks/launchconfiguration.go | 2 +- upup/pkg/fi/cloudup/alitasks/securitygrouprule.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go b/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go index 35fd8107a8..7db3d4509c 100644 --- a/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go +++ b/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go @@ -302,7 +302,7 @@ func (_ *LaunchConfiguration) RenderALI(t *aliup.ALIAPITarget, a, e, changes *La } type terraformLaunchConfiguration struct { - ImageID *string `json:"image_id ,omitempty"` + ImageID *string `json:"image_id,omitempty"` InstanceType *string `json:"instance_type,omitempty"` SystemDiskCategory *string `json:"system_disk_category,omitempty"` UserData *string `json:"user_data,omitempty"` diff --git a/upup/pkg/fi/cloudup/alitasks/securitygrouprule.go b/upup/pkg/fi/cloudup/alitasks/securitygrouprule.go index 25ec3577cb..1e5a9f3810 100644 --- a/upup/pkg/fi/cloudup/alitasks/securitygrouprule.go +++ b/upup/pkg/fi/cloudup/alitasks/securitygrouprule.go @@ -185,8 +185,8 @@ type terraformSecurityGroupRole struct { Type *string `json:"type,omitempty"` IpProtocol *string `json:"ip_protocol,omitempty"` SourceCidrIp *string `json:"cidr_ip,omitempty"` - SecurityGroupId *terraform.Literal `json:"security_group_id ,omitempty"` - SourceGroupId *terraform.Literal `json:"source_security_group_id ,omitempty"` + SecurityGroupId *terraform.Literal `json:"security_group_id,omitempty"` + SourceGroupId *terraform.Literal `json:"source_security_group_id,omitempty"` PortRange *string `json:"port_range,omitempty"` }