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

Merge pull request #239 from gabriel-samfira/fix-nil-pointer-cmd-pool

Browse source 
Fix potential nil pointer dereference in cli
This commit is contained in:
Gabriel 2024-03-28 12:08:49 +02:00 • committed by GitHub
commit 72501aee0f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cmd/garm-cli/cmd/pool.go
View file

@ -54,7 +54,7 @@ var (
priority uint
)
type poolPayloadGetter interface {
type poolsPayloadGetter interface {
GetPayload() params.Pools
}
@ -98,7 +98,7 @@ Example:
return errNeedsInitError
}
var response poolPayloadGetter
var response poolsPayloadGetter
var err error
switch len(args) {
@ -192,6 +192,10 @@ var poolDeleteCmd = &cobra.Command{
},
}
type poolPayloadGetter interface {
GetPayload() params.Pool
}
var poolAddCmd = &cobra.Command{
Use: "add",
Aliases: []string{"create"},
@ -242,30 +246,23 @@ var poolAddCmd = &cobra.Command{
return err
}
var pool params.Pool
var err error
var response poolPayloadGetter
if cmd.Flags().Changed("repo") {
var response *apiClientRepos.CreateRepoPoolOK
newRepoPoolReq := apiClientRepos.NewCreateRepoPoolParams()
newRepoPoolReq.RepoID = poolRepository
newRepoPoolReq.Body = newPoolParams
response, err = apiCli.Repositories.CreateRepoPool(newRepoPoolReq, authToken)
pool = response.Payload
} else if cmd.Flags().Changed("org") {
var response *apiClientOrgs.CreateOrgPoolOK
newOrgPoolReq := apiClientOrgs.NewCreateOrgPoolParams()
newOrgPoolReq.OrgID = poolOrganization
newOrgPoolReq.Body = newPoolParams
response, err = apiCli.Organizations.CreateOrgPool(newOrgPoolReq, authToken)
pool = response.Payload
} else if cmd.Flags().Changed("enterprise") {
var response *apiClientEnterprises.CreateEnterprisePoolOK
newEnterprisePoolReq := apiClientEnterprises.NewCreateEnterprisePoolParams()
newEnterprisePoolReq.EnterpriseID = poolEnterprise
newEnterprisePoolReq.Body = newPoolParams
response, err = apiCli.Enterprises.CreateEnterprisePool(newEnterprisePoolReq, authToken)
pool = response.Payload
} else {
cmd.Help() //nolint
os.Exit(0)
@ -274,7 +271,8 @@ var poolAddCmd = &cobra.Command{
if err != nil {
return err
}
formatOnePool(pool)
formatOnePool(response.GetPayload())
return nil
},
}