Remove GitHub App ID configuration

https://github.blog/changelog/2024-05-01-github-apps-can-now-use-the-client-id-to-fetch-installation-tokens
Homebrew · May 2, 2024 · 42863f2 · 42863f2
1 parent 17ee6f4
commit 42863f2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -81,7 +81,6 @@ jobs:
         DOMAIN: ${{ secrets.DOMAIN }}
         PUBLIC_IP: ${{ secrets.PUBLIC_IP }}
         ORKA_BASE_URL: ${{ secrets.ORKA_BASE_URL }}
-        GITHUB_APP_ID: ${{ secrets.GITHUBAPP_ID }}
         GITHUB_CLIENT_ID: ${{ secrets.GITHUBCLIENT_ID }}
         GITHUB_ORGANISATION: ${{ github.repository_owner }}
         GITHUB_INSTALLATION_ID: ${{ secrets.GITHUBAPP_INSTALLATION_ID }}
@@ -94,7 +93,6 @@ jobs:
           s|@DOMAIN@|$DOMAIN|g
           s|@PUBLIC_IP@|$PUBLIC_IP|g
           s|@ORKA_BASE_URL@|$ORKA_BASE_URL|g
-          s|@GITHUB_APP_ID@|$GITHUB_APP_ID|g
           s|@GITHUB_CLIENT_ID@|$GITHUB_CLIENT_ID|g
           s|@GITHUB_ORGANISATION@|$GITHUB_ORGANISATION|g
           s|@GITHUB_INSTALLATION_ID@|$GITHUB_INSTALLATION_ID|g

diff --git a/deployment/config.yml.in b/deployment/config.yml.in
@@ -7,7 +7,6 @@ metadata:
 data:
   PUBLIC_IP: "@PUBLIC_IP@"
   ORKA_BASE_URL: "@ORKA_BASE_URL@"
-  GITHUB_APP_ID: "@GITHUB_APP_ID@"
   GITHUB_CLIENT_ID: "@GITHUB_CLIENT_ID@"
   GITHUB_ORGANISATION: "@GITHUB_ORGANISATION@"
   GITHUB_INSTALLATION_ID: "@GITHUB_INSTALLATION_ID@"

diff --git a/src/shared_state.rb b/src/shared_state.rb
@@ -31,7 +31,7 @@ class SharedState
   class Config
     attr_reader :state_file,
                 :orka_base_url, :orka_token,
-                :github_app_id, :github_app_private_key,
+                :github_app_private_key,
                 :github_client_id, :github_client_secret,
                 :github_webhook_secret,
                 :github_organisation, :github_installation_id,
@@ -41,7 +41,6 @@ def initialize
       @state_file = ENV.fetch("STATE_FILE")
       @orka_base_url = ENV.fetch("ORKA_BASE_URL")
       @orka_token = ENV.fetch("ORKA_TOKEN")
-      @github_app_id = ENV.fetch("GITHUB_APP_ID")
       @github_app_private_key = OpenSSL::PKey::RSA.new(Base64.strict_decode64(ENV.fetch("GITHUB_APP_PRIVATE_KEY")))
       @github_client_id = ENV.fetch("GITHUB_CLIENT_ID")
       @github_client_secret = ENV.fetch("GITHUB_CLIENT_SECRET")
@@ -185,7 +184,7 @@ def jwt_github_client
     payload = {
       iat: Time.now.to_i - 60,
       exp: Time.now.to_i + (9 * 60), # 10 is the max, but let's be safe with 9.
-      iss: @config.github_app_id,
+      iss: @config.github_client_id,
     }
     token = JWT.encode(payload, @config.github_app_private_key, "RS256")