Merge branch 'main' into release/0.4

Author: Gottox

Cargo.lock

@@ -194,6 +194,10 @@ spec:
                 type: object
               payload:
                 type: string
+              primaryKey:
+                description: The name of the primary key field in the payload (e.g. "id", "name", "alias"). Used to inject the resource ID extracted from the stored resource path into PUT requests, working around Keycloak versions that don't populate the model ID from the URL path parameter.
+                nullable: true
+                type: string
             required:
             - endpoint
             - immutablePayload

charts/rustcloak-operator/crds/clusterkeycloakapiobjects.rustcloak.k8s.eboland.de.yaml

@@ -194,6 +194,10 @@ spec:
                 type: object
               payload:
                 type: string
+              primaryKey:
+                description: The name of the primary key field in the payload (e.g. "id", "name", "alias"). Used to inject the resource ID extracted from the stored resource path into PUT requests, working around Keycloak versions that don't populate the model ID from the URL path parameter.
+                nullable: true
+                type: string
             required:
             - endpoint
             - immutablePayload

charts/rustcloak-operator/crds/keycloakapiobjects.rustcloak.k8s.eboland.de.yaml

@@ -34,6 +34,7 @@ Custom Resource for Keycloak API requests. The user should not use this resource
 |[spec.options.patchFrom[].value](#specoptionspatchfromvalue)|string||
 |[spec.options.patchFrom[].value_as](#specoptionspatchfromvalueas)|string||
 |[spec.payload](#specpayload)|string|✅|
+|[spec.primaryKey](#specprimarykey)|string||
 |[status](#status)|object||
 |[status.conditions[]](#statusconditions)|object||
 |[status.conditions[].lastTransitionTime](#statusconditionslasttransitiontime)|string||
@@ -64,6 +65,7 @@ Type: object
 |[immutablePayload](#specimmutablepayload)|string|✅|
 |[options](#specoptions)|object||
 |[payload](#specpayload)|string|✅|
+|[primaryKey](#specprimarykey)|string||
 
 defines an API request to the Keycloak Admin API.
 
@@ -365,6 +367,14 @@ Type: string
 
 ---
 
+### spec.primaryKey
+
+Type: string
+
+The name of the primary key field in the payload (e.g. "id", "name", "alias"). Used to inject the resource ID extracted from the stored resource path into PUT requests, working around Keycloak versions that don't populate the model ID from the URL path parameter.
+
+---
+
 ### status
 
 Type: object

docs/src/crds/clusterkeycloakapiobject.md

@@ -34,6 +34,7 @@ Custom Resource for Keycloak API requests. The user should not use this resource
 |[spec.options.patchFrom[].value](#specoptionspatchfromvalue)|string||
 |[spec.options.patchFrom[].value_as](#specoptionspatchfromvalueas)|string||
 |[spec.payload](#specpayload)|string|✅|
+|[spec.primaryKey](#specprimarykey)|string||
 |[status](#status)|object||
 |[status.conditions[]](#statusconditions)|object||
 |[status.conditions[].lastTransitionTime](#statusconditionslasttransitiontime)|string||
@@ -64,6 +65,7 @@ Type: object
 |[immutablePayload](#specimmutablepayload)|string|✅|
 |[options](#specoptions)|object||
 |[payload](#specpayload)|string|✅|
+|[primaryKey](#specprimarykey)|string||
 
 defines an API request to the Keycloak Admin API.
 
@@ -365,6 +367,14 @@ Type: string
 
 ---
 
+### spec.primaryKey
+
+Type: string
+
+The name of the primary key field in the payload (e.g. "id", "name", "alias"). Used to inject the resource ID extracted from the stored resource path into PUT requests, working around Keycloak versions that don't populate the model ID from the URL path parameter.
+
+---
+
 ### status
 
 Type: object

docs/src/crds/keycloakapiobject.md

@@ -30,6 +30,13 @@ both_scopes! {
             pub endpoint: KeycloakApiEndpoint,
             pub immutable_payload: ImmutableString,
             pub payload: String,
+            /// The name of the primary key field in the payload (e.g. "id",
+            /// "name", "alias"). Used to inject the resource ID extracted
+            /// from the stored resource path into PUT requests, working
+            /// around Keycloak versions that don't populate the model ID
+            /// from the URL path parameter.
+            #[serde(default, skip_serializing_if = "Option::is_none")]
+            pub primary_key: Option<String>,
         }
     }
 }

rustcloak-crd/src/crd/api_object.rs

@@ -253,6 +253,15 @@ where
         if let Some(endpoint) =
             resource.status().as_ref().and_then(|s| s.endpoint.as_ref())
         {
+            // Inject the resource ID into the payload before PUT. Some
+            // Keycloak versions do not populate the model ID from the URL
+            // path parameter during updates, causing a NullPointerException.
+            if let Some(primary_key) = &spec.primary_key
+                && let Some(id) = endpoint.resource_path.rsplit('/').next()
+                    && let Some(obj) = payload.as_object_mut() {
+                        obj.entry(primary_key.clone())
+                            .or_insert_with(|| Value::String(id.to_string()));
+                    }
             match keycloak.put(&endpoint.resource_path, &payload).await {
                 Ok(_) => {
                     success = true;

rustcloak-operator/src/controller/api_object_controller.rs

@@ -222,6 +222,7 @@ where
                 options: resource.inner_spec().options().cloned(),
                 immutable_payload,
                 payload,
+                primary_key: Some(primary_key.to_string()),
             },
         );