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

Use accessors when getting response values

Browse source 
Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2023-08-23 14:21:51 +00:00
parent e238f84781
commit 5f2cb19503
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
runner/pool/organization.go
View file

@ -103,7 +103,7 @@ func (r *organization) findRunnerGroupByName(ctx context.Context, name string) (
return nil, errors.Wrap(err, "fetching runners")
}
for _, runnerGroup := range runnerGroups.RunnerGroups {
if runnerGroup.Name != nil && *runnerGroup.Name == name {
if runnerGroup.GetName() == name {
return runnerGroup, nil
}
}
@ -131,7 +131,7 @@ func (r *organization) GetJITConfig(ctx context.Context, instance params.Instanc
if err != nil {
return nil, nil, fmt.Errorf("failed to find runner group: %w", err)
}
rg = *runnerGroup.ID
rg = runnerGroup.GetID()
}
req := github.GenerateJITConfigRequest{
@ -149,7 +149,7 @@ func (r *organization) GetJITConfig(ctx context.Context, instance params.Instanc
return nil, nil, fmt.Errorf("failed to get JIT config: %w", err)
}
runner = jitConfig.Runner
runner = jitConfig.GetRunner()
defer func() {
if err != nil && runner != nil {
_, innerErr := r.ghcli.RemoveOrganizationRunner(r.ctx, r.cfg.Name, runner.GetID())
@ -157,7 +157,7 @@ func (r *organization) GetJITConfig(ctx context.Context, instance params.Instanc
}
}()
decoded, err := base64.StdEncoding.DecodeString(*jitConfig.EncodedJITConfig)
decoded, err := base64.StdEncoding.DecodeString(jitConfig.GetEncodedJITConfig())
if err != nil {
return nil, nil, fmt.Errorf("failed to decode JIT config: %w", err)
}
@ -167,7 +167,7 @@ func (r *organization) GetJITConfig(ctx context.Context, instance params.Instanc
return nil, nil, fmt.Errorf("failed to unmarshal JIT config: %w", err)
}
return ret, jitConfig.Runner, nil
return ret, runner, nil
}
func (r *organization) GithubCLI() common.GithubClient {

4
runner/pool/repository.go
View file

@ -121,7 +121,7 @@ func (r *repository) GetJITConfig(ctx context.Context, instance params.Instance,
}
}()
decoded, err := base64.StdEncoding.DecodeString(*jitConfig.EncodedJITConfig)
decoded, err := base64.StdEncoding.DecodeString(jitConfig.GetEncodedJITConfig())
if err != nil {
return nil, nil, fmt.Errorf("failed to decode JIT config: %w", err)
}
@ -131,7 +131,7 @@ func (r *repository) GetJITConfig(ctx context.Context, instance params.Instance,
return nil, nil, fmt.Errorf("failed to unmarshal JIT config: %w", err)
}
return ret, jitConfig.Runner, nil
return ret, runner, nil
}
func (r *repository) GithubCLI() common.GithubClient {