Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pkg/credentials/git_credential.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ type GitCredential interface {

// gitCredential is the embedded struct used for Git credentials.
type gitCredential struct {
CredentialType Type `json:"Type" validate:"omitempty,oneof=Anonymous Reference UsernamePassword"`
CredentialType Type `json:"Type" validate:"omitempty,oneof=Anonymous GitHub Reference UsernamePassword"`
}
25 changes: 25 additions & 0 deletions pkg/credentials/github_app.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package credentials

// GitHubApp defines a GitHub App connection Git credential.
type GitHubApp struct {
ID string `json:"Id"`

gitCredential
}

// NewGitHubApp creates and initializes a GitHub App Git credential.
func NewGitHubApp(id string) *GitHubApp {
return &GitHubApp{
ID: id,
gitCredential: gitCredential{
CredentialType: GitCredentialTypeGitHubApp,
},
}
}

// Type returns the type for this Git credential.
func (g *GitHubApp) Type() Type {
return g.CredentialType
}

var _ GitCredential = &GitHubApp{}
6 changes: 6 additions & 0 deletions pkg/credentials/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ func (r *Resource) UnmarshalJSON(b []byte) error {
return err
}
r.Details = usernamePasswordGitCredential
case GitCredentialTypeGitHubApp:
var gitHubAppGitCredential *GitHubApp
if err := json.Unmarshal(*gitCredentials, &gitHubAppGitCredential); err != nil {
return err
}
r.Details = gitHubAppGitCredential
}

return nil
Expand Down
1 change: 1 addition & 0 deletions pkg/credentials/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ type Type string

const (
GitCredentialTypeAnonymous = Type("Anonymous")
GitCredentialTypeGitHubApp = Type("GitHub")
GitCredentialTypeReference = Type("Reference")
GitCredentialTypeUsernamePassword = Type("UsernamePassword")
)
7 changes: 7 additions & 0 deletions pkg/projects/git_persistence_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,13 @@ func (p *gitPersistenceSettings) UnmarshalJSON(b []byte) error {
return err
}
p.credential = usernamePasswordGitCredential
case credentials.GitCredentialTypeGitHubApp:
var gitHubAppGitCredential *credentials.GitHubApp
err := json.Unmarshal(*gitCredentials, &gitHubAppGitCredential)
if err != nil {
return err
}
p.credential = gitHubAppGitCredential
}

var conversionState *json.RawMessage
Expand Down
Loading