fix: set identifier max length to match k8s service name limit

garden-io · Jul 10, 2018 · ad0a54f · ad0a54f
1 parent 4bf5d18
commit ad0a54f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/docs/reference/config.md b/docs/reference/config.md
@@ -28,7 +28,7 @@ module:
 
   # Valid RFC1035/RFC1123 (DNS) label (may contain lowercase letters, numbers and dashes, must
   # start with a letter, and cannot end with a dash) and additionally cannot contain consecutive
-  # dashes
+  # dashes or be longer than 63 characters.
   # 
   # Optional.
   name: 
@@ -177,7 +177,7 @@ project:
 
       # Valid RFC1035/RFC1123 (DNS) label (may contain lowercase letters, numbers and dashes, must
       # start with a letter, and cannot end with a dash) and additionally cannot contain
-      # consecutive dashes
+      # consecutive dashes or be longer than 63 characters.
       # 
       # Required.
       name:
@@ -203,7 +203,7 @@ module:
 
   # Valid RFC1035/RFC1123 (DNS) label (may contain lowercase letters, numbers and dashes, must
   # start with a letter, and cannot end with a dash) and additionally cannot contain consecutive
-  # dashes
+  # dashes or be longer than 63 characters.
   # 
   # Optional.
   name: 
@@ -328,7 +328,7 @@ module:
 
   # Valid RFC1035/RFC1123 (DNS) label (may contain lowercase letters, numbers and dashes, must
   # start with a letter, and cannot end with a dash) and additionally cannot contain consecutive
-  # dashes
+  # dashes or be longer than 63 characters.
   # 
   # Optional.
   name: 
@@ -412,7 +412,7 @@ module:
     # Optional.
     - # Valid RFC1035/RFC1123 (DNS) label (may contain lowercase letters, numbers and dashes, must
       # start with a letter, and cannot end with a dash) and additionally cannot contain
-      # consecutive dashes
+      # consecutive dashes or be longer than 63 characters.
       # 
       # Required.
       name: 
@@ -423,7 +423,7 @@ module:
       dependencies: 
         # Valid RFC1035/RFC1123 (DNS) label (may contain lowercase letters, numbers and dashes,
         # must start with a letter, and cannot end with a dash) and additionally cannot contain
-        # consecutive dashes
+        # consecutive dashes or be longer than 63 characters.
         # 
         # Optional.
         - 

diff --git a/src/types/common.ts b/src/types/common.ts
@@ -32,11 +32,12 @@ export const joiPrimitive = () => Joi.alternatives().try(Joi.number(), Joi.strin
 export const identifierRegex = /^[a-z][a-z0-9]*(-[a-z0-9]+)*$/
 export const envVarRegex = /^(?!GARDEN)[A-Z_][A-Z0-9_]*$/
 
-export const joiIdentifier = () => Joi
-  .string().regex(identifierRegex)
+export const joiIdentifier = () => Joi.string()
+  .regex(identifierRegex)
+  .max(63)
   .description(
     "Valid RFC1035/RFC1123 (DNS) label (may contain lowercase letters, numbers and dashes, must start with a letter, " +
-    "and cannot end with a dash) and additionally cannot contain consecutive dashes",
+    "and cannot end with a dash) and additionally cannot contain consecutive dashes or be longer than 63 characters.",
 )
 
 export const joiIdentifierMap = (valueSchema: JoiObject) => Joi