summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-01-22 12:22:46 +0100
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-01-22 12:22:46 +0100
commit63d188b40214ae9df9977eba92a62af5e8e3ce5e (patch)
treee9b9d34a3be45ad30bb01c9d272e4ba763a9b6be /controller-api
parentb54f86da25e5183fc45d1d5f1620eb6394d7aca0 (diff)
Restrict tenant and application names to not have double dashes, upon creationgd
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java
index 70ebc8712d5..a7ac1882159 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java
@@ -12,7 +12,7 @@ import java.util.regex.Pattern;
*/
public abstract class Identifier {
- protected static final Pattern strictPattern = Pattern.compile("[a-z0-9][a-z0-9-]{0,26}[a-z0-9]");
+ protected static final Pattern strictPattern = Pattern.compile("^(?=.{1,28}$)[a-z0-9](-?[a-z0-9]+)*$");
private static final Pattern serializedIdentifierPattern = Pattern.compile("[a-zA-Z0-9_-]+");
private static final Pattern serializedPattern = Pattern.compile("[a-zA-Z0-9_.-]+");