mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(storage): Rename ServeLayer -> Serve

Browse source 
This is going to be used for general content-addressed objects, and is
not layer specific anymore.
This commit is contained in:
Vincent Ambo 2020-10-27 13:47:08 +01:00 committed by Vincent Ambo
parent 5ce745d104
commit cbbf45b5cb
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/nixery/main.go
View file

@ -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 // 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 // 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). // serveLayer serves an image layer from storage (if it exists).
func (h *registryHandler) serveLayer(w http.ResponseWriter, r *http.Request, digest string) { func (h *registryHandler) serveLayer(w http.ResponseWriter, r *http.Request, digest string) {
storage := h.state.Storage storage := h.state.Storage
err := storage.ServeLayer(digest, r, w) err := storage.Serve(digest, r, w)
if err != nil { if err != nil {
log.WithError(err).WithFields(log.Fields{ log.WithError(err).WithFields(log.Fields{
"layer": digest, "layer": digest,

6
tools/nixery/storage/filesystem.go
View file

@ -83,13 +83,13 @@ func (b *FSBackend) Move(ctx context.Context, old, new string) error {
return os.Rename(path.Join(b.path, old), newpath) 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) p := path.Join(b.path, "layers", digest)
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"layer": digest, "digest": digest,
"path": p, "path": p,
}).Info("serving layer from filesystem") }).Info("serving blob from filesystem")
http.ServeFile(w, r, p) http.ServeFile(w, r, p)
return nil return nil

6
tools/nixery/storage/gcs.go
View file

@ -150,18 +150,18 @@ func (b *GCSBackend) Move(ctx context.Context, old, new string) error {
return nil 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) url, err := b.constructLayerUrl(digest)
if err != nil { if err != nil {
log.WithError(err).WithFields(log.Fields{ log.WithError(err).WithFields(log.Fields{
"layer": digest, "digest": digest,
"bucket": b.bucket, "bucket": b.bucket,
}).Error("failed to sign GCS URL") }).Error("failed to sign GCS URL")
return err 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.Header().Set("Location", url)
w.WriteHeader(303) w.WriteHeader(303)

6
tools/nixery/storage/storage.go
View file

@ -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 // 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 // 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 Move(ctx context.Context, old, new string) error
// Serve provides a handler function to serve HTTP requests // Serve provides a handler function to serve HTTP requests
// for layers in the storage backend. // for objects in the storage backend.
ServeLayer(digest string, r *http.Request, w http.ResponseWriter) error Serve(digest string, r *http.Request, w http.ResponseWriter) error
} }