fix: realm groups api spec, fixes #192 (#196)

DoodleScheduling · Mar 18, 2024 · 9042bf7 · 9042bf7
1 parent 0a86f88
commit 9042bf7
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 5 deletions.
diff --git a/api/v1beta1/keycloakrealm_types.go b/api/v1beta1/keycloakrealm_types.go
@@ -240,7 +240,7 @@ type KeycloakAPIRealm struct {
 	// Enabled event types
 	// +optional
 
-	Groups []string `json:"groups,omitempty"`
+	Groups []KeycloakAPIGroup `json:"groups,omitempty"`
 
 	EnabledEventTypes []string `json:"enabledEventTypes,omitempty"`
 	// Enable events recording
@@ -862,3 +862,13 @@ type TokenResponse struct {
 	// +optional
 	ErrorDescription string `json:"error_description"`
 }
+
+type KeycloakAPIGroup struct {
+	ID          string              `json:"id,omitempty"`
+	Name        string              `json:"name,omitempty"`
+	Path        string              `json:"path,omitempty"`
+	RealmRoles  []string            `json:"realmRoles,omitempty"`
+	Attributes  map[string][]string `json:"attributes,omitempty"`
+	ClientRoles map[string][]string `json:"clientRoles,omitempty"`
+	SubGroups   []extv1.JSON        `json:"subGroups,omitempty"`
+}
diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/chart/keycloak-controller/crds/keycloak.infra.doodle.com_keycloakrealms.yaml b/chart/keycloak-controller/crds/keycloak.infra.doodle.com_keycloakrealms.yaml
@@ -973,7 +973,34 @@ spec:
                     type: integer
                   groups:
                     items:
-                      type: string
+                      properties:
+                        attributes:
+                          additionalProperties:
+                            items:
+                              type: string
+                            type: array
+                          type: object
+                        clientRoles:
+                          additionalProperties:
+                            items:
+                              type: string
+                            type: array
+                          type: object
+                        id:
+                          type: string
+                        name:
+                          type: string
+                        path:
+                          type: string
+                        realmRoles:
+                          items:
+                            type: string
+                          type: array
+                        subGroups:
+                          items:
+                            x-kubernetes-preserve-unknown-fields: true
+                          type: array
+                      type: object
                     type: array
                   id:
                     description: ID is the internal keycloak id

diff --git a/config/base/crd/bases/keycloak.infra.doodle.com_keycloakrealms.yaml b/config/base/crd/bases/keycloak.infra.doodle.com_keycloakrealms.yaml
@@ -973,7 +973,34 @@ spec:
                     type: integer
                   groups:
                     items:
-                      type: string
+                      properties:
+                        attributes:
+                          additionalProperties:
+                            items:
+                              type: string
+                            type: array
+                          type: object
+                        clientRoles:
+                          additionalProperties:
+                            items:
+                              type: string
+                            type: array
+                          type: object
+                        id:
+                          type: string
+                        name:
+                          type: string
+                        path:
+                          type: string
+                        realmRoles:
+                          items:
+                            type: string
+                          type: array
+                        subGroups:
+                          items:
+                            x-kubernetes-preserve-unknown-fields: true
+                          type: array
+                      type: object
                     type: array
                   id:
                     description: ID is the internal keycloak id