fix: don't use curly brackets for additional scoping

pkg/model/spotinstmodel/elastigroup.go

@@ -84,7 +84,6 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 		}
 
 		// Cloud config.
-		{
 		if cfg := b.Cluster.Spec.CloudConfig; cfg != nil {
 			// Product.
 			if cfg.SpotinstProduct != nil {
@@ -96,10 +95,8 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 				group.Orientation = cfg.SpotinstOrientation
 			}
 		}
-		}
 
 		// Strategy.
-		{
 		for k, v := range ig.ObjectMeta.Labels {
 			switch k {
 			case InstanceGroupLabelOrientation:
@@ -123,19 +120,15 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 				break
 			}
 		}
-		}
 
 		// Instance profile.
-		{
 		iprof, err := b.LinkToIAMInstanceProfile(ig)
 		if err != nil {
 			return err
 		}
 		group.IAMInstanceProfile = iprof
-		}
 
 		// Root volume.
-		{
 		volumeSize := fi.Int32Value(ig.Spec.RootVolumeSize)
 		if volumeSize == 0 {
 			var err error
@@ -153,17 +146,13 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 		group.RootVolumeSize = fi.Int64(int64(volumeSize))
 		group.RootVolumeType = fi.String(volumeType)
 		group.RootVolumeOptimization = ig.Spec.RootVolumeOptimization
-		}
 
 		// Tenancy.
-		{
 		if ig.Spec.Tenancy != "" {
 			group.Tenancy = fi.String(ig.Spec.Tenancy)
 		}
-		}
 
 		// Risk.
-		{
 		var risk float64
 		switch ig.Spec.Role {
 		case kops.InstanceGroupRoleMaster:
@@ -176,10 +165,8 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 			return fmt.Errorf("spotinst: kops.Role not found %s", ig.Spec.Role)
 		}
 		group.Risk = &risk
-		}
 
 		// Security groups.
-		{
 		for _, id := range ig.Spec.AdditionalSecurityGroups {
 			sgTask := &awstasks.SecurityGroup{
 				Name:   fi.String(id),
@@ -191,19 +178,15 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 			}
 			group.SecurityGroups = append(group.SecurityGroups, sgTask)
 		}
-		}
 
 		// SSH Key.
-		{
 		sshKey, err := b.LinkToSSHKey()
 		if err != nil {
 			return err
 		}
 		group.SSHKey = sshKey
-		}
 
 		// Load balancer.
-		{
 		var lb *awstasks.LoadBalancer
 		switch ig.Spec.Role {
 		case kops.InstanceGroupRoleMaster:
@@ -216,19 +199,15 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 		if lb != nil {
 			group.LoadBalancer = lb
 		}
-		}
 
 		// User data.
-		{
 		userData, err := b.BootstrapScript.ResourceNodeUp(ig, b.Cluster)
 		if err != nil {
 			return err
 		}
 		group.UserData = userData
-		}
 
 		// Public IP.
-		{
 		subnetMap := make(map[string]*kops.ClusterSubnetSpec)
 		for i := range b.Cluster.Spec.Subnets {
 			subnet := &b.Cluster.Spec.Subnets[i]
@@ -265,10 +244,8 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 			return fmt.Errorf("spotinst: unknown subnet type %q", subnetType)
 		}
 		group.AssociatePublicIP = &associatePublicIP
-		}
 
 		// Subnets.
-		{
 		subnets, err := b.GatherSubnets(ig)
 		if err != nil {
 			return err
@@ -279,10 +256,8 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 		for _, subnet := range subnets {
 			group.Subnets = append(group.Subnets, b.LinkToSubnet(subnet))
 		}
-		}
 
 		// Capacity.
-		{
 		minSize := int32(1)
 		if ig.Spec.MinSize != nil {
 			minSize = fi.Int32Value(ig.Spec.MinSize)
@@ -299,10 +274,8 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 
 		group.MinSize = fi.Int64(int64(minSize))
 		group.MaxSize = fi.Int64(int64(maxSize))
-		}
 
 		// Tags.
-		{
 		tags, err := b.CloudTagsForInstanceGroup(ig)
 		if err != nil {
 			return fmt.Errorf("spotinst: error building cloud tags: %v", err)
@@ -310,10 +283,8 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 		tags[awsup.TagClusterName] = b.ClusterName()
 		tags["Name"] = b.AutoscalingGroupName(ig)
 		group.Tags = tags
-		}
 
 		// Auto Scaler.
-		{
 		if ig.Spec.Role != kops.InstanceGroupRoleBastion {
 			group.ClusterIdentifier = fi.String(b.ClusterName())
 
@@ -359,7 +330,6 @@ func (b *ElastigroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 				}
 			}
 		}
-		}
 
 		c.AddTask(group)
 	}