refactor(aws): Refactored instance type utils

 - gathered instance type related (hard-coded) config / utils in one place
 - converted BlockDeviceConfig from Groovy to Java

spinnaker/spinnaker#5989

clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/handlers/BasicAmazonDeployHandler.groovy

@@ -27,10 +27,10 @@ import com.netflix.frigga.Names
 import com.netflix.spinnaker.clouddriver.aws.AmazonCloudProvider
 import com.netflix.spinnaker.config.AwsConfiguration
 import com.netflix.spinnaker.config.AwsConfiguration.DeployDefaults
-import com.netflix.spinnaker.clouddriver.aws.data.InstanceFamilyUtils
 import com.netflix.spinnaker.clouddriver.aws.deploy.AmiIdResolver
 import com.netflix.spinnaker.clouddriver.aws.deploy.AutoScalingWorker
-import com.netflix.spinnaker.clouddriver.aws.deploy.BlockDeviceConfig
+import com.netflix.spinnaker.clouddriver.aws.deploy.InstanceTypeUtils
+import com.netflix.spinnaker.clouddriver.aws.deploy.InstanceTypeUtils.BlockDeviceConfig
 import com.netflix.spinnaker.clouddriver.aws.deploy.ResolvedAmiResult
 import com.netflix.spinnaker.clouddriver.aws.deploy.description.BasicAmazonDeployDescription
 import com.netflix.spinnaker.clouddriver.aws.deploy.ops.loadbalancer.LoadBalancerLookupHelper
@@ -233,7 +233,7 @@ class BasicAmazonDeployHandler implements DeployHandler<BasicAmazonDeployDescrip
       if (!ami) {
         throw new IllegalArgumentException("unable to resolve AMI imageId from $description.amiName in $region")
       }
-      InstanceFamilyUtils.isAmiAndFamilyCompatible(ami.virtualizationType, description.instanceType)
+      InstanceTypeUtils.validateCompatibility(ami.virtualizationType, description.instanceType)
 
       def account = accountCredentialsRepository.getOne(description.credentials.name)
       if (account == null) {
@@ -290,7 +290,7 @@ class BasicAmazonDeployHandler implements DeployHandler<BasicAmazonDeployDescrip
         kernelId: description.kernelId,
         ramdiskId: description.ramdiskId,
         instanceMonitoring: description.instanceMonitoring,
-        ebsOptimized: description.ebsOptimized == null ? InstanceFamilyUtils.getDefaultEbsOptimizedFlag(description.instanceType) : description.ebsOptimized,
+        ebsOptimized: description.ebsOptimized == null ? InstanceTypeUtils.getDefaultEbsOptimizedFlag(description.instanceType) : description.ebsOptimized,
         regionScopedProvider: regionScopedProvider,
         base64UserData: description.base64UserData,
         legacyUdf: description.legacyUdf,
@@ -496,7 +496,7 @@ class BasicAmazonDeployHandler implements DeployHandler<BasicAmazonDeployDescrip
    */
   @VisibleForTesting
   static Boolean getUnlimitedCpuCredits(final Boolean unlimitedCpuCredits, final String instanceType) {
-    def isApplicableButNotSpecified = unlimitedCpuCredits == null && InstanceFamilyUtils.isBurstingSupported(instanceType)
+    def isApplicableButNotSpecified = unlimitedCpuCredits == null && InstanceTypeUtils.isBurstingSupported(instanceType)
     return isApplicableButNotSpecified ? false : unlimitedCpuCredits
   }
 

clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/ops/ModifyAsgLaunchConfigurationOperation.groovy

@@ -21,7 +21,7 @@ import com.amazonaws.services.autoscaling.model.UpdateAutoScalingGroupRequest
 import com.netflix.frigga.Names
 import com.netflix.spinnaker.config.AwsConfiguration
 import com.netflix.spinnaker.clouddriver.aws.deploy.AmiIdResolver
-import com.netflix.spinnaker.clouddriver.aws.deploy.BlockDeviceConfig
+import com.netflix.spinnaker.clouddriver.aws.deploy.InstanceTypeUtils.BlockDeviceConfig
 import com.netflix.spinnaker.clouddriver.aws.deploy.ResolvedAmiResult
 import com.netflix.spinnaker.clouddriver.aws.deploy.description.ModifyAsgLaunchConfigurationDescription
 import com.netflix.spinnaker.clouddriver.aws.services.RegionScopedProviderFactory

clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/ops/actions/ModifyServerGroupLaunchTemplate.java

@@ -22,7 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
-import com.netflix.spinnaker.clouddriver.aws.deploy.BlockDeviceConfig;
+import com.netflix.spinnaker.clouddriver.aws.deploy.InstanceTypeUtils.BlockDeviceConfig;
 import com.netflix.spinnaker.clouddriver.aws.deploy.description.ModifyServerGroupLaunchTemplateDescription;
 import com.netflix.spinnaker.clouddriver.aws.deploy.ops.ModifyServerGroupLaunchTemplateAtomicOperation.LaunchTemplateException;
 import com.netflix.spinnaker.clouddriver.aws.deploy.ops.actions.UpdateAutoScalingGroup.UpdateAutoScalingGroupCommand;

clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/ops/actions/PrepareModifyServerGroupLaunchTemplate.java

@@ -29,7 +29,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.netflix.spinnaker.clouddriver.aws.deploy.AmiIdResolver;
-import com.netflix.spinnaker.clouddriver.aws.deploy.BlockDeviceConfig;
+import com.netflix.spinnaker.clouddriver.aws.deploy.InstanceTypeUtils.BlockDeviceConfig;
 import com.netflix.spinnaker.clouddriver.aws.deploy.ResolvedAmiResult;
 import com.netflix.spinnaker.clouddriver.aws.deploy.description.ModifyServerGroupLaunchTemplateDescription;
 import com.netflix.spinnaker.clouddriver.aws.deploy.ops.ModifyServerGroupLaunchTemplateAtomicOperation.LaunchTemplateException;

clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/validators/BasicAmazonDeployDescriptionValidator.groovy

@@ -20,6 +20,7 @@ import com.google.common.annotations.VisibleForTesting
 import com.netflix.spinnaker.clouddriver.aws.AmazonOperation
 import com.netflix.spinnaker.clouddriver.aws.deploy.description.BasicAmazonDeployDescription
 import com.netflix.spinnaker.clouddriver.aws.model.AmazonBlockDevice
+import com.netflix.spinnaker.clouddriver.aws.deploy.InstanceTypeUtils
 import com.netflix.spinnaker.clouddriver.aws.security.AmazonCredentials
 import com.netflix.spinnaker.clouddriver.aws.security.NetflixAmazonCredentials
 import com.netflix.spinnaker.clouddriver.deploy.ValidationErrors

clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/validators/ModifyServerGroupLaunchTemplateValidator.java

@@ -18,7 +18,7 @@
 package com.netflix.spinnaker.clouddriver.aws.deploy.validators;
 
 import com.netflix.spinnaker.clouddriver.aws.AmazonOperation;
-import com.netflix.spinnaker.clouddriver.aws.data.InstanceFamilyUtils;
+import com.netflix.spinnaker.clouddriver.aws.deploy.InstanceTypeUtils;
 import com.netflix.spinnaker.clouddriver.aws.deploy.description.ModifyServerGroupLaunchTemplateDescription;
 import com.netflix.spinnaker.clouddriver.aws.model.AmazonBlockDevice;
 import com.netflix.spinnaker.clouddriver.aws.security.NetflixAmazonCredentials;
@@ -87,7 +87,7 @@ public void validate(
 
     // unlimitedCpuCredits (set to true / false) is valid only with supported instance types
     if (description.getUnlimitedCpuCredits() != null
-        && !InstanceFamilyUtils.isBurstingSupported(description.getInstanceType())) {
+        && !InstanceTypeUtils.isBurstingSupported(description.getInstanceType())) {
       errors.rejectValue(
           "unlimitedCpuCredits",
           "modifyservergrouplaunchtemplatedescription.bursting.not.supported.by.instanceType");

clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonBlockDevice.groovy

@@ -16,7 +16,9 @@
 
 package com.netflix.spinnaker.clouddriver.aws.model
 
-import groovy.transform.Canonical
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+import groovy.transform.TupleConstructor
 
 /**
  * Model for a block device mapping
@@ -25,10 +27,10 @@ import groovy.transform.Canonical
  *   (deviceName + virtualName)
  * or an EBS device:
  *   (deviceName + size + (optionally) volumeType, deleteOnTermination, iops, snapshotId)
- *
- *
  */
-@Canonical
+@ToString
+@EqualsAndHashCode
+@TupleConstructor(force = true)
 class AmazonBlockDevice {
 
   // Required for all:
@@ -75,4 +77,69 @@ class AmazonBlockDevice {
    */
   Boolean encrypted
 
+  private AmazonBlockDevice(Builder builder) {
+    deviceName = builder.deviceName
+    virtualName = builder.virtualName
+    size = builder.size
+    volumeType = builder.volumeType
+    deleteOnTermination = builder.deleteOnTermination
+    iops = builder.iops
+    snapshotId = builder.snapshotId
+    encrypted = builder.encrypted
+  }
+
+  static class Builder {
+    String deviceName
+    String virtualName
+    Integer size
+    String volumeType
+    Boolean deleteOnTermination
+    Integer iops
+    String snapshotId
+    Boolean encrypted
+
+    Builder deviceName(String deviceName) {
+      this.deviceName = deviceName
+      return this
+    }
+
+    Builder virtualName(String virtualName) {
+      this.virtualName = virtualName
+      return this
+    }
+
+    Builder size(Integer size) {
+      this.size = size
+      return this
+    }
+
+    Builder volumeType(String volumeType) {
+      this.volumeType = volumeType
+      return this
+    }
+
+    Builder deleteOnTermination(Boolean deleteOnTermination) {
+      this.deleteOnTermination = deleteOnTermination
+      return this
+    }
+
+    Builder iops(Integer iops) {
+      this.iops = iops
+      return this
+    }
+
+    Builder snapshotId(String snapshotId) {
+      this.snapshotId = snapshotId
+      return this
+    }
+
+    Builder encrypted(Boolean encrypted) {
+      this.encrypted = encrypted
+      return this
+    }
+
+    AmazonBlockDevice build() {
+      return new AmazonBlockDevice(this)
+    }
+  }
 }

clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy

@@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.awsobjectmapper.AmazonObjectMapperConfigurer
 import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.clouddriver.aws.AwsConfigurationProperties
-import com.netflix.spinnaker.clouddriver.aws.deploy.BlockDeviceConfig
+import com.netflix.spinnaker.clouddriver.aws.deploy.InstanceTypeUtils.BlockDeviceConfig
 import com.netflix.spinnaker.clouddriver.aws.deploy.handlers.BasicAmazonDeployHandler
 import com.netflix.spinnaker.clouddriver.aws.deploy.ops.securitygroup.SecurityGroupLookupFactory
 import com.netflix.spinnaker.clouddriver.aws.deploy.scalingpolicy.DefaultScalingPolicyCopier