diff options
| author | Torbjørn Smørgrav <smorgrav@users.noreply.github.com> | 2020-06-01 16:03:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 16:03:58 +0200 |
| commit | 42508c8fd230926f345f0561a4384210b17d4695 (patch) | |
| tree | 2733e8bce3042f5197cb9cc99ac826a3a9af1ccb /flags/src | |
| parent | 2e3d463d90a4834b65446415e1f92389091716ab (diff) | |
| parent | 82b30bbdde998be1335acbb2c3828a17809524e3 (diff) | |
Merge pull request #13431 from vespa-engine/andreer/public-signup-feature-flag
add "isCd" to user api output
Diffstat (limited to 'flags/src')
3 files changed, 12 insertions, 0 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 5897a5ab58b..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,6 +51,9 @@ 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. * 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 3759cf1448a..59926355bda 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -10,6 +10,7 @@ import java.util.Optional; import java.util.TreeMap; import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID; +import static com.yahoo.vespa.flags.FetchVector.Dimension.CONSOLE_USER_EMAIL; import static com.yahoo.vespa.flags.FetchVector.Dimension.HOSTNAME; import static com.yahoo.vespa.flags.FetchVector.Dimension.NODE_TYPE; import static com.yahoo.vespa.flags.FetchVector.Dimension.VESPA_VERSION; @@ -278,6 +279,13 @@ public class Flags { "Takes effect immediately on new hosts, on next redeploy for applications", APPLICATION_ID); + public static final UnboundBooleanFlag ENABLE_PUBLIC_SIGNUP_FLOW = defineFeatureFlag( + "enable-public-signup-flow", false, + "Show the public signup flow for a user in the console", + "takes effect on browser reload of api/user/v1/user", + CONSOLE_USER_EMAIL + ); + /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, String description, String modificationEffect, FetchVector.Dimension... dimensions) { 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 " + |