Skip to content

Commit 8749d12

Browse files
committed
Refactor longer length inline error checking statements
1 parent c8a883b commit 8749d12

File tree

5 files changed

+31
-10
lines changed

5 files changed

+31
-10
lines changed

internal/framework/controller/register.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,13 @@ func Register(
8282
}
8383

8484
for field, indexerFunc := range cfg.fieldIndices {
85-
if err := addIndex(ctx, mgr.GetFieldIndexer(), objectType, field, indexerFunc); err != nil {
85+
if err := addIndex(
86+
ctx,
87+
mgr.GetFieldIndexer(),
88+
objectType,
89+
field,
90+
indexerFunc,
91+
); err != nil {
8692
return err
8793
}
8894
}

internal/mode/provisioner/manager.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,13 @@ func StartManager(cfg Config) error {
7272
eventCh := make(chan interface{})
7373

7474
for _, regCfg := range controllerRegCfgs {
75-
err := controller.Register(ctx, regCfg.objectType, mgr, eventCh, regCfg.options...)
76-
if err != nil {
75+
if err := controller.Register(
76+
ctx,
77+
regCfg.objectType,
78+
mgr,
79+
eventCh,
80+
regCfg.options...,
81+
); err != nil {
7782
return fmt.Errorf("cannot register controller for %T: %w", regCfg.objectType, err)
7883
}
7984
}

internal/mode/static/handler.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ func (h *eventHandlerImpl) HandleEventBatch(ctx context.Context, batch events.Ev
9090
}
9191

9292
var nginxReloadRes nginxReloadResult
93-
err := h.updateNginx(ctx, dataplane.BuildConfiguration(ctx, graph, h.cfg.serviceResolver))
94-
if err != nil {
93+
if err := h.updateNginx(ctx, dataplane.BuildConfiguration(ctx, graph, h.cfg.serviceResolver)); err != nil {
9594
h.cfg.logger.Error(err, "Failed to update NGINX configuration")
9695
nginxReloadRes.error = err
9796
} else {

internal/mode/static/manager.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,13 @@ func StartManager(cfg config.Config) error {
156156
ctx := ctlr.SetupSignalHandler()
157157

158158
for _, regCfg := range controllerRegCfgs {
159-
err := controller.Register(ctx, regCfg.objectType, mgr, eventCh, regCfg.options...)
160-
if err != nil {
159+
if err := controller.Register(
160+
ctx,
161+
regCfg.objectType,
162+
mgr,
163+
eventCh,
164+
regCfg.options...,
165+
); err != nil {
161166
return fmt.Errorf("cannot register controller for %T: %w", regCfg.objectType, err)
162167
}
163168
}

internal/mode/static/state/graph/httproute.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,10 @@ func buildRoute(
180180
ParentRefs: sectionNameRefs,
181181
}
182182

183-
err := validateHostnames(ghr.Spec.Hostnames, field.NewPath("spec").Child("hostnames"))
184-
if err != nil {
183+
if err := validateHostnames(
184+
ghr.Spec.Hostnames,
185+
field.NewPath("spec").Child("hostnames"),
186+
); err != nil {
185187
r.Valid = false
186188
r.Conditions = append(r.Conditions, staticConds.NewRouteUnsupportedValue(err.Error()))
187189

@@ -550,7 +552,11 @@ func validateMatch(
550552
allErrs = append(allErrs, validateQueryParamMatch(validator, q, queryParamPath)...)
551553
}
552554

553-
if err := validateMethodMatch(validator, match.Method, matchPath.Child("method")); err != nil {
555+
if err := validateMethodMatch(
556+
validator,
557+
match.Method,
558+
matchPath.Child("method"),
559+
); err != nil {
554560
allErrs = append(allErrs, err)
555561
}
556562

0 commit comments

Comments
 (0)