diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-12-04 14:23:35 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-12-04 14:23:35 +0100 |
| commit | 64e6092d0a9eb981cda5d9e0ad11383bcdc244a6 (patch) | |
| tree | 6f1a2b33f3f136a51adfea4ba410eea1605f91be /controller-api | |
| parent | 28ea00bcf2f4e4935a0f9da4f42072b26bd00a67 (diff) | |
Call extra validation (non-"default", lowercase) for tenant, app, instance IDs
Diffstat (limited to 'controller-api')
3 files changed, 4 insertions, 2 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ApplicationId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ApplicationId.java index c2512c2032b..3ad1d3f4d35 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ApplicationId.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ApplicationId.java @@ -19,6 +19,7 @@ public class ApplicationId extends NonDefaultIdentifier { public static void validate(String id) { if ( ! strictPattern.matcher(id).matches()) throwInvalidId(id, strictPatternExplanation); + new ApplicationId(id); // validate } } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/InstanceId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/InstanceId.java index 8e14774b827..6973a142b16 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/InstanceId.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/InstanceId.java @@ -19,6 +19,7 @@ public class InstanceId extends SerializedIdentifier { public static void validate(String id) { if ( ! strictPattern.matcher(id).matches()) throwInvalidId(id, strictPatternExplanation); + new InstanceId(id); // validate } } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java index 3ac24bac7ca..d8318470f82 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java @@ -17,9 +17,9 @@ public class TenantId extends NonDefaultIdentifier { } public static void validate(String id) { - if (!strictPattern.matcher(id).matches()) { + if ( ! strictPattern.matcher(id).matches()) throwInvalidId(id, strictPatternExplanation); - } + new TenantId(id); // validate } } |