From 82b30bbdde998be1335acbb2c3828a17809524e3 Mon Sep 17 00:00:00 2001 From: andreer Date: Fri, 29 May 2020 14:15:57 +0200 Subject: make it green --- .../restapi/user/responses/user-with-applications-athenz.json | 1 + flags/src/main/java/com/yahoo/vespa/flags/FetchVector.java | 8 ++++---- .../src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json index 56108dce94f..a69b4d2a062 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json @@ -1,5 +1,6 @@ { "isPublic": false, + "isCd": false, "user": { "name": "Joe Developer", "email": "dev@domail", 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 02adfd1a14b..89c4f16e27b 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/FetchVector.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/FetchVector.java @@ -51,16 +51,16 @@ public class FetchVector { */ VESPA_VERSION, + /** Email address of user - provided by auth0 in console. */ + CONSOLE_USER_EMAIL, + /** * Zone from ZoneId::value of the form environment.region. * *

NOTE: There is seldom any need to set ZONE_ID, as all flags are set per zone anyways. The controller * could PERHAPS use this where it handles multiple zones. */ - ZONE_ID, - - /** Email address of user - provided by auth0 in console. */ - CONSOLE_USER_EMAIL + ZONE_ID } private final Map map; 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 c7081ca72ab..4b989b8f819 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 @@ -19,6 +19,7 @@ public class DimensionHelper { serializedDimensions.put(FetchVector.Dimension.NODE_TYPE, "node-type"); serializedDimensions.put(FetchVector.Dimension.CLUSTER_TYPE, "cluster-type"); serializedDimensions.put(FetchVector.Dimension.VESPA_VERSION, "vespa-version"); + serializedDimensions.put(FetchVector.Dimension.CONSOLE_USER_EMAIL, "console-user-email"); if (serializedDimensions.size() != FetchVector.Dimension.values().length) { throw new IllegalStateException(FetchVectorHelper.class.getName() + " is not in sync with " + -- cgit v1.2.3