Fail on invalid formats (#2897)

* Fail on invalid quantity format * a more robust implementation * cleanup
fabric8io · Mar 12, 2021 · 72e6189 · 72e6189
1 parent c3a1fb4
commit 72e6189
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...nerator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/Quantity.java b/...nerator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/Quantity.java
@@ -47,7 +47,7 @@ public class Quantity  implements Serializable {
 
   private static final String AT_LEAST_ONE_DIGIT_REGEX = ".*\\d+.*";
   private String amount;
-  private String format;
+  private String format = "";
   private Map<String, Object> additionalProperties = new HashMap<String, Object>();
 
   /**
@@ -76,7 +76,9 @@ public Quantity(String amount) {
    */
   public Quantity(String amount, String format) {
     this.amount = amount;
-    this.format = format;
+    if (format != null) {
+      this.format = format;
+    }
   }
 
   public String getAmount() {
@@ -170,6 +172,10 @@ public static BigDecimal getAmountInBytes(Quantity quantity) throws ArithmeticEx
       case "E":
         multiple = decimalFactor.pow(18, MathContext.DECIMAL64);
         break;
+      case "":
+        break;
+      default:
+        throw new IllegalArgumentException("Invalid quantity format passed to parse");
     }
 
     return digit.multiply(multiple);

diff --git a/...tor/kubernetes-model-core/src/test/java/io/fabric8/kubernetes/api/model/QuantityTest.java b/...tor/kubernetes-model-core/src/test/java/io/fabric8/kubernetes/api/model/QuantityTest.java
@@ -160,5 +160,7 @@ public void testParseFailure() {
     assertThrows(IllegalArgumentException.class, () -> new Quantity(""));
     assertThrows(IllegalArgumentException.class, () -> new Quantity(null));
     assertThrows(IllegalArgumentException.class, () -> Quantity.getAmountInBytes(new Quantity()));
+    assertThrows(IllegalArgumentException.class, () -> Quantity.getAmountInBytes(new Quantity("4MiB")));
+    assertThrows(IllegalArgumentException.class, () -> Quantity.getAmountInBytes(new Quantity("4megabyte")));
   }
 }