Merge pull request #47 from crossplane-contrib/feature/issue-46-paren…

…tid-ref fix(issue-46): Make parent group referencable
crossplane-contrib · Feb 14, 2024 · 945e5e4 · 945e5e4
2 parents 341521a + 4472092
commit 945e5e4
Show file tree

Hide file tree

Showing 5 changed files with 112 additions and 14 deletions.
diff --git a/apis/group/v1alpha1/zz_generated.deepcopy.go b/apis/group/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/group/v1alpha1/zz_generated.resolvers.go b/apis/group/v1alpha1/zz_generated.resolvers.go
diff --git a/apis/group/v1alpha1/zz_group_types.go b/apis/group/v1alpha1/zz_group_types.go
diff --git a/config/group/config.go b/config/group/config.go
@@ -7,10 +7,13 @@ func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("keycloak_group", func(r *config.Resource) {
 		// We need to override the default group that upjet generated for
 		r.ShortGroup = "group"
+
+		r.References["parent_id"] = config.Reference{
+			Type: "Group",
+		}
 	})
 	p.AddResourceConfigurator("keycloak_group_memberships", func(r *config.Resource) {
 		// We need to override the default group that upjet generated for
-		// this resource, which would be "github"
 		r.ShortGroup = "group"
 		r.References["group_id"] = config.Reference{
 			Type: "Group",
@@ -19,7 +22,6 @@ func Configure(p *config.Provider) {
 	})
 	p.AddResourceConfigurator("keycloak_group_roles", func(r *config.Resource) {
 		// We need to override the default group that upjet generated for
-		// this resource, which would be "github"
 		r.ShortGroup = "group"
 		r.References["group_id"] = config.Reference{
 			Type: "Group",

diff --git a/package/crds/group.keycloak.crossplane.io_groups.yaml b/package/crds/group.keycloak.crossplane.io_groups.yaml
@@ -80,6 +80,79 @@ spec:
                     description: The ID of this group's parent. If omitted, this group
                       will be defined at the root level.
                     type: string
+                  parentIdRef:
+                    description: Reference to a Group to populate parentId.
+                    properties:
+                      name:
+                        description: Name of the referenced object.
+                        type: string
+                      policy:
+                        description: Policies for referencing.
+                        properties:
+                          resolution:
+                            default: Required
+                            description: Resolution specifies whether resolution of
+                              this reference is required. The default is 'Required',
+                              which means the reconcile will fail if the reference
+                              cannot be resolved. 'Optional' means this reference
+                              will be a no-op if it cannot be resolved.
+                            enum:
+                            - Required
+                            - Optional
+                            type: string
+                          resolve:
+                            description: Resolve specifies when this reference should
+                              be resolved. The default is 'IfNotPresent', which will
+                              attempt to resolve the reference only when the corresponding
+                              field is not present. Use 'Always' to resolve the reference
+                              on every reconcile.
+                            enum:
+                            - Always
+                            - IfNotPresent
+                            type: string
+                        type: object
+                    required:
+                    - name
+                    type: object
+                  parentIdSelector:
+                    description: Selector for a Group to populate parentId.
+                    properties:
+                      matchControllerRef:
+                        description: MatchControllerRef ensures an object with the
+                          same controller reference as the selecting object is selected.
+                        type: boolean
+                      matchLabels:
+                        additionalProperties:
+                          type: string
+                        description: MatchLabels ensures an object with matching labels
+                          is selected.
+                        type: object
+                      policy:
+                        description: Policies for selection.
+                        properties:
+                          resolution:
+                            default: Required
+                            description: Resolution specifies whether resolution of
+                              this reference is required. The default is 'Required',
+                              which means the reconcile will fail if the reference
+                              cannot be resolved. 'Optional' means this reference
+                              will be a no-op if it cannot be resolved.
+                            enum:
+                            - Required
+                            - Optional
+                            type: string
+                          resolve:
+                            description: Resolve specifies when this reference should
+                              be resolved. The default is 'IfNotPresent', which will
+                              attempt to resolve the reference only when the corresponding
+                              field is not present. Use 'Always' to resolve the reference
+                              on every reconcile.
+                            enum:
+                            - Always
+                            - IfNotPresent
+                            type: string
+                        type: object
+                    type: object
                   realmId:
                     description: The realm this group exists in.
                     type: string
@@ -179,10 +252,6 @@ spec:
                   name:
                     description: The name of the group.
                     type: string
-                  parentId:
-                    description: The ID of this group's parent. If omitted, this group
-                      will be defined at the root level.
-                    type: string
                 type: object
               managementPolicies:
                 default: