Merge pull request #415 from gsmet/rest-graphql-endpoints

Allow overriding both REST and GraphQL API endpoints

Author: gsmet

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

@@ -127,6 +127,40 @@ endif::add-copy-button-to-env-var[]
 |`https://api.github.com`
 
 
+a| [[quarkus-github-app_quarkus.github-app.rest-api-endpoint]]`link:#quarkus-github-app_quarkus.github-app.rest-api-endpoint[quarkus.github-app.rest-api-endpoint]`
+
+[.description]
+--
+The REST API endpoint. 
+Defaults to the public github.com instance REST API endpoint.
+
+ifdef::add-copy-button-to-env-var[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_GITHUB_APP_REST_API_ENDPOINT+++[]
+endif::add-copy-button-to-env-var[]
+ifndef::add-copy-button-to-env-var[]
+Environment variable: `+++QUARKUS_GITHUB_APP_REST_API_ENDPOINT+++`
+endif::add-copy-button-to-env-var[]
+--|string 
+|`${quarkus.github-app.instance-endpoint}`
+
+
+a| [[quarkus-github-app_quarkus.github-app.graphql-api-endpoint]]`link:#quarkus-github-app_quarkus.github-app.graphql-api-endpoint[quarkus.github-app.graphql-api-endpoint]`
+
+[.description]
+--
+The GraphQL API endpoint. 
+Defaults to the public github.com instance GraphQL endpoint.
+
+ifdef::add-copy-button-to-env-var[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_GITHUB_APP_GRAPHQL_API_ENDPOINT+++[]
+endif::add-copy-button-to-env-var[]
+ifndef::add-copy-button-to-env-var[]
+Environment variable: `+++QUARKUS_GITHUB_APP_GRAPHQL_API_ENDPOINT+++`
+endif::add-copy-button-to-env-var[]
+--|string 
+|`${quarkus.github-app.instance-endpoint}/graphql`
+
+
 a| [[quarkus-github-app_quarkus.github-app.debug.payload-directory]]`link:#quarkus-github-app_quarkus.github-app.debug.payload-directory[quarkus.github-app.debug.payload-directory]`
 
 [.description]

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

@@ -82,8 +82,12 @@ public Optional<String> webhookProxyUrl() {
         return gitHubAppRuntimeConfig.webhookProxyUrl;
     }
 
-    public String instanceEndpoint() {
-        return gitHubAppRuntimeConfig.instanceEndpoint;
+    public String restApiEndpoint() {
+        return gitHubAppRuntimeConfig.restApiEndpoint;
+    }
+
+    public String graphqlApiEndpoint() {
+        return gitHubAppRuntimeConfig.graphqlApiEndpoint;
     }
 
     public Debug debug() {

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

@@ -64,6 +64,22 @@ public class GitHubAppRuntimeConfig {
     @ConfigItem(defaultValue = "https://api.github.com")
     String instanceEndpoint;
 
+    /**
+     * The REST API endpoint.
+     * <p>
+     * Defaults to the public github.com instance REST API endpoint.
+     */
+    @ConfigItem(defaultValue = "${quarkus.github-app.instance-endpoint}")
+    String restApiEndpoint;
+
+    /**
+     * The GraphQL API endpoint.
+     * <p>
+     * Defaults to the public github.com instance GraphQL endpoint.
+     */
+    @ConfigItem(defaultValue = "${quarkus.github-app.instance-endpoint}/graphql")
+    String graphqlApiEndpoint;
+
     /**
      * Debug configuration.
      */

runtime/src/main/java/io/quarkiverse/githubapp/runtime/github/GitHubService.java

@@ -120,7 +120,7 @@ private GitHub createInstallationClient(long installationId) throws IOException
 
         final GitHubBuilder gitHubBuilder = new GitHubBuilder()
                 .withAppInstallationToken(installationToken.getToken())
-                .withEndpoint(checkedConfigProvider.instanceEndpoint());
+                .withEndpoint(checkedConfigProvider.restApiEndpoint());
 
         GitHub gitHub = gitHubBuilder.build();
 
@@ -135,7 +135,7 @@ private DynamicGraphQLClient createInstallationGraphQLClient(long installationId
         CachedInstallationToken installationToken = installationTokenCache.get(installationId);
 
         DynamicGraphQLClient graphQLClient = DynamicGraphQLClientBuilder.newBuilder()
-                .url(checkedConfigProvider.instanceEndpoint() + "/graphql")
+                .url(checkedConfigProvider.graphqlApiEndpoint())
                 .header(AUTHORIZATION_HEADER, String.format(AUTHORIZATION_HEADER_BEARER, installationToken.getToken()))
                 .build();
 
@@ -187,7 +187,7 @@ private GitHub createApplicationGitHub() {
         try {
             final GitHubBuilder gitHubBuilder = new GitHubBuilder()
                     .withJwtToken(jwtToken)
-                    .withEndpoint(checkedConfigProvider.instanceEndpoint());
+                    .withEndpoint(checkedConfigProvider.restApiEndpoint());
 
             return gitHubBuilder.build();
         } catch (IOException e) {