maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(server): Pass HTTP request to storage.ServeLayer

Browse source 
The request object is required for some serving methods (e.g. the
filesystem one).
This commit is contained in:
Vincent Ambo 2019-10-28 18:18:17 +01:00 • committed by Vincent Ambo
parent e5bb2fc887
commit 167a0b3263
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/nixery/server/builder/builder.go
View file

@ -411,7 +411,7 @@ func uploadHashLayer(ctx context.Context, s *State, key string, lw layerWriter)
"layer": key, "layer": key,
"sha256": sha256sum, "sha256": sha256sum,
"size": size, "size": size,
}).Info("uploaded layer") }).Info("created and persisted layer")
entry := manifest.Entry{ entry := manifest.Entry{
Digest: "sha256:" + sha256sum, Digest: "sha256:" + sha256sum,

2
tools/nixery/server/main.go
View file

@ -175,7 +175,7 @@ func (h *registryHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if len(layerMatches) == 3 { if len(layerMatches) == 3 {
digest := layerMatches[2] digest := layerMatches[2]
storage := h.state.Storage storage := h.state.Storage
err := storage.ServeLayer(digest, w) err := storage.ServeLayer(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,

4
tools/nixery/server/storage/gcs.go
View file

@ -139,7 +139,7 @@ func (b *GCSBackend) Move(old, new string) error {
return nil 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) url, err := b.constructLayerUrl(digest)
if err != nil { if err != nil {
log.WithError(err).WithFields(log.Fields{ log.WithError(err).WithFields(log.Fields{
@ -150,6 +150,8 @@ func (b *GCSBackend) ServeLayer(digest string, w http.ResponseWriter) error {
return err return err
} }
log.WithField("layer", digest).Info("redirecting layer request to GCS bucket")
w.Header().Set("Location", url) w.Header().Set("Location", url)
w.WriteHeader(303) w.WriteHeader(303)
return nil return nil

2
tools/nixery/server/storage/storage.go
View file

@ -30,5 +30,5 @@ type Backend interface {
// 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 layers in the storage backend.
ServeLayer(digest string, w http.ResponseWriter) error ServeLayer(digest string, r *http.Request, w http.ResponseWriter) error
} }