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

fix: ifElseChain linter findings

Browse source 
Signed-off-by: Mario Constanti <mario.constanti@mercedes-benz.com>
This commit is contained in:
Mario Constanti 2024-02-22 09:38:00 +01:00
parent b0e3f78fbb
commit 9f405e0e8f
3 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apiserver/controllers/controllers.go
View file

@ -107,19 +107,21 @@ func (a *APIController) handleWorkflowJobEvent(ctx context.Context, w http.Respo
hookType := r.Header.Get("X-Github-Hook-Installation-Target-Type") hookType := r.Header.Get("X-Github-Hook-Installation-Target-Type")
if err := a.r.DispatchWorkflowJob(hookType, signature, body); err != nil { if err := a.r.DispatchWorkflowJob(hookType, signature, body); err != nil {
if errors.Is(err, gErrors.ErrNotFound) { switch {
case errors.Is(err, gErrors.ErrNotFound):
metrics.WebhooksReceived.WithLabelValues( metrics.WebhooksReceived.WithLabelValues(
"false", // label: valid "false", // label: valid
"owner_unknown", // label: reason "owner_unknown", // label: reason
).Inc() ).Inc()
slog.With(slog.Any("error", err)).ErrorContext(ctx, "got not found error from DispatchWorkflowJob. webhook not meant for us?") slog.With(slog.Any("error", err)).ErrorContext(ctx, "got not found error from DispatchWorkflowJob. webhook not meant for us?")
return return
} else if strings.Contains(err.Error(), "signature") { // nolint:golangci-lint,godox TODO: check error type case strings.Contains(err.Error(), "signature"):
// nolint:golangci-lint,godox TODO: check error type
metrics.WebhooksReceived.WithLabelValues( metrics.WebhooksReceived.WithLabelValues(
"false", // label: valid "false", // label: valid
"signature_invalid", // label: reason "signature_invalid", // label: reason
).Inc() ).Inc()
} else { default:
metrics.WebhooksReceived.WithLabelValues( metrics.WebhooksReceived.WithLabelValues(
"false", // label: valid "false", // label: valid
"unknown", // label: reason "unknown", // label: reason

22
runner/metrics/instance.go
View file

@ -31,23 +31,21 @@ func CollectInstanceMetric(ctx context.Context, r *runner.Runner) error {
poolNames := make(map[string]poolInfo) poolNames := make(map[string]poolInfo)
for _, pool := range pools { for _, pool := range pools {
if pool.EnterpriseName != "" { switch {
case pool.OrgName != "":
poolNames[pool.ID] = poolInfo{ poolNames[pool.ID] = poolInfo{
Name: pool.EnterpriseName, Name: pool.OrgName,
Type: string(pool.PoolType()), Type: string(pool.PoolType()),
ProviderName: pool.ProviderName,
} }
} else if pool.OrgName != "" { case pool.EnterpriseName != "":
poolNames[pool.ID] = poolInfo{ poolNames[pool.ID] = poolInfo{
Name: pool.OrgName, Name: pool.EnterpriseName,
Type: string(pool.PoolType()), Type: string(pool.PoolType()),
ProviderName: pool.ProviderName,
} }
} else { default:
poolNames[pool.ID] = poolInfo{ poolNames[pool.ID] = poolInfo{
Name: pool.RepoName, Name: pool.RepoName,
Type: string(pool.PoolType()), Type: string(pool.PoolType()),
ProviderName: pool.ProviderName,
} }
} }
} }

15
runner/metrics/pool.go
View file

@ -30,17 +30,18 @@ func CollectPoolMetric(ctx context.Context, r *runner.Runner) error {
poolNames := make(map[string]poolInfo) poolNames := make(map[string]poolInfo)
for _, pool := range pools { for _, pool := range pools {
if pool.EnterpriseName != "" { switch {
poolNames[pool.ID] = poolInfo{ case pool.OrgName != "":
Name: pool.EnterpriseName,
Type: string(pool.PoolType()),
}
} else if pool.OrgName != "" {
poolNames[pool.ID] = poolInfo{ poolNames[pool.ID] = poolInfo{
Name: pool.OrgName, Name: pool.OrgName,
Type: string(pool.PoolType()), Type: string(pool.PoolType()),
} }
} else { case pool.EnterpriseName != "":
poolNames[pool.ID] = poolInfo{
Name: pool.EnterpriseName,
Type: string(pool.PoolType()),
}
default:
poolNames[pool.ID] = poolInfo{ poolNames[pool.ID] = poolInfo{
Name: pool.RepoName, Name: pool.RepoName,
Type: string(pool.PoolType()), Type: string(pool.PoolType()),