DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Take into account legacy config

Browse source 
Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2024-04-17 13:45:56 +00:00
parent 4610f83209
commit 257fb0b09a
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config/config.go
View file

@ -299,6 +299,13 @@ type Github struct {
App GithubApp `toml:"app" json:"app"` App GithubApp `toml:"app" json:"app"`
} }
func (g *Github) GetAuthType() GithubAuthType {
if g.AuthType == "" {
return GithubAuthTypePAT
}
return g.AuthType
}
func (g *Github) APIEndpoint() string { func (g *Github) APIEndpoint() string {
if g.APIBaseURL != "" { if g.APIBaseURL != "" {
return g.APIBaseURL return g.APIBaseURL

10
database/sql/sql.go
View file

@ -297,7 +297,7 @@ func (s *sqlDatabase) migrateCredentialsToDB() (err error) {
credParams := params.CreateGithubCredentialsParams{ credParams := params.CreateGithubCredentialsParams{
Name: cred.Name, Name: cred.Name,
Description: cred.Description, Description: cred.Description,
AuthType: params.GithubAuthType(cred.AuthType), AuthType: params.GithubAuthType(cred.GetAuthType()),
} }
switch credParams.AuthType { switch credParams.AuthType {
case params.GithubAuthTypeApp: case params.GithubAuthTypeApp:
@ -315,11 +315,15 @@ func (s *sqlDatabase) migrateCredentialsToDB() (err error) {
return errors.Wrap(err, "validating app credentials") return errors.Wrap(err, "validating app credentials")
} }
case params.GithubAuthTypePAT: case params.GithubAuthTypePAT:
if cred.PAT.OAuth2Token == "" { token := cred.PAT.OAuth2Token
if token == "" {
token = cred.OAuth2Token
}
if token == "" {
return errors.New("missing OAuth2 token") return errors.New("missing OAuth2 token")
} }
credParams.PAT = params.GithubPAT{ credParams.PAT = params.GithubPAT{
OAuth2Token: cred.PAT.OAuth2Token, OAuth2Token: token,
} }
} }