From 26ac9b3fe22c61d2f64f1ef641be2ec59a1d139c Mon Sep 17 00:00:00 2001 From: evanboyle Date: Tue, 27 Jul 2021 16:12:08 -0700 Subject: [PATCH] lint --- pkg/engine/lifeycletest/provider_test.go | 2 +- pkg/resource/deploy/providers/registry.go | 4 +--- pkg/resource/deploy/step.go | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/engine/lifeycletest/provider_test.go b/pkg/engine/lifeycletest/provider_test.go index 475aad661..06562e9f3 100644 --- a/pkg/engine/lifeycletest/provider_test.go +++ b/pkg/engine/lifeycletest/provider_test.go @@ -451,7 +451,7 @@ func TestSingleResourceExplicitProviderAliasUpdateDelete(t *testing.T) { registerResource = false p.Steps = []TestStep{{Op: Update}} - snap = p.Run(t, snap) + _ = p.Run(t, snap) // Check the identity of the provider that performed the delete. deleterID, ok := deletes.Load(resourceID) diff --git a/pkg/resource/deploy/providers/registry.go b/pkg/resource/deploy/providers/registry.go index 9e8b8f85e..4541a1413 100644 --- a/pkg/resource/deploy/providers/registry.go +++ b/pkg/resource/deploy/providers/registry.go @@ -320,7 +320,7 @@ func (r *Registry) Diff(urn resource.URN, id resource.ID, olds, news resource.Pr // Same executes as part of the "Same" step for a provider that has not changed. It exists solely to allow the registry // to point aliases for a provider to the proper object. -func (r *Registry) Same(ref Reference) error { +func (r *Registry) Same(ref Reference) { r.m.RLock() defer r.m.RUnlock() @@ -332,8 +332,6 @@ func (r *Registry) Same(ref Reference) error { aliasRef := mustNewReference(alias, ref.ID()) r.providers[ref] = r.providers[aliasRef] } - - return nil } // Create coonfigures the provider with the given URN using the indicated configuration, assigns it an ID, and diff --git a/pkg/resource/deploy/step.go b/pkg/resource/deploy/step.go index ff448ce3d..2b29b7ffb 100644 --- a/pkg/resource/deploy/step.go +++ b/pkg/resource/deploy/step.go @@ -129,7 +129,8 @@ func (s *SameStep) Apply(preview bool) (resource.Status, StepCompleteFunc, error if providers.IsProviderType(s.new.Type) { ref, err := providers.NewReference(s.new.URN, s.new.ID) if err != nil { - return resource.StatusOK, nil, errors.Errorf("bad provider reference '%v' for resource %v: %v", s.Provider(), s.URN(), err) + return resource.StatusOK, nil, errors.Errorf( + "bad provider reference '%v' for resource %v: %v", s.Provider(), s.URN(), err) } s.Deployment().SameProvider(ref) }