From 167a0b32630ed86b3a053e56fa499957872d7b38 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Mon, 28 Oct 2019 18:18:17 +0100
Subject: refactor(server): Pass HTTP request to storage.ServeLayer

The request object is required for some serving methods (e.g. the
filesystem one).
---
 tools/nixery/server/builder/builder.go | 2 +-
 tools/nixery/server/main.go            | 2 +-
 tools/nixery/server/storage/gcs.go     | 4 +++-
 tools/nixery/server/storage/storage.go | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'tools/nixery')

diff --git a/tools/nixery/server/builder/builder.go b/tools/nixery/server/builder/builder.go
index 17ea1b8e6209..021cc662c56d 100644
--- a/tools/nixery/server/builder/builder.go
+++ b/tools/nixery/server/builder/builder.go
@@ -411,7 +411,7 @@ func uploadHashLayer(ctx context.Context, s *State, key string, lw layerWriter)
 		"layer":  key,
 		"sha256": sha256sum,
 		"size":   size,
-	}).Info("uploaded layer")
+	}).Info("created and persisted layer")
 
 	entry := manifest.Entry{
 		Digest: "sha256:" + sha256sum,
diff --git a/tools/nixery/server/main.go b/tools/nixery/server/main.go
index b5d7091ed002..282fe9773a73 100644
--- a/tools/nixery/server/main.go
+++ b/tools/nixery/server/main.go
@@ -175,7 +175,7 @@ func (h *registryHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if len(layerMatches) == 3 {
 		digest := layerMatches[2]
 		storage := h.state.Storage
-		err := storage.ServeLayer(digest, w)
+		err := storage.ServeLayer(digest, r, w)
 		if err != nil {
 			log.WithError(err).WithFields(log.Fields{
 				"layer":   digest,
diff --git a/tools/nixery/server/storage/gcs.go b/tools/nixery/server/storage/gcs.go
index feb6d30d681e..749c7ba150e5 100644
--- a/tools/nixery/server/storage/gcs.go
+++ b/tools/nixery/server/storage/gcs.go
@@ -139,7 +139,7 @@ func (b *GCSBackend) Move(old, new string) error {
 	return nil
 }
 
-func (b *GCSBackend) ServeLayer(digest string, w http.ResponseWriter) error {
+func (b *GCSBackend) ServeLayer(digest string, r *http.Request, w http.ResponseWriter) error {
 	url, err := b.constructLayerUrl(digest)
 	if err != nil {
 		log.WithError(err).WithFields(log.Fields{
@@ -150,6 +150,8 @@ func (b *GCSBackend) ServeLayer(digest string, w http.ResponseWriter) error {
 		return err
 	}
 
+	log.WithField("layer", digest).Info("redirecting layer request to GCS bucket")
+
 	w.Header().Set("Location", url)
 	w.WriteHeader(303)
 	return nil
diff --git a/tools/nixery/server/storage/storage.go b/tools/nixery/server/storage/storage.go
index 15b8355e6ef5..ad10d682e93a 100644
--- a/tools/nixery/server/storage/storage.go
+++ b/tools/nixery/server/storage/storage.go
@@ -30,5 +30,5 @@ type Backend interface {
 
 	// Serve provides a handler function to serve HTTP requests
 	// for layers in the storage backend.
-	ServeLayer(digest string, w http.ResponseWriter) error
+	ServeLayer(digest string, r *http.Request, w http.ResponseWriter) error
 }
-- 
cgit 1.4.1