Skip to content

Commit bf4eaa8

Browse files
committed
Wrap NewPackage and Create with different error strings
To help differentiate which is which in case of an error. Signed-off-by: Nic Cope <nicc@rk0n.org>
1 parent 89ba83b commit bf4eaa8

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

internal/controller/pkg/resolver/reconciler.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ const (
7777
errFindDependencyUpgrade = "cannot find dependency version to upgrade"
7878
errFmtNoValidVersion = "dependency (%s) does not have a valid version to upgrade that satisfies all constraints. If there is a valid version that requires downgrade, manual intervention is required. Constraints: %v"
7979
errGetDependency = "cannot get dependency package"
80+
errConstructDependency = "cannot construct dependency package"
8081
errCreateDependency = "cannot create dependency package"
8182
errUpdateDependency = "cannot update dependency package"
8283
errFmtSplit = "package should have 2 segments after split but has %d"
@@ -351,10 +352,10 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
351352

352353
pack, err := NewPackage(dep, addVer, ref)
353354
if err != nil {
354-
log.Debug(errCreateDependency, "error", err)
355-
lock.SetConditions(v1beta1.ResolutionFailed(errors.Wrap(err, errCreateDependency)))
355+
log.Debug(errConstructDependency, "error", err)
356+
lock.SetConditions(v1beta1.ResolutionFailed(errors.Wrap(err, errConstructDependency)))
356357
_ = r.client.Status().Update(ctx, lock)
357-
return reconcile.Result{}, errors.Wrap(err, errCreateDependency)
358+
return reconcile.Result{}, errors.Wrap(err, errConstructDependency)
358359
}
359360

360361
// NOTE(hasheddan): consider making the lock the controller of packages

0 commit comments

Comments
 (0)