Skip to content

Change GitHub auth to be for GitHub Enterprise Server #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mouismail wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Change GitHub auth to be for GitHub Enterprise Server #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 2 additions & 50 deletions pkg/clients/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down