From cbbf45b5cb268a605134022d91308e6c57c9d273 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Tue, 27 Oct 2020 13:47:08 +0100
Subject: refactor(storage): Rename ServeLayer -> Serve

This is going to be used for general content-addressed objects, and is
not layer specific anymore.
---
 tools/nixery/main.go               | 4 ++--
 tools/nixery/storage/filesystem.go | 8 ++++----
 tools/nixery/storage/gcs.go        | 6 +++---
 tools/nixery/storage/storage.go    | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'tools')

diff --git a/tools/nixery/main.go b/tools/nixery/main.go
index 92c602b1f79f..573f42767d04 100644
--- a/tools/nixery/main.go
+++ b/tools/nixery/main.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC
+// Copyright 2019-2020 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not
 // use this file except in compliance with the License. You may obtain a copy of
@@ -159,7 +159,7 @@ func (h *registryHandler) serveManifestTag(w http.ResponseWriter, r *http.Reques
 // serveLayer serves an image layer from storage (if it exists).
 func (h *registryHandler) serveLayer(w http.ResponseWriter, r *http.Request, digest string) {
 	storage := h.state.Storage
-	err := storage.ServeLayer(digest, r, w)
+	err := storage.Serve(digest, r, w)
 	if err != nil {
 		log.WithError(err).WithFields(log.Fields{
 			"layer":   digest,
diff --git a/tools/nixery/storage/filesystem.go b/tools/nixery/storage/filesystem.go
index cdbc31c5e046..926e9257a1e0 100644
--- a/tools/nixery/storage/filesystem.go
+++ b/tools/nixery/storage/filesystem.go
@@ -83,13 +83,13 @@ func (b *FSBackend) Move(ctx context.Context, old, new string) error {
 	return os.Rename(path.Join(b.path, old), newpath)
 }
 
-func (b *FSBackend) ServeLayer(digest string, r *http.Request, w http.ResponseWriter) error {
+func (b *FSBackend) Serve(digest string, r *http.Request, w http.ResponseWriter) error {
 	p := path.Join(b.path, "layers", digest)
 
 	log.WithFields(log.Fields{
-		"layer": digest,
-		"path":  p,
-	}).Info("serving layer from filesystem")
+		"digest": digest,
+		"path":   p,
+	}).Info("serving blob from filesystem")
 
 	http.ServeFile(w, r, p)
 	return nil
diff --git a/tools/nixery/storage/gcs.go b/tools/nixery/storage/gcs.go
index c247cca62140..61b5dea52351 100644
--- a/tools/nixery/storage/gcs.go
+++ b/tools/nixery/storage/gcs.go
@@ -150,18 +150,18 @@ func (b *GCSBackend) Move(ctx context.Context, old, new string) error {
 	return nil
 }
 
-func (b *GCSBackend) ServeLayer(digest string, r *http.Request, w http.ResponseWriter) error {
+func (b *GCSBackend) Serve(digest string, r *http.Request, w http.ResponseWriter) error {
 	url, err := b.constructLayerUrl(digest)
 	if err != nil {
 		log.WithError(err).WithFields(log.Fields{
-			"layer":  digest,
+			"digest": digest,
 			"bucket": b.bucket,
 		}).Error("failed to sign GCS URL")
 
 		return err
 	}
 
-	log.WithField("layer", digest).Info("redirecting layer request to GCS bucket")
+	log.WithField("digest", digest).Info("redirecting blob request to GCS bucket")
 
 	w.Header().Set("Location", url)
 	w.WriteHeader(303)
diff --git a/tools/nixery/storage/storage.go b/tools/nixery/storage/storage.go
index c97b5e4facc6..4040ef08dc9c 100644
--- a/tools/nixery/storage/storage.go
+++ b/tools/nixery/storage/storage.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC
+// Copyright 2019-2020 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not
 // use this file except in compliance with the License. You may obtain a copy of
@@ -46,6 +46,6 @@ type Backend interface {
 	Move(ctx context.Context, old, new string) error
 
 	// Serve provides a handler function to serve HTTP requests
-	// for layers in the storage backend.
-	ServeLayer(digest string, r *http.Request, w http.ResponseWriter) error
+	// for objects in the storage backend.
+	Serve(digest string, r *http.Request, w http.ResponseWriter) error
 }
-- 
cgit 1.4.1