Skip to content

Commit c359c69

Browse files
committed
Simplify error handling when updating resources
1 parent e9e02be commit c359c69

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

tests/framework/resourcemanager.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,7 @@ func (rm *ResourceManager) Apply(resources []client.Object) error {
103103
return err
104104
}
105105
resource.SetResourceVersion(obj.GetResourceVersion())
106-
if err := rm.K8sClient.Update(ctx, resource); err != nil {
107-
return err
108-
}
109-
return nil
106+
return rm.K8sClient.Update(ctx, resource)
110107
})
111108
if err != nil {
112109
return fmt.Errorf("error updating resource: %w", err)
@@ -144,10 +141,7 @@ func (rm *ResourceManager) ApplyFromFiles(files []string, namespace string) erro
144141
return err
145142
}
146143
obj.SetResourceVersion(fetchedObj.GetResourceVersion())
147-
if err := rm.K8sClient.Update(ctx, &obj); err != nil {
148-
return err
149-
}
150-
return nil
144+
return rm.K8sClient.Update(ctx, &obj)
151145
})
152146
if err != nil {
153147
return fmt.Errorf("error updating resource: %w", err)

0 commit comments

Comments
 (0)