428d2263e5
This commit adds support to core resources to enable deferred deletion of resources. Clients may optionally specify a time period after which resources must be deleted via an object sent with their DELETE. That object may define an optional grace period in seconds, or allow the default "preferred" value for a resource to be used. Once the object is marked as pending deletion, the deletionTimestamp field will be set and an etcd TTL will be in place. Clients should assume resources that have deletionTimestamp set will be deleted at some point in the future. Other changes will come later to enable graceful deletion on a per resource basis.
259 lines
8.1 KiB
Go
259 lines
8.1 KiB
Go
/*
|
|
Copyright 2014 Google Inc. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package resttest
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
|
)
|
|
|
|
type Tester struct {
|
|
*testing.T
|
|
storage apiserver.RESTStorage
|
|
storageError injectErrorFunc
|
|
clusterScope bool
|
|
}
|
|
|
|
type injectErrorFunc func(err error)
|
|
|
|
func New(t *testing.T, storage apiserver.RESTStorage, storageError injectErrorFunc) *Tester {
|
|
return &Tester{
|
|
T: t,
|
|
storage: storage,
|
|
storageError: storageError,
|
|
}
|
|
}
|
|
|
|
func (t *Tester) withStorageError(err error, fn func()) {
|
|
t.storageError(err)
|
|
defer t.storageError(nil)
|
|
fn()
|
|
}
|
|
|
|
func (t *Tester) ClusterScope() *Tester {
|
|
t.clusterScope = true
|
|
return t
|
|
}
|
|
|
|
func copyOrDie(obj runtime.Object) runtime.Object {
|
|
out, err := api.Scheme.Copy(obj)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return out
|
|
}
|
|
|
|
func (t *Tester) TestCreate(valid runtime.Object, invalid ...runtime.Object) {
|
|
t.TestCreateHasMetadata(copyOrDie(valid))
|
|
t.TestCreateGeneratesName(copyOrDie(valid))
|
|
t.TestCreateGeneratesNameReturnsServerTimeout(copyOrDie(valid))
|
|
if t.clusterScope {
|
|
t.TestCreateRejectsNamespace(copyOrDie(valid))
|
|
} else {
|
|
t.TestCreateRejectsMismatchedNamespace(copyOrDie(valid))
|
|
}
|
|
t.TestCreateInvokesValidation(invalid...)
|
|
}
|
|
|
|
func (t *Tester) TestCreateResetsUserData(valid runtime.Object) {
|
|
objectMeta, err := api.ObjectMetaFor(valid)
|
|
if err != nil {
|
|
t.Fatalf("object does not have ObjectMeta: %v\n%#v", err, valid)
|
|
}
|
|
|
|
now := util.Now()
|
|
objectMeta.UID = "bad-uid"
|
|
objectMeta.CreationTimestamp = now
|
|
|
|
obj, err := t.storage.(apiserver.RESTCreater).Create(api.NewDefaultContext(), valid)
|
|
if err != nil {
|
|
t.Fatalf("Unexpected error: %v", err)
|
|
}
|
|
if obj == nil {
|
|
t.Fatalf("Unexpected object from result: %#v", obj)
|
|
}
|
|
if objectMeta.UID == "bad-uid" || objectMeta.CreationTimestamp == now {
|
|
t.Errorf("ObjectMeta did not reset basic fields: %#v", objectMeta)
|
|
}
|
|
}
|
|
|
|
func (t *Tester) TestCreateHasMetadata(valid runtime.Object) {
|
|
objectMeta, err := api.ObjectMetaFor(valid)
|
|
if err != nil {
|
|
t.Fatalf("object does not have ObjectMeta: %v\n%#v", err, valid)
|
|
}
|
|
|
|
objectMeta.Name = "test"
|
|
objectMeta.Namespace = api.NamespaceDefault
|
|
context := api.NewDefaultContext()
|
|
if t.clusterScope {
|
|
objectMeta.Namespace = api.NamespaceNone
|
|
context = api.NewContext()
|
|
}
|
|
|
|
obj, err := t.storage.(apiserver.RESTCreater).Create(context, valid)
|
|
if err != nil {
|
|
t.Fatalf("Unexpected error: %v", err)
|
|
}
|
|
if obj == nil {
|
|
t.Fatalf("Unexpected object from result: %#v", obj)
|
|
}
|
|
if !api.HasObjectMetaSystemFieldValues(objectMeta) {
|
|
t.Errorf("storage did not populate object meta field values")
|
|
}
|
|
}
|
|
|
|
func (t *Tester) TestCreateGeneratesName(valid runtime.Object) {
|
|
objectMeta, err := api.ObjectMetaFor(valid)
|
|
if err != nil {
|
|
t.Fatalf("object does not have ObjectMeta: %v\n%#v", err, valid)
|
|
}
|
|
|
|
objectMeta.GenerateName = "test-"
|
|
|
|
_, err = t.storage.(apiserver.RESTCreater).Create(api.NewDefaultContext(), valid)
|
|
if err != nil {
|
|
t.Fatalf("Unexpected error: %v", err)
|
|
}
|
|
if objectMeta.Name == "test-" || !strings.HasPrefix(objectMeta.Name, "test-") {
|
|
t.Errorf("unexpected name: %#v", valid)
|
|
}
|
|
}
|
|
|
|
func (t *Tester) TestCreateGeneratesNameReturnsServerTimeout(valid runtime.Object) {
|
|
objectMeta, err := api.ObjectMetaFor(valid)
|
|
if err != nil {
|
|
t.Fatalf("object does not have ObjectMeta: %v\n%#v", err, valid)
|
|
}
|
|
|
|
objectMeta.GenerateName = "test-"
|
|
t.withStorageError(errors.NewAlreadyExists("kind", "thing"), func() {
|
|
_, err := t.storage.(apiserver.RESTCreater).Create(api.NewDefaultContext(), valid)
|
|
if err == nil || !errors.IsServerTimeout(err) {
|
|
t.Fatalf("Unexpected error: %v", err)
|
|
}
|
|
})
|
|
}
|
|
|
|
func (t *Tester) TestCreateInvokesValidation(invalid ...runtime.Object) {
|
|
for i, obj := range invalid {
|
|
ctx := api.NewDefaultContext()
|
|
_, err := t.storage.(apiserver.RESTCreater).Create(ctx, obj)
|
|
if !errors.IsInvalid(err) {
|
|
t.Errorf("%d: Expected to get an invalid resource error, got %v", i, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (t *Tester) TestCreateRejectsMismatchedNamespace(valid runtime.Object) {
|
|
objectMeta, err := api.ObjectMetaFor(valid)
|
|
if err != nil {
|
|
t.Fatalf("object does not have ObjectMeta: %v\n%#v", err, valid)
|
|
}
|
|
|
|
objectMeta.Namespace = "not-default"
|
|
|
|
_, err = t.storage.(apiserver.RESTCreater).Create(api.NewDefaultContext(), valid)
|
|
if err == nil {
|
|
t.Errorf("Expected an error, but we didn't get one")
|
|
} else if strings.Contains(err.Error(), "Controller.Namespace does not match the provided context") {
|
|
t.Errorf("Expected 'Controller.Namespace does not match the provided context' error, got '%v'", err.Error())
|
|
}
|
|
}
|
|
|
|
func (t *Tester) TestCreateRejectsNamespace(valid runtime.Object) {
|
|
objectMeta, err := api.ObjectMetaFor(valid)
|
|
if err != nil {
|
|
t.Fatalf("object does not have ObjectMeta: %v\n%#v", err, valid)
|
|
}
|
|
|
|
objectMeta.Namespace = "not-default"
|
|
|
|
_, err = t.storage.(apiserver.RESTCreater).Create(api.NewDefaultContext(), valid)
|
|
if err == nil {
|
|
t.Errorf("Expected an error, but we didn't get one")
|
|
} else if strings.Contains(err.Error(), "Controller.Namespace does not match the provided context") {
|
|
t.Errorf("Expected 'Controller.Namespace does not match the provided context' error, got '%v'", err.Error())
|
|
}
|
|
}
|
|
|
|
func (t *Tester) TestDeleteGraceful(createFn func() runtime.Object, expectedGrace int64, wasGracefulFn func() bool) {
|
|
t.TestDeleteGracefulHasDefault(createFn(), expectedGrace, wasGracefulFn)
|
|
t.TestDeleteGracefulUsesZeroOnNil(createFn(), 0)
|
|
}
|
|
|
|
func (t *Tester) TestDeleteNoGraceful(createFn func() runtime.Object, wasGracefulFn func() bool) {
|
|
existing := createFn()
|
|
objectMeta, err := api.ObjectMetaFor(existing)
|
|
if err != nil {
|
|
t.Fatalf("object does not have ObjectMeta: %v\n%#v", err, existing)
|
|
}
|
|
|
|
ctx := api.WithNamespace(api.NewContext(), objectMeta.Namespace)
|
|
_, err = t.storage.(apiserver.RESTGracefulDeleter).Delete(ctx, objectMeta.Name, api.NewDeleteOptions(10))
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
if _, err := t.storage.(apiserver.RESTGetter).Get(ctx, objectMeta.Name); !errors.IsNotFound(err) {
|
|
t.Errorf("unexpected error, object should not exist: %v", err)
|
|
}
|
|
if wasGracefulFn() {
|
|
t.Errorf("resource should not support graceful delete")
|
|
}
|
|
}
|
|
|
|
func (t *Tester) TestDeleteGracefulHasDefault(existing runtime.Object, expectedGrace int64, wasGracefulFn func() bool) {
|
|
objectMeta, err := api.ObjectMetaFor(existing)
|
|
if err != nil {
|
|
t.Fatalf("object does not have ObjectMeta: %v\n%#v", err, existing)
|
|
}
|
|
|
|
ctx := api.WithNamespace(api.NewContext(), objectMeta.Namespace)
|
|
_, err = t.storage.(apiserver.RESTGracefulDeleter).Delete(ctx, objectMeta.Name, &api.DeleteOptions{})
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
if _, err := t.storage.(apiserver.RESTGetter).Get(ctx, objectMeta.Name); err != nil {
|
|
t.Errorf("unexpected error, object should exist: %v", err)
|
|
}
|
|
if !wasGracefulFn() {
|
|
t.Errorf("did not gracefully delete resource")
|
|
}
|
|
}
|
|
|
|
func (t *Tester) TestDeleteGracefulUsesZeroOnNil(existing runtime.Object, expectedGrace int64) {
|
|
objectMeta, err := api.ObjectMetaFor(existing)
|
|
if err != nil {
|
|
t.Fatalf("object does not have ObjectMeta: %v\n%#v", err, existing)
|
|
}
|
|
|
|
ctx := api.WithNamespace(api.NewContext(), objectMeta.Namespace)
|
|
_, err = t.storage.(apiserver.RESTGracefulDeleter).Delete(ctx, objectMeta.Name, nil)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
if _, err := t.storage.(apiserver.RESTGetter).Get(ctx, objectMeta.Name); !errors.IsNotFound(err) {
|
|
t.Errorf("unexpected error, object should exist: %v", err)
|
|
}
|
|
}
|