Merge pull request #768 from gsmet/avoid-loading-private-key-srcfg

Avoid loading the private key with SmallRye Config

Author: gsmet

docs/modules/ROOT/pages/includes/quarkus-github-app.adoc

@@ -94,7 +94,7 @@ ifndef::add-copy-button-to-env-var[]
 Environment variable: `+++QUARKUS_GITHUB_APP_PRIVATE_KEY+++`
 endif::add-copy-button-to-env-var[]
 --
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/PrivateKey.html[PrivateKey]
+|string
 |
 
 a| [[quarkus-github-app_quarkus-github-app-webhook-url-path]] [.property-path]##link:#quarkus-github-app_quarkus-github-app-webhook-url-path[`quarkus.github-app.webhook-url-path`]##

docs/modules/ROOT/pages/includes/quarkus-github-app_quarkus.github-app.adoc

@@ -94,7 +94,7 @@ ifndef::add-copy-button-to-env-var[]
 Environment variable: `+++QUARKUS_GITHUB_APP_PRIVATE_KEY+++`
 endif::add-copy-button-to-env-var[]
 --
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/PrivateKey.html[PrivateKey]
+|string
 |
 
 a| [[quarkus-github-app_quarkus-github-app-webhook-url-path]] [.property-path]##link:#quarkus-github-app_quarkus-github-app-webhook-url-path[`quarkus.github-app.webhook-url-path`]##

runtime/src/main/java/io/quarkiverse/githubapp/runtime/config/CheckedConfigProvider.java

@@ -43,12 +43,14 @@ public class CheckedConfigProvider {
         this.launchMode = launchMode;
 
         Map<String, String> credentials = getCredentials();
-        String privateKeyFromCredentials = credentials.get(Credentials.PRIVATE_KEY);
-        if (privateKeyFromCredentials != null && !privateKeyFromCredentials.isBlank()) {
-            this.privateKey = Optional.of(new PrivateKeyConverter().convert(privateKeyFromCredentials.trim()));
-        } else {
-            this.privateKey = gitHubAppRuntimeConfig.privateKey();
+
+        String privateKey = credentials.get(Credentials.PRIVATE_KEY);
+        if (privateKey == null || privateKey.isBlank()) {
+            privateKey = gitHubAppRuntimeConfig.privateKey().orElse(null);
         }
+        this.privateKey = privateKey != null ? Optional.of(new PrivateKeyConverter().convert(privateKey.trim()))
+                : Optional.empty();
+
         String webhookSecretFromCredentials = credentials.get(Credentials.WEBHOOK_SECRET);
         if (webhookSecretFromCredentials != null && !webhookSecretFromCredentials.isBlank()) {
             this.webhookSecret = Optional.of(webhookSecretFromCredentials.trim());

runtime/src/main/java/io/quarkiverse/githubapp/runtime/config/GitHubAppRuntimeConfig.java

@@ -1,7 +1,6 @@
 package io.quarkiverse.githubapp.runtime.config;
 
 import java.nio.file.Path;
-import java.security.PrivateKey;
 import java.util.Optional;
 
 import io.quarkiverse.githubapp.Credentials;
@@ -45,8 +44,7 @@ public interface GitHubAppRuntimeConfig {
      * <p>
      * Optional for tests, but mandatory in production and dev mode.
      */
-    @WithConverter(PrivateKeyConverter.class)
-    Optional<PrivateKey> privateKey();
+    Optional<String> privateKey();
 
     /**
      * The webhook URL path on which the GitHub App route is mounted.

runtime/src/main/java/io/quarkiverse/githubapp/runtime/config/PrivateKeyConverter.java

@@ -3,7 +3,6 @@
 import static io.quarkus.runtime.configuration.ConverterSupport.DEFAULT_QUARKUS_CONVERTER_PRIORITY;
 
 import java.io.Serializable;
-import java.security.GeneralSecurityException;
 import java.security.PrivateKey;
 
 import jakarta.annotation.Priority;
@@ -29,7 +28,7 @@ public PrivateKey convert(final String value) {
 
         try {
             return PrivateKeyUtil.loadKey(privateKeyValue);
-        } catch (GeneralSecurityException e) {
+        } catch (Exception e) {
             throw new ConfigurationException("Unable to interpret the provided private key", e);
         }
     }