Merge pull request #15088 from vespa-engine/ogronnesby/budget-quota-int

 Make budget quota be cents/hours

3 files changed, 3 insertions, 42 deletions

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/BigDecimalFlag.java b/flags/src/main/java/com/yahoo/vespa/flags/BigDecimalFlag.java
deleted file mode 100644
index f5273719275..00000000000
--- a/flags/src/main/java/com/yahoo/vespa/flags/BigDecimalFlag.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2020 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.flags;
-
-import java.math.BigDecimal;
-
-/**
- * @author ogronnesby
- */
-public class BigDecimalFlag extends FlagImpl<BigDecimal, BigDecimalFlag> {
-    public BigDecimalFlag(FlagId id, BigDecimal defaultValue, FetchVector fetchVector, FlagSerializer<BigDecimal> serializer, FlagSource source) {
-        super(id, defaultValue, fetchVector, serializer, source, BigDecimalFlag::new);
-    }
-
-    public BigDecimal value() { return boxedValue(); }
-}
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index c25d78640f4..e622e1dd419 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -262,9 +262,9 @@ public class Flags {
             APPLICATION_ID
     );
 
-    public static final UnboundBigDecimalFlag TENANT_BUDGET_QUOTA = defineBigDecimalFlag(
-            "tenant-budget-quota", new BigDecimal("5.00"),
-            "The budget in $/hr a tenant is allowed spend per instance, as calculated by NodeResources",
+    public static final UnboundIntFlag TENANT_BUDGET_QUOTA = defineIntFlag(
+            "tenant-budget-quota", -1,
+            "The budget in cents/hr a tenant is allowed spend per instance, as calculated by NodeResources",
             "Only takes effect on next deployment, if set to a value other than the default for flag!",
             APPLICATION_ID
     );
@@ -366,12 +366,6 @@ public class Flags {
     }
 
     /** WARNING: public for testing: All flags should be defined in {@link Flags}. */
-    public static UnboundBigDecimalFlag defineBigDecimalFlag(String flagId, BigDecimal defaultValue, String description,
-                                                             String modificationEffect, FetchVector.Dimension... dimensions) {
-        return define(UnboundBigDecimalFlag::new, flagId, defaultValue, description, modificationEffect, dimensions);
-    }
-
-    /** WARNING: public for testing: All flags should be defined in {@link Flags}. */
     public static <T> UnboundJacksonFlag<T> defineJacksonFlag(String flagId, T defaultValue, Class<T> jacksonClass, String description,
                                                               String modificationEffect, FetchVector.Dimension... dimensions) {
         return define((id2, defaultValue2, vector2) -> new UnboundJacksonFlag<>(id2, defaultValue2, vector2, jacksonClass),
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/UnboundBigDecimalFlag.java b/flags/src/main/java/com/yahoo/vespa/flags/UnboundBigDecimalFlag.java
deleted file mode 100644
index 0b26046c777..00000000000
--- a/flags/src/main/java/com/yahoo/vespa/flags/UnboundBigDecimalFlag.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.flags;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.DecimalNode;
-
-import java.math.BigDecimal;
-
-/**
- * @author ogronnesby
- */
-public class UnboundBigDecimalFlag extends UnboundFlagImpl<BigDecimal, BigDecimalFlag, UnboundBigDecimalFlag>  {
-    public UnboundBigDecimalFlag(FlagId id, BigDecimal defaultValue, FetchVector defaultFetchVector) {
-        super(id, defaultValue, defaultFetchVector,
-                new SimpleFlagSerializer<>(DecimalNode::valueOf, JsonNode::isBigDecimal, JsonNode::decimalValue),
-                UnboundBigDecimalFlag::new, BigDecimalFlag::new);
-    }
-}