Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit d3da93c

Browse files
author
Timothy St. Clair
committed
Renaming api/errors/etcd to api/errors/storage as it no longer
has any etcd specific dependencies. Reference issue kubernetes#17546
1 parent 4b3e2b5 commit d3da93c

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

‎pkg/api/errors/etcd/doc.go renamed to ‎pkg/api/errors/storage/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ limitations under the License.
1515
*/
1616

1717
// Package etcd provides conversion of etcd errors to API errors.
18-
package etcd
18+
package storage

‎pkg/api/errors/etcd/etcd.go renamed to ‎pkg/api/errors/storage/storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package etcd
17+
package storage
1818

1919
import (
2020
"k8s.io/kubernetes/pkg/api/errors"

‎pkg/registry/deployment/etcd/etcd.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"k8s.io/kubernetes/pkg/api"
2323
"k8s.io/kubernetes/pkg/api/errors"
24-
etcderr "k8s.io/kubernetes/pkg/api/errors/etcd"
24+
storeerr "k8s.io/kubernetes/pkg/api/errors/storage"
2525
"k8s.io/kubernetes/pkg/api/rest"
2626
"k8s.io/kubernetes/pkg/apis/extensions"
2727
extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation"
@@ -148,8 +148,8 @@ func (r *RollbackREST) Create(ctx api.Context, obj runtime.Object) (out runtime.
148148

149149
func (r *RollbackREST) rollbackDeployment(ctx api.Context, deploymentID string, config *extensions.RollbackConfig, annotations map[string]string) (err error) {
150150
if _, err = r.setDeploymentRollback(ctx, deploymentID, config, annotations); err != nil {
151-
err = etcderr.InterpretGetError(err, extensions.Resource("deployments"), deploymentID)
152-
err = etcderr.InterpretUpdateError(err, extensions.Resource("deployments"), deploymentID)
151+
err = storeerr.InterpretGetError(err, extensions.Resource("deployments"), deploymentID)
152+
err = storeerr.InterpretUpdateError(err, extensions.Resource("deployments"), deploymentID)
153153
if _, ok := err.(*errors.StatusError); !ok {
154154
err = errors.NewConflict(extensions.Resource("deployments/rollback"), deploymentID, err)
155155
}

‎pkg/registry/deployment/etcd/etcd_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"k8s.io/kubernetes/pkg/api"
2424
"k8s.io/kubernetes/pkg/api/errors"
25-
etcderrors "k8s.io/kubernetes/pkg/api/errors/etcd"
25+
storeerr "k8s.io/kubernetes/pkg/api/errors/storage"
2626
"k8s.io/kubernetes/pkg/api/unversioned"
2727
"k8s.io/kubernetes/pkg/apis/extensions"
2828
"k8s.io/kubernetes/pkg/fields"
@@ -366,15 +366,15 @@ func TestEtcdCreateDeploymentRollbackNoDeployment(t *testing.T) {
366366
if err == nil {
367367
t.Fatalf("Expected not-found-error but got nothing")
368368
}
369-
if !errors.IsNotFound(etcderrors.InterpretGetError(err, extensions.Resource("deployments"), name)) {
369+
if !errors.IsNotFound(storeerr.InterpretGetError(err, extensions.Resource("deployments"), name)) {
370370
t.Fatalf("Unexpected error returned: %#v", err)
371371
}
372372

373373
_, err = storage.Deployment.Get(ctx, name)
374374
if err == nil {
375375
t.Fatalf("Expected not-found-error but got nothing")
376376
}
377-
if !errors.IsNotFound(etcderrors.InterpretGetError(err, extensions.Resource("deployments"), name)) {
377+
if !errors.IsNotFound(storeerr.InterpretGetError(err, extensions.Resource("deployments"), name)) {
378378
t.Fatalf("Unexpected error: %v", err)
379379
}
380380
}

‎pkg/registry/generic/etcd/etcd.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"k8s.io/kubernetes/pkg/api"
2525
kubeerr "k8s.io/kubernetes/pkg/api/errors"
26-
etcderr "k8s.io/kubernetes/pkg/api/errors/etcd"
26+
storeerr "k8s.io/kubernetes/pkg/api/errors/storage"
2727
"k8s.io/kubernetes/pkg/api/meta"
2828
"k8s.io/kubernetes/pkg/api/rest"
2929
"k8s.io/kubernetes/pkg/api/unversioned"
@@ -188,7 +188,7 @@ func (e *Etcd) ListPredicate(ctx api.Context, m generic.Matcher, options *api.Li
188188
if name, ok := m.MatchesSingle(); ok {
189189
if key, err := e.KeyFunc(ctx, name); err == nil {
190190
err := e.Storage.GetToList(ctx, key, filterFunc, list)
191-
return list, etcderr.InterpretListError(err, e.QualifiedResource)
191+
return list, storeerr.InterpretListError(err, e.QualifiedResource)
192192
}
193193
// if we cannot extract a key based on the current context, the optimization is skipped
194194
}
@@ -197,7 +197,7 @@ func (e *Etcd) ListPredicate(ctx api.Context, m generic.Matcher, options *api.Li
197197
options = &api.ListOptions{ResourceVersion: "0"}
198198
}
199199
err := e.Storage.List(ctx, e.KeyRootFunc(ctx), options.ResourceVersion, filterFunc, list)
200-
return list, etcderr.InterpretListError(err, e.QualifiedResource)
200+
return list, storeerr.InterpretListError(err, e.QualifiedResource)
201201
}
202202

203203
// Create inserts a new item according to the unique key from the object.
@@ -219,7 +219,7 @@ func (e *Etcd) Create(ctx api.Context, obj runtime.Object) (runtime.Object, erro
219219
}
220220
out := e.NewFunc()
221221
if err := e.Storage.Create(ctx, key, obj, out, ttl); err != nil {
222-
err = etcderr.InterpretCreateError(err, e.QualifiedResource, name)
222+
err = storeerr.InterpretCreateError(err, e.QualifiedResource, name)
223223
err = rest.CheckGeneratedNameError(e.CreateStrategy, err, obj)
224224
return nil, err
225225
}
@@ -328,10 +328,10 @@ func (e *Etcd) Update(ctx api.Context, obj runtime.Object) (runtime.Object, bool
328328

329329
if err != nil {
330330
if creating {
331-
err = etcderr.InterpretCreateError(err, e.QualifiedResource, name)
331+
err = storeerr.InterpretCreateError(err, e.QualifiedResource, name)
332332
err = rest.CheckGeneratedNameError(e.CreateStrategy, err, obj)
333333
} else {
334-
err = etcderr.InterpretUpdateError(err, e.QualifiedResource, name)
334+
err = storeerr.InterpretUpdateError(err, e.QualifiedResource, name)
335335
}
336336
return nil, false, err
337337
}
@@ -364,7 +364,7 @@ func (e *Etcd) Get(ctx api.Context, name string) (runtime.Object, error) {
364364
return nil, err
365365
}
366366
if err := e.Storage.Get(ctx, key, obj, false); err != nil {
367-
return nil, etcderr.InterpretGetError(err, e.QualifiedResource, name)
367+
return nil, storeerr.InterpretGetError(err, e.QualifiedResource, name)
368368
}
369369
if e.Decorator != nil {
370370
if err := e.Decorator(obj); err != nil {
@@ -388,7 +388,7 @@ func (e *Etcd) Delete(ctx api.Context, name string, options *api.DeleteOptions)
388388

389389
obj := e.NewFunc()
390390
if err := e.Storage.Get(ctx, key, obj, false); err != nil {
391-
return nil, etcderr.InterpretDeleteError(err, e.QualifiedResource, name)
391+
return nil, storeerr.InterpretDeleteError(err, e.QualifiedResource, name)
392392
}
393393

394394
// support older consumers of delete by treating "nil" as delete immediately
@@ -445,7 +445,7 @@ func (e *Etcd) Delete(ctx api.Context, name string, options *api.DeleteOptions)
445445
case errAlreadyDeleting:
446446
return e.finalizeDelete(obj, true)
447447
default:
448-
return nil, etcderr.InterpretUpdateError(err, e.QualifiedResource, name)
448+
return nil, storeerr.InterpretUpdateError(err, e.QualifiedResource, name)
449449
}
450450
}
451451

@@ -459,7 +459,7 @@ func (e *Etcd) Delete(ctx api.Context, name string, options *api.DeleteOptions)
459459
// before its deletion, but it's the best approximation.
460460
return e.finalizeDelete(lastExisting, true)
461461
}
462-
return nil, etcderr.InterpretDeleteError(err, e.QualifiedResource, name)
462+
return nil, storeerr.InterpretDeleteError(err, e.QualifiedResource, name)
463463
}
464464
return e.finalizeDelete(out, true)
465465
}

‎pkg/registry/pod/etcd/etcd.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"k8s.io/kubernetes/pkg/api"
2525
"k8s.io/kubernetes/pkg/api/errors"
26-
etcderr "k8s.io/kubernetes/pkg/api/errors/etcd"
26+
storeerr "k8s.io/kubernetes/pkg/api/errors/storage"
2727
"k8s.io/kubernetes/pkg/api/rest"
2828
"k8s.io/kubernetes/pkg/api/unversioned"
2929
"k8s.io/kubernetes/pkg/api/validation"
@@ -175,8 +175,8 @@ func (r *BindingREST) setPodHostAndAnnotations(ctx api.Context, podID, oldMachin
175175
// assignPod assigns the given pod to the given machine.
176176
func (r *BindingREST) assignPod(ctx api.Context, podID string, machine string, annotations map[string]string) (err error) {
177177
if _, err = r.setPodHostAndAnnotations(ctx, podID, "", machine, annotations); err != nil {
178-
err = etcderr.InterpretGetError(err, api.Resource("pods"), podID)
179-
err = etcderr.InterpretUpdateError(err, api.Resource("pods"), podID)
178+
err = storeerr.InterpretGetError(err, api.Resource("pods"), podID)
179+
err = storeerr.InterpretUpdateError(err, api.Resource("pods"), podID)
180180
if _, ok := err.(*errors.StatusError); !ok {
181181
err = errors.NewConflict(api.Resource("pods/binding"), podID, err)
182182
}

‎pkg/registry/pod/etcd/etcd_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"golang.org/x/net/context"
2525
"k8s.io/kubernetes/pkg/api"
2626
"k8s.io/kubernetes/pkg/api/errors"
27-
etcderrors "k8s.io/kubernetes/pkg/api/errors/etcd"
27+
storeerr "k8s.io/kubernetes/pkg/api/errors/storage"
2828
"k8s.io/kubernetes/pkg/api/rest"
2929
"k8s.io/kubernetes/pkg/fields"
3030
"k8s.io/kubernetes/pkg/labels"
@@ -422,15 +422,15 @@ func TestEtcdCreateBindingNoPod(t *testing.T) {
422422
if err == nil {
423423
t.Fatalf("Expected not-found-error but got nothing")
424424
}
425-
if !errors.IsNotFound(etcderrors.InterpretGetError(err, api.Resource("pods"), "foo")) {
425+
if !errors.IsNotFound(storeerr.InterpretGetError(err, api.Resource("pods"), "foo")) {
426426
t.Fatalf("Unexpected error returned: %#v", err)
427427
}
428428

429429
_, err = storage.Get(ctx, "foo")
430430
if err == nil {
431431
t.Fatalf("Expected not-found-error but got nothing")
432432
}
433-
if !errors.IsNotFound(etcderrors.InterpretGetError(err, api.Resource("pods"), "foo")) {
433+
if !errors.IsNotFound(storeerr.InterpretGetError(err, api.Resource("pods"), "foo")) {
434434
t.Fatalf("Unexpected error: %v", err)
435435
}
436436
}

‎pkg/registry/service/allocator/etcd/etcd.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"k8s.io/kubernetes/pkg/api"
2525
k8serr "k8s.io/kubernetes/pkg/api/errors"
26-
etcderr "k8s.io/kubernetes/pkg/api/errors/etcd"
26+
storeerr "k8s.io/kubernetes/pkg/api/errors/storage"
2727
"k8s.io/kubernetes/pkg/api/unversioned"
2828
"k8s.io/kubernetes/pkg/registry/service"
2929
"k8s.io/kubernetes/pkg/registry/service/allocator"
@@ -164,7 +164,7 @@ func (e *Etcd) tryUpdate(fn func() error) error {
164164
return existing, nil
165165
}),
166166
)
167-
return etcderr.InterpretUpdateError(err, e.resource, "")
167+
return storeerr.InterpretUpdateError(err, e.resource, "")
168168
}
169169

170170
// Refresh reloads the RangeAllocation from etcd.
@@ -177,7 +177,7 @@ func (e *Etcd) Refresh() (*api.RangeAllocation, error) {
177177
if storage.IsNotFound(err) {
178178
return nil, nil
179179
}
180-
return nil, etcderr.InterpretGetError(err, e.resource, "")
180+
return nil, storeerr.InterpretGetError(err, e.resource, "")
181181
}
182182

183183
return existing, nil
@@ -188,7 +188,7 @@ func (e *Etcd) Refresh() (*api.RangeAllocation, error) {
188188
func (e *Etcd) Get() (*api.RangeAllocation, error) {
189189
existing := &api.RangeAllocation{}
190190
if err := e.storage.Get(context.TODO(), e.baseKey, existing, true); err != nil {
191-
return nil, etcderr.InterpretGetError(err, e.resource, "")
191+
return nil, storeerr.InterpretGetError(err, e.resource, "")
192192
}
193193
return existing, nil
194194
}
@@ -216,7 +216,7 @@ func (e *Etcd) CreateOrUpdate(snapshot *api.RangeAllocation) error {
216216
}),
217217
)
218218
if err != nil {
219-
return etcderr.InterpretUpdateError(err, e.resource, "")
219+
return storeerr.InterpretUpdateError(err, e.resource, "")
220220
}
221221
err = e.alloc.Restore(snapshot.Range, snapshot.Data)
222222
if err == nil {

0 commit comments

Comments
 (0)