Rds options orderable instance fix (awslabs#460)

* Fix Joda time deserialization bug introduced by upgrading Jackson in 8d2f71e * Ignore RDS instance versions that can be described but not ordered Co-authored-by: PoeppingT <[email protected]>
beansandroasters · Jan 5, 2023 · e2fbf17 · e2fbf17
1 parent ea2037a
commit e2fbf17
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 121 deletions.
diff --git a/resources/custom-resources/rds-options/pom.xml b/resources/custom-resources/rds-options/pom.xml
@@ -32,7 +32,7 @@ limitations under the License.
         </license>
     </licenses>
     <properties>
-        <checkstyle.maxAllowedViolations>37</checkstyle.maxAllowedViolations>
+        <checkstyle.maxAllowedViolations>10</checkstyle.maxAllowedViolations>
     </properties>
 
     <build>
@@ -65,6 +65,13 @@ limitations under the License.
             <!-- Don't bundle our layer so we get the shared one at runtime -->
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
+            <artifactId>CloudFormationUtils</artifactId>
+            <version>1.0.0</version>
+            <!-- Don't bundle our layer so we get the shared one at runtime -->
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>url-connection-client</artifactId>

diff --git a/...ces/rds-options/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/Database.java b/...ces/rds-options/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/Database.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.amazon.aws.partners.saasfactory.saasboost;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -86,6 +87,7 @@ enum RdsInstance {
         R5_2XL("db.r5.2xlarge", "8 vCPUs 64 GiB RAM"),
         R5_4XL("db.r5.4xlarge", "16 vCPUs 128 GiB RAM"),
         R5_12XL("db.r5.12xlarge", "48 vCPUs 384 GiB RAM"),
+        R5_16XL("db.r5.16xlarge", "64 vCPUs 512 GiB RAM"),
         R5_24XL("db.r5.24xlarge", "96 vCPUs 768 GiB RAM");
 
         private final String instanceClass;