feat: refactor handlers to pkg (#44)

Author: avtakkar

cmd/proxy/main.go

@@ -15,12 +15,12 @@ import (
 	"time"
 
 	"github.com/alexflint/go-arg"
-	"github.com/azure/peerd/internal/handlers"
 	"github.com/azure/peerd/pkg/containerd"
 	pcontext "github.com/azure/peerd/pkg/context"
 	"github.com/azure/peerd/pkg/discovery/content/provider"
 	"github.com/azure/peerd/pkg/discovery/routing"
 	"github.com/azure/peerd/pkg/files/store"
+	"github.com/azure/peerd/pkg/handlers"
 	"github.com/azure/peerd/pkg/k8s"
 	"github.com/azure/peerd/pkg/k8s/events"
 	"github.com/azure/peerd/pkg/metrics"

internal/handlers/v2/registry.go renamed to pkg/containerd/handler.go

@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-package v2
+package containerd
 
 import (
 	"fmt"
 	"net/http"
 	"strconv"
 	"time"
 
-	"github.com/azure/peerd/pkg/containerd"
 	pcontext "github.com/azure/peerd/pkg/context"
 	"github.com/azure/peerd/pkg/oci/distribution"
 	"github.com/opencontainers/go-digest"
@@ -24,7 +23,7 @@ const (
 
 // Registry is a handler that handles requests to this registry.
 type Registry struct {
-	containerdStore containerd.Store
+	containerdStore Store
 }
 
 // Handle handles a request to this registry.
@@ -138,7 +137,7 @@ func (r *Registry) handleBlob(c pcontext.Context, dgst digest.Digest) {
 }
 
 // NewRegistry creates a new registry handler.
-func NewRegistry(containerdStore containerd.Store) *Registry {
+func NewRegistry(containerdStore Store) *Registry {
 	return &Registry{
 		containerdStore: containerdStore,
 	}

internal/handlers/v2/registry_test.go renamed to pkg/containerd/handler_test.go

@@ -1,35 +1,34 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-package v2
+package containerd
 
 import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
-	"github.com/azure/peerd/pkg/containerd"
 	pcontext "github.com/azure/peerd/pkg/context"
 	"github.com/azure/peerd/pkg/oci/distribution"
 	"github.com/gin-gonic/gin"
 )
 
 func TestNewRegistry(t *testing.T) {
 	// Create a new registry
-	r := NewRegistry(containerd.NewMockContainerdStore(nil))
+	r := NewRegistry(NewMockContainerdStore(nil))
 
 	if r == nil {
 		t.Fatal("expected registry")
 	}
 }
 
 func TestHandleManifest(t *testing.T) {
-	img, err := containerd.ParseReference("library/alpine:3.18.0", "sha256:bb863d6b95453b6b10dfaa1a52cb53f453d9a97ee775808ebaf6533bb4c9bb30")
+	img, err := ParseReference("library/alpine:3.18.0", "sha256:bb863d6b95453b6b10dfaa1a52cb53f453d9a97ee775808ebaf6533bb4c9bb30")
 	if err != nil {
 		t.Fatal(err)
 	}
-	refs := []containerd.Reference{img}
+	refs := []Reference{img}
 
-	ms := containerd.NewMockContainerdStore(refs)
+	ms := NewMockContainerdStore(refs)
 
 	r := NewRegistry(ms)
 
@@ -65,13 +64,13 @@ func TestHandleManifest(t *testing.T) {
 }
 
 func TestHandleBlob(t *testing.T) {
-	img, err := containerd.ParseReference("library/alpine:3.18.0", "sha256:blob")
+	img, err := ParseReference("library/alpine:3.18.0", "sha256:blob")
 	if err != nil {
 		t.Fatal(err)
 	}
-	refs := []containerd.Reference{img}
+	refs := []Reference{img}
 
-	ms := containerd.NewMockContainerdStore(refs)
+	ms := NewMockContainerdStore(refs)
 
 	r := NewRegistry(ms)
 
@@ -107,13 +106,13 @@ func TestHandleBlob(t *testing.T) {
 }
 
 func TestHandle(t *testing.T) {
-	img, err := containerd.ParseReference("library/alpine:3.18.0", "sha256:bb863d6b95453b6b10dfaa1a52cb53f453d9a97ee775808ebaf6533bb4c9bb30")
+	img, err := ParseReference("library/alpine:3.18.0", "sha256:bb863d6b95453b6b10dfaa1a52cb53f453d9a97ee775808ebaf6533bb4c9bb30")
 	if err != nil {
 		t.Fatal(err)
 	}
-	refs := []containerd.Reference{img}
+	refs := []Reference{img}
 
-	ms := containerd.NewMockContainerdStore(refs)
+	ms := NewMockContainerdStore(refs)
 
 	r := NewRegistry(ms)
 

internal/handlers/v2/mirror.go renamed to pkg/discovery/content/registry/mirror.go

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-package v2
+package registry
 
 import (
 	"context"
@@ -24,7 +24,7 @@ var (
 	ResolveTimeout = 1 * time.Second
 )
 
-// Mirror is a handler that handles requests to this registry Mirror.
+// Mirror is a handler that handles requests to this registry proxy.
 type Mirror struct {
 	resolveTimeout time.Duration
 	router         routing.Router
@@ -118,8 +118,8 @@ func (m *Mirror) Handle(c pcontext.Context) {
 	}
 }
 
-// NewMirror creates a new mirror handler.
-func NewMirror(router routing.Router) *Mirror {
+// New creates a new mirror handler.
+func New(router routing.Router) *Mirror {
 	return &Mirror{
 		resolveTimeout: ResolveTimeout,
 		router:         router,

internal/handlers/v2/mirror_test.go renamed to pkg/discovery/content/registry/mirror_test.go

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-package v2
+package registry
 
 import (
 	"fmt"

internal/handlers/files/handler.go renamed to pkg/handlers/files/handler.go

@@ -7,12 +7,12 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/azure/peerd/internal/handlers/files"
-	v2 "github.com/azure/peerd/internal/handlers/v2"
 	"github.com/azure/peerd/pkg/containerd"
 	pcontext "github.com/azure/peerd/pkg/context"
 	"github.com/azure/peerd/pkg/discovery/routing"
 	filesStore "github.com/azure/peerd/pkg/files/store"
+	"github.com/azure/peerd/pkg/handlers/files"
+	v2 "github.com/azure/peerd/pkg/handlers/v2"
 	"github.com/gin-gonic/gin"
 	"github.com/rs/zerolog"
 )

internal/handlers/files/handler_test.go renamed to pkg/handlers/files/handler_test.go

@@ -10,15 +10,16 @@ import (
 
 	"github.com/azure/peerd/pkg/containerd"
 	pcontext "github.com/azure/peerd/pkg/context"
+	"github.com/azure/peerd/pkg/discovery/content/registry"
 	"github.com/azure/peerd/pkg/discovery/routing"
 	"github.com/azure/peerd/pkg/metrics"
 	"github.com/azure/peerd/pkg/oci/distribution"
 )
 
 // V2Handler describes a handler for OCI content.
 type V2Handler struct {
-	mirror          *Mirror
-	registry        *Registry
+	proxy           *registry.Mirror
+	registry        *containerd.Registry
 	metricsRecorder metrics.Metrics
 }
 
@@ -55,7 +56,7 @@ func (h *V2Handler) Handle(c pcontext.Context) {
 		h.registry.Handle(c)
 		return
 	} else {
-		h.mirror.Handle(c)
+		h.proxy.Handle(c)
 		return
 	}
 }
@@ -86,8 +87,8 @@ func (h *V2Handler) fill(c pcontext.Context) error {
 // New creates a new OCI content handler.
 func New(ctx context.Context, router routing.Router, containerdStore containerd.Store) (*V2Handler, error) {
 	return &V2Handler{
-		mirror:          NewMirror(router),
-		registry:        NewRegistry(containerdStore),
+		proxy:           registry.New(router),
+		registry:        containerd.NewRegistry(containerdStore),
 		metricsRecorder: metrics.FromContext(ctx),
 	}, nil
 }