Add reference for ClientScopeID

crossplane-contrib · May 20, 2024 · 72cb516 · 72cb516
1 parent 2759b66
commit 72cb516
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 2 deletions.
diff --git a/apis/client/v1alpha1/zz_generated.deepcopy.go b/apis/client/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/client/v1alpha1/zz_generated.resolvers.go b/apis/client/v1alpha1/zz_generated.resolvers.go
diff --git a/apis/client/v1alpha1/zz_protocolmapper_types.go b/apis/client/v1alpha1/zz_protocolmapper_types.go
diff --git a/config/mapper/config.go b/config/mapper/config.go
@@ -5,14 +5,17 @@ import "github.com/crossplane/upjet/pkg/config"
 // Configure configures individual resources by adding custom ResourceConfigurators.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("keycloak_generic_protocol_mapper", func(r *config.Resource) {
-		// We need to override the default group that upjet generated for
 		r.ShortGroup = "client"
+		r.References["client_scope_id"] = config.Reference{
+			Type: "github.com/crossplane-contrib/provider-keycloak/apis/openidclient/v1alpha1.ClientScope",
+		}
 	})
+
 	p.AddResourceConfigurator("keycloak_generic_role_mapper", func(r *config.Resource) {
 		r.ShortGroup = "client"
-
 		r.References["role_id"] = config.Reference{
 			Type: "github.com/crossplane-contrib/provider-keycloak/apis/role/v1alpha1.Role",
 		}
+
 	})
 }
diff --git a/package/crds/client.keycloak.crossplane.io_protocolmappers.yaml b/package/crds/client.keycloak.crossplane.io_protocolmappers.yaml
@@ -158,6 +158,82 @@ spec:
                       The ID of the client scope this protocol mapper should be added to. Conflicts with client_id. This argument is required if client_id is not set.
                       The mapper's associated client scope. Cannot be used at the same time as client_id.
                     type: string
+                  clientScopeIdRef:
+                    description: Reference to a ClientScope in openidclient to populate
+                      clientScopeId.
+                    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
+                  clientScopeIdSelector:
+                    description: Selector for a ClientScope in openidclient to populate
+                      clientScopeId.
+                    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
                   config:
                     additionalProperties:
                       type: string
@@ -360,6 +436,82 @@ spec:
                       The ID of the client scope this protocol mapper should be added to. Conflicts with client_id. This argument is required if client_id is not set.
                       The mapper's associated client scope. Cannot be used at the same time as client_id.
                     type: string
+                  clientScopeIdRef:
+                    description: Reference to a ClientScope in openidclient to populate
+                      clientScopeId.
+                    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
+                  clientScopeIdSelector:
+                    description: Selector for a ClientScope in openidclient to populate
+                      clientScopeId.
+                    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
                   config:
                     additionalProperties:
                       type: string