[#5919] Platform: change default storage option for AWS provider to 1x250GB

managed/src/main/java/AppInit.java

@@ -90,10 +90,10 @@ public AppInit(Environment environment, Application application,
       List<Provider> providerList = Provider.find.query().where().findList();
       for (Provider provider : providerList) {
         if (provider.code.equals("aws")) {
-          for (InstanceType instanceType : InstanceType.findByProvider(provider)) {
+          for (InstanceType instanceType : InstanceType.findByProvider(provider,
+            application.config())) {
             if (instanceType.instanceTypeDetails != null &&
-                (instanceType.instanceTypeDetails.volumeDetailsList == null ||
-                    instanceType.instanceTypeDetails.volumeDetailsList.isEmpty())) {
+              (instanceType.instanceTypeDetails.volumeDetailsList == null)) {
               awsInitializer.initialize(provider.customerUUID, provider.uuid);
               break;
             }

managed/src/main/java/com/yugabyte/yw/cloud/AWSInitializer.java

@@ -517,7 +517,7 @@ private void storeInstanceTypeInfoToDB() {
           throw new UnsupportedOperationException(msg);
         } else {
           // TODO: hardcode me not?
-          volumeCount = 2;
+          volumeCount = 0;
           volumeSizeGB = 250;
           volumeType = VolumeType.EBS;
         }

managed/src/main/java/com/yugabyte/yw/controllers/InstanceTypeController.java

@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.inject.Inject;
+import com.typesafe.config.Config;
 import com.yugabyte.yw.cloud.CloudAPI;
 import com.yugabyte.yw.cloud.PublicCloudConstants;
 import com.yugabyte.yw.commissioner.Common;
@@ -26,13 +27,20 @@
 public class InstanceTypeController extends AuthenticatedController {
 
   public static final Logger LOG = LoggerFactory.getLogger(InstanceTypeController.class);
+  private final Config config;
 
   @Inject
   FormFactory formFactory;
 
   @Inject
   CloudAPI.Factory cloudAPIFactory;
 
+  // TODO: Remove this when we have HelperMethod in place to get Config details
+  @Inject
+  public InstanceTypeController(Config config) {
+    this.config = config;
+  }
+
   /**
    * GET endpoint for listing instance types
    *
@@ -48,7 +56,7 @@ public Result list(UUID customerUUID, UUID providerUUID, List<String> zoneCodes)
     }
     Map<String, InstanceType> instanceTypesMap;
     try {
-      instanceTypesMap = InstanceType.findByProvider(provider).stream()
+      instanceTypesMap = InstanceType.findByProvider(provider, config).stream()
         .collect(toMap(InstanceType::getInstanceTypeCode, identity()));
     } catch (Exception e) {
       LOG.error("Unable to list Instance types {}:{} in DB.", providerUUID, e.getMessage());

managed/src/main/java/com/yugabyte/yw/models/InstanceType.java

@@ -14,6 +14,7 @@
 import com.google.common.collect.ImmutableList;
 import com.yugabyte.yw.cloud.PublicCloudConstants;
 import com.yugabyte.yw.commissioner.Common;
+import com.typesafe.config.Config;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,6 +30,8 @@ public class InstanceType extends Model {
 
   public static List<String> AWS_INSTANCE_PREFIXES_SUPPORTED = ImmutableList.of(
     "m3.", "c5.", "c5d.", "c4.", "c3.", "i3.");
+  static final String YB_AWS_DEFAULT_VOLUME_COUNT_KEY = "yb.aws.default_volume_count";
+  static final String YB_AWS_DEFAULT_VOLUME_SIZE_GB_KEY = "yb.aws.default_volume_size_gb";
 
   public enum VolumeType {
     @EnumValue("EBS")
@@ -156,8 +159,8 @@ public static void resetInstanceTypeDetailsForProvider(Common.CloudType provider
   /**
    * Delete Instance Types corresponding to given provider
    */
-  public static void deleteInstanceTypesForProvider(Provider provider) {
-    for (InstanceType instanceType : findByProvider(provider)) {
+  public static void deleteInstanceTypesForProvider(Provider provider, Config config) {
+    for (InstanceType instanceType : findByProvider(provider, config)) {
       instanceType.delete();
     }
   }
@@ -166,10 +169,18 @@ private static Predicate<InstanceType> supportedInstanceTypes(List<String> suppo
     return p -> supportedPrefixes.stream().anyMatch(prefix -> p.getInstanceTypeCode().startsWith(prefix));
   }
 
+  private static void populateDefaultIfEmpty(InstanceType instanceType, Config config) {
+    if (instanceType.instanceTypeDetailsJson.isEmpty()) {
+      instanceType.instanceTypeDetails.setVolumeDetailsList(
+        config.getInt(YB_AWS_DEFAULT_VOLUME_COUNT_KEY),
+        config.getInt(YB_AWS_DEFAULT_VOLUME_SIZE_GB_KEY), VolumeType.EBS);
+    }
+  }
+
   /**
    * Query Helper to find supported instance types for a given cloud provider.
    */
-  public static List<InstanceType> findByProvider(Provider provider) {
+  public static List<InstanceType> findByProvider(Provider provider, Config config) {
     List<InstanceType> entries = InstanceType.find.query().where()
       .eq("provider_code", provider.code)
       .eq("active", true)
@@ -179,6 +190,9 @@ public static List<InstanceType> findByProvider(Provider provider) {
       entries = entries.stream()
         .filter(supportedInstanceTypes(AWS_INSTANCE_PREFIXES_SUPPORTED))
         .collect(Collectors.toList());
+      for (InstanceType instanceType : entries) {
+        populateDefaultIfEmpty(instanceType, config);
+      }
     }
 
     return entries.stream().map(entry -> InstanceType.get(entry.getProviderCode(),
@@ -251,6 +265,5 @@ public static InstanceTypeDetails createGCPInstanceTypeDetails(VolumeType volume
               volumeType);
       return instanceTypeDetails;
     }
-
   }
 }

managed/src/main/resources/reference.conf

@@ -24,6 +24,15 @@ yb {
     task_retention_duration = 120 days
   }
 
+
+  aws {
+      # default volume count for aws instance types with EBS Only storage info
+      default_volume_count = 1
+
+      # default volume size for aws instance types with EBS Only storage info
+      default_volume_size_gb = 250
+    }
+
   metrics.host="localhost"
   metrics.url = "http://"${yb.metrics.host}":9090/api/v1"
   storage.path="/opt/yugabyte"

managed/src/test/java/com/yugabyte/yw/models/InstanceTypeTest.java

@@ -15,11 +15,13 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.typesafe.config.Config;
 import com.yugabyte.yw.common.ModelFactory;
 import com.yugabyte.yw.models.InstanceType.VolumeType;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mock;
 
 import com.yugabyte.yw.common.FakeDBApplication;
 import play.libs.Json;
@@ -29,6 +31,9 @@ public class InstanceTypeTest extends FakeDBApplication {
   private Customer defaultCustomer;
   private InstanceType.InstanceTypeDetails defaultDetails;
 
+  @Mock
+  Config mockConfig;
+
   @Before
   public void setUp() {
     defaultCustomer = ModelFactory.testCustomer();
@@ -48,7 +53,7 @@ public void testCreate() {
     assertEquals("aws", i1.getProviderCode());
     assertEquals("foo", i1.getInstanceTypeCode());
   }
-  
+
   @Test
   public void testGetNonDefaultInstanceTypeDetails() {
     int volumeCount = 3;
@@ -64,7 +69,7 @@ public void testGetNonDefaultInstanceTypeDetails() {
       assertEquals(String.format("/mnt/d%d", i), v.mountPath);
     }
   }
-  
+
   @Test
   public void testGetDefaultInstanceTypeDetails() {
     InstanceType.InstanceTypeDetails itDetails =
@@ -90,7 +95,7 @@ public void testFindByProvider() {
     instanceType.setActive(false);
     instanceType.save();
     InstanceType.upsert(newProvider.code, "bar", 2, 10.0, defaultDetails);
-    List<InstanceType> instanceTypeList = InstanceType.findByProvider(defaultProvider);
+    List<InstanceType> instanceTypeList = InstanceType.findByProvider(defaultProvider, mockConfig);
     assertNotNull(instanceTypeList);
     assertEquals(2, instanceTypeList.size());
     Set<String> possibleTypes = new HashSet<>();
@@ -105,19 +110,19 @@ public void testFindByProvider() {
   public void testFindByProviderWithUnSupportedInstances() {
     InstanceType.upsert(defaultProvider.code, "t2.medium", 3, 10.0, defaultDetails);
     InstanceType.upsert(defaultProvider.code, "c3.medium", 2, 10.0, defaultDetails);
-    List<InstanceType> instanceTypeList = InstanceType.findByProvider(defaultProvider);
+    List<InstanceType> instanceTypeList = InstanceType.findByProvider(defaultProvider, mockConfig);
     assertNotNull(instanceTypeList);
     assertEquals(1, instanceTypeList.size());
     assertThat(instanceTypeList.get(0).getInstanceTypeCode(),
         allOf(notNullValue(), equalTo("c3.medium")));
   }
-  
+
   @Test
   public void testDeleteByProvider() {
     Provider newProvider = ModelFactory.gcpProvider(defaultCustomer);
     InstanceType.upsert(newProvider.code, "bar", 2, 10.0, defaultDetails);
-    InstanceType.deleteInstanceTypesForProvider(newProvider);
-    List<InstanceType> instanceTypeList = InstanceType.findByProvider(newProvider);
+    InstanceType.deleteInstanceTypesForProvider(newProvider, mockConfig);
+    List<InstanceType> instanceTypeList = InstanceType.findByProvider(newProvider, mockConfig);
     assertEquals(0, instanceTypeList.size());
   }