Fix #34169: rename cloudwatch property

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/ecs/EcsBackend.java

@@ -134,7 +134,7 @@ public void initialize() {
         securityGroups = EnvironmentUtils.readList(environment, "proxy.ecs.security-groups");
         totalWaitMs = environment.getProperty(PROPERTY_PREFIX + PROPERTY_SERVICE_WAIT_TIME, Integer.class, 180000);
 
-        enableCloudWatch = environment.getProperty("proxy.ecs.enable-cloudwatch", Boolean.class, false);
+        enableCloudWatch = EnvironmentUtils.getProperty(environment, "proxy.ecs.enable-cloud-watch", "proxy.ecs.enable-cloudwatch", Boolean.class, false);
         cloudWatchGroupPrefix = environment.getProperty("proxy.ecs.cloud-watch-group-prefix", String.class, "/ecs/");
         cloudWatchRegion = environment.getProperty("proxy.ecs.cloud-watch-region", String.class, getProperty(PROPERTY_REGION));
         cloudWatchStreamPrefix = environment.getProperty("proxy.ecs.cloud-watch-stream-prefix", String.class, "ecs");

src/main/java/eu/openanalytics/containerproxy/util/EnvironmentUtils.java

@@ -70,4 +70,22 @@ public static List<String> readList(Environment environment, String propertyName
         return result;
     }
 
+    /**
+     * Reads a property from the environment (i.e. config file). Supports reading a fallback property.
+     * This is useful to rename properties.
+     * @param environment environment to read the property from
+     * @param propertyName property name
+     * @param fallbackPropertyName property name used when no value found
+     * @param targetType the expected type of the property value
+     * @param defaultValue the default value to return if no value is found
+     * @return the property value or null
+     */
+    public static <T> T getProperty(Environment environment, String propertyName, String fallbackPropertyName, Class<T> targetType, T defaultValue) {
+        T result = environment.getProperty(propertyName, targetType);
+        if (result != null) {
+            return result;
+        }
+        return environment.getProperty(fallbackPropertyName, targetType, defaultValue);
+    }
+
 }