From 5f2cb19503e1297f70f24d9c96f9c04bfa109886 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Wed, 23 Aug 2023 14:21:51 +0000 Subject: [PATCH] Use accessors when getting response values Signed-off-by: Gabriel Adrian Samfira --- runner/pool/organization.go | 10 +++++----- runner/pool/repository.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/runner/pool/organization.go b/runner/pool/organization.go index 0c9eb146..5e88f73e 100644 --- a/runner/pool/organization.go +++ b/runner/pool/organization.go @@ -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 { diff --git a/runner/pool/repository.go b/runner/pool/repository.go index ec5c92e1..e09081d3 100644 --- a/runner/pool/repository.go +++ b/runner/pool/repository.go @@ -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 {