Bump google.golang.org/api
This commit is contained in:
Andrea Spacca
240
vendor/github.com/google/martian/priority/priority_group.go
generated
vendored
Normal file
240
vendor/github.com/google/martian/priority/priority_group.go
generated
vendored
Normal file
@@ -0,0 +1,240 @@
|
||||
// Copyright 2015 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 priority allows grouping modifiers and applying them in priority order.
|
||||
package priority
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
"sync"
|
||||
|
||||
"github.com/google/martian"
|
||||
"github.com/google/martian/parse"
|
||||
)
|
||||
|
||||
var (
|
||||
// ErrModifierNotFound is the error returned when attempting to remove a
|
||||
// modifier when the modifier does not exist in the group.
|
||||
ErrModifierNotFound = errors.New("modifier not found in group")
|
||||
)
|
||||
|
||||
// priorityRequestModifier is a request modifier with a priority.
|
||||
type priorityRequestModifier struct {
|
||||
reqmod martian.RequestModifier
|
||||
priority int64
|
||||
}
|
||||
|
||||
// priorityResponseModifier is a response modifier with a priority.
|
||||
type priorityResponseModifier struct {
|
||||
resmod martian.ResponseModifier
|
||||
priority int64
|
||||
}
|
||||
|
||||
// Group is a group of request and response modifiers ordered by their priority.
|
||||
type Group struct {
|
||||
reqmu sync.RWMutex
|
||||
reqmods []*priorityRequestModifier
|
||||
|
||||
resmu sync.RWMutex
|
||||
resmods []*priorityResponseModifier
|
||||
}
|
||||
|
||||
type groupJSON struct {
|
||||
Modifiers []modifierJSON `json:"modifiers"`
|
||||
Scope []parse.ModifierType `json:"scope"`
|
||||
}
|
||||
|
||||
type modifierJSON struct {
|
||||
Priority int64 `json:"priority"`
|
||||
Modifier json.RawMessage `json:"modifier"`
|
||||
}
|
||||
|
||||
func init() {
|
||||
parse.Register("priority.Group", groupFromJSON)
|
||||
}
|
||||
|
||||
// NewGroup returns a priority group.
|
||||
func NewGroup() *Group {
|
||||
return &Group{}
|
||||
}
|
||||
|
||||
// AddRequestModifier adds a RequestModifier with the given priority.
|
||||
//
|
||||
// If a modifier is added with a priority that is equal to an existing priority
|
||||
// the newer modifier will be added before the existing modifier in the chain.
|
||||
func (pg *Group) AddRequestModifier(reqmod martian.RequestModifier, priority int64) {
|
||||
pg.reqmu.Lock()
|
||||
defer pg.reqmu.Unlock()
|
||||
|
||||
preqmod := &priorityRequestModifier{
|
||||
reqmod: reqmod,
|
||||
priority: priority,
|
||||
}
|
||||
|
||||
for i, m := range pg.reqmods {
|
||||
if preqmod.priority >= m.priority {
|
||||
pg.reqmods = append(pg.reqmods, nil)
|
||||
copy(pg.reqmods[i+1:], pg.reqmods[i:])
|
||||
pg.reqmods[i] = preqmod
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Either this is the first modifier in the list, or the priority is less
|
||||
// than all existing modifiers.
|
||||
pg.reqmods = append(pg.reqmods, preqmod)
|
||||
}
|
||||
|
||||
// RemoveRequestModifier removes the the highest priority given RequestModifier.
|
||||
// Returns ErrModifierNotFound if the given modifier does not exist in the group.
|
||||
func (pg *Group) RemoveRequestModifier(reqmod martian.RequestModifier) error {
|
||||
pg.reqmu.Lock()
|
||||
defer pg.reqmu.Unlock()
|
||||
|
||||
for i, m := range pg.reqmods {
|
||||
if m.reqmod == reqmod {
|
||||
copy(pg.reqmods[i:], pg.reqmods[i+1:])
|
||||
pg.reqmods[len(pg.reqmods)-1] = nil
|
||||
pg.reqmods = pg.reqmods[:len(pg.reqmods)-1]
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
return ErrModifierNotFound
|
||||
}
|
||||
|
||||
// AddResponseModifier adds a ResponseModifier with the given priority.
|
||||
//
|
||||
// If a modifier is added with a priority that is equal to an existing priority
|
||||
// the newer modifier will be added before the existing modifier in the chain.
|
||||
func (pg *Group) AddResponseModifier(resmod martian.ResponseModifier, priority int64) {
|
||||
pg.resmu.Lock()
|
||||
defer pg.resmu.Unlock()
|
||||
|
||||
presmod := &priorityResponseModifier{
|
||||
resmod: resmod,
|
||||
priority: priority,
|
||||
}
|
||||
|
||||
for i, m := range pg.resmods {
|
||||
if presmod.priority >= m.priority {
|
||||
pg.resmods = append(pg.resmods, nil)
|
||||
copy(pg.resmods[i+1:], pg.resmods[i:])
|
||||
pg.resmods[i] = presmod
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Either this is the first modifier in the list, or the priority is less
|
||||
// than all existing modifiers.
|
||||
pg.resmods = append(pg.resmods, presmod)
|
||||
}
|
||||
|
||||
// RemoveResponseModifier removes the the highest priority given ResponseModifier.
|
||||
// Returns ErrModifierNotFound if the given modifier does not exist in the group.
|
||||
func (pg *Group) RemoveResponseModifier(resmod martian.ResponseModifier) error {
|
||||
pg.resmu.Lock()
|
||||
defer pg.resmu.Unlock()
|
||||
|
||||
for i, m := range pg.resmods {
|
||||
if m.resmod == resmod {
|
||||
copy(pg.resmods[i:], pg.resmods[i+1:])
|
||||
pg.resmods[len(pg.resmods)-1] = nil
|
||||
pg.resmods = pg.resmods[:len(pg.resmods)-1]
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
return ErrModifierNotFound
|
||||
}
|
||||
|
||||
// ModifyRequest modifies the request. Modifiers are run in descending order of
|
||||
// their priority. If an error is returned by a RequestModifier the error is
|
||||
// returned and no further modifiers are run.
|
||||
func (pg *Group) ModifyRequest(req *http.Request) error {
|
||||
pg.reqmu.RLock()
|
||||
defer pg.reqmu.RUnlock()
|
||||
|
||||
for _, m := range pg.reqmods {
|
||||
if err := m.reqmod.ModifyRequest(req); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// ModifyResponse modifies the response. Modifiers are run in descending order
|
||||
// of their priority. If an error is returned by a ResponseModifier the error
|
||||
// is returned and no further modifiers are run.
|
||||
func (pg *Group) ModifyResponse(res *http.Response) error {
|
||||
pg.resmu.RLock()
|
||||
defer pg.resmu.RUnlock()
|
||||
|
||||
for _, m := range pg.resmods {
|
||||
if err := m.resmod.ModifyResponse(res); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// groupFromJSON builds a priority.Group from JSON.
|
||||
//
|
||||
// Example JSON:
|
||||
// {
|
||||
// "priority.Group": {
|
||||
// "scope": ["request", "response"],
|
||||
// "modifiers": [
|
||||
// {
|
||||
// "priority": 100, // Will run first.
|
||||
// "modifier": { ... },
|
||||
// },
|
||||
// {
|
||||
// "priority": 0, // Will run last.
|
||||
// "modifier": { ... },
|
||||
// }
|
||||
// ]
|
||||
// }
|
||||
// }
|
||||
func groupFromJSON(b []byte) (*parse.Result, error) {
|
||||
msg := &groupJSON{}
|
||||
if err := json.Unmarshal(b, msg); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
pg := NewGroup()
|
||||
|
||||
for _, m := range msg.Modifiers {
|
||||
r, err := parse.FromJSON(m.Modifier)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
reqmod := r.RequestModifier()
|
||||
if reqmod != nil {
|
||||
pg.AddRequestModifier(reqmod, m.Priority)
|
||||
}
|
||||
|
||||
resmod := r.ResponseModifier()
|
||||
if resmod != nil {
|
||||
pg.AddResponseModifier(resmod, m.Priority)
|
||||
}
|
||||
}
|
||||
|
||||
return parse.NewResult(pg, msg.Scope)
|
||||
}
|
||||
243
vendor/github.com/google/martian/priority/priority_group_test.go
generated
vendored
Normal file
243
vendor/github.com/google/martian/priority/priority_group_test.go
generated
vendored
Normal file
@@ -0,0 +1,243 @@
|
||||
// Copyright 2015 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 priority
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"github.com/google/martian/martiantest"
|
||||
"github.com/google/martian/parse"
|
||||
"github.com/google/martian/proxyutil"
|
||||
|
||||
// Import to register header.Modifier with JSON parser.
|
||||
_ "github.com/google/martian/header"
|
||||
)
|
||||
|
||||
func TestPriorityGroupModifyRequest(t *testing.T) {
|
||||
var order []string
|
||||
|
||||
pg := NewGroup()
|
||||
|
||||
tm50 := martiantest.NewModifier()
|
||||
tm50.RequestFunc(func(*http.Request) {
|
||||
order = append(order, "tm50")
|
||||
})
|
||||
pg.AddRequestModifier(tm50, 50)
|
||||
|
||||
tm100a := martiantest.NewModifier()
|
||||
tm100a.RequestFunc(func(*http.Request) {
|
||||
order = append(order, "tm100a")
|
||||
})
|
||||
pg.AddRequestModifier(tm100a, 100)
|
||||
|
||||
tm100b := martiantest.NewModifier()
|
||||
tm100b.RequestFunc(func(*http.Request) {
|
||||
order = append(order, "tm100b")
|
||||
})
|
||||
pg.AddRequestModifier(tm100b, 100)
|
||||
|
||||
tm75 := martiantest.NewModifier()
|
||||
tm75.RequestFunc(func(*http.Request) {
|
||||
order = append(order, "tm75")
|
||||
})
|
||||
|
||||
if err := pg.RemoveRequestModifier(tm75); err != ErrModifierNotFound {
|
||||
t.Fatalf("RemoveRequestModifier(): got %v, want ErrModifierNotFound", err)
|
||||
}
|
||||
|
||||
pg.AddRequestModifier(tm75, 100)
|
||||
|
||||
if err := pg.RemoveRequestModifier(tm75); err != nil {
|
||||
t.Fatalf("RemoveRequestModifier(): got %v, want no error", err)
|
||||
}
|
||||
|
||||
req, err := http.NewRequest("GET", "http://example.com/", nil)
|
||||
if err != nil {
|
||||
t.Fatalf("http.NewRequest(): got %v, want no error", err)
|
||||
}
|
||||
if err := pg.ModifyRequest(req); err != nil {
|
||||
t.Fatalf("ModifyRequest(): got %v, want no error", err)
|
||||
}
|
||||
if got, want := order, []string{"tm100b", "tm100a", "tm50"}; !reflect.DeepEqual(got, want) {
|
||||
t.Fatalf("reflect.DeepEqual(%v, %v): got false, want true", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPriorityGroupModifyRequestHaltsOnError(t *testing.T) {
|
||||
pg := NewGroup()
|
||||
|
||||
reqerr := errors.New("request error")
|
||||
tm := martiantest.NewModifier()
|
||||
tm.RequestError(reqerr)
|
||||
|
||||
pg.AddRequestModifier(tm, 100)
|
||||
|
||||
tm2 := martiantest.NewModifier()
|
||||
pg.AddRequestModifier(tm2, 75)
|
||||
|
||||
req, err := http.NewRequest("GET", "http://example.com/", nil)
|
||||
if err != nil {
|
||||
t.Fatalf("http.NewRequest(): got %v, want no error", err)
|
||||
}
|
||||
if err := pg.ModifyRequest(req); err != reqerr {
|
||||
t.Fatalf("ModifyRequest(): got %v, want %v", err, reqerr)
|
||||
}
|
||||
|
||||
if tm2.RequestModified() {
|
||||
t.Error("tm2.RequestModified(): got true, want false")
|
||||
}
|
||||
}
|
||||
|
||||
func TestPriorityGroupModifyResponse(t *testing.T) {
|
||||
var order []string
|
||||
|
||||
pg := NewGroup()
|
||||
|
||||
tm50 := martiantest.NewModifier()
|
||||
tm50.ResponseFunc(func(*http.Response) {
|
||||
order = append(order, "tm50")
|
||||
})
|
||||
pg.AddResponseModifier(tm50, 50)
|
||||
|
||||
tm100a := martiantest.NewModifier()
|
||||
tm100a.ResponseFunc(func(*http.Response) {
|
||||
order = append(order, "tm100a")
|
||||
})
|
||||
pg.AddResponseModifier(tm100a, 100)
|
||||
|
||||
tm100b := martiantest.NewModifier()
|
||||
tm100b.ResponseFunc(func(*http.Response) {
|
||||
order = append(order, "tm100b")
|
||||
})
|
||||
pg.AddResponseModifier(tm100b, 100)
|
||||
|
||||
tm75 := martiantest.NewModifier()
|
||||
tm75.ResponseFunc(func(*http.Response) {
|
||||
order = append(order, "tm75")
|
||||
})
|
||||
|
||||
if err := pg.RemoveResponseModifier(tm75); err != ErrModifierNotFound {
|
||||
t.Fatalf("RemoveResponseModifier(): got %v, want ErrModifierNotFound", err)
|
||||
}
|
||||
|
||||
pg.AddResponseModifier(tm75, 100)
|
||||
|
||||
if err := pg.RemoveResponseModifier(tm75); err != nil {
|
||||
t.Fatalf("RemoveResponseModifier(): got %v, want no error", err)
|
||||
}
|
||||
|
||||
res := proxyutil.NewResponse(200, nil, nil)
|
||||
if err := pg.ModifyResponse(res); err != nil {
|
||||
t.Fatalf("ModifyResponse(): got %v, want no error", err)
|
||||
}
|
||||
if got, want := order, []string{"tm100b", "tm100a", "tm50"}; !reflect.DeepEqual(got, want) {
|
||||
t.Fatalf("reflect.DeepEqual(%v, %v): got false, want true", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPriorityGroupModifyResponseHaltsOnError(t *testing.T) {
|
||||
pg := NewGroup()
|
||||
|
||||
reserr := errors.New("response error")
|
||||
tm := martiantest.NewModifier()
|
||||
tm.ResponseError(reserr)
|
||||
|
||||
pg.AddResponseModifier(tm, 100)
|
||||
|
||||
tm2 := martiantest.NewModifier()
|
||||
pg.AddResponseModifier(tm2, 75)
|
||||
|
||||
res := proxyutil.NewResponse(200, nil, nil)
|
||||
if err := pg.ModifyResponse(res); err != reserr {
|
||||
t.Fatalf("ModifyRequest(): got %v, want %v", err, reserr)
|
||||
}
|
||||
|
||||
if tm2.ResponseModified() {
|
||||
t.Error("tm2.ResponseModified(): got true, want false")
|
||||
}
|
||||
}
|
||||
|
||||
func TestGroupFromJSON(t *testing.T) {
|
||||
msg := []byte(`{
|
||||
"priority.Group": {
|
||||
"scope": ["request", "response"],
|
||||
"modifiers": [
|
||||
{
|
||||
"priority": 100,
|
||||
"modifier": {
|
||||
"header.Modifier": {
|
||||
"scope": ["request", "response"],
|
||||
"name": "X-Testing",
|
||||
"value": "true"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"priority": 0,
|
||||
"modifier": {
|
||||
"header.Modifier": {
|
||||
"scope": ["request", "response"],
|
||||
"name": "Y-Testing",
|
||||
"value": "true"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}`)
|
||||
|
||||
r, err := parse.FromJSON(msg)
|
||||
if err != nil {
|
||||
t.Fatalf("parse.FromJSON(): got %v, want no error", err)
|
||||
}
|
||||
|
||||
reqmod := r.RequestModifier()
|
||||
if reqmod == nil {
|
||||
t.Fatal("reqmod: got nil, want not nil")
|
||||
}
|
||||
|
||||
req, err := http.NewRequest("GET", "http://example.com", nil)
|
||||
if err != nil {
|
||||
t.Fatalf("http.NewRequest(): got %v, want no error", err)
|
||||
}
|
||||
if err := reqmod.ModifyRequest(req); err != nil {
|
||||
t.Fatalf("ModifyRequest(): got %v, want no error", err)
|
||||
}
|
||||
if got, want := req.Header.Get("X-Testing"), "true"; got != want {
|
||||
t.Errorf("req.Header.Get(%q): got %q, want %q", "X-Testing", got, want)
|
||||
}
|
||||
if got, want := req.Header.Get("Y-Testing"), "true"; got != want {
|
||||
t.Errorf("req.Header.Get(%q): got %q, want %q", "Y-Testing", got, want)
|
||||
}
|
||||
|
||||
resmod := r.ResponseModifier()
|
||||
if resmod == nil {
|
||||
t.Fatal("resmod: got nil, want not nil")
|
||||
}
|
||||
|
||||
res := proxyutil.NewResponse(200, nil, req)
|
||||
if err := resmod.ModifyResponse(res); err != nil {
|
||||
t.Fatalf("ModifyResponse(): got %v, want no error", err)
|
||||
}
|
||||
if got, want := res.Header.Get("X-Testing"), "true"; got != want {
|
||||
t.Errorf("res.Header.Get(%q): got %q, want %q", "X-Testing", got, want)
|
||||
}
|
||||
if got, want := res.Header.Get("Y-Testing"), "true"; got != want {
|
||||
t.Errorf("res.Header.Get(%q): got %q, want %q", "Y-Testing", got, want)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user