Update pkg/client.go

Co-authored-by: Nick Floyd <139819+nickfloyd@users.noreply.github.com>
octokit · Jun 3, 2024 · 1a4d9fc · 1a4d9fc
1 parent 9007016
commit 1a4d9fc
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/pkg/client.go b/pkg/client.go
@@ -33,24 +33,23 @@ func NewApiClient(optionFuncs ...ClientOptionFunc) (*Client, error) {
 		netHttpClient.Timeout = options.RequestTimeout
 	}
 
-	// Configure GitHub App authentication if required fields are provided
-	if (options.GitHubAppID != 0 || options.GitHubAppClientID != "") && options.GitHubAppInstallationID != 0 && options.GitHubAppPemFilePath != "" {
-		existingTransport := netHttpClient.Transport
-
-		if options.GitHubAppClientID != "" {
-			appTransport, err := ghinstallation.NewKeyFromFile(existingTransport, options.GitHubAppClientID, options.GitHubAppInstallationID, options.GitHubAppPemFilePath)
-			if err != nil {
-				return nil, fmt.Errorf("failed to create transport from GitHub App using clientID: %v", err)
-			}
-			netHttpClient.Transport = appTransport
-		} else {
-			appTransport, err := ghinstallation.NewKeyFromFileWithAppID(existingTransport, options.GitHubAppID, options.GitHubAppInstallationID, options.GitHubAppPemFilePath)
-			if err != nil {
-				return nil, fmt.Errorf("failed to create transport from GitHub App using appID: %v", err)
-			}
-			netHttpClient.Transport = appTransport
-		}
-	}
+  if (options.GitHubAppID != 0 || options.GitHubAppClientID != "") && options.GitHubAppInstallationID != 0 && options.GitHubAppPemFilePath != "" {
+      existingTransport := netHttpClient.Transport
+      var appTransport ghinstallation.Transport
+      var err error
+
+      if options.GitHubAppClientID != "" {
+          appTransport, err = ghinstallation.NewKeyFromFile(existingTransport, options.GitHubAppClientID, options.GitHubAppInstallationID, options.GitHubAppPemFilePath)
+      } else {
+          appTransport, err = ghinstallation.NewKeyFromFileWithAppID(existingTransport, options.GitHubAppID, options.GitHubAppInstallationID, options.GitHubAppPemFilePath)
+      }
+
+      if err != nil {
+          return nil, fmt.Errorf("failed to create transport from GitHub App: %v", err)
+      }
+
+      netHttpClient.Transport = appTransport
+  }
 
 	// Middleware must be applied after App transport is set, otherwise App token will fail to be
 	// renewed with a 400 Bad Request error (even though the request is identical to a successful one.)