Skip to content

Commit e2526c5

Browse files
martinmalymartinmaly
authored
Remove Unused Error Results (#3033)
1 parent efab12b commit e2526c5

File tree

9 files changed

+23
-77
lines changed

9 files changed

+23
-77
lines changed

‎porch/apiserver/pkg/registry/porch/packagecommon.go

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,7 @@ func (r *packageCommon) getPackageRevision(ctx context.Context, name string, opt
126126
return nil, err
127127
}
128128

129-
obj, err := pkg.GetPackageRevision()
130-
if err != nil {
131-
return nil, err
132-
}
129+
obj := pkg.GetPackageRevision()
133130
return obj, nil
134131
}
135132

@@ -147,12 +144,7 @@ func (r *packageCommon) updatePackageRevision(ctx context.Context, name string,
147144
return nil, false, err
148145
}
149146

150-
oldObj, err := oldPackage.GetPackageRevision()
151-
if err != nil {
152-
klog.Infof("update failed to retrieve old object: %v", err)
153-
return nil, false, err
154-
}
155-
147+
oldObj := oldPackage.GetPackageRevision()
156148
newRuntimeObj, err := objInfo.UpdatedObject(ctx, oldObj)
157149
if err != nil {
158150
klog.Infof("update failed to construct UpdatedObject: %v", err)
@@ -199,9 +191,6 @@ func (r *packageCommon) updatePackageRevision(ctx context.Context, name string,
199191
return nil, false, apierrors.NewInternalError(err)
200192
}
201193

202-
created, err := rev.GetPackageRevision()
203-
if err != nil {
204-
return nil, false, apierrors.NewInternalError(err)
205-
}
194+
created := rev.GetPackageRevision()
206195
return created, false, nil
207196
}

‎porch/apiserver/pkg/registry/porch/packagerevision.go

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,7 @@ func (r *packageRevisions) List(ctx context.Context, options *metainternalversio
8080
}
8181

8282
if err := r.packageCommon.listPackages(ctx, filter, func(p repository.PackageRevision) error {
83-
item, err := p.GetPackageRevision()
84-
if err != nil {
85-
return err
86-
}
83+
item := p.GetPackageRevision()
8784
result.Items = append(result.Items, *item)
8885
return nil
8986
}); err != nil {
@@ -142,10 +139,7 @@ func (r *packageRevisions) Create(ctx context.Context, runtimeObject runtime.Obj
142139
return nil, apierrors.NewInternalError(err)
143140
}
144141

145-
created, err := rev.GetPackageRevision()
146-
if err != nil {
147-
return nil, apierrors.NewInternalError(err)
148-
}
142+
created := rev.GetPackageRevision()
149143
return created, nil
150144
}
151145

@@ -186,11 +180,7 @@ func (r *packageRevisions) Delete(ctx context.Context, name string, deleteValida
186180
return nil, false, err
187181
}
188182

189-
oldObj, err := oldPackage.GetPackageRevision()
190-
if err != nil {
191-
klog.Infof("update failed to retrieve old object: %v", err)
192-
return nil, false, err
193-
}
183+
oldObj := oldPackage.GetPackageRevision()
194184

195185
if deleteValidation != nil {
196186
err := deleteValidation(ctx, oldObj)

‎porch/engine/pkg/engine/engine.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,7 @@ func (cad *cadEngine) UpdatePackageResources(ctx context.Context, repositoryObj
316316
ctx, span := tracer.Start(ctx, "cadEngine::UpdatePackageResources", trace.WithAttributes())
317317
defer span.End()
318318

319-
rev, err := oldPackage.GetPackageRevision()
320-
if err != nil {
321-
return nil, fmt.Errorf("failed to get package revision: %w", err)
322-
}
319+
rev := oldPackage.GetPackageRevision()
323320

324321
// Validate package lifecycle. Can only update a draft.
325322
switch lifecycle := rev.Spec.Lifecycle; lifecycle {

‎porch/repository/pkg/cache/cache_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,7 @@ func TestLatestPackages(t *testing.T) {
7171

7272
gotLatest := map[string]string{}
7373
for _, pr := range revisions {
74-
rev, err := pr.GetPackageRevision()
75-
if err != nil {
76-
t.Errorf("GetPackageRevision(%s) failed: %v", pr.Key(), err)
77-
}
74+
rev := pr.GetPackageRevision()
7875

7976
if latest, ok := rev.Labels[api.LatestPackageRevisionKey]; ok {
8077
if got, want := latest, api.LatestPackageRevisionValue; got != want {

‎porch/repository/pkg/cache/repository.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,15 @@ type cachedPackageRevision struct {
5353
isLatestRevision bool
5454
}
5555

56-
func (c *cachedPackageRevision) GetPackageRevision() (*v1alpha1.PackageRevision, error) {
57-
rev, err := c.PackageRevision.GetPackageRevision()
58-
if err != nil {
59-
return nil, err
60-
}
56+
func (c *cachedPackageRevision) GetPackageRevision() *v1alpha1.PackageRevision {
57+
rev := c.PackageRevision.GetPackageRevision()
6158
if c.isLatestRevision {
6259
if rev.Labels == nil {
6360
rev.Labels = map[string]string{}
6461
}
6562
rev.Labels[v1alpha1.LatestPackageRevisionKey] = v1alpha1.LatestPackageRevisionValue
6663
}
67-
return rev, nil
64+
return rev
6865
}
6966

7067
var _ repository.PackageRevision = &cachedPackageRevision{}

‎porch/repository/pkg/git/git_test.go

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,7 @@ func TestListPackagesTrivial(t *testing.T) {
375375
t.Fatalf("draft.Close() failed: %v", err)
376376
}
377377

378-
result, err := newRevision.GetPackageRevision()
379-
if err != nil {
380-
t.Fatalf("GetPackageRevision() failed: %v", err)
381-
}
378+
result := newRevision.GetPackageRevision()
382379
if got, want := result.Spec.Lifecycle, v1alpha1.PackageRevisionLifecycleDraft; got != want {
383380
t.Errorf("Newly created package type: got %q, want %q", got, want)
384381
}
@@ -462,10 +459,7 @@ func TestCreatePackageInTrivialRepository(t *testing.T) {
462459
t.Fatalf("draft.Close() failed: %v", err)
463460
}
464461

465-
result, err := newRevision.GetPackageRevision()
466-
if err != nil {
467-
t.Fatalf("GetPackageRevision() failed: %v", err)
468-
}
462+
result := newRevision.GetPackageRevision()
469463
if got, want := result.Spec.Lifecycle, v1alpha1.PackageRevisionLifecycleDraft; got != want {
470464
t.Errorf("Newly created package type: got %q, want %q", got, want)
471465
}
@@ -514,10 +508,7 @@ func TestListPackagesSimple(t *testing.T) {
514508

515509
got := map[repository.PackageRevisionKey]v1alpha1.PackageRevisionLifecycle{}
516510
for _, r := range revisions {
517-
rev, err := r.GetPackageRevision()
518-
if err != nil {
519-
t.Errorf("GetPackageRevision failed for %q: %v", r.KubeObjectName(), err)
520-
}
511+
rev := r.GetPackageRevision()
521512
got[repository.PackageRevisionKey{
522513
Repository: rev.Spec.RepositoryName,
523514
Package: rev.Spec.PackageName,
@@ -574,10 +565,7 @@ func TestListPackagesDrafts(t *testing.T) {
574565

575566
got := map[repository.PackageRevisionKey]v1alpha1.PackageRevisionLifecycle{}
576567
for _, r := range revisions {
577-
rev, err := r.GetPackageRevision()
578-
if err != nil {
579-
t.Errorf("GetPackageRevision failed for %q: %v", r.KubeObjectName(), err)
580-
}
568+
rev := r.GetPackageRevision()
581569
got[repository.PackageRevisionKey{
582570
Repository: rev.Spec.RepositoryName,
583571
Package: rev.Spec.PackageName,
@@ -638,11 +626,7 @@ func TestApproveDraft(t *testing.T) {
638626
t.Fatalf("Close failed: %v", err)
639627
}
640628

641-
rev, err := new.GetPackageRevision()
642-
if err != nil {
643-
t.Fatalf("GetPackageRevision failed: %v", err)
644-
}
645-
629+
rev := new.GetPackageRevision()
646630
if got, want := rev.Spec.Lifecycle, v1alpha1.PackageRevisionLifecyclePublished; got != want {
647631
t.Errorf("Approved package lifecycle: got %s, want %s", got, want)
648632
}
@@ -690,10 +674,7 @@ func TestDeletePackages(t *testing.T) {
690674
for len(all) > 0 {
691675
// Delete one of the packages
692676
deleting := all[0]
693-
pr, err := deleting.GetPackageRevision()
694-
if err != nil {
695-
t.Fatalf("GetPackageRevision of %q failed: %v", deleting.KubeObjectName(), err)
696-
}
677+
pr := deleting.GetPackageRevision()
697678
name := repository.PackageRevisionKey{Repository: pr.Spec.RepositoryName, Package: pr.Spec.PackageName, Revision: pr.Spec.Revision}
698679

699680
if rn, ok := wantDeletedRefs[name]; ok {
@@ -941,12 +922,7 @@ func TestNested(t *testing.T) {
941922

942923
got := map[string]v1alpha1.PackageRevisionLifecycle{}
943924
for _, pr := range revisions {
944-
rev, err := pr.GetPackageRevision()
945-
if err != nil {
946-
t.Errorf("GetPackageRevision(%s) failed: %v", pr.Key(), err)
947-
continue
948-
}
949-
925+
rev := pr.GetPackageRevision()
950926
if rev.Spec.Revision == "main" {
951927
// skip packages with "main" revision, to match the above simplified package discovery algo.
952928
continue

‎porch/repository/pkg/git/package.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (p *gitPackageRevision) uid() types.UID {
6868
return types.UID(fmt.Sprintf("uid:%s:%s", p.path, p.revision))
6969
}
7070

71-
func (p *gitPackageRevision) GetPackageRevision() (*v1alpha1.PackageRevision, error) {
71+
func (p *gitPackageRevision) GetPackageRevision() *v1alpha1.PackageRevision {
7272
key := p.Key()
7373

7474
return &v1alpha1.PackageRevision{
@@ -94,7 +94,7 @@ func (p *gitPackageRevision) GetPackageRevision() (*v1alpha1.PackageRevision, er
9494
Tasks: p.tasks,
9595
},
9696
Status: v1alpha1.PackageRevisionStatus{},
97-
}, nil
97+
}
9898
}
9999

100100
func (p *gitPackageRevision) GetResources(ctx context.Context) (*v1alpha1.PackageRevisionResources, error) {

‎porch/repository/pkg/oci/oci.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ func (p *ociPackageRevision) Key() repository.PackageRevisionKey {
358358
}
359359
}
360360

361-
func (p *ociPackageRevision) GetPackageRevision() (*v1alpha1.PackageRevision, error) {
361+
func (p *ociPackageRevision) GetPackageRevision() *v1alpha1.PackageRevision {
362362
key := p.Key()
363363

364364
return &v1alpha1.PackageRevision{
@@ -382,7 +382,7 @@ func (p *ociPackageRevision) GetPackageRevision() (*v1alpha1.PackageRevision, er
382382

383383
Tasks: p.tasks,
384384
},
385-
}, nil
385+
}
386386
}
387387

388388
func (p *ociPackageRevision) GetUpstreamLock() (kptfile.Upstream, kptfile.UpstreamLock, error) {

‎porch/repository/pkg/repository/repository.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ type PackageRevision interface {
5151
Lifecycle() v1alpha1.PackageRevisionLifecycle
5252

5353
// GetPackageRevision returns the PackageRevision ("DRY") API representation of this package-revision
54-
GetPackageRevision() (*v1alpha1.PackageRevision, error)
54+
GetPackageRevision() *v1alpha1.PackageRevision
5555

5656
// GetResources returns the PackageRevisionResources ("WET") API representation of this package-revision
5757
// TODO: return PackageResources or filesystem abstraction?

0 commit comments

Comments
 (0)