From 4ee69d1eb6871e48c2e4c904f27923868537fee9 Mon Sep 17 00:00:00 2001 From: Mohammad Ismail <96207520+mouismail@users.noreply.github.com> Date: Thu, 5 Sep 2024 10:15:15 +0200 Subject: [PATCH] Change GitHub auth to be for GitHub Enterprise Server --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/mouismail/actions-controller?shareId=XXXX-XXXX-XXXX-XXXX). --- pkg/clients/github.go | 52 ++----------------------------------------- 1 file changed, 2 insertions(+), 50 deletions(-) diff --git a/pkg/clients/github.go b/pkg/clients/github.go index cc5e916..ed5c2aa 100644 --- a/pkg/clients/github.go +++ b/pkg/clients/github.go @@ -48,62 +48,14 @@ func NewGithub(logger *zap.SugaredLogger, organizationID, repository string, sev repository: repository, serverInfo: severInfo, } - err := a.initCloudClients() - //err := a.initClients() - if err != nil { + err := a.initClients() + if err != nil) { return nil, err } return a, nil } -func (a *Github) initCloudClients() error { - ctx := context.Background() - atr, err := ghinstallation.NewAppsTransportKeyFromFile(http.DefaultTransport, a.appID, a.keyPath) - - if err != nil { - return fmt.Errorf(utils.ErrMissingClient, err) - } - cloudClient := v3.NewClient(&http.Client{Transport: atr}) - installation, _, err := cloudClient.Apps.FindRepositoryInstallation(ctx, a.organizationID, a.repository) - if err != nil { - return fmt.Errorf(utils.ErrFindingOrgInstallations, err) - } - a.installationID = installation.GetID() - a.logger.Infow("found installation id", "installation-id", a.installationID) - - installationToken, _, err := cloudClient.Apps.CreateInstallationToken(ctx, a.installationID, nil) - if err != nil { - return fmt.Errorf(utils.ErrCreatingInstallationToken, err) - } - a.installationToken = installationToken.GetToken() - - itr := ghinstallation.NewFromAppsTransport(atr, a.installationID) - a.atr = atr - a.itr = itr - - a.logger.Infow("successfully initialized github app client", "organization-id", a.organizationID, "installation-id", a.installationID, "expected-events", installation.Events) - return nil -} - -func (a *Github) GetCloudV3Client() *v3.Client { - newClient := v3.NewClient(&http.Client{ - Transport: &oauth2.Transport{ - Base: http.DefaultTransport, - Source: oauth2.StaticTokenSource(&oauth2.Token{AccessToken: a.installationToken}), - }, - CheckRedirect: nil, - Jar: nil, - Timeout: 0, - }) - return newClient -} - -func (a *Github) GetCloudV3AppClient() *v3.Client { - client := v3.NewClient(&http.Client{Transport: a.atr}) - return client -} - func (a *Github) initClients() error { ctx := context.Background() atr, err := ghinstallation.NewAppsTransportKeyFromFile(http.DefaultTransport, a.appID, a.keyPath)