Simplify Resolve()

aws · Jul 21, 2023 · dd38aa1 · dd38aa1
1 parent 5d438fa
commit dd38aa1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/pkg/apis/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/providers/amifamily/resolver.go b/pkg/providers/amifamily/resolver.go
@@ -171,9 +171,7 @@ func (r Resolver) Resolve(ctx context.Context, nodeTemplate *v1alpha1.AWSNodeTem
 			if resolved.MetadataOptions == nil {
 				resolved.MetadataOptions = amiFamily.DefaultMetadataOptions()
 			}
-			if len(nodeTemplate.Spec.LicenseSpecifications) > 0 {
-				resolved.LicenseSpecifications = nodeTemplate.Spec.LicenseSpecifications
-			}
+			resolved.LicenseSpecifications = nodeTemplate.Spec.LicenseSpecifications
 			resolvedTemplates = append(resolvedTemplates, resolved)
 		}
 	}

diff --git a/pkg/providers/launchtemplate/launchtemplate.go b/pkg/providers/launchtemplate/launchtemplate.go
@@ -290,9 +290,9 @@ func createPlacement(placement *v1alpha1.Placement) *ec2.LaunchTemplatePlacement
 		return nil
 	}
 	return &ec2.LaunchTemplatePlacementRequest{
-        HostResourceGroupArn: placement.HostResourceGroupARN,
-        GroupId: placement.GroupID,
-    }
+		HostResourceGroupArn: placement.HostResourceGroupARN,
+		GroupId:              placement.GroupID,
+	}
 }
 
 func (p *Provider) blockDeviceMappings(blockDeviceMappings []*v1alpha1.BlockDeviceMapping) []*ec2.LaunchTemplateBlockDeviceMappingRequest {