From 5ee98eed8d153fb3cf2159a73b96065b87d09161 Mon Sep 17 00:00:00 2001
From: Mark Burnett <mark.m.burnett@gmail.com>
Date: Thu, 10 May 2018 14:49:28 -0500
Subject: [PATCH] Drop IP & hostname regexes for formats

Change-Id: I0373cf020d03646e68cb0ba9903fe74e84716888
---
 promenade/schemas/KubernetesNetwork.yaml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/promenade/schemas/KubernetesNetwork.yaml b/promenade/schemas/KubernetesNetwork.yaml
index 7da6de87..f9fcf43b 100644
--- a/promenade/schemas/KubernetesNetwork.yaml
+++ b/promenade/schemas/KubernetesNetwork.yaml
@@ -13,19 +13,24 @@ data:
       pattern: '^(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\/([0-9]|[1-2][0-9]|3[0-2])$'
     domain_name:
       type: string
-      pattern: '^([a-z][a-z0-9-]+\.)+[a-z]+\.?$'
+      format: hostname
+    domain_suffix:
+      type: string
+      pattern: '^\.[a-z0-9][a-z0-9-\.]*$'
     hostname:
       type: string
-      pattern: '^([a-z][a-z0-9-]+)(\.+[a-z]+\.)?$'
+      format: hostname
     hostname_or_ip_address:
-      type: string
-      pattern: '^(([a-z][a-z0-9-]+)(\.+[a-z]+\.)?|(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5])))$'
+      anyOf:
+        - $ref: '#/definitions/hostname'
+        - $ref: '#/definitions/ip_address'
+        - $ref: '#/definitions/domain_suffix'
     ip_address:
       type: string
-      pattern: '^(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))$'
+      format: ipv4
     url:
       type: string
-      # XXX add regex
+      format: uri
 
   type: object
   properties:
@@ -102,7 +107,7 @@ data:
         additional_no_proxy:
           type: array
           items:
-            type: 'string'
+            $ref: '#/definitions/hostname_or_ip_address'
         url:
           $ref: '#/definitions/url'
       required: