Add pod-scoped property overrides for ConfigurationOption (#165)

* Initial plan

* Add pod-based property override support to ConfigurationOption

Co-authored-by: phrocker <[email protected]>

* Update pod name configuration to use explicit sentrius.pod.name property

Co-authored-by: phrocker <[email protected]>

* Add Flyway migration V36 for pod_name column on configuration_options

Co-authored-by: phrocker <[email protected]>

* Add clarifying comments to Flyway migration V36

Co-authored-by: phrocker <[email protected]>

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: phrocker <[email protected]>

Author: Copilot

api/src/main/java/io/sentrius/sso/controllers/api/PropertyOverrideController.java

@@ -3,6 +3,7 @@
 import io.sentrius.sso.core.annotations.LimitAccess;
 import io.sentrius.sso.core.config.SystemOptions;
 import io.sentrius.sso.core.controllers.BaseController;
+import io.sentrius.sso.core.model.ConfigurationOption;
 import io.sentrius.sso.core.model.security.enums.ApplicationAccessEnum;
 import io.sentrius.sso.core.services.ErrorOutputService;
 import io.sentrius.sso.core.services.PropertyOverrideService;
@@ -12,11 +13,13 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
  * REST API controller for managing application property overrides.
  * Provides endpoints to view, update, and delete property overrides stored in the database.
+ * Supports pod-specific and global property overrides.
  */
 @Slf4j
 @RestController
@@ -36,28 +39,49 @@ public PropertyOverrideController(
 
     /**
      * Get all properties with their current values and override status.
+     * Optionally filter by pod name.
      * 
+     * @param podName The pod name to filter by, or null for global properties
      * @return Map of property names to property information
      */
     @GetMapping
     @LimitAccess(applicationAccess = {ApplicationAccessEnum.CAN_MANAGE_APPLICATION})
-    public ResponseEntity<Map<String, PropertyOverrideService.PropertyInfo>> getAllProperties() {
-        log.info("Fetching all properties");
-        Map<String, PropertyOverrideService.PropertyInfo> properties = propertyOverrideService.getAllProperties();
+    public ResponseEntity<Map<String, PropertyOverrideService.PropertyInfo>> getAllProperties(
+            @RequestParam(required = false) String podName) {
+        log.info("Fetching all properties for pod: {}", podName != null ? podName : "global");
+        Map<String, PropertyOverrideService.PropertyInfo> properties = propertyOverrideService.getAllProperties(podName);
         return ResponseEntity.ok(properties);
     }
 
+    /**
+     * Get all configuration options for a specific pod.
+     * 
+     * @param podName The pod name
+     * @return List of configuration options for the pod
+     */
+    @GetMapping("/pod/{podName}")
+    @LimitAccess(applicationAccess = {ApplicationAccessEnum.CAN_MANAGE_APPLICATION})
+    public ResponseEntity<List<ConfigurationOption>> getPropertiesForPod(@PathVariable String podName) {
+        log.info("Fetching all configurations for pod: {}", podName);
+        List<ConfigurationOption> configs = propertyOverrideService.getAllConfigurationsForPod(podName);
+        return ResponseEntity.ok(configs);
+    }
+
     /**
      * Get a specific property value.
+     * Optionally specify a pod name to get pod-specific override.
      * 
      * @param propertyName The property name
+     * @param podName The pod name, or null for global lookup
      * @return The property value
      */
     @GetMapping("/{propertyName}")
     @LimitAccess(applicationAccess = {ApplicationAccessEnum.CAN_MANAGE_APPLICATION})
-    public ResponseEntity<Map<String, String>> getProperty(@PathVariable String propertyName) {
-        log.info("Fetching property: {}", propertyName);
-        String value = propertyOverrideService.getProperty(propertyName);
+    public ResponseEntity<Map<String, String>> getProperty(
+            @PathVariable String propertyName,
+            @RequestParam(required = false) String podName) {
+        log.info("Fetching property: {} for pod: {}", propertyName, podName != null ? podName : "global");
+        String value = propertyOverrideService.getProperty(podName, propertyName);
 
         if (value == null) {
             return ResponseEntity.notFound().build();
@@ -66,26 +90,38 @@ public ResponseEntity<Map<String, String>> getProperty(@PathVariable String prop
         Map<String, String> response = new HashMap<>();
         response.put("propertyName", propertyName);
         response.put("value", value);
+        if (podName != null) {
+            response.put("podName", podName);
+        }
         return ResponseEntity.ok(response);
     }
 
     /**
      * Set or update a property override.
+     * Optionally specify a pod name for pod-specific override.
      * 
-     * @param request The request containing property name and value
+     * @param request The request containing property name, value, and optional pod name
      * @return Success message
      */
     @PostMapping
     @LimitAccess(applicationAccess = {ApplicationAccessEnum.CAN_MANAGE_APPLICATION})
     public ResponseEntity<Map<String, String>> setPropertyOverride(@RequestBody PropertyUpdateRequest request) {
-        log.info("Setting property override: {} = {}", request.getPropertyName(), request.getValue());
+        log.info("Setting property override: {} = {} for pod: {}", 
+            request.getPropertyName(), request.getValue(), 
+            request.getPodName() != null ? request.getPodName() : "global");
 
         try {
-            propertyOverrideService.setPropertyOverride(request.getPropertyName(), request.getValue());
+            propertyOverrideService.setPropertyOverride(
+                request.getPodName(), 
+                request.getPropertyName(), 
+                request.getValue());
 
             Map<String, String> response = new HashMap<>();
             response.put("message", "Property override saved successfully");
             response.put("propertyName", request.getPropertyName());
+            if (request.getPodName() != null) {
+                response.put("podName", request.getPodName());
+            }
             return ResponseEntity.ok(response);
         } catch (SecurityException e) {
             log.warn("Security violation: {}", e.getMessage());
@@ -98,21 +134,28 @@ public ResponseEntity<Map<String, String>> setPropertyOverride(@RequestBody Prop
 
     /**
      * Delete a property override (reverts to file value).
+     * Optionally specify a pod name to delete pod-specific override.
      * 
      * @param propertyName The property name
+     * @param podName The pod name, or null for global override
      * @return Success message
      */
     @DeleteMapping("/{propertyName}")
     @LimitAccess(applicationAccess = {ApplicationAccessEnum.CAN_MANAGE_APPLICATION})
-    public ResponseEntity<Map<String, String>> deletePropertyOverride(@PathVariable String propertyName) {
-        log.info("Deleting property override: {}", propertyName);
+    public ResponseEntity<Map<String, String>> deletePropertyOverride(
+            @PathVariable String propertyName,
+            @RequestParam(required = false) String podName) {
+        log.info("Deleting property override: {} for pod: {}", propertyName, podName != null ? podName : "global");
 
         try {
-            propertyOverrideService.removePropertyOverride(propertyName);
+            propertyOverrideService.removePropertyOverride(podName, propertyName);
 
             Map<String, String> response = new HashMap<>();
             response.put("message", "Property override removed successfully");
             response.put("propertyName", propertyName);
+            if (podName != null) {
+                response.put("podName", podName);
+            }
             return ResponseEntity.ok(response);
         } catch (SecurityException e) {
             log.warn("Security violation: {}", e.getMessage());
@@ -133,5 +176,11 @@ public ResponseEntity<Map<String, String>> deletePropertyOverride(@PathVariable
     public static class PropertyUpdateRequest {
         private String propertyName;
         private String value;
+        private String podName;
+        
+        public PropertyUpdateRequest(String propertyName, String value) {
+            this.propertyName = propertyName;
+            this.value = value;
+        }
     }
 }

api/src/main/resources/db/h2/V3__Configuration_Options.sql

@@ -1,5 +1,8 @@
 create table if not exists "configuration_options" (
    id BIGSERIAL PRIMARY KEY,
+   "pod_name" character varying(255),
    "configuration_name" character varying(250) NOT NULL,
     "configuration_value" text NOT NULL
-    );
+    );
+
+CREATE INDEX IF NOT EXISTS idx_config_pod_name ON configuration_options (pod_name, configuration_name);

api/src/main/resources/db/migration/V36__add_pod_name_to_configuration_options.sql

@@ -0,0 +1,9 @@
+-- Add pod_name column to configuration_options for pod-specific overrides
+-- NULL pod_name represents global configuration options that apply to all pods
+-- Pod-specific overrides take precedence over global overrides when queried
+ALTER TABLE configuration_options ADD COLUMN IF NOT EXISTS pod_name VARCHAR(255);
+
+-- Create composite index for efficient pod-based queries (pod_name, configuration_name)
+-- Queries filtering by pod_name will use this index
+-- Note: If you need to query by configuration_name alone frequently, consider adding a separate index
+CREATE INDEX IF NOT EXISTS idx_config_pod_name ON configuration_options (pod_name, configuration_name);