Bump google.golang.org/api

vendor/github.com/google/martian/api/forwarder.go

@@ -0,0 +1,56 @@
+// Copyright 2016 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 api contains a forwarder to route system HTTP requests to the
+// local API server.
+package api
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/google/martian"
+	"github.com/google/martian/log"
+)
+
+// Forwarder is a request modifier that routes the request to the API server and
+// marks the request for skipped logging.
+type Forwarder struct {
+	host string
+	port int
+}
+
+// NewForwarder returns a Forwarder that rewrites requests to host.
+func NewForwarder(host string, port int) *Forwarder {
+	return &Forwarder{
+		host: host,
+		port: port,
+	}
+}
+
+// ModifyRequest forwards the request to the local API server running at f.port,
+// downgrades the scheme to http and marks the request context for skipped logging.
+func (f *Forwarder) ModifyRequest(req *http.Request) error {
+	ctx := martian.NewContext(req)
+	ctx.APIRequest()
+	ctx.SkipLogging()
+
+	in := req.URL.String()
+	req.URL.Scheme = "http"
+	req.URL.Host = fmt.Sprintf("%s:%d", "localhost", f.port)
+	out := req.URL.String()
+	log.Infof("api.Forwarder: forwarding %s to %s", in, out)
+
+	return nil
+}

vendor/github.com/google/martian/api/forwarder_test.go

@@ -0,0 +1,56 @@
+// Copyright 2016 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 api
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/google/martian"
+)
+
+func TestApiForwarder(t *testing.T) {
+	forwarder := NewForwarder("", 8181)
+
+	req, err := http.NewRequest("GET", "https://martian.proxy/configure", nil)
+	if err != nil {
+		t.Fatalf("NewRequest(): got %v, want no error", err)
+	}
+
+	ctx, remove, err := martian.TestContext(req, nil, nil)
+	if err != nil {
+		t.Fatalf("TestContext(): got %v, want no error", err)
+	}
+	defer remove()
+
+	if err := forwarder.ModifyRequest(req); err != nil {
+		t.Fatalf("ModifyRequest(): got %v, want no error", err)
+	}
+
+	if got, want := req.URL.Scheme, "http"; got != want {
+		t.Errorf("req.URL.Scheme: got %s, want %s", got, want)
+	}
+	if got, want := req.URL.Host, "localhost:8181"; got != want {
+		t.Errorf("req.URL.Host: got %s, want %s", got, want)
+	}
+
+	if !ctx.SkippingLogging() {
+		t.Errorf("ctx.SkippingLogging: got false, want true")
+	}
+
+	if !ctx.IsAPIRequest() {
+		t.Errorf("ctx.IsApiRequest: got false, want true")
+	}
+}