summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2023-08-23 16:21:44 +0200
committergjoranv <gjoranv@gmail.com>2023-08-23 17:26:09 +0200
commit04561fc0bf54f7ec23b99c0781dbae4e8b1bf5af (patch)
tree6a450901e714552228bc69dfcafa53f9beb7611e /flags
parentf37ad506b56dffd8002eb9334d0811e788dade01 (diff)
Add 'cloud-account' dimension
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/FetchVector.java6
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java1
2 files changed, 6 insertions, 1 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/FetchVector.java b/flags/src/main/java/com/yahoo/vespa/flags/FetchVector.java
index 5bcc1e67547..7af1661cf0c 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/FetchVector.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/FetchVector.java
@@ -9,7 +9,6 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
-import java.util.function.BiConsumer;
import java.util.function.Consumer;
/**
@@ -34,6 +33,11 @@ public class FetchVector {
*/
CLOUD,
+ /**
+ * Cloud account ID from com.yahoo.config.provision.CloudAccount::value, e.g. aws:123456789012
+ */
+ CLOUD_ACCOUNT,
+
/** Cluster ID from com.yahoo.config.provision.ClusterSpec.Id::value, e.g. cluster-controllers, logserver. */
CLUSTER_ID,
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java b/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java
index 5e5506b616b..2193d70ec47 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java
@@ -17,6 +17,7 @@ public class DimensionHelper {
static {
serializedDimensions.put(FetchVector.Dimension.APPLICATION_ID, "application");
serializedDimensions.put(FetchVector.Dimension.CLOUD, "cloud");
+ serializedDimensions.put(FetchVector.Dimension.CLOUD_ACCOUNT, "cloud-account");
serializedDimensions.put(FetchVector.Dimension.CLUSTER_ID, "cluster-id");
serializedDimensions.put(FetchVector.Dimension.CLUSTER_TYPE, "cluster-type");
serializedDimensions.put(FetchVector.Dimension.CONSOLE_USER_EMAIL, "console-user-email");