From 7ba43e0c3fb49bc984042fce2c4e71ae542d667d Mon Sep 17 00:00:00 2001
From: Andrew Keesler <akeesler@vmware.com>
Date: Wed, 29 Jul 2020 13:14:50 -0700
Subject: [PATCH] More validations on the LoginDiscoveryConfig CRD

Signed-off-by: Ryan Richard <richardry@vmware.com>
---
 deploy/crd.yaml | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/deploy/crd.yaml b/deploy/crd.yaml
index 863f423d..a7b884cd 100644
--- a/deploy/crd.yaml
+++ b/deploy/crd.yaml
@@ -1,5 +1,21 @@
 #@ load("@ytt:data", "data")
 
+#! Example of valid LoginDiscoveryConfig object:
+#! ---
+#! apiVersion: suzerain-io.github.io/v1alpha1
+#! kind: LoginDiscoveryConfig
+#! metadata:
+#!   name: login-discovery
+#!   namespace: integration
+#! spec:
+#!   server: https://foo
+#!   certificateAuthorityData: bar
+#!   identityProviders:
+#!     - name: baz
+#!       type: token
+#!     - name: bat
+#!       type: token
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -8,20 +24,24 @@ metadata:
 spec:
   group: suzerain-io.github.io
   versions:
+    #! Any changes to these schemas should also be reflected in the types.go file(s)
+    #! in https://github.com/suzerain-io/placeholder-name-api/tree/main/pkg/apis/placeholder
     - name: v1alpha1
       served: true
       storage: true
       schema:
         openAPIV3Schema:
           type: object
+          required: [spec]
           properties:
             spec:
               type: object
-              required: [server, certificateAuthorityData]
+              required: [server, certificateAuthorityData, identityProviders]
               properties:
                 server:
                   type: string
                   minLength: 1
+                  pattern: '^https://'
                 certificateAuthorityData:
                   type: string
                   minLength: 1
@@ -29,12 +49,15 @@ spec:
                   type: array
                   items:
                     type: object
+                    required: [name, type]
                     properties:
                       name:
                         type: string
-                      idpType:
+                        minLength: 1
+                        pattern: '^[a-zA-Z0-9]+(?:(-|_)?[a-zA-Z0-9]+)+$'
+                      type: #! The name of this property is "type" (not declaring the type of a property).
                         type: string
-                        pattern: '^token$' #! validation via regexp pattern match
+                        pattern: '^token$'
   scope: Namespaced
   names:
     plural: logindiscoveryconfigs