
Contains breaking API change on api.Status#Details (type change) Turn Details from string -> StatusDetails - a general bucket for keyed error behavior. Define an open enumeration ReasonType exposed as Reason on the status object to provide machine readable subcategorization beyond HTTP Status Code. Define a human readable field Message which is common convention (previously this was joined into Details). Precedence order: HTTP Status Code, Reason, Details. apiserver would impose restraints on the ReasonTypes defined by the main apiobject, and ensure their use is consistent. There are four long term scenarios this change supports: 1. Allow a client access to a machine readable field that can be easily switched on for improving or translating the generic server Message. 2. Return a 404 when a composite operation on multiple resources fails with enough data so that a client can distinguish which item does not exist. E.g. resource Parent and resource Child, POST /parents/1/children to create a new Child, but /parents/1 is deleted. POST returns 404, ReasonTypeNotFound, and Details.ID = "1", Details.Kind = "parent" 3. Allow a client to receive validation data that is keyed by attribute for building user facing UIs around field submission. Validation is usually expressed as map[string][]string, but that type is less appropriate for many other uses. 4. Allow specific API errors to return more granular failure status for specific operations. An example might be a minion proxy, where the operation that failed may be both proxying OR the minion itself. In this case a reason may be defined "proxy_failed" corresponding to 502, where the Details field may be extended to contain a nested error object. At this time only ID and Kind are exposed
198 lines
5.0 KiB
Go
198 lines
5.0 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 apiserver
|
|
|
|
import (
|
|
"bytes"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
)
|
|
|
|
func TestOperation(t *testing.T) {
|
|
ops := NewOperations()
|
|
|
|
c := make(chan interface{})
|
|
op := ops.NewOperation(c)
|
|
// Allow context switch, so that op's ID can get added to the map and Get will work.
|
|
// This is just so we can test Get. Ordinary users have no need to call Get immediately
|
|
// after calling NewOperation, because it returns the operation directly.
|
|
time.Sleep(time.Millisecond)
|
|
go func() {
|
|
time.Sleep(500 * time.Millisecond)
|
|
c <- "All done"
|
|
}()
|
|
|
|
if op.expired(time.Now().Add(-time.Minute)) {
|
|
t.Errorf("Expired before finished: %#v", op)
|
|
}
|
|
ops.expire(time.Minute)
|
|
if tmp := ops.Get(op.ID); tmp == nil {
|
|
t.Errorf("expire incorrectly removed the operation %#v", ops)
|
|
}
|
|
|
|
op.WaitFor(10 * time.Millisecond)
|
|
if _, completed := op.StatusOrResult(); completed {
|
|
t.Errorf("Unexpectedly fast completion")
|
|
}
|
|
|
|
const waiters = 10
|
|
var waited int32
|
|
for i := 0; i < waiters; i++ {
|
|
go func() {
|
|
op.WaitFor(time.Hour)
|
|
atomic.AddInt32(&waited, 1)
|
|
}()
|
|
}
|
|
|
|
op.WaitFor(time.Minute)
|
|
if _, completed := op.StatusOrResult(); !completed {
|
|
t.Errorf("Unexpectedly slow completion")
|
|
}
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
if waited != waiters {
|
|
t.Errorf("Multiple waiters doesn't work, only %v finished", waited)
|
|
}
|
|
|
|
if op.expired(time.Now().Add(-time.Second)) {
|
|
t.Errorf("Should not be expired: %#v", op)
|
|
}
|
|
if !op.expired(time.Now().Add(-80 * time.Millisecond)) {
|
|
t.Errorf("Should be expired: %#v", op)
|
|
}
|
|
|
|
ops.expire(80 * time.Millisecond)
|
|
if tmp := ops.Get(op.ID); tmp != nil {
|
|
t.Errorf("expire failed to remove the operation %#v", ops)
|
|
}
|
|
|
|
if op.result.(string) != "All done" {
|
|
t.Errorf("Got unexpected result: %#v", op.result)
|
|
}
|
|
}
|
|
|
|
func TestOperationsList(t *testing.T) {
|
|
simpleStorage := &SimpleRESTStorage{}
|
|
handler := New(map[string]RESTStorage{
|
|
"foo": simpleStorage,
|
|
}, "/prefix/version")
|
|
handler.asyncOpWait = 0
|
|
server := httptest.NewServer(handler)
|
|
client := http.Client{}
|
|
|
|
simple := Simple{
|
|
Name: "foo",
|
|
}
|
|
data, err := api.Encode(simple)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
response, err := client.Post(server.URL+"/prefix/version/foo", "application/json", bytes.NewBuffer(data))
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
if response.StatusCode != http.StatusAccepted {
|
|
t.Errorf("Unexpected response %#v", response)
|
|
}
|
|
|
|
response, err = client.Get(server.URL + "/prefix/version/operations")
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
if response.StatusCode != http.StatusOK {
|
|
t.Fatalf("unexpected status code %#v", response)
|
|
}
|
|
body, err := ioutil.ReadAll(response.Body)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
obj, err := api.Decode(body)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
oplist, ok := obj.(*api.ServerOpList)
|
|
if !ok {
|
|
t.Fatalf("expected ServerOpList, got %#v", obj)
|
|
}
|
|
if len(oplist.Items) != 1 {
|
|
t.Errorf("expected 1 operation, got %#v", obj)
|
|
}
|
|
}
|
|
|
|
func TestOpGet(t *testing.T) {
|
|
simpleStorage := &SimpleRESTStorage{}
|
|
handler := New(map[string]RESTStorage{
|
|
"foo": simpleStorage,
|
|
}, "/prefix/version")
|
|
handler.asyncOpWait = 0
|
|
server := httptest.NewServer(handler)
|
|
client := http.Client{}
|
|
|
|
simple := Simple{
|
|
Name: "foo",
|
|
}
|
|
data, err := api.Encode(simple)
|
|
t.Log(string(data))
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
request, err := http.NewRequest("POST", server.URL+"/prefix/version/foo", bytes.NewBuffer(data))
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
response, err := client.Do(request)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
if response.StatusCode != http.StatusAccepted {
|
|
t.Errorf("Unexpected response %#v", response)
|
|
}
|
|
|
|
var itemOut api.Status
|
|
body, err := extractBody(response, &itemOut)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
if itemOut.Status != api.StatusWorking || itemOut.Details == nil || itemOut.Details.ID == "" {
|
|
t.Fatalf("Unexpected status: %#v (%s)", itemOut, string(body))
|
|
}
|
|
|
|
req2, err := http.NewRequest("GET", server.URL+"/prefix/version/operations/"+itemOut.Details.ID, nil)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
_, err = client.Do(req2)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
if response.StatusCode != http.StatusAccepted {
|
|
t.Errorf("Unexpected response %#v", response)
|
|
}
|
|
}
|