wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/loader/ConfigLoader.java

@@ -23,6 +23,9 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
 import io.javaoperatorsdk.operator.api.config.ControllerConfigurationOverrider;
+import io.javaoperatorsdk.operator.config.loader.provider.EnvVarConfigProvider;
+import io.javaoperatorsdk.operator.config.loader.provider.PrirityListConfigProvider;
+import io.javaoperatorsdk.operator.config.loader.provider.SystemPropertyConfigProvider;
 import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
 
 public class ConfigLoader {
@@ -134,7 +137,11 @@ public static ConfigLoader getDefault() {
   private final ConfigProvider configProvider;
 
   public ConfigLoader() {
-    this(new DefaultConfigProvider(), DEFAULT_CONTROLLER_KEY_PREFIX, DEFAULT_OPERATOR_KEY_PREFIX);
+    this(
+        new PrirityListConfigProvider(
+            List.of(new EnvVarConfigProvider(), new SystemPropertyConfigProvider())),
+        DEFAULT_CONTROLLER_KEY_PREFIX,
+        DEFAULT_OPERATOR_KEY_PREFIX);
   }
 
   public ConfigLoader(ConfigProvider configProvider) {

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/loader/DefaultConfigProvider.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright Java Operator SDK Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.javaoperatorsdk.operator.config.loader.provider;
+
+import java.time.Duration;
+
+/** Utility for converting raw string config values to typed instances. */
+final class ConfigValueConverter {
+
+  private ConfigValueConverter() {}
+
+  /**
+   * Converts {@code raw} to an instance of {@code type}. Supported types: {@link String}, {@link
+   * Boolean}, {@link Integer}, {@link Long}, {@link Double}, and {@link Duration} (ISO-8601 format,
+   * e.g. {@code PT30S}).
+   *
+   * @throws IllegalArgumentException if {@code type} is not supported
+   */
+  public static <T> T convert(String raw, Class<T> type) {
+    final Object converted;
+    if (type == String.class) {
+      converted = raw;
+    } else if (type == Boolean.class) {
+      converted = Boolean.parseBoolean(raw);
+    } else if (type == Integer.class) {
+      converted = Integer.parseInt(raw);
+    } else if (type == Long.class) {
+      converted = Long.parseLong(raw);
+    } else if (type == Double.class) {
+      converted = Double.parseDouble(raw);
+    } else if (type == Duration.class) {
+      converted = Duration.parse(raw);
+    } else {
+      throw new IllegalArgumentException("Unsupported config type: " + type.getName());
+    }
+    return type.cast(converted);
+  }
+}

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/loader/provider/ConfigValueConverter.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright Java Operator SDK Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.javaoperatorsdk.operator.config.loader.provider;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+import io.javaoperatorsdk.operator.config.loader.ConfigProvider;
+
+/**
+ * A {@link ConfigProvider} that resolves configuration values from environment variables.
+ *
+ * <p>The key is converted to an environment variable name by replacing dots and hyphens with
+ * underscores and converting to upper case (e.g. {@code josdk.cache-sync.timeout} → {@code
+ * JOSDK_CACHE_SYNC_TIMEOUT}).
+ *
+ * <p>Supported value types are: {@link String}, {@link Boolean}, {@link Integer}, {@link Long},
+ * {@link Double}, and {@link java.time.Duration} (ISO-8601 format, e.g. {@code PT30S}).
+ */
+public class EnvVarConfigProvider implements ConfigProvider {
+
+  private final Function<String, String> envLookup;
+
+  public EnvVarConfigProvider() {
+    this(System::getenv);
+  }
+
+  EnvVarConfigProvider(Function<String, String> envLookup) {
+    this.envLookup = envLookup;
+  }
+
+  @Override
+  public <T> Optional<T> getValue(String key, Class<T> type) {
+    if (key == null) {
+      return Optional.empty();
+    }
+    String raw = envLookup.apply(toEnvKey(key));
+    if (raw == null) {
+      return Optional.empty();
+    }
+    return Optional.of(ConfigValueConverter.convert(raw, type));
+  }
+
+  static String toEnvKey(String key) {
+    return key.trim().replace('.', '_').replace('-', '_').toUpperCase();
+  }
+}

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/loader/provider/EnvVarConfigProvider.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright Java Operator SDK Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.javaoperatorsdk.operator.config.loader.provider;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.javaoperatorsdk.operator.config.loader.ConfigProvider;
+
+/**
+ * A {@link ConfigProvider} that delegates to an ordered list of providers. Providers are queried in
+ * list order; the first non-empty result wins.
+ */
+public class PrirityListConfigProvider implements ConfigProvider {
+
+  private final List<ConfigProvider> providers;
+
+  public PrirityListConfigProvider(List<ConfigProvider> providers) {
+    this.providers = List.copyOf(providers);
+  }
+
+  @Override
+  public <T> Optional<T> getValue(String key, Class<T> type) {
+    for (ConfigProvider provider : providers) {
+      Optional<T> value = provider.getValue(key, type);
+      if (value.isPresent()) {
+        return value;
+      }
+    }
+    return Optional.empty();
+  }
+}

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/loader/provider/PrirityListConfigProvider.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright Java Operator SDK Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.javaoperatorsdk.operator.config.loader.provider;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.Properties;
+
+import io.javaoperatorsdk.operator.config.loader.ConfigProvider;
+
+/**
+ * A {@link ConfigProvider} that resolves configuration values from a {@link Properties} file.
+ *
+ * <p>Keys are looked up as-is against the loaded properties. Supported value types are: {@link
+ * String}, {@link Boolean}, {@link Integer}, {@link Long}, {@link Double}, and {@link
+ * java.time.Duration} (ISO-8601 format, e.g. {@code PT30S}).
+ */
+public class PropertiesConfigProvider implements ConfigProvider {
+
+  private final Properties properties;
+
+  /**
+   * Loads properties from the given file path.
+   *
+   * @throws UncheckedIOException if the file cannot be read
+   */
+  public PropertiesConfigProvider(Path path) {
+    this.properties = load(path);
+  }
+
+  /** Uses the supplied {@link Properties} instance directly. */
+  public PropertiesConfigProvider(Properties properties) {
+    this.properties = properties;
+  }
+
+  @Override
+  public <T> Optional<T> getValue(String key, Class<T> type) {
+    if (key == null) {
+      return Optional.empty();
+    }
+    String raw = properties.getProperty(key);
+    if (raw == null) {
+      return Optional.empty();
+    }
+    return Optional.of(ConfigValueConverter.convert(raw, type));
+  }
+
+  private static Properties load(Path path) {
+    try (InputStream in = Files.newInputStream(path)) {
+      Properties props = new Properties();
+      props.load(in);
+      return props;
+    } catch (IOException e) {
+      throw new UncheckedIOException("Failed to load config properties from " + path, e);
+    }
+  }
+}