From b61b8f3a520fcfae1edbdd28cde61bad38d0d008 Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Mon, 9 Mar 2020 12:29:45 +1100
Subject: [PATCH 1/9] WIP: serve from object storage

---
 .gitlab-source-config.yml                             |  5 +++++
 internal/source/disk/disk.go                          |  3 +++
 internal/source/domains.go                            |  4 ++++
 .../domains/gitlabsourceconfig/gitlabsourceconfig.go  | 11 ++++++++---
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 .gitlab-source-config.yml

diff --git a/.gitlab-source-config.yml b/.gitlab-source-config.yml
new file mode 100644
index 000000000..c87ea2dec
--- /dev/null
+++ b/.gitlab-source-config.yml
@@ -0,0 +1,5 @@
+domains:
+  enabled:
+    - root.127.0.0.1.xip.io
+  rollout:
+    percentage: 100
diff --git a/internal/source/disk/disk.go b/internal/source/disk/disk.go
index b79d222de..cb07547e8 100644
--- a/internal/source/disk/disk.go
+++ b/internal/source/disk/disk.go
@@ -5,6 +5,8 @@ import (
 	"sync"
 	"time"
 
+	log "github.com/sirupsen/logrus"
+
 	"gitlab.com/gitlab-org/gitlab-pages/internal/domain"
 )
 
@@ -33,6 +35,7 @@ func (d *Disk) GetDomain(host string) (*domain.Domain, error) {
 
 	domain, _ := d.dm[host]
 
+	log.Info("Found a domain? for host:%s domain: %+v", host, domain)
 	return domain, nil
 }
 
diff --git a/internal/source/domains.go b/internal/source/domains.go
index 11794b915..3d4f44427 100644
--- a/internal/source/domains.go
+++ b/internal/source/domains.go
@@ -24,6 +24,8 @@ var (
 )
 
 func init() {
+
+	log.Info("whaaaaat")
 	// Start watching the config file for domains that will use the new `gitlab` source,
 	// to be removed once we switch completely to using it.
 	go gitlabsourceconfig.WatchForGitlabSourceConfigChange(&gitlabSourceConfig, 1*time.Minute)
@@ -82,7 +84,9 @@ func (d *Domains) IsReady() bool {
 }
 
 func (d *Domains) source(domain string) Source {
+	log.Infof("the domain: %s and domains... %+v", domain, d)
 	if d.gitlab == nil {
+		log.Info("seems lik d.gitlab is nil...")
 		return d.disk
 	}
 
diff --git a/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go b/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go
index ebc8b4859..3a6ce2810 100644
--- a/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go
+++ b/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go
@@ -34,9 +34,11 @@ type GitlabSourceConfig struct {
 // the fields already set.
 func (config *GitlabSourceConfig) UpdateFromYaml(content []byte) error {
 	updated := GitlabSourceConfig{}
-
+	log.Infof("we should be coming here....")
 	err := yaml.Unmarshal(content, &updated)
 	if err != nil {
+		log.WithError(err).Error("oooops...")
+
 		return err
 	}
 
@@ -60,7 +62,7 @@ func WatchForGitlabSourceConfigChange(config *GitlabSourceConfig, interval time.
 	if gitlabSourceConfigFile == "" {
 		gitlabSourceConfigFile = ".gitlab-source-config.yml"
 	}
-
+	log.Info("WatchForGitlabSourceConfigChange: %+v", config)
 	for {
 		content, err := readConfig(gitlabSourceConfigFile)
 		if err != nil {
@@ -84,8 +86,11 @@ func WatchForGitlabSourceConfigChange(config *GitlabSourceConfig, interval time.
 }
 
 func readConfig(configfile string) ([]byte, error) {
-	content, err := ioutil.ReadFile(configfile)
 
+	wd, err := os.Getwd()
+	log.WithError(err).Infof("the current directory %s", wd)
+	content, err := ioutil.ReadFile(configfile)
+	log.WithError(err).Errorf("the config file: %s", configfile)
 	if err != nil && !os.IsNotExist(err) {
 		return nil, err
 	}
-- 
GitLab


From bc9d405294ec8371268f51c3ac0a107b47eb714c Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Wed, 11 Mar 2020 11:29:09 +1100
Subject: [PATCH 2/9] custom domain in source config, hard-code domain to
 return, debug req/res to gitlab api

---
 .gitlab-source-config.yml                 |  4 ++--
 internal/source/gitlab/cache/entry.go     |  3 ++-
 internal/source/gitlab/cache/retriever.go | 28 +++++++++++++++++++++++
 internal/source/gitlab/client/client.go   |  7 +++++-
 internal/source/gitlab/gitlab.go          | 12 +++++++---
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/.gitlab-source-config.yml b/.gitlab-source-config.yml
index c87ea2dec..af78003bd 100644
--- a/.gitlab-source-config.yml
+++ b/.gitlab-source-config.yml
@@ -1,5 +1,5 @@
 domains:
   enabled:
-    - root.127.0.0.1.xip.io
+    - test.jaime
   rollout:
-    percentage: 100
+    percentage: 10
diff --git a/internal/source/gitlab/cache/entry.go b/internal/source/gitlab/cache/entry.go
index d91bb3314..bcd3c807b 100644
--- a/internal/source/gitlab/cache/entry.go
+++ b/internal/source/gitlab/cache/entry.go
@@ -3,6 +3,7 @@ package cache
 import (
 	"context"
 	"errors"
+	"fmt"
 	"sync"
 	"time"
 
@@ -69,7 +70,7 @@ func (e *Entry) Retrieve(ctx context.Context, client api.Client) (lookup *api.Lo
 	case <-e.retrieved:
 		lookup = e.Lookup()
 	}
-
+	fmt.Printf("found the lookup... %+v\n", lookup)
 	return lookup
 }
 
diff --git a/internal/source/gitlab/cache/retriever.go b/internal/source/gitlab/cache/retriever.go
index cf0541b1b..6aee472db 100644
--- a/internal/source/gitlab/cache/retriever.go
+++ b/internal/source/gitlab/cache/retriever.go
@@ -3,6 +3,7 @@ package cache
 import (
 	"context"
 	"errors"
+	"fmt"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -40,6 +41,33 @@ func (r *Retriever) resolveWithBackoff(ctx context.Context, domain string) <-cha
 		var lookup api.Lookup
 
 		for i := 1; i <= maxRetrievalRetries; i++ {
+			fmt.Printf("retrieving domain: %q from cache: %d \n", domain, i)
+
+			if domain == "test.jaime" {
+				response <- api.Lookup{
+					Name:  "test.jaime",
+					Error: nil,
+					Domain: &api.VirtualDomain{
+						Certificate: "",
+						Key:         "",
+						LookupPaths: []api.LookupPath{
+							api.LookupPath{
+								ProjectID:     20,
+								AccessControl: false,
+								HTTPSOnly:     false,
+								Prefix:        "/",
+								Source: api.Source{
+									Type: "file",
+									Type:"object-storage"
+									Path: "bucket://",
+								},
+							},
+						},
+					},
+				}
+				break
+			}
+
 			lookup = r.client.GetLookup(ctx, domain)
 
 			if lookup.Error != nil {
diff --git a/internal/source/gitlab/client/client.go b/internal/source/gitlab/client/client.go
index afe9da6f8..9d5fd8610 100644
--- a/internal/source/gitlab/client/client.go
+++ b/internal/source/gitlab/client/client.go
@@ -8,6 +8,7 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
+	"net/http/httputil"
 	"net/url"
 	"time"
 
@@ -76,6 +77,7 @@ func (gc *Client) GetLookup(ctx context.Context, host string) api.Lookup {
 	params := url.Values{}
 	params.Set("host", host)
 
+	fmt.Printf("\n\nclient.GetLookup 1 \n")
 	resp, err := gc.get(ctx, "/api/v4/internal/pages", params)
 	if err != nil {
 		return api.Lookup{Name: host, Error: err}
@@ -101,11 +103,14 @@ func (gc *Client) get(ctx context.Context, path string, params url.Values) (*htt
 	if err != nil {
 		return nil, err
 	}
-
+	dreq, err := httputil.DumpRequestOut(req, true)
+	fmt.Printf("the request out: %q\nerr:%+v", dreq, err)
 	resp, err := gc.httpClient.Do(req)
 	if err != nil {
 		return nil, err
 	}
+	dres, err := httputil.DumpResponse(resp, true)
+	fmt.Printf("the response %q\nerr:%+v", dres, err)
 
 	if resp == nil {
 		return nil, errors.New("unknown response")
diff --git a/internal/source/gitlab/gitlab.go b/internal/source/gitlab/gitlab.go
index 6260200ae..3fd11f3c8 100644
--- a/internal/source/gitlab/gitlab.go
+++ b/internal/source/gitlab/gitlab.go
@@ -3,6 +3,7 @@ package gitlab
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 	"path"
 	"strings"
@@ -35,7 +36,7 @@ func New(config client.Config) (*Gitlab, error) {
 // GitLab
 func (g *Gitlab) GetDomain(name string) (*domain.Domain, error) {
 	lookup := g.client.Resolve(context.Background(), name)
-
+	fmt.Printf("gitlab GetDomain: %q %+v %+v\n", lookup.Name, lookup.Error, lookup.Domain)
 	if lookup.Error != nil {
 		return nil, lookup.Error
 	}
@@ -53,7 +54,7 @@ func (g *Gitlab) GetDomain(name string) (*domain.Domain, error) {
 		CertificateKey:  lookup.Domain.Key,
 		Resolver:        g,
 	}
-
+	fmt.Printf("did we find the domain? %+v\n", domain)
 	return &domain, nil
 }
 
@@ -63,15 +64,20 @@ func (g *Gitlab) GetDomain(name string) (*domain.Domain, error) {
 func (g *Gitlab) Resolve(r *http.Request) (*serving.Request, error) {
 	host := request.GetHostWithoutPort(r)
 
+	fmt.Printf("gitlab.Resolve 1\n")
 	response := g.client.Resolve(r.Context(), host)
 	if response.Error != nil {
+		fmt.Printf("gitlab.Resolve 2\n")
+
 		return &serving.Request{Serving: defaultServing()}, response.Error
 	}
 
 	urlPath := path.Clean(r.URL.Path)
 	size := len(response.Domain.LookupPaths)
 
-	for _, lookup := range response.Domain.LookupPaths {
+	for k, lookup := range response.Domain.LookupPaths {
+		fmt.Printf("gitlab.Resolve 3... %d-%+v\n", k, lookup)
+
 		isSubPath := strings.HasPrefix(urlPath, lookup.Prefix)
 		isRootPath := urlPath == path.Clean(lookup.Prefix)
 
-- 
GitLab


From a10f045a67e19f45cddc255ae586b0ca33186d4e Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Thu, 12 Mar 2020 20:30:30 +1100
Subject: [PATCH 3/9] WIP: Add object storage

Add `objectstorage` package. Depends on minio Go's SDK. This SDK
allows talking to either S3 or GCP object storage, as well as
minio's server for local development/self-managed instance.
---
 .gitlab-source-config.yml                     |   2 +-
 go.mod                                        |   2 +
 go.sum                                        |  20 +++
 internal/serving/disk/helpers.go              |   2 +
 internal/source/domains.go                    |   2 -
 .../gitlabsourceconfig/gitlabsourceconfig.go  |   6 +-
 internal/source/gitlab/cache/retriever.go     |  10 +-
 internal/source/gitlab/factory.go             |  11 +-
 internal/source/gitlab/gitlab.go              |   9 +-
 internal/source/objectstorage/client.go       | 134 ++++++++++++++++++
 10 files changed, 176 insertions(+), 22 deletions(-)
 create mode 100644 internal/source/objectstorage/client.go

diff --git a/.gitlab-source-config.yml b/.gitlab-source-config.yml
index af78003bd..fdcc05180 100644
--- a/.gitlab-source-config.yml
+++ b/.gitlab-source-config.yml
@@ -1,5 +1,5 @@
 domains:
   enabled:
-    - test.jaime
+    - jaime.test
   rollout:
     percentage: 10
diff --git a/go.mod b/go.mod
index 908342efd..0db9f55b8 100644
--- a/go.mod
+++ b/go.mod
@@ -4,6 +4,7 @@ go 1.12
 
 require (
 	github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67 // indirect
+	github.com/davecgh/go-spew v1.1.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/fzipp/gocyclo v0.0.0-20150627053110-6acd4345c835
 	github.com/getsentry/raven-go v0.1.2 // indirect
@@ -15,6 +16,7 @@ require (
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/karrick/godirwalk v1.10.12
 	github.com/kr/pretty v0.1.0 // indirect
+	github.com/minio/minio-go/v6 v6.0.49
 	github.com/namsral/flag v1.7.4-pre
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/prometheus/client_golang v1.1.0
diff --git a/go.sum b/go.sum
index f78dc055f..6e2202f06 100644
--- a/go.sum
+++ b/go.sum
@@ -19,6 +19,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fzipp/gocyclo v0.0.0-20150627053110-6acd4345c835 h1:roDmqJ4Qes7hrDOsWsMCce0vQHz3xiMPjJ9m4c2eeNs=
 github.com/fzipp/gocyclo v0.0.0-20150627053110-6acd4345c835/go.mod h1:BjL/N0+C+j9uNX+1xcNuM9vdSIcXCZrQZUYbXOFbgN8=
@@ -45,6 +46,8 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg=
@@ -58,6 +61,8 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmg
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
@@ -76,6 +81,12 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lightstep/lightstep-tracer-go v0.15.6/go.mod h1:6AMpwZpsyCFwSovxzM78e+AsYxE8sGwiM6C3TytaWeI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/minio/minio-go/v6 v6.0.49 h1:bU4kIa/qChTLC1jrWZ8F+8gOiw1MClubddAJVR4gW3w=
+github.com/minio/minio-go/v6 v6.0.49/go.mod h1:qD0lajrGW49lKZLtXKtCB4X/qkMf0a5tBvN2PaZg7Gg=
+github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU=
+github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -120,6 +131,10 @@ github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -144,6 +159,7 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -155,6 +171,7 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -182,6 +199,7 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191010201905-e5ffc44a6fee h1:Cgj5oVkw7Gktu56MAiU0r1u0jyuT6jmtOzcAJwLj89c=
 golang.org/x/tools v0.0.0-20191010201905-e5ffc44a6fee/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -199,6 +217,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk=
+gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
diff --git a/internal/serving/disk/helpers.go b/internal/serving/disk/helpers.go
index 01f597673..86a6f5ec0 100644
--- a/internal/serving/disk/helpers.go
+++ b/internal/serving/disk/helpers.go
@@ -1,6 +1,7 @@
 package disk
 
 import (
+	"fmt"
 	"io"
 	"mime"
 	"net/http"
@@ -47,6 +48,7 @@ func detectContentType(path string) (string, error) {
 		contentType = http.DetectContentType(buf[:n])
 	}
 
+	fmt.Printf("disk source.... the content type: %q", contentType)
 	return contentType, nil
 }
 
diff --git a/internal/source/domains.go b/internal/source/domains.go
index 3d4f44427..37812bbc6 100644
--- a/internal/source/domains.go
+++ b/internal/source/domains.go
@@ -24,8 +24,6 @@ var (
 )
 
 func init() {
-
-	log.Info("whaaaaat")
 	// Start watching the config file for domains that will use the new `gitlab` source,
 	// to be removed once we switch completely to using it.
 	go gitlabsourceconfig.WatchForGitlabSourceConfigChange(&gitlabSourceConfig, 1*time.Minute)
diff --git a/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go b/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go
index 3a6ce2810..583fc955e 100644
--- a/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go
+++ b/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go
@@ -62,7 +62,7 @@ func WatchForGitlabSourceConfigChange(config *GitlabSourceConfig, interval time.
 	if gitlabSourceConfigFile == "" {
 		gitlabSourceConfigFile = ".gitlab-source-config.yml"
 	}
-	log.Info("WatchForGitlabSourceConfigChange: %+v", config)
+
 	for {
 		content, err := readConfig(gitlabSourceConfigFile)
 		if err != nil {
@@ -86,11 +86,7 @@ func WatchForGitlabSourceConfigChange(config *GitlabSourceConfig, interval time.
 }
 
 func readConfig(configfile string) ([]byte, error) {
-
-	wd, err := os.Getwd()
-	log.WithError(err).Infof("the current directory %s", wd)
 	content, err := ioutil.ReadFile(configfile)
-	log.WithError(err).Errorf("the config file: %s", configfile)
 	if err != nil && !os.IsNotExist(err) {
 		return nil, err
 	}
diff --git a/internal/source/gitlab/cache/retriever.go b/internal/source/gitlab/cache/retriever.go
index 6aee472db..84c40728a 100644
--- a/internal/source/gitlab/cache/retriever.go
+++ b/internal/source/gitlab/cache/retriever.go
@@ -43,9 +43,9 @@ func (r *Retriever) resolveWithBackoff(ctx context.Context, domain string) <-cha
 		for i := 1; i <= maxRetrievalRetries; i++ {
 			fmt.Printf("retrieving domain: %q from cache: %d \n", domain, i)
 
-			if domain == "test.jaime" {
+			if domain == "jaime.test" {
 				response <- api.Lookup{
-					Name:  "test.jaime",
+					Name:  "jaime.test",
 					Error: nil,
 					Domain: &api.VirtualDomain{
 						Certificate: "",
@@ -57,9 +57,9 @@ func (r *Retriever) resolveWithBackoff(ctx context.Context, domain string) <-cha
 								HTTPSOnly:     false,
 								Prefix:        "/",
 								Source: api.Source{
-									Type: "file",
-									Type:"object-storage"
-									Path: "bucket://",
+									Type: "object",
+									// type object storage TODO
+									Path: "root/blog/public/",
 								},
 							},
 						},
diff --git a/internal/source/gitlab/factory.go b/internal/source/gitlab/factory.go
index d526994f8..f19f0be98 100644
--- a/internal/source/gitlab/factory.go
+++ b/internal/source/gitlab/factory.go
@@ -9,6 +9,7 @@ import (
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/disk"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/serverless"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/api"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/source/objectstorage"
 )
 
 // fabricateLookupPath fabricates a serving LookupPath based on the API LookupPath
@@ -35,12 +36,20 @@ func fabricateServing(lookup api.LookupPath) serving.Serving {
 	case "serverless":
 		serving, err := serverless.NewFromAPISource(source.Serverless)
 		if err != nil {
-			log.WithError(err).Errorf("could not fabricate serving for project %d", lookup.ProjectID)
+			log.WithError(err).Errorf("could not fabricate serverless serving for project %d", lookup.ProjectID)
 
 			break
 		}
 
 		return serving
+	case "object":
+		// TODO make values configurable - needs omnibus update
+		objectStorage, err := objectstorage.New("gitlab.local:9000", "pages", "minio", "gdk-minio", false)
+		if err != nil {
+			log.WithError(err).Errorf("could not fabricate object serving for project %d", lookup.ProjectID)
+			break
+		}
+		return objectStorage
 	}
 
 	return defaultServing()
diff --git a/internal/source/gitlab/gitlab.go b/internal/source/gitlab/gitlab.go
index 3fd11f3c8..e072aff4b 100644
--- a/internal/source/gitlab/gitlab.go
+++ b/internal/source/gitlab/gitlab.go
@@ -3,7 +3,6 @@ package gitlab
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"path"
 	"strings"
@@ -36,7 +35,6 @@ func New(config client.Config) (*Gitlab, error) {
 // GitLab
 func (g *Gitlab) GetDomain(name string) (*domain.Domain, error) {
 	lookup := g.client.Resolve(context.Background(), name)
-	fmt.Printf("gitlab GetDomain: %q %+v %+v\n", lookup.Name, lookup.Error, lookup.Domain)
 	if lookup.Error != nil {
 		return nil, lookup.Error
 	}
@@ -54,7 +52,6 @@ func (g *Gitlab) GetDomain(name string) (*domain.Domain, error) {
 		CertificateKey:  lookup.Domain.Key,
 		Resolver:        g,
 	}
-	fmt.Printf("did we find the domain? %+v\n", domain)
 	return &domain, nil
 }
 
@@ -64,19 +61,15 @@ func (g *Gitlab) GetDomain(name string) (*domain.Domain, error) {
 func (g *Gitlab) Resolve(r *http.Request) (*serving.Request, error) {
 	host := request.GetHostWithoutPort(r)
 
-	fmt.Printf("gitlab.Resolve 1\n")
 	response := g.client.Resolve(r.Context(), host)
 	if response.Error != nil {
-		fmt.Printf("gitlab.Resolve 2\n")
-
 		return &serving.Request{Serving: defaultServing()}, response.Error
 	}
 
 	urlPath := path.Clean(r.URL.Path)
 	size := len(response.Domain.LookupPaths)
 
-	for k, lookup := range response.Domain.LookupPaths {
-		fmt.Printf("gitlab.Resolve 3... %d-%+v\n", k, lookup)
+	for _, lookup := range response.Domain.LookupPaths {
 
 		isSubPath := strings.HasPrefix(urlPath, lookup.Prefix)
 		isRootPath := urlPath == path.Clean(lookup.Prefix)
diff --git a/internal/source/objectstorage/client.go b/internal/source/objectstorage/client.go
new file mode 100644
index 000000000..685d19d19
--- /dev/null
+++ b/internal/source/objectstorage/client.go
@@ -0,0 +1,134 @@
+package objectstorage
+
+import (
+	"errors"
+	"fmt"
+	"mime"
+	"net/http"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/minio/minio-go/v6"
+	log "github.com/sirupsen/logrus"
+
+	"gitlab.com/gitlab-org/gitlab-pages/internal/httperrors"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
+)
+
+// ErrKeyNotFound TODO update doc
+var ErrKeyNotFound = errors.New("key not found")
+
+type Client struct {
+	bucket string
+	minio  *minio.Client
+}
+
+func New(endpoint, bucket, accessKeyID, secretAccessKey string, useSSL bool) (*Client, error) {
+	minioClient, err := minio.New(endpoint, accessKeyID, secretAccessKey, useSSL)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create minio client: %w", err)
+	}
+	return &Client{
+		bucket: bucket,
+		minio:  minioClient,
+	}, nil
+}
+
+// func (c *Client) ListBucketsAndObjects() {
+// 	buckets, err := c.minio.ListBuckets()
+// 	if err != nil {
+// 		fmt.Println(err)
+// 		return
+// 	}
+// 	doneCh := make(chan struct{})
+// 	defer close(doneCh)
+//
+// 	for k, bucket := range buckets {
+// 		fmt.Printf("%d - %+v\n\n", k+1, bucket)
+// 		if bucket.Name == "pages" {
+// 			for obj := range c.minio.ListObjectsV2WithMetadata(bucket.Name, "root/blog/public/", true, doneCh) {
+// 				fmt.Printf("found a keeeeey: %q", obj.Key)
+// 			}
+// 		}
+// 	}
+// }
+func (c *Client) GetObject(path string) (*minio.Object, *minio.ObjectInfo, error) {
+	// TODO c.minio.GetObjectWithContext fails locally for some reason
+	obj, err := c.minio.GetObject(c.bucket, path, minio.GetObjectOptions{})
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to get object: %w", err)
+	}
+	stat, err := obj.Stat()
+	if err != nil {
+		if e, ok := err.(minio.ErrorResponse); ok && e.Code == "NoSuchKey" {
+			return nil, nil, ErrKeyNotFound
+		}
+		return nil, nil, fmt.Errorf("failed to stat object: %w", err)
+	}
+	return obj, &stat, nil
+}
+
+func (c *Client) ServeFileHTTP(handler serving.Handler) bool {
+	// TODO validate different paths like disk/Reader.tryFile
+	fullPath := strings.TrimSuffix(handler.LookupPath.Path, "/") + "/"
+	pathWithoutExt := fullPath
+
+	if handler.SubPath != "" {
+		fullPath += handler.SubPath
+	}
+
+	if endsWithSlash(fullPath) {
+		fullPath += "index.html"
+	}
+
+	w := handler.Writer
+	content, stat, err := c.tryZipFileFirst(pathWithoutExt + "doesnotexist.zip")
+	if err != nil {
+		log.WithError(err).Error("can't get zip file?")
+		return false
+	}
+
+	fmt.Printf("we are trying to serve: %q\n", fullPath)
+	if content == nil {
+		// didn't find zip, try full path
+		content, stat, err = c.GetObject(fullPath)
+		if err != nil {
+			log.WithError(err).Error("failed to get object")
+			return false
+		}
+	}
+	defer content.Close()
+
+	if !handler.LookupPath.HasAccessControl {
+		// Set caching headers
+		w.Header().Set("Cache-Control", "max-age=600")
+		w.Header().Set("Expires", time.Now().Add(10*time.Minute).Format(time.RFC1123))
+	}
+	contentType := mime.TypeByExtension(filepath.Ext(stat.Key))
+	fmt.Printf("from object storage: filext  %q vs object stat: %q\n", contentType, stat.ContentType)
+	w.Header().Set("Content-Type", contentType)
+
+	fmt.Printf("were about to serve: %q\n%q\n", stat.Key, stat.ContentType)
+	// TODO get time object was modified?
+	http.ServeContent(w, handler.Request, fullPath, stat.LastModified, content)
+
+	return true
+}
+
+func (c *Client) ServeNotFoundHTTP(handler serving.Handler) {
+	httperrors.Serve404(handler.Writer)
+}
+
+func endsWithSlash(path string) bool {
+	return strings.HasSuffix(path, "/")
+}
+
+func (c *Client) tryZipFileFirst(path string) (*minio.Object, *minio.ObjectInfo, error) {
+	obj, stat, err := c.GetObject(path)
+	if err != nil && err == ErrKeyNotFound {
+		// could not find zip file
+		return nil, nil, nil
+	}
+	return obj, stat, err
+}
-- 
GitLab


From efe34227344aea770887505c09018387f627fedc Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Mon, 16 Mar 2020 18:05:25 +1100
Subject: [PATCH 4/9] Add zip package

Based on !136. Simpler version of a zip reader that can find files
inside the archive. Adds a simple cache per reader.
Fallsback to reading from object storage directly if artifact
is not found.
---
 .../serving/objectstorage/objectstorage.go    | 166 ++++++++++++++++++
 internal/source/domains.go                    |   2 -
 internal/source/gitlab/cache/entry.go         |   3 +-
 internal/source/gitlab/cache/retriever.go     |   7 +-
 internal/source/gitlab/factory.go             |   9 -
 internal/source/gitlab/gitlab.go              |  18 +-
 internal/source/objectstorage/client.go       | 134 --------------
 internal/zip/zipreader.go                     | 126 +++++++++++++
 8 files changed, 310 insertions(+), 155 deletions(-)
 create mode 100644 internal/serving/objectstorage/objectstorage.go
 delete mode 100644 internal/source/objectstorage/client.go
 create mode 100644 internal/zip/zipreader.go

diff --git a/internal/serving/objectstorage/objectstorage.go b/internal/serving/objectstorage/objectstorage.go
new file mode 100644
index 000000000..f36334c20
--- /dev/null
+++ b/internal/serving/objectstorage/objectstorage.go
@@ -0,0 +1,166 @@
+package objectstorage
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"mime"
+	"net/http"
+	"path/filepath"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/minio/minio-go/v6"
+	log "github.com/sirupsen/logrus"
+
+	"gitlab.com/gitlab-org/gitlab-pages/internal/httperrors"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/zip"
+)
+
+// ErrKeyNotFound TODO update doc
+var ErrKeyNotFound = errors.New("key not found")
+
+type Client struct {
+	bucket string
+	minio  *minio.Client
+
+	// TODO: cache zip files by projectID for now, will need to expire/cleanup
+	cacheMux      sync.Mutex
+	cachedReaders map[uint64]*zip.Reader
+}
+
+func New(endpoint, bucket, accessKeyID, secretAccessKey string, useSSL bool) (*Client, error) {
+	minioClient, err := minio.New(endpoint, accessKeyID, secretAccessKey, useSSL)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create minio client: %w", err)
+	}
+	return &Client{
+		bucket:        bucket,
+		minio:         minioClient,
+		cacheMux:      sync.Mutex{},
+		cachedReaders: map[uint64]*zip.Reader{},
+	}, nil
+}
+
+func (c *Client) GetObject(path string) (*minio.Object, *minio.ObjectInfo, error) {
+	// TODO c.minio.GetObjectWithContext fails locally for some reason
+	obj, err := c.minio.GetObject(c.bucket, path, minio.GetObjectOptions{})
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to get object: %w", err)
+	}
+	stat, err := obj.Stat()
+	if err != nil {
+		if e, ok := err.(minio.ErrorResponse); ok && e.Code == "NoSuchKey" {
+			return nil, nil, ErrKeyNotFound
+		}
+		return nil, nil, fmt.Errorf("failed to stat object: %w", err)
+	}
+	return obj, &stat, nil
+}
+
+func (c *Client) ServeFileHTTP(handler serving.Handler) bool {
+	served, err := c.tryZipFile(handler)
+	if err != nil {
+		log.WithError(err).Error("file not found in archive")
+		return false
+	}
+
+	if !served {
+		if err := c.serveFile(handler); err != nil {
+			log.WithError(err).Error("can't serve file")
+			return false
+		}
+	}
+
+	return true
+}
+
+func (c *Client) ServeNotFoundHTTP(handler serving.Handler) {
+	httperrors.Serve404(handler.Writer)
+}
+
+func endsWithSlash(path string) bool {
+	return strings.HasSuffix(path, "/")
+}
+
+func (c *Client) serveFile(handler serving.Handler) error {
+	// TODO validate different paths like disk/Reader.tryFile
+	fileName := strings.TrimSuffix(handler.LookupPath.Path, "/") + "/"
+	if handler.SubPath != "" {
+		fileName += handler.SubPath
+	}
+
+	if endsWithSlash(fileName) {
+		fileName += "index.html"
+	}
+	content, stat, err := c.GetObject(fileName)
+	if err != nil {
+		return err
+	}
+	return writeContent(handler, content, stat.Key, stat.LastModified, false)
+}
+
+func (c *Client) tryZipFile(handler serving.Handler) (bool, error) {
+	projectID := handler.LookupPath.ProjectID
+	c.cacheMux.Lock()
+	reader, ok := c.cachedReaders[projectID]
+	c.cacheMux.Unlock()
+	if !ok {
+		// TODO assume the API returns the base path of the project and we'll look for artifact.zip
+		obj, objStat, err := c.GetObject(handler.LookupPath.Path + "artifact.zip")
+		if err != nil {
+			if err == ErrKeyNotFound {
+				// could not find zip file
+				return false, nil
+			}
+			return false, fmt.Errorf("failed to get object: %w", err)
+		}
+		// override reader
+		reader, err = zip.New(obj, objStat.Size)
+		if err != nil {
+			return false, fmt.Errorf("failed create zip.Reader: %w", err)
+		}
+		c.cacheMux.Lock()
+		c.cachedReaders[projectID] = reader
+		c.cacheMux.Unlock()
+	}
+
+	filename := "index.html"
+	if handler.SubPath != "" {
+		filename = handler.SubPath
+	}
+
+	file, stat, err := reader.Open(filename)
+	if err != nil {
+		return false, fmt.Errorf("failed to open file: %w", err)
+	}
+	defer file.Close()
+
+	err = writeContent(handler, file, stat.Name(), stat.ModTime(), true)
+	return err == nil, err
+}
+
+func writeContent(handler serving.Handler, content interface{}, fileName string, modTime time.Time, fromZip bool) error {
+	w := handler.Writer
+	if !handler.LookupPath.HasAccessControl {
+		// Set caching headers
+		w.Header().Set("Cache-Control", "max-age=600")
+		w.Header().Set("Expires", time.Now().Add(10*time.Minute).Format(time.RFC1123))
+	}
+	contentType := mime.TypeByExtension(filepath.Ext(fileName))
+	w.Header().Set("Content-Type", contentType)
+
+	// TODO implement Seek(offset int64, whence int) (int64, error) so that we can use http.ServeContent?
+	var err error
+	if fromZip {
+		_, err = io.Copy(w, content.(io.Reader))
+		if err != nil {
+			return fmt.Errorf("failed to write response: %w", err)
+		}
+	} else {
+		http.ServeContent(w, handler.Request, fileName, modTime, content.(io.ReadSeeker))
+	}
+	return nil
+}
diff --git a/internal/source/domains.go b/internal/source/domains.go
index 37812bbc6..11794b915 100644
--- a/internal/source/domains.go
+++ b/internal/source/domains.go
@@ -82,9 +82,7 @@ func (d *Domains) IsReady() bool {
 }
 
 func (d *Domains) source(domain string) Source {
-	log.Infof("the domain: %s and domains... %+v", domain, d)
 	if d.gitlab == nil {
-		log.Info("seems lik d.gitlab is nil...")
 		return d.disk
 	}
 
diff --git a/internal/source/gitlab/cache/entry.go b/internal/source/gitlab/cache/entry.go
index bcd3c807b..d91bb3314 100644
--- a/internal/source/gitlab/cache/entry.go
+++ b/internal/source/gitlab/cache/entry.go
@@ -3,7 +3,6 @@ package cache
 import (
 	"context"
 	"errors"
-	"fmt"
 	"sync"
 	"time"
 
@@ -70,7 +69,7 @@ func (e *Entry) Retrieve(ctx context.Context, client api.Client) (lookup *api.Lo
 	case <-e.retrieved:
 		lookup = e.Lookup()
 	}
-	fmt.Printf("found the lookup... %+v\n", lookup)
+
 	return lookup
 }
 
diff --git a/internal/source/gitlab/cache/retriever.go b/internal/source/gitlab/cache/retriever.go
index 84c40728a..be1e5699e 100644
--- a/internal/source/gitlab/cache/retriever.go
+++ b/internal/source/gitlab/cache/retriever.go
@@ -3,7 +3,6 @@ package cache
 import (
 	"context"
 	"errors"
-	"fmt"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -41,8 +40,6 @@ func (r *Retriever) resolveWithBackoff(ctx context.Context, domain string) <-cha
 		var lookup api.Lookup
 
 		for i := 1; i <= maxRetrievalRetries; i++ {
-			fmt.Printf("retrieving domain: %q from cache: %d \n", domain, i)
-
 			if domain == "jaime.test" {
 				response <- api.Lookup{
 					Name:  "jaime.test",
@@ -57,8 +54,8 @@ func (r *Retriever) resolveWithBackoff(ctx context.Context, domain string) <-cha
 								HTTPSOnly:     false,
 								Prefix:        "/",
 								Source: api.Source{
-									Type: "object",
-									// type object storage TODO
+									// TODO this needs to come from Rails cc @vshushlin @krasio
+									Type: "object_storage",
 									Path: "root/blog/public/",
 								},
 							},
diff --git a/internal/source/gitlab/factory.go b/internal/source/gitlab/factory.go
index f19f0be98..a20e9e7b6 100644
--- a/internal/source/gitlab/factory.go
+++ b/internal/source/gitlab/factory.go
@@ -9,7 +9,6 @@ import (
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/disk"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/serverless"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/api"
-	"gitlab.com/gitlab-org/gitlab-pages/internal/source/objectstorage"
 )
 
 // fabricateLookupPath fabricates a serving LookupPath based on the API LookupPath
@@ -42,14 +41,6 @@ func fabricateServing(lookup api.LookupPath) serving.Serving {
 		}
 
 		return serving
-	case "object":
-		// TODO make values configurable - needs omnibus update
-		objectStorage, err := objectstorage.New("gitlab.local:9000", "pages", "minio", "gdk-minio", false)
-		if err != nil {
-			log.WithError(err).Errorf("could not fabricate object serving for project %d", lookup.ProjectID)
-			break
-		}
-		return objectStorage
 	}
 
 	return defaultServing()
diff --git a/internal/source/gitlab/gitlab.go b/internal/source/gitlab/gitlab.go
index e072aff4b..1db5cd474 100644
--- a/internal/source/gitlab/gitlab.go
+++ b/internal/source/gitlab/gitlab.go
@@ -3,6 +3,7 @@ package gitlab
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 	"path"
 	"strings"
@@ -10,6 +11,7 @@ import (
 	"gitlab.com/gitlab-org/gitlab-pages/internal/domain"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/request"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/objectstorage"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/api"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/cache"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/client"
@@ -18,7 +20,8 @@ import (
 // Gitlab source represent a new domains configuration source. We fetch all the
 // information about domains from GitLab instance.
 type Gitlab struct {
-	client api.Resolver
+	client        api.Resolver
+	objectStorage *objectstorage.Client
 }
 
 // New returns a new instance of gitlab domain source.
@@ -28,7 +31,12 @@ func New(config client.Config) (*Gitlab, error) {
 		return nil, err
 	}
 
-	return &Gitlab{client: cache.NewCache(client)}, nil
+	// TODO make values configurable - needs omnibus update
+	objectStorage, err := objectstorage.New("gitlab.local:9000", "pages", "minio", "gdk-minio", false)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create object storage client: %w", err)
+	}
+	return &Gitlab{client: cache.NewCache(client), objectStorage: objectStorage}, nil
 }
 
 // GetDomain return a representation of a domain that we have fetched from
@@ -79,9 +87,13 @@ func (g *Gitlab) Resolve(r *http.Request) (*serving.Request, error) {
 			if isSubPath {
 				subPath = strings.TrimPrefix(urlPath, lookup.Prefix)
 			}
+			s := fabricateServing(lookup)
+			if lookup.Source.Type == "object_storage" {
+				s = g.objectStorage
+			}
 
 			return &serving.Request{
-				Serving:    fabricateServing(lookup),
+				Serving:    s,
 				LookupPath: fabricateLookupPath(size, lookup),
 				SubPath:    subPath}, nil
 		}
diff --git a/internal/source/objectstorage/client.go b/internal/source/objectstorage/client.go
deleted file mode 100644
index 685d19d19..000000000
--- a/internal/source/objectstorage/client.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package objectstorage
-
-import (
-	"errors"
-	"fmt"
-	"mime"
-	"net/http"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/minio/minio-go/v6"
-	log "github.com/sirupsen/logrus"
-
-	"gitlab.com/gitlab-org/gitlab-pages/internal/httperrors"
-	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
-)
-
-// ErrKeyNotFound TODO update doc
-var ErrKeyNotFound = errors.New("key not found")
-
-type Client struct {
-	bucket string
-	minio  *minio.Client
-}
-
-func New(endpoint, bucket, accessKeyID, secretAccessKey string, useSSL bool) (*Client, error) {
-	minioClient, err := minio.New(endpoint, accessKeyID, secretAccessKey, useSSL)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create minio client: %w", err)
-	}
-	return &Client{
-		bucket: bucket,
-		minio:  minioClient,
-	}, nil
-}
-
-// func (c *Client) ListBucketsAndObjects() {
-// 	buckets, err := c.minio.ListBuckets()
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		return
-// 	}
-// 	doneCh := make(chan struct{})
-// 	defer close(doneCh)
-//
-// 	for k, bucket := range buckets {
-// 		fmt.Printf("%d - %+v\n\n", k+1, bucket)
-// 		if bucket.Name == "pages" {
-// 			for obj := range c.minio.ListObjectsV2WithMetadata(bucket.Name, "root/blog/public/", true, doneCh) {
-// 				fmt.Printf("found a keeeeey: %q", obj.Key)
-// 			}
-// 		}
-// 	}
-// }
-func (c *Client) GetObject(path string) (*minio.Object, *minio.ObjectInfo, error) {
-	// TODO c.minio.GetObjectWithContext fails locally for some reason
-	obj, err := c.minio.GetObject(c.bucket, path, minio.GetObjectOptions{})
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to get object: %w", err)
-	}
-	stat, err := obj.Stat()
-	if err != nil {
-		if e, ok := err.(minio.ErrorResponse); ok && e.Code == "NoSuchKey" {
-			return nil, nil, ErrKeyNotFound
-		}
-		return nil, nil, fmt.Errorf("failed to stat object: %w", err)
-	}
-	return obj, &stat, nil
-}
-
-func (c *Client) ServeFileHTTP(handler serving.Handler) bool {
-	// TODO validate different paths like disk/Reader.tryFile
-	fullPath := strings.TrimSuffix(handler.LookupPath.Path, "/") + "/"
-	pathWithoutExt := fullPath
-
-	if handler.SubPath != "" {
-		fullPath += handler.SubPath
-	}
-
-	if endsWithSlash(fullPath) {
-		fullPath += "index.html"
-	}
-
-	w := handler.Writer
-	content, stat, err := c.tryZipFileFirst(pathWithoutExt + "doesnotexist.zip")
-	if err != nil {
-		log.WithError(err).Error("can't get zip file?")
-		return false
-	}
-
-	fmt.Printf("we are trying to serve: %q\n", fullPath)
-	if content == nil {
-		// didn't find zip, try full path
-		content, stat, err = c.GetObject(fullPath)
-		if err != nil {
-			log.WithError(err).Error("failed to get object")
-			return false
-		}
-	}
-	defer content.Close()
-
-	if !handler.LookupPath.HasAccessControl {
-		// Set caching headers
-		w.Header().Set("Cache-Control", "max-age=600")
-		w.Header().Set("Expires", time.Now().Add(10*time.Minute).Format(time.RFC1123))
-	}
-	contentType := mime.TypeByExtension(filepath.Ext(stat.Key))
-	fmt.Printf("from object storage: filext  %q vs object stat: %q\n", contentType, stat.ContentType)
-	w.Header().Set("Content-Type", contentType)
-
-	fmt.Printf("were about to serve: %q\n%q\n", stat.Key, stat.ContentType)
-	// TODO get time object was modified?
-	http.ServeContent(w, handler.Request, fullPath, stat.LastModified, content)
-
-	return true
-}
-
-func (c *Client) ServeNotFoundHTTP(handler serving.Handler) {
-	httperrors.Serve404(handler.Writer)
-}
-
-func endsWithSlash(path string) bool {
-	return strings.HasSuffix(path, "/")
-}
-
-func (c *Client) tryZipFileFirst(path string) (*minio.Object, *minio.ObjectInfo, error) {
-	obj, stat, err := c.GetObject(path)
-	if err != nil && err == ErrKeyNotFound {
-		// could not find zip file
-		return nil, nil, nil
-	}
-	return obj, stat, err
-}
diff --git a/internal/zip/zipreader.go b/internal/zip/zipreader.go
new file mode 100644
index 000000000..03528cc27
--- /dev/null
+++ b/internal/zip/zipreader.go
@@ -0,0 +1,126 @@
+package zip
+
+import (
+	"archive/zip"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+const zipDeployPath = "public"
+const maxSymlinkSize = 4096
+const maxSymlinkDepth = 3
+
+type Reader struct {
+	archive *zip.Reader
+}
+
+// New creates a new zip Reader. A reader can find a file inside an archive
+// with a depth < `maxSymlinkDepth`
+func New(readerAt io.ReaderAt, size int64) (*Reader, error) {
+	archive, err := zip.NewReader(readerAt, size)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Reader{archive: archive}, nil
+}
+
+func (r *Reader) find(path string) *zip.File {
+	// This is O(n) search, very, very, very slow
+	for _, file := range r.archive.File {
+		if file.Name == path || file.Name == path+"/" {
+			return file
+		}
+	}
+
+	return nil
+}
+
+func (r *Reader) readSymlink(file *zip.File) (string, error) {
+	fi := file.FileInfo()
+
+	if (fi.Mode() & os.ModeSymlink) != os.ModeSymlink {
+		return "", nil
+	}
+
+	if fi.Size() > maxSymlinkSize {
+		return "", errors.New("symlink size too long")
+	}
+
+	rc, err := file.Open()
+	if err != nil {
+		return "", err
+	}
+	defer rc.Close()
+
+	data, err := ioutil.ReadAll(rc)
+	if err != nil {
+		return "", err
+	}
+
+	// resolve symlink location relative to current file
+	targetPath, err := filepath.Rel(filepath.Dir(file.Name), string(data))
+	if err != nil {
+		return "", err
+	}
+
+	return targetPath, nil
+}
+
+func (r *Reader) resolveUnchecked(path string) (*zip.File, error) {
+	// limit the resolve depth of symlink
+	for depth := 0; depth < maxSymlinkDepth; depth++ {
+		file := r.find(path)
+		if file == nil {
+			break
+		}
+
+		targetPath, err := r.readSymlink(file)
+		if err != nil {
+			return nil, err
+		}
+
+		// not a symlink
+		if targetPath == "" {
+			return file, nil
+		}
+
+		path = targetPath
+	}
+
+	return nil, fmt.Errorf("%q: not found", path)
+}
+
+func (r *Reader) resolvePublic(path string) (string, *zip.File, error) {
+	path = filepath.Join(zipDeployPath, path)
+	file, err := r.resolveUnchecked(path)
+	if err != nil {
+		return "", nil, err
+	}
+
+	if !strings.HasPrefix(file.Name, zipDeployPath+"/") {
+		return "", nil, fmt.Errorf("%q: is not in %s/", file.Name, zipDeployPath)
+	}
+
+	return file.Name[len(zipDeployPath)+1:], file, nil
+}
+
+// Open reaturns a ReadCloser to the caller which is responsible of closing. os.FileInfo is also returned in one go.
+func (r *Reader) Open(path string) (io.ReadCloser, os.FileInfo, error) {
+	_, file, err := r.resolvePublic(path)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	rc, err := file.Open()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return rc, file.FileInfo(), nil
+}
-- 
GitLab


From 28e23307c9ab68c286c6df8ccc1e16982af68d32 Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Mon, 16 Mar 2020 18:14:36 +1100
Subject: [PATCH 5/9] Try to find file in object storage rather than archive

---
 internal/serving/objectstorage/objectstorage.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/internal/serving/objectstorage/objectstorage.go b/internal/serving/objectstorage/objectstorage.go
index f36334c20..4708fb149 100644
--- a/internal/serving/objectstorage/objectstorage.go
+++ b/internal/serving/objectstorage/objectstorage.go
@@ -127,13 +127,16 @@ func (c *Client) tryZipFile(handler serving.Handler) (bool, error) {
 		c.cacheMux.Unlock()
 	}
 
-	filename := "index.html"
-	if handler.SubPath != "" {
-		filename = handler.SubPath
+	filename := handler.SubPath
+	if filename == "" {
+		filename = "index.html"
 	}
 
 	file, stat, err := reader.Open(filename)
 	if err != nil {
+		if strings.Contains(err.Error(), "not found") {
+			return false, nil
+		}
 		return false, fmt.Errorf("failed to open file: %w", err)
 	}
 	defer file.Close()
-- 
GitLab


From c20bd994c6383d3a2753cc1aef92da6a0c811255 Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Mon, 16 Mar 2020 18:19:10 +1100
Subject: [PATCH 6/9] Clean debug lines and formatting

---
 internal/source/disk/disk.go            | 3 ---
 internal/source/gitlab/client/client.go | 7 +------
 internal/source/gitlab/gitlab.go        | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/internal/source/disk/disk.go b/internal/source/disk/disk.go
index cb07547e8..b79d222de 100644
--- a/internal/source/disk/disk.go
+++ b/internal/source/disk/disk.go
@@ -5,8 +5,6 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/sirupsen/logrus"
-
 	"gitlab.com/gitlab-org/gitlab-pages/internal/domain"
 )
 
@@ -35,7 +33,6 @@ func (d *Disk) GetDomain(host string) (*domain.Domain, error) {
 
 	domain, _ := d.dm[host]
 
-	log.Info("Found a domain? for host:%s domain: %+v", host, domain)
 	return domain, nil
 }
 
diff --git a/internal/source/gitlab/client/client.go b/internal/source/gitlab/client/client.go
index 9d5fd8610..afe9da6f8 100644
--- a/internal/source/gitlab/client/client.go
+++ b/internal/source/gitlab/client/client.go
@@ -8,7 +8,6 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
-	"net/http/httputil"
 	"net/url"
 	"time"
 
@@ -77,7 +76,6 @@ func (gc *Client) GetLookup(ctx context.Context, host string) api.Lookup {
 	params := url.Values{}
 	params.Set("host", host)
 
-	fmt.Printf("\n\nclient.GetLookup 1 \n")
 	resp, err := gc.get(ctx, "/api/v4/internal/pages", params)
 	if err != nil {
 		return api.Lookup{Name: host, Error: err}
@@ -103,14 +101,11 @@ func (gc *Client) get(ctx context.Context, path string, params url.Values) (*htt
 	if err != nil {
 		return nil, err
 	}
-	dreq, err := httputil.DumpRequestOut(req, true)
-	fmt.Printf("the request out: %q\nerr:%+v", dreq, err)
+
 	resp, err := gc.httpClient.Do(req)
 	if err != nil {
 		return nil, err
 	}
-	dres, err := httputil.DumpResponse(resp, true)
-	fmt.Printf("the response %q\nerr:%+v", dres, err)
 
 	if resp == nil {
 		return nil, errors.New("unknown response")
diff --git a/internal/source/gitlab/gitlab.go b/internal/source/gitlab/gitlab.go
index 1db5cd474..cac7b9bcf 100644
--- a/internal/source/gitlab/gitlab.go
+++ b/internal/source/gitlab/gitlab.go
@@ -78,7 +78,6 @@ func (g *Gitlab) Resolve(r *http.Request) (*serving.Request, error) {
 	size := len(response.Domain.LookupPaths)
 
 	for _, lookup := range response.Domain.LookupPaths {
-
 		isSubPath := strings.HasPrefix(urlPath, lookup.Prefix)
 		isRootPath := urlPath == path.Clean(lookup.Prefix)
 
-- 
GitLab


From 6fd91585aad7930ea3df4e56ccbee2bab6917999 Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Wed, 18 Mar 2020 15:12:51 +1100
Subject: [PATCH 7/9] Add Google Cloud Storage support

Update objectstorage package to define object handling interfaces.
Move code specific to minio implementation into its own package.
Add gcs package.
---
 go.mod                                        |  21 +-
 go.sum                                        | 276 +++++++++++++++++-
 internal/serving/objectstorage/gcs/gcs.go     | 103 +++++++
 internal/serving/objectstorage/minio/minio.go |  83 ++++++
 .../serving/objectstorage/objectstorage.go    | 108 ++++---
 internal/source/domains.go                    |   4 +-
 .../gitlabsourceconfig/gitlabsourceconfig.go  |   1 -
 internal/source/gitlab/gitlab.go              |  30 +-
 8 files changed, 554 insertions(+), 72 deletions(-)
 create mode 100644 internal/serving/objectstorage/gcs/gcs.go
 create mode 100644 internal/serving/objectstorage/minio/minio.go

diff --git a/go.mod b/go.mod
index 0db9f55b8..ae9357560 100644
--- a/go.mod
+++ b/go.mod
@@ -3,19 +3,20 @@ module gitlab.com/gitlab-org/gitlab-pages
 go 1.12
 
 require (
+	cloud.google.com/go v0.54.0 // indirect
+	cloud.google.com/go/storage v1.6.0
 	github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67 // indirect
-	github.com/davecgh/go-spew v1.1.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/fzipp/gocyclo v0.0.0-20150627053110-6acd4345c835
 	github.com/getsentry/raven-go v0.1.2 // indirect
-	github.com/golang/mock v1.3.1
+	github.com/golang/mock v1.4.1
+	github.com/golang/protobuf v1.3.5 // indirect
 	github.com/gorilla/context v1.1.1
 	github.com/gorilla/handlers v1.4.2
 	github.com/gorilla/securecookie v1.1.1
 	github.com/gorilla/sessions v1.2.0
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/karrick/godirwalk v1.10.12
-	github.com/kr/pretty v0.1.0 // indirect
 	github.com/minio/minio-go/v6 v6.0.49
 	github.com/namsral/flag v1.7.4-pre
 	github.com/patrickmn/go-cache v2.1.0+incompatible
@@ -27,11 +28,13 @@ require (
 	github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
 	gitlab.com/gitlab-org/labkit v0.0.0-20190902063225-3253d7975ca7
 	gitlab.com/lupine/go-mimedb v0.0.0-20180307000149-e8af1d659877
-	golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7
-	golang.org/x/lint v0.0.0-20190930215403-16217165b5de
-	golang.org/x/net v0.0.0-20190909003024-a7b16738d86b
-	golang.org/x/sys v0.0.0-20190910064555-bbd175535a8b
-	golang.org/x/tools v0.0.0-20191010201905-e5ffc44a6fee
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b
+	golang.org/x/net v0.0.0-20200301022130-244492dfa37a
+	golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0
+	golang.org/x/tools v0.0.0-20200317031654-fbeba2149c82
+	google.golang.org/api v0.20.0
+	google.golang.org/genproto v0.0.0-20200316142031-303a05041dad // indirect
+	google.golang.org/grpc v1.28.0 // indirect
 	gopkg.in/yaml.v2 v2.2.2
 )
diff --git a/go.sum b/go.sum
index 6e2202f06..40f9c955b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,18 +1,56 @@
 cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0 h1:MZQCQQaRwOrAcuKjiHWHrgKykt4fZyuwF2dtiG3fGW8=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0 h1:3ithwDMr7/3vpAMXiH+ZQnYbuIsh+OPhUPMFC9enmn0=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0 h1:xE3CPsOgttP4ACBePh79zTKALtXwn/Edhcr16R5hMWU=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0 h1:Lpy6hKgdcl7a3WGSfJIFmxmcdjSpP6OmBEfcOv1Y680=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0 h1:UDpwYIwla4jHGzZJaEJYx1tOejbgSoNqsAfHAUYe2r8=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/certifi/gocertifi v0.0.0-20180905225744-ee1a9a0726d2/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4=
 github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67 h1:8k9FLYBLKT+9v2HQJ/a95ZemmTx+/ltJcAiRhVushG8=
 github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/client9/reopen v1.0.0 h1:8tpLVR74DLpLObrn2KvsyxJY++2iORGR17WLUdSzUws=
 github.com/client9/reopen v1.0.0/go.mod h1:caXVCEr+lUtoN1FlsRiOWdfQtdRHIYfcb0ai8qKWtkQ=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -20,6 +58,10 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fzipp/gocyclo v0.0.0-20150627053110-6acd4345c835 h1:roDmqJ4Qes7hrDOsWsMCce0vQHz3xiMPjJ9m4c2eeNs=
 github.com/fzipp/gocyclo v0.0.0-20150627053110-6acd4345c835/go.mod h1:BjL/N0+C+j9uNX+1xcNuM9vdSIcXCZrQZUYbXOFbgN8=
@@ -27,6 +69,9 @@ github.com/getsentry/raven-go v0.1.0 h1:lc5jnN9D+q3panDpihwShgaOVvP6esoMEKbID2yh
 github.com/getsentry/raven-go v0.1.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
 github.com/getsentry/raven-go v0.1.2 h1:4V0z512S5mZXiBvmW2RbuZBSIY1sEdMNsPjpx2zwtSE=
 github.com/getsentry/raven-go v0.1.2/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
@@ -35,17 +80,47 @@ github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1 h1:ocYkMQY5RrXTYgXl7ICpV0IXwlEQGwKIsery4gyXa1U=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
@@ -58,9 +133,15 @@ github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYb
 github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 h1:Iju5GlWwrvL6UBg4zJJt3btmonfrMlCDdsejg4CZE7c=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
@@ -113,6 +194,8 @@ github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQ
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo=
@@ -122,6 +205,7 @@ github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNG
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE=
 github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/sebest/xff v0.0.0-20160910043805-6c115e0ffa35 h1:eajwn6K3weW5cd1ZXLu2sJ4pvwlBiCWY4uDejOr73gM=
@@ -151,71 +235,237 @@ github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMW
 github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad h1:W0LEBv82YCGEtcmPA3uNZBI33/qF//HAAs3MawDjRa0=
 github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod h1:Hy8o65+MXnS6EwGElrSRjUzQDLXreJlzYLlWiHtt8hM=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 gitlab.com/gitlab-org/labkit v0.0.0-20190902063225-3253d7975ca7 h1:SjRvqPKdE28stndKtjq2uxqWuxd66LHVlgNo3Bee6J0=
 gitlab.com/gitlab-org/labkit v0.0.0-20190902063225-3253d7975ca7/go.mod h1:sbAEvWjYMLbm6k0ZY3wS6anrwVCPslOv0CvfLmIbFZU=
 gitlab.com/lupine/go-mimedb v0.0.0-20180307000149-e8af1d659877 h1:k5N2m0IPaMuwWmFTO9fyTK4IEnSm35GC/p1S7VRgUyM=
 gitlab.com/lupine/go-mimedb v0.0.0-20180307000149-e8af1d659877/go.mod h1:Es0wDVbtgNqhpEXMb+yct6JKnGMrNsUSh9oio0bqqdU=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367 h1:0IiAsCRByjO2QjX7ZPkw5oU9x+n1YqRL802rjC0c3Aw=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190909003024-a7b16738d86b h1:XfVGCX+0T4WOStkaOsJRllbsiImhB2jgVBGc9L0lPGc=
-golang.org/x/net v0.0.0-20190909003024-a7b16738d86b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0 h1:MsuvTghUPjX762sGLnGsxC3HM0B5r83wEtYcYR8/vRs=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190306220723-b294cbcfc56d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 h1:4y9KwBHBgBNwDbtu44R5o1fdOCQUEXhbk/P4A9WmJq0=
 golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190910064555-bbd175535a8b h1:3S2h5FadpNr0zUUCVZjlKIEYF+KaX/OBplTGo89CYHI=
-golang.org/x/sys v0.0.0-20190910064555-bbd175535a8b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0 h1:4Khi5GeNOkZS5DqSBRn4Sy7BE6GuxwOqARPqfurkdNk=
+golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191010201905-e5ffc44a6fee h1:Cgj5oVkw7Gktu56MAiU0r1u0jyuT6jmtOzcAJwLj89c=
-golang.org/x/tools v0.0.0-20191010201905-e5ffc44a6fee/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2 h1:L/G4KZvrQn7FWLN/LlulBtBzrLUhqjiGfTWWDmrh+IQ=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200317031654-fbeba2149c82 h1:EAK38BPVZz5cyBjz9wJDm/ZnlJXkMPjU35S3ueV3mfQ=
+golang.org/x/tools v0.0.0-20200317031654-fbeba2149c82/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0 h1:TgDr+1inK2XVUKZx3BYAqQg/GwucGdBkzZjWaTg/I+A=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0 h1:jz2KixHX7EcCPiQrySzPdnYT7DbINAypCqKZ1Z7GM40=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63 h1:YzfoEYWbODU5Fbt37+h7X16BWQbad7Q4S6gclTKFXM8=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200316142031-303a05041dad h1:X7UJIdVkigJ9Se+KCiK9ERNUhYAmzSqPe/jIZPoODjw=
+google.golang.org/genproto v0.0.0-20200316142031-303a05041dad/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/grpc v1.16.0 h1:dz5IJGuC2BB7qXR5AyHNwAUBhZscK2xVez7mznh72sY=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 gopkg.in/DataDog/dd-trace-go.v1 v1.7.0/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk=
 gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
@@ -224,3 +474,13 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/internal/serving/objectstorage/gcs/gcs.go b/internal/serving/objectstorage/gcs/gcs.go
new file mode 100644
index 000000000..4322844da
--- /dev/null
+++ b/internal/serving/objectstorage/gcs/gcs.go
@@ -0,0 +1,103 @@
+package gcs
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"mime"
+	"path/filepath"
+	"time"
+
+	"cloud.google.com/go/storage"
+	"google.golang.org/api/option"
+
+	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/objectstorage"
+)
+
+const defaultAppCreds = "/Users/jaime/.gitlab/gitlab-gcp-creds.json"
+const bucketName = "jaime-test-bucket"
+
+var (
+	defaultTimeout          = time.Second * 100
+	defaultGetObjectTimeout = time.Second * 500
+)
+
+type GCS struct {
+	bucket string
+	client *storage.Client
+}
+
+type object struct {
+	reader    *storage.Reader
+	objHandle *storage.ObjectHandle
+}
+
+func NewGCS(bucket string) (*GCS, error) {
+	// Creates the new bucket.
+	ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
+	defer cancel()
+
+	// Creates a client.
+	client, err := storage.NewClient(ctx,
+		option.WithCredentialsFile(defaultAppCreds),
+		option.WithScopes(storage.ScopeReadOnly))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create gcs client: %w", err)
+	}
+	return &GCS{
+		bucket: bucket,
+		client: client,
+	}, nil
+}
+
+func (gcs *GCS) GetObject(path string) (objectstorage.Object, error) {
+	// TODO make this context cancellable from the caller
+	ctx := context.Background()
+
+	objHandle := gcs.client.Bucket(gcs.bucket).Object(path)
+	reader, err := objHandle.NewReader(ctx)
+	if err != nil {
+		if err == storage.ErrObjectNotExist {
+			return nil, objectstorage.ErrKeyNotFound
+		}
+		return nil, fmt.Errorf("failed to get reader... %w", err)
+	}
+
+	return &object{
+		reader:    reader,
+		objHandle: objHandle,
+	}, nil
+}
+
+func (o *object) ReaderAt() (io.ReaderAt, error) {
+	buff := bytes.NewBuffer([]byte{})
+	_, err := io.Copy(buff, o.reader)
+	if err != nil {
+		return nil, err
+	}
+
+	return bytes.NewReader(buff.Bytes()), nil
+}
+func (o *object) Reader() io.Reader {
+	return o.reader
+}
+func (o *object) Size() int64 {
+	return o.reader.Attrs.Size
+}
+func (o *object) Name() string {
+	return o.objHandle.ObjectName()
+}
+func (o *object) ModTime() time.Time {
+	return o.reader.Attrs.LastModified
+}
+func (o *object) ContentType() string {
+	contentType := o.reader.Attrs.ContentType
+	if contentType == "" {
+		contentType = mime.TypeByExtension(filepath.Ext(o.Name()))
+	}
+	return contentType
+}
+func (o *object) Close() error {
+	return o.reader.Close()
+}
diff --git a/internal/serving/objectstorage/minio/minio.go b/internal/serving/objectstorage/minio/minio.go
new file mode 100644
index 000000000..03640e1bc
--- /dev/null
+++ b/internal/serving/objectstorage/minio/minio.go
@@ -0,0 +1,83 @@
+package minio
+
+import (
+	"fmt"
+	"io"
+	"mime"
+	"path/filepath"
+	"time"
+
+	"github.com/minio/minio-go/v6"
+
+	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/objectstorage"
+)
+
+type Minio struct {
+	bucket string
+	client *minio.Client
+}
+type object struct {
+	object     *minio.Object
+	objectInfo *minio.ObjectInfo
+}
+
+func New(endpoint, bucket, accessKeyID, secretAccessKey string, useSSL bool) (*Minio, error) {
+	minioClient, err := minio.New(endpoint, accessKeyID, secretAccessKey, useSSL)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create minio client: %w", err)
+	}
+	return &Minio{
+		bucket: bucket,
+		client: minioClient,
+	}, nil
+}
+
+func (m *Minio) GetObject(path string) (objectstorage.Object, error) {
+	// TODO c.minio.GetObjectWithContext fails locally for some reason
+	obj, err := m.client.GetObject(m.bucket, path, minio.GetObjectOptions{})
+	if err != nil {
+		return nil, fmt.Errorf("failed to get object: %w", err)
+	}
+	stat, err := obj.Stat()
+	if err != nil {
+		if e, ok := err.(minio.ErrorResponse); ok && e.Code == "NoSuchKey" {
+			return nil, objectstorage.ErrKeyNotFound
+		}
+		return nil, fmt.Errorf("failed to stat object: %w", err)
+	}
+	return &object{
+		object:     obj,
+		objectInfo: &stat,
+	}, nil
+}
+
+func (o *object) ReaderAt() (io.ReaderAt, error) {
+	return o.object, nil
+}
+
+func (o *object) Reader() io.Reader {
+	return o.object
+}
+func (o *object) Size() int64 {
+	return o.objectInfo.Size
+}
+
+func (o *object) Name() string {
+	return o.objectInfo.Key
+}
+
+func (o *object) ModTime() time.Time {
+	return o.objectInfo.LastModified
+}
+
+func (o *object) ContentType() string {
+	contentType := o.objectInfo.ContentType
+	if contentType == "" {
+		contentType = mime.TypeByExtension(filepath.Ext(o.Name()))
+	}
+	return contentType
+}
+
+func (o *object) Close() error {
+	return o.object.Close()
+}
diff --git a/internal/serving/objectstorage/objectstorage.go b/internal/serving/objectstorage/objectstorage.go
index 4708fb149..d32dbf24a 100644
--- a/internal/serving/objectstorage/objectstorage.go
+++ b/internal/serving/objectstorage/objectstorage.go
@@ -11,7 +11,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/minio/minio-go/v6"
 	log "github.com/sirupsen/logrus"
 
 	"gitlab.com/gitlab-org/gitlab-pages/internal/httperrors"
@@ -22,42 +21,41 @@ import (
 // ErrKeyNotFound TODO update doc
 var ErrKeyNotFound = errors.New("key not found")
 
-type Client struct {
-	bucket string
-	minio  *minio.Client
+type Provider string
+
+const (
+	ProviderS3  Provider = "s3"
+	ProviderGCS Provider = "gcs"
+)
+
+type ObjectStorage interface {
+	GetObject(path string) (Object, error)
+}
 
+type Object interface {
+	ReaderAt() (io.ReaderAt, error)
+	Reader() io.Reader
+	Name() string
+	Size() int64
+	ModTime() time.Time
+	ContentType() string
+	Close() error
+}
+
+type Client struct {
+	bucket   string
+	provider ObjectStorage
 	// TODO: cache zip files by projectID for now, will need to expire/cleanup
 	cacheMux      sync.Mutex
 	cachedReaders map[uint64]*zip.Reader
 }
 
-func New(endpoint, bucket, accessKeyID, secretAccessKey string, useSSL bool) (*Client, error) {
-	minioClient, err := minio.New(endpoint, accessKeyID, secretAccessKey, useSSL)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create minio client: %w", err)
-	}
+func New(provider ObjectStorage) *Client {
 	return &Client{
-		bucket:        bucket,
-		minio:         minioClient,
+		provider:      provider,
 		cacheMux:      sync.Mutex{},
 		cachedReaders: map[uint64]*zip.Reader{},
-	}, nil
-}
-
-func (c *Client) GetObject(path string) (*minio.Object, *minio.ObjectInfo, error) {
-	// TODO c.minio.GetObjectWithContext fails locally for some reason
-	obj, err := c.minio.GetObject(c.bucket, path, minio.GetObjectOptions{})
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to get object: %w", err)
 	}
-	stat, err := obj.Stat()
-	if err != nil {
-		if e, ok := err.(minio.ErrorResponse); ok && e.Code == "NoSuchKey" {
-			return nil, nil, ErrKeyNotFound
-		}
-		return nil, nil, fmt.Errorf("failed to stat object: %w", err)
-	}
-	return obj, &stat, nil
 }
 
 func (c *Client) ServeFileHTTP(handler serving.Handler) bool {
@@ -66,10 +64,8 @@ func (c *Client) ServeFileHTTP(handler serving.Handler) bool {
 		log.WithError(err).Error("file not found in archive")
 		return false
 	}
-
 	if !served {
 		if err := c.serveFile(handler); err != nil {
-			log.WithError(err).Error("can't serve file")
 			return false
 		}
 	}
@@ -95,11 +91,19 @@ func (c *Client) serveFile(handler serving.Handler) error {
 	if endsWithSlash(fileName) {
 		fileName += "index.html"
 	}
-	content, stat, err := c.GetObject(fileName)
+	object, err := c.provider.GetObject(fileName)
 	if err != nil {
+		if err == ErrKeyNotFound {
+			return nil
+		}
 		return err
 	}
-	return writeContent(handler, content, stat.Key, stat.LastModified, false)
+	defer object.Close()
+	err = writeContent(handler, object.Reader(), object.Name(), object.ModTime(), object.ContentType())
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 func (c *Client) tryZipFile(handler serving.Handler) (bool, error) {
@@ -107,21 +111,31 @@ func (c *Client) tryZipFile(handler serving.Handler) (bool, error) {
 	c.cacheMux.Lock()
 	reader, ok := c.cachedReaders[projectID]
 	c.cacheMux.Unlock()
-	if !ok {
+	if ok && reader == nil {
+		// cached zip not found
+		// TODO need to expire the cache
+		return false, nil
+	} else if !ok {
 		// TODO assume the API returns the base path of the project and we'll look for artifact.zip
-		obj, objStat, err := c.GetObject(handler.LookupPath.Path + "artifact.zip")
+		obj, err := c.provider.GetObject(handler.LookupPath.Path + "artifactssssss.zip")
 		if err != nil {
 			if err == ErrKeyNotFound {
+				c.cachedReaders[projectID] = nil
 				// could not find zip file
 				return false, nil
 			}
 			return false, fmt.Errorf("failed to get object: %w", err)
 		}
-		// override reader
-		reader, err = zip.New(obj, objStat.Size)
+
+		r, err := obj.ReaderAt()
+		if err != nil {
+			return false, err
+		}
+		reader, err = zip.New(r, obj.Size())
 		if err != nil {
 			return false, fmt.Errorf("failed create zip.Reader: %w", err)
 		}
+
 		c.cacheMux.Lock()
 		c.cachedReaders[projectID] = reader
 		c.cacheMux.Unlock()
@@ -140,30 +154,30 @@ func (c *Client) tryZipFile(handler serving.Handler) (bool, error) {
 		return false, fmt.Errorf("failed to open file: %w", err)
 	}
 	defer file.Close()
-
-	err = writeContent(handler, file, stat.Name(), stat.ModTime(), true)
+	contentType := mime.TypeByExtension(filepath.Ext(stat.Name()))
+	err = writeContent(handler, file, stat.Name(), stat.ModTime(), contentType)
 	return err == nil, err
 }
 
-func writeContent(handler serving.Handler, content interface{}, fileName string, modTime time.Time, fromZip bool) error {
+func writeContent(handler serving.Handler, content io.Reader, fileName string, modTime time.Time, contentType string) error {
+	if content == nil {
+		return nil
+	}
+
 	w := handler.Writer
 	if !handler.LookupPath.HasAccessControl {
 		// Set caching headers
 		w.Header().Set("Cache-Control", "max-age=600")
 		w.Header().Set("Expires", time.Now().Add(10*time.Minute).Format(time.RFC1123))
 	}
-	contentType := mime.TypeByExtension(filepath.Ext(fileName))
 	w.Header().Set("Content-Type", contentType)
-
+	w.Header().Set("Last-Modified", modTime.UTC().Format(http.TimeFormat))
 	// TODO implement Seek(offset int64, whence int) (int64, error) so that we can use http.ServeContent?
 	var err error
-	if fromZip {
-		_, err = io.Copy(w, content.(io.Reader))
-		if err != nil {
-			return fmt.Errorf("failed to write response: %w", err)
-		}
-	} else {
-		http.ServeContent(w, handler.Request, fileName, modTime, content.(io.ReadSeeker))
+	_, err = io.Copy(w, content.(io.Reader))
+	if err != nil {
+		return fmt.Errorf("failed to write response: %w", err)
 	}
+
 	return nil
 }
diff --git a/internal/source/domains.go b/internal/source/domains.go
index 11794b915..9765bda75 100644
--- a/internal/source/domains.go
+++ b/internal/source/domains.go
@@ -9,6 +9,7 @@ import (
 
 	"gitlab.com/gitlab-org/gitlab-pages/internal/domain"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/rollout"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/objectstorage"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/disk"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/domains/gitlabsourceconfig"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab"
@@ -45,7 +46,8 @@ func NewDomains(config Config) (*Domains, error) {
 		return &Domains{disk: disk.New()}, nil
 	}
 
-	gitlab, err := gitlab.New(config)
+	gitlab, err := gitlab.New(config, objectstorage.ProviderS3)
+	// gitlab, err := gitlab.New(config, objectstorage.ProviderGCS)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go b/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go
index 583fc955e..2a1c8fcc2 100644
--- a/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go
+++ b/internal/source/domains/gitlabsourceconfig/gitlabsourceconfig.go
@@ -34,7 +34,6 @@ type GitlabSourceConfig struct {
 // the fields already set.
 func (config *GitlabSourceConfig) UpdateFromYaml(content []byte) error {
 	updated := GitlabSourceConfig{}
-	log.Infof("we should be coming here....")
 	err := yaml.Unmarshal(content, &updated)
 	if err != nil {
 		log.WithError(err).Error("oooops...")
diff --git a/internal/source/gitlab/gitlab.go b/internal/source/gitlab/gitlab.go
index cac7b9bcf..a42e27784 100644
--- a/internal/source/gitlab/gitlab.go
+++ b/internal/source/gitlab/gitlab.go
@@ -8,10 +8,14 @@ import (
 	"path"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
+
 	"gitlab.com/gitlab-org/gitlab-pages/internal/domain"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/request"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/objectstorage"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/objectstorage/gcs"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/objectstorage/minio"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/api"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/cache"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/client"
@@ -25,18 +29,32 @@ type Gitlab struct {
 }
 
 // New returns a new instance of gitlab domain source.
-func New(config client.Config) (*Gitlab, error) {
+func New(config client.Config, objectStorageProvider objectstorage.Provider) (*Gitlab, error) {
 	client, err := client.NewFromConfig(config)
 	if err != nil {
 		return nil, err
 	}
-
+	var provider objectstorage.ObjectStorage
 	// TODO make values configurable - needs omnibus update
-	objectStorage, err := objectstorage.New("gitlab.local:9000", "pages", "minio", "gdk-minio", false)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create object storage client: %w", err)
+	switch objectStorageProvider {
+	case objectstorage.ProviderS3:
+		var err error
+		provider, err = minio.New("gitlab.local:9000", "pages", "minio", "gdk-minio", false)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create minio client: %w", err)
+		}
+	case objectstorage.ProviderGCS:
+		var err error
+		provider, err = gcs.NewGCS("jaime-test-bucket")
+		if err != nil {
+			return nil, fmt.Errorf("failed to create gcs client: %w", err)
+		}
+	default:
+		log.Warn("no object storage provider set")
+
 	}
-	return &Gitlab{client: cache.NewCache(client), objectStorage: objectStorage}, nil
+
+	return &Gitlab{client: cache.NewCache(client), objectStorage: objectstorage.New(provider)}, nil
 }
 
 // GetDomain return a representation of a domain that we have fetched from
-- 
GitLab


From b6742cf9e52ebdeaff260a5136028912ee78a624 Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Wed, 18 Mar 2020 15:35:58 +1100
Subject: [PATCH 8/9] Fix styling from linter errors

---
 internal/serving/objectstorage/gcs/gcs.go     | 19 ++++++++++--
 internal/serving/objectstorage/minio/minio.go | 11 +++++++
 .../serving/objectstorage/objectstorage.go    | 30 ++++++++++++-------
 internal/zip/zipreader.go                     |  3 +-
 4 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/internal/serving/objectstorage/gcs/gcs.go b/internal/serving/objectstorage/gcs/gcs.go
index 4322844da..2a940423c 100644
--- a/internal/serving/objectstorage/gcs/gcs.go
+++ b/internal/serving/objectstorage/gcs/gcs.go
@@ -19,10 +19,10 @@ const defaultAppCreds = "/Users/jaime/.gitlab/gitlab-gcp-creds.json"
 const bucketName = "jaime-test-bucket"
 
 var (
-	defaultTimeout          = time.Second * 100
-	defaultGetObjectTimeout = time.Second * 500
+	defaultTimeout = time.Second * 10
 )
 
+// GCS ..
 type GCS struct {
 	bucket string
 	client *storage.Client
@@ -33,6 +33,7 @@ type object struct {
 	objHandle *storage.ObjectHandle
 }
 
+// NewGCS ..
 func NewGCS(bucket string) (*GCS, error) {
 	// Creates the new bucket.
 	ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
@@ -51,6 +52,7 @@ func NewGCS(bucket string) (*GCS, error) {
 	}, nil
 }
 
+// GetObject ..
 func (gcs *GCS) GetObject(path string) (objectstorage.Object, error) {
 	// TODO make this context cancellable from the caller
 	ctx := context.Background()
@@ -70,6 +72,7 @@ func (gcs *GCS) GetObject(path string) (objectstorage.Object, error) {
 	}, nil
 }
 
+// ReaderAt ..
 func (o *object) ReaderAt() (io.ReaderAt, error) {
 	buff := bytes.NewBuffer([]byte{})
 	_, err := io.Copy(buff, o.reader)
@@ -79,18 +82,28 @@ func (o *object) ReaderAt() (io.ReaderAt, error) {
 
 	return bytes.NewReader(buff.Bytes()), nil
 }
+
+// Reader ..
 func (o *object) Reader() io.Reader {
 	return o.reader
 }
+
+// Size ..
 func (o *object) Size() int64 {
 	return o.reader.Attrs.Size
 }
+
+// Name ..
 func (o *object) Name() string {
 	return o.objHandle.ObjectName()
 }
+
+// ModTime ..
 func (o *object) ModTime() time.Time {
 	return o.reader.Attrs.LastModified
 }
+
+// ContentType ..
 func (o *object) ContentType() string {
 	contentType := o.reader.Attrs.ContentType
 	if contentType == "" {
@@ -98,6 +111,8 @@ func (o *object) ContentType() string {
 	}
 	return contentType
 }
+
+// Close ..
 func (o *object) Close() error {
 	return o.reader.Close()
 }
diff --git a/internal/serving/objectstorage/minio/minio.go b/internal/serving/objectstorage/minio/minio.go
index 03640e1bc..90fe5ecf3 100644
--- a/internal/serving/objectstorage/minio/minio.go
+++ b/internal/serving/objectstorage/minio/minio.go
@@ -12,6 +12,7 @@ import (
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/objectstorage"
 )
 
+// Minio ..
 type Minio struct {
 	bucket string
 	client *minio.Client
@@ -21,6 +22,7 @@ type object struct {
 	objectInfo *minio.ObjectInfo
 }
 
+// New ..
 func New(endpoint, bucket, accessKeyID, secretAccessKey string, useSSL bool) (*Minio, error) {
 	minioClient, err := minio.New(endpoint, accessKeyID, secretAccessKey, useSSL)
 	if err != nil {
@@ -32,6 +34,7 @@ func New(endpoint, bucket, accessKeyID, secretAccessKey string, useSSL bool) (*M
 	}, nil
 }
 
+// GetObject ..
 func (m *Minio) GetObject(path string) (objectstorage.Object, error) {
 	// TODO c.minio.GetObjectWithContext fails locally for some reason
 	obj, err := m.client.GetObject(m.bucket, path, minio.GetObjectOptions{})
@@ -51,25 +54,32 @@ func (m *Minio) GetObject(path string) (objectstorage.Object, error) {
 	}, nil
 }
 
+// ReaderAt ..
 func (o *object) ReaderAt() (io.ReaderAt, error) {
 	return o.object, nil
 }
 
+// Reader ..
 func (o *object) Reader() io.Reader {
 	return o.object
 }
+
+// Size ..
 func (o *object) Size() int64 {
 	return o.objectInfo.Size
 }
 
+// Name ..
 func (o *object) Name() string {
 	return o.objectInfo.Key
 }
 
+// ModTime ..
 func (o *object) ModTime() time.Time {
 	return o.objectInfo.LastModified
 }
 
+// ContentType ..
 func (o *object) ContentType() string {
 	contentType := o.objectInfo.ContentType
 	if contentType == "" {
@@ -78,6 +88,7 @@ func (o *object) ContentType() string {
 	return contentType
 }
 
+// Close ..
 func (o *object) Close() error {
 	return o.object.Close()
 }
diff --git a/internal/serving/objectstorage/objectstorage.go b/internal/serving/objectstorage/objectstorage.go
index d32dbf24a..96ee0f62c 100644
--- a/internal/serving/objectstorage/objectstorage.go
+++ b/internal/serving/objectstorage/objectstorage.go
@@ -21,17 +21,22 @@ import (
 // ErrKeyNotFound TODO update doc
 var ErrKeyNotFound = errors.New("key not found")
 
+// Provider ..
 type Provider string
 
 const (
-	ProviderS3  Provider = "s3"
+	// ProviderS3 ..
+	ProviderS3 Provider = "s3"
+	// ProviderGCS ..
 	ProviderGCS Provider = "gcs"
 )
 
+// ObjectStorage ..
 type ObjectStorage interface {
 	GetObject(path string) (Object, error)
 }
 
+// Object ..
 type Object interface {
 	ReaderAt() (io.ReaderAt, error)
 	Reader() io.Reader
@@ -42,6 +47,7 @@ type Object interface {
 	Close() error
 }
 
+// Client ..
 type Client struct {
 	bucket   string
 	provider ObjectStorage
@@ -50,6 +56,7 @@ type Client struct {
 	cachedReaders map[uint64]*zip.Reader
 }
 
+// New ..
 func New(provider ObjectStorage) *Client {
 	return &Client{
 		provider:      provider,
@@ -58,6 +65,7 @@ func New(provider ObjectStorage) *Client {
 	}
 }
 
+// ServeFileHTTP ..
 func (c *Client) ServeFileHTTP(handler serving.Handler) bool {
 	served, err := c.tryZipFile(handler)
 	if err != nil {
@@ -73,6 +81,7 @@ func (c *Client) ServeFileHTTP(handler serving.Handler) bool {
 	return true
 }
 
+// ServeNotFoundHTTP ..
 func (c *Client) ServeNotFoundHTTP(handler serving.Handler) {
 	httperrors.Serve404(handler.Writer)
 }
@@ -107,10 +116,10 @@ func (c *Client) serveFile(handler serving.Handler) error {
 }
 
 func (c *Client) tryZipFile(handler serving.Handler) (bool, error) {
-	projectID := handler.LookupPath.ProjectID
 	c.cacheMux.Lock()
+	defer c.cacheMux.Unlock()
+	projectID := handler.LookupPath.ProjectID
 	reader, ok := c.cachedReaders[projectID]
-	c.cacheMux.Unlock()
 	if ok && reader == nil {
 		// cached zip not found
 		// TODO need to expire the cache
@@ -136,29 +145,28 @@ func (c *Client) tryZipFile(handler serving.Handler) (bool, error) {
 			return false, fmt.Errorf("failed create zip.Reader: %w", err)
 		}
 
-		c.cacheMux.Lock()
 		c.cachedReaders[projectID] = reader
-		c.cacheMux.Unlock()
 	}
+	err := c.handleZipFile(reader, handler)
+	return err == nil, err
+}
 
+func (c *Client) handleZipFile(reader *zip.Reader, handler serving.Handler) error {
 	filename := handler.SubPath
 	if filename == "" {
 		filename = "index.html"
 	}
-
 	file, stat, err := reader.Open(filename)
 	if err != nil {
 		if strings.Contains(err.Error(), "not found") {
-			return false, nil
+			return nil
 		}
-		return false, fmt.Errorf("failed to open file: %w", err)
+		return fmt.Errorf("failed to open file: %w", err)
 	}
 	defer file.Close()
 	contentType := mime.TypeByExtension(filepath.Ext(stat.Name()))
-	err = writeContent(handler, file, stat.Name(), stat.ModTime(), contentType)
-	return err == nil, err
+	return writeContent(handler, file, stat.Name(), stat.ModTime(), contentType)
 }
-
 func writeContent(handler serving.Handler, content io.Reader, fileName string, modTime time.Time, contentType string) error {
 	if content == nil {
 		return nil
diff --git a/internal/zip/zipreader.go b/internal/zip/zipreader.go
index 03528cc27..abfae417b 100644
--- a/internal/zip/zipreader.go
+++ b/internal/zip/zipreader.go
@@ -15,6 +15,7 @@ const zipDeployPath = "public"
 const maxSymlinkSize = 4096
 const maxSymlinkDepth = 3
 
+// Reader ..
 type Reader struct {
 	archive *zip.Reader
 }
@@ -110,7 +111,7 @@ func (r *Reader) resolvePublic(path string) (string, *zip.File, error) {
 	return file.Name[len(zipDeployPath)+1:], file, nil
 }
 
-// Open reaturns a ReadCloser to the caller which is responsible of closing. os.FileInfo is also returned in one go.
+// Open returns a ReadCloser to the caller which is responsible of closing. os.FileInfo is also returned in one go.
 func (r *Reader) Open(path string) (io.ReadCloser, os.FileInfo, error) {
 	_, file, err := r.resolvePublic(path)
 	if err != nil {
-- 
GitLab


From 22a1b67fb20aeacb7e929db52ecca5af99f89b9f Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Wed, 18 Mar 2020 15:49:27 +1100
Subject: [PATCH 9/9] Support error handling for lower Go versions

---
 go.mod                                          | 1 +
 internal/serving/objectstorage/gcs/gcs.go       | 4 ++--
 internal/serving/objectstorage/minio/minio.go   | 6 +++---
 internal/serving/objectstorage/objectstorage.go | 8 ++++----
 internal/source/gitlab/gitlab.go                | 4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/go.mod b/go.mod
index ae9357560..1c20bd973 100644
--- a/go.mod
+++ b/go.mod
@@ -34,6 +34,7 @@ require (
 	golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0
 	golang.org/x/tools v0.0.0-20200317031654-fbeba2149c82
 	google.golang.org/api v0.20.0
+	google.golang.org/appengine v1.6.5 // indirect
 	google.golang.org/genproto v0.0.0-20200316142031-303a05041dad // indirect
 	google.golang.org/grpc v1.28.0 // indirect
 	gopkg.in/yaml.v2 v2.2.2
diff --git a/internal/serving/objectstorage/gcs/gcs.go b/internal/serving/objectstorage/gcs/gcs.go
index 2a940423c..3dc56efb4 100644
--- a/internal/serving/objectstorage/gcs/gcs.go
+++ b/internal/serving/objectstorage/gcs/gcs.go
@@ -44,7 +44,7 @@ func NewGCS(bucket string) (*GCS, error) {
 		option.WithCredentialsFile(defaultAppCreds),
 		option.WithScopes(storage.ScopeReadOnly))
 	if err != nil {
-		return nil, fmt.Errorf("failed to create gcs client: %w", err)
+		return nil, fmt.Errorf("failed to create gcs client: %v", err)
 	}
 	return &GCS{
 		bucket: bucket,
@@ -63,7 +63,7 @@ func (gcs *GCS) GetObject(path string) (objectstorage.Object, error) {
 		if err == storage.ErrObjectNotExist {
 			return nil, objectstorage.ErrKeyNotFound
 		}
-		return nil, fmt.Errorf("failed to get reader... %w", err)
+		return nil, fmt.Errorf("failed to get reader... %v", err)
 	}
 
 	return &object{
diff --git a/internal/serving/objectstorage/minio/minio.go b/internal/serving/objectstorage/minio/minio.go
index 90fe5ecf3..bdfb90227 100644
--- a/internal/serving/objectstorage/minio/minio.go
+++ b/internal/serving/objectstorage/minio/minio.go
@@ -26,7 +26,7 @@ type object struct {
 func New(endpoint, bucket, accessKeyID, secretAccessKey string, useSSL bool) (*Minio, error) {
 	minioClient, err := minio.New(endpoint, accessKeyID, secretAccessKey, useSSL)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create minio client: %w", err)
+		return nil, fmt.Errorf("failed to create minio client: %v", err)
 	}
 	return &Minio{
 		bucket: bucket,
@@ -39,14 +39,14 @@ func (m *Minio) GetObject(path string) (objectstorage.Object, error) {
 	// TODO c.minio.GetObjectWithContext fails locally for some reason
 	obj, err := m.client.GetObject(m.bucket, path, minio.GetObjectOptions{})
 	if err != nil {
-		return nil, fmt.Errorf("failed to get object: %w", err)
+		return nil, fmt.Errorf("failed to get object: %v", err)
 	}
 	stat, err := obj.Stat()
 	if err != nil {
 		if e, ok := err.(minio.ErrorResponse); ok && e.Code == "NoSuchKey" {
 			return nil, objectstorage.ErrKeyNotFound
 		}
-		return nil, fmt.Errorf("failed to stat object: %w", err)
+		return nil, fmt.Errorf("failed to stat object: %v", err)
 	}
 	return &object{
 		object:     obj,
diff --git a/internal/serving/objectstorage/objectstorage.go b/internal/serving/objectstorage/objectstorage.go
index 96ee0f62c..6a003bb9a 100644
--- a/internal/serving/objectstorage/objectstorage.go
+++ b/internal/serving/objectstorage/objectstorage.go
@@ -133,7 +133,7 @@ func (c *Client) tryZipFile(handler serving.Handler) (bool, error) {
 				// could not find zip file
 				return false, nil
 			}
-			return false, fmt.Errorf("failed to get object: %w", err)
+			return false, fmt.Errorf("failed to get object: %v", err)
 		}
 
 		r, err := obj.ReaderAt()
@@ -142,7 +142,7 @@ func (c *Client) tryZipFile(handler serving.Handler) (bool, error) {
 		}
 		reader, err = zip.New(r, obj.Size())
 		if err != nil {
-			return false, fmt.Errorf("failed create zip.Reader: %w", err)
+			return false, fmt.Errorf("failed create zip.Reader: %v", err)
 		}
 
 		c.cachedReaders[projectID] = reader
@@ -161,7 +161,7 @@ func (c *Client) handleZipFile(reader *zip.Reader, handler serving.Handler) erro
 		if strings.Contains(err.Error(), "not found") {
 			return nil
 		}
-		return fmt.Errorf("failed to open file: %w", err)
+		return fmt.Errorf("failed to open file: %v", err)
 	}
 	defer file.Close()
 	contentType := mime.TypeByExtension(filepath.Ext(stat.Name()))
@@ -184,7 +184,7 @@ func writeContent(handler serving.Handler, content io.Reader, fileName string, m
 	var err error
 	_, err = io.Copy(w, content.(io.Reader))
 	if err != nil {
-		return fmt.Errorf("failed to write response: %w", err)
+		return fmt.Errorf("failed to write response: %v", err)
 	}
 
 	return nil
diff --git a/internal/source/gitlab/gitlab.go b/internal/source/gitlab/gitlab.go
index ec70e10ae..b741b269d 100644
--- a/internal/source/gitlab/gitlab.go
+++ b/internal/source/gitlab/gitlab.go
@@ -41,13 +41,13 @@ func New(config client.Config, objectStorageProvider objectstorage.Provider) (*G
 		var err error
 		provider, err = minio.New("gitlab.local:9000", "pages", "minio", "gdk-minio", false)
 		if err != nil {
-			return nil, fmt.Errorf("failed to create minio client: %w", err)
+			return nil, fmt.Errorf("failed to create minio client: %v", err)
 		}
 	case objectstorage.ProviderGCS:
 		var err error
 		provider, err = gcs.NewGCS("jaime-test-bucket")
 		if err != nil {
-			return nil, fmt.Errorf("failed to create gcs client: %w", err)
+			return nil, fmt.Errorf("failed to create gcs client: %v", err)
 		}
 	default:
 		log.Warn("no object storage provider set")
-- 
GitLab