test: add CLI-level E2E tests for native push pipeline

commit: c06283480f7288bcb637a6d4269869a826a811b8
author: brice · 7mo ago · 2026-03-14 14:10 UTC
parent: c8966e7
signature: unsigned

2 files · +148 -7

M internal/adapters/in/cli/push.go +13 -7


@@ -22,6 +22,12 @@ import (
22	22		"github.com/bnema/gordon/pkg/validation"
23	23		)
24	24
	25	+	var (
	26	+	dockerTagFn = dockerTag
	27	+	dockerPushFn = dockerPush
	28	+	dockerImageExistsFn = dockerImageExists
	29	+	)
	30	+
25	31		func newPushCmd() *cobra.Command {
26	32		var (
27	33		noDeploy bool

@@ -486,11 +492,11 @@ func buildAndPush(ctx context.Context, version, platform, dockerfile string, bui
486	492		}
487	493
488	494		fmt.Println("Pushing...")
489		-	if err := dockerPush(ctx, latestRef); err != nil {
	495	+	if err := dockerPushFn(ctx, latestRef); err != nil {
490	496		return fmt.Errorf("failed to push %s: %w", latestRef, err)
491	497		}
492	498		if version != "latest" {
493		-	if err := dockerPush(ctx, versionRef); err != nil {
	499	+	if err := dockerPushFn(ctx, versionRef); err != nil {
494	500		return fmt.Errorf("failed to push %s: %w", versionRef, err)
495	501		}
496	502		}

@@ -552,26 +558,26 @@ func tagAndPush(ctx context.Context, registry, imageName, version, versionRef, l
552	558		localImage := fmt.Sprintf("%s/%s", registry, imageName)
553	559
554	560		fmt.Println("\nChecking local image...")
555		-	if !dockerImageExists(ctx, localImage) {
	561	+	if !dockerImageExistsFn(ctx, localImage) {
556	562		return fmt.Errorf("local image %s not found; build and tag it before pushing", localImage)
557	563		}
558	564
559	565		fmt.Println("Tagging...")
560		-	if err := dockerTag(ctx, localImage, versionRef); err != nil {
	566	+	if err := dockerTagFn(ctx, localImage, versionRef); err != nil {
561	567		return fmt.Errorf("failed to tag %s: %w", versionRef, err)
562	568		}
563	569		if version != "latest" {
564		-	if err := dockerTag(ctx, localImage, latestRef); err != nil {
	570	+	if err := dockerTagFn(ctx, localImage, latestRef); err != nil {
565	571		return fmt.Errorf("failed to tag %s: %w", latestRef, err)
566	572		}
567	573		}
568	574
569	575		fmt.Println("Pushing...")
570		-	if err := dockerPush(ctx, versionRef); err != nil {
	576	+	if err := dockerPushFn(ctx, versionRef); err != nil {
571	577		return fmt.Errorf("failed to push %s: %w", versionRef, err)
572	578		}
573	579		if version != "latest" {
574		-	if err := dockerPush(ctx, latestRef); err != nil {
	580	+	if err := dockerPushFn(ctx, latestRef); err != nil {
575	581		return fmt.Errorf("failed to push %s: %w", latestRef, err)
576	582		}
577	583		}

 	"github.com/bnema/gordon/pkg/validation"
 )
+var (
+	dockerTagFn         = dockerTag
+	dockerPushFn        = dockerPush
+	dockerImageExistsFn = dockerImageExists
+)
 func newPushCmd() *cobra.Command {
 	var (
 		noDeploy   bool
 	}
 	fmt.Println("Pushing...")
-	if err := dockerPush(ctx, latestRef); err != nil {
+	if err := dockerPushFn(ctx, latestRef); err != nil {
 		return fmt.Errorf("failed to push %s: %w", latestRef, err)
 	}
 	if version != "latest" {
-		if err := dockerPush(ctx, versionRef); err != nil {
+		if err := dockerPushFn(ctx, versionRef); err != nil {
 			return fmt.Errorf("failed to push %s: %w", versionRef, err)
 		}
 	}
 	localImage := fmt.Sprintf("%s/%s", registry, imageName)
 	fmt.Println("\nChecking local image...")
-	if !dockerImageExists(ctx, localImage) {
+	if !dockerImageExistsFn(ctx, localImage) {
 		return fmt.Errorf("local image %s not found; build and tag it before pushing", localImage)
 	}
 	fmt.Println("Tagging...")
-	if err := dockerTag(ctx, localImage, versionRef); err != nil {
+	if err := dockerTagFn(ctx, localImage, versionRef); err != nil {
 		return fmt.Errorf("failed to tag %s: %w", versionRef, err)
 	}
 	if version != "latest" {
-		if err := dockerTag(ctx, localImage, latestRef); err != nil {
+		if err := dockerTagFn(ctx, localImage, latestRef); err != nil {
 			return fmt.Errorf("failed to tag %s: %w", latestRef, err)
 		}
 	}
 	fmt.Println("Pushing...")
-	if err := dockerPush(ctx, versionRef); err != nil {
+	if err := dockerPushFn(ctx, versionRef); err != nil {
 		return fmt.Errorf("failed to push %s: %w", versionRef, err)
 	}
 	if version != "latest" {
-		if err := dockerPush(ctx, latestRef); err != nil {
+		if err := dockerPushFn(ctx, latestRef); err != nil {
 			return fmt.Errorf("failed to push %s: %w", latestRef, err)
 		}
 	}

A internal/adapters/in/cli/push_integration_test.go +135 -0

@@ -0,0 +1,135 @@
	1	+	package cli
	2	+
	3	+	import (
	4	+	"context"
	5	+	"fmt"
	6	+	"net/http"
	7	+	"net/http/httptest"
	8	+	"strings"
	9	+	"testing"
	10	+
	11	+	"github.com/bnema/zerowrap"
	12	+	v1 "github.com/google/go-containerregistry/pkg/v1"
	13	+	"github.com/google/go-containerregistry/pkg/v1/random"
	14	+	"github.com/stretchr/testify/assert"
	15	+	"github.com/stretchr/testify/require"
	16	+
	17	+	registryhttp "github.com/bnema/gordon/internal/adapters/in/http/registry"
	18	+	"github.com/bnema/gordon/internal/adapters/out/filesystem"
	19	+	"github.com/bnema/gordon/internal/domain"
	20	+	registrysvc "github.com/bnema/gordon/internal/usecase/registry"
	21	+	"github.com/bnema/gordon/pkg/registrypush"
	22	+	)
	23	+
	24	+	func TestIntegration_TagAndPush_NativeRegistry(t *testing.T) {
	25	+	t.Parallel()
	26	+
	27	+	ctx := context.Background()
	28	+	harness := newCLITestRegistry(t, 9510241024)
	29	+	defer harness.Close()
	30	+
	31	+	img, err := random.Image(512, 1)
	32	+	require.NoError(t, err)
	33	+
	34	+	originalPush := dockerPushFn
	35	+	originalTag := dockerTagFn
	36	+	originalImageExists := dockerImageExistsFn
	37	+	t.Cleanup(func() {
	38	+	dockerPushFn = originalPush
	39	+	dockerTagFn = originalTag
	40	+	dockerImageExistsFn = originalImageExists
	41	+	})
	42	+
	43	+	dockerPushFn = func(ctx context.Context, ref string) error {
	44	+	pusher := registrypush.New(
	45	+	registrypush.WithChunkSize(256),
	46	+	registrypush.WithTransport(harness.server.Client().Transport),
	47	+	registrypush.WithImageSource(func(context.Context, string) (v1.Image, error) {
	48	+	return img, nil
	49	+	}),
	50	+	)
	51	+	return pusher.Push(ctx, ref)
	52	+	}
	53	+	dockerTagFn = func(context.Context, string, string) error {
	54	+	return nil
	55	+	}
	56	+	dockerImageExistsFn = func(context.Context, string) bool {
	57	+	return true
	58	+	}
	59	+
	60	+	registry := strings.TrimPrefix(harness.server.URL, "http://")
	61	+	versionRef := registry + "/testapp:v1.0.0"
	62	+	latestRef := registry + "/testapp:latest"
	63	+
	64	+	err = tagAndPush(ctx, registry, "testapp", "v1.0.0", versionRef, latestRef)
	65	+	require.NoError(t, err)
	66	+
	67	+	harness.RequireManifest(t, "v1.0.0")
	68	+	harness.RequireManifest(t, "latest")
	69	+	harness.RequireBlobs(ctx, t, img)
	70	+	}
	71	+
	72	+	type cliTestRegistry struct {
	73	+	server *httptest.Server
	74	+	}
	75	+
	76	+	func newCLITestRegistry(t testing.T, maxBlobChunkSize int64) cliTestRegistry {
	77	+	t.Helper()
	78	+
	79	+	log := zerowrap.Default()
	80	+	rootDir := t.TempDir()
	81	+
	82	+	blobStore, err := filesystem.NewBlobStorage(rootDir, log)
	83	+	require.NoError(t, err)
	84	+
	85	+	manifestStore, err := filesystem.NewManifestStorage(rootDir, log)
	86	+	require.NoError(t, err)
	87	+
	88	+	svc := registrysvc.NewService(blobStore, manifestStore, cliNoopEventPublisher{})
	89	+	handler := registryhttp.NewHandler(svc, log, maxBlobChunkSize)
	90	+
	91	+	return &cliTestRegistry{server: httptest.NewServer(handler)}
	92	+	}
	93	+
	94	+	func (h *cliTestRegistry) Close() {
	95	+	h.server.Close()
	96	+	}
	97	+
	98	+	func (h cliTestRegistry) RequireManifest(t testing.T, tag string) {
	99	+	t.Helper()
	100	+
	101	+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/testapp/manifests/%s", h.server.URL, tag), nil)
	102	+	require.NoError(t, err)
	103	+
	104	+	resp, err := h.server.Client().Do(req)
	105	+	require.NoError(t, err)
	106	+	defer resp.Body.Close()
	107	+
	108	+	assert.Equal(t, http.StatusOK, resp.StatusCode)
	109	+	}
	110	+
	111	+	func (h cliTestRegistry) RequireBlobs(ctx context.Context, t testing.T, img v1.Image) {
	112	+	t.Helper()
	113	+
	114	+	layers, err := img.Layers()
	115	+	require.NoError(t, err)
	116	+
	117	+	for _, layer := range layers {
	118	+	digest, digestErr := layer.Digest()
	119	+	require.NoError(t, digestErr)
	120	+
	121	+	req, reqErr := http.NewRequestWithContext(ctx, http.MethodGet, fmt.Sprintf("%s/v2/testapp/blobs/%s", h.server.URL, digest.String()), nil)
	122	+	require.NoError(t, reqErr)
	123	+
	124	+	resp, respErr := h.server.Client().Do(req)
	125	+	require.NoError(t, respErr)
	126	+	assert.Equal(t, http.StatusOK, resp.StatusCode)
	127	+	require.NoError(t, resp.Body.Close())
	128	+	}
	129	+	}
	130	+
	131	+	type cliNoopEventPublisher struct{}
	132	+
	133	+	func (cliNoopEventPublisher) Publish(domain.EventType, any) error {
	134	+	return nil
	135	+	}

@@ -0,0 +1,135 @@
	1	+	package cli
	2	+
	3	+	import (
	4	+	"context"
	5	+	"fmt"
	6	+	"net/http"
	7	+	"net/http/httptest"
	8	+	"strings"
	9	+	"testing"
	10	+
	11	+	"github.com/bnema/zerowrap"
	12	+	v1 "github.com/google/go-containerregistry/pkg/v1"
	13	+	"github.com/google/go-containerregistry/pkg/v1/random"
	14	+	"github.com/stretchr/testify/assert"
	15	+	"github.com/stretchr/testify/require"
	16	+
	17	+	registryhttp "github.com/bnema/gordon/internal/adapters/in/http/registry"
	18	+	"github.com/bnema/gordon/internal/adapters/out/filesystem"
	19	+	"github.com/bnema/gordon/internal/domain"
	20	+	registrysvc "github.com/bnema/gordon/internal/usecase/registry"
	21	+	"github.com/bnema/gordon/pkg/registrypush"
	22	+	)
	23	+
	24	+	func TestIntegration_TagAndPush_NativeRegistry(t *testing.T) {
	25	+	t.Parallel()
	26	+
	27	+	ctx := context.Background()
	28	+	harness := newCLITestRegistry(t, 9510241024)
	29	+	defer harness.Close()
	30	+
	31	+	img, err := random.Image(512, 1)
	32	+	require.NoError(t, err)
	33	+
	34	+	originalPush := dockerPushFn
	35	+	originalTag := dockerTagFn
	36	+	originalImageExists := dockerImageExistsFn
	37	+	t.Cleanup(func() {
	38	+	dockerPushFn = originalPush
	39	+	dockerTagFn = originalTag
	40	+	dockerImageExistsFn = originalImageExists
	41	+	})
	42	+
	43	+	dockerPushFn = func(ctx context.Context, ref string) error {
	44	+	pusher := registrypush.New(
	45	+	registrypush.WithChunkSize(256),
	46	+	registrypush.WithTransport(harness.server.Client().Transport),
	47	+	registrypush.WithImageSource(func(context.Context, string) (v1.Image, error) {
	48	+	return img, nil
	49	+	}),
	50	+	)
	51	+	return pusher.Push(ctx, ref)
	52	+	}
	53	+	dockerTagFn = func(context.Context, string, string) error {
	54	+	return nil
	55	+	}
	56	+	dockerImageExistsFn = func(context.Context, string) bool {
	57	+	return true
	58	+	}
	59	+
	60	+	registry := strings.TrimPrefix(harness.server.URL, "http://")
	61	+	versionRef := registry + "/testapp:v1.0.0"
	62	+	latestRef := registry + "/testapp:latest"
	63	+
	64	+	err = tagAndPush(ctx, registry, "testapp", "v1.0.0", versionRef, latestRef)
	65	+	require.NoError(t, err)
	66	+
	67	+	harness.RequireManifest(t, "v1.0.0")
	68	+	harness.RequireManifest(t, "latest")
	69	+	harness.RequireBlobs(ctx, t, img)
	70	+	}
	71	+
	72	+	type cliTestRegistry struct {
	73	+	server *httptest.Server
	74	+	}
	75	+
	76	+	func newCLITestRegistry(t testing.T, maxBlobChunkSize int64) cliTestRegistry {
	77	+	t.Helper()
	78	+
	79	+	log := zerowrap.Default()
	80	+	rootDir := t.TempDir()
	81	+
	82	+	blobStore, err := filesystem.NewBlobStorage(rootDir, log)
	83	+	require.NoError(t, err)
	84	+
	85	+	manifestStore, err := filesystem.NewManifestStorage(rootDir, log)
	86	+	require.NoError(t, err)
	87	+
	88	+	svc := registrysvc.NewService(blobStore, manifestStore, cliNoopEventPublisher{})
	89	+	handler := registryhttp.NewHandler(svc, log, maxBlobChunkSize)
	90	+
	91	+	return &cliTestRegistry{server: httptest.NewServer(handler)}
	92	+	}
	93	+
	94	+	func (h *cliTestRegistry) Close() {
	95	+	h.server.Close()
	96	+	}
	97	+
	98	+	func (h cliTestRegistry) RequireManifest(t testing.T, tag string) {
	99	+	t.Helper()
	100	+
	101	+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/testapp/manifests/%s", h.server.URL, tag), nil)
	102	+	require.NoError(t, err)
	103	+
	104	+	resp, err := h.server.Client().Do(req)
	105	+	require.NoError(t, err)
	106	+	defer resp.Body.Close()
	107	+
	108	+	assert.Equal(t, http.StatusOK, resp.StatusCode)
	109	+	}
	110	+
	111	+	func (h cliTestRegistry) RequireBlobs(ctx context.Context, t testing.T, img v1.Image) {
	112	+	t.Helper()
	113	+
	114	+	layers, err := img.Layers()
	115	+	require.NoError(t, err)
	116	+
	117	+	for _, layer := range layers {
	118	+	digest, digestErr := layer.Digest()
	119	+	require.NoError(t, digestErr)
	120	+
	121	+	req, reqErr := http.NewRequestWithContext(ctx, http.MethodGet, fmt.Sprintf("%s/v2/testapp/blobs/%s", h.server.URL, digest.String()), nil)
	122	+	require.NoError(t, reqErr)
	123	+
	124	+	resp, respErr := h.server.Client().Do(req)
	125	+	require.NoError(t, respErr)
	126	+	assert.Equal(t, http.StatusOK, resp.StatusCode)
	127	+	require.NoError(t, resp.Body.Close())
	128	+	}
	129	+	}
	130	+
	131	+	type cliNoopEventPublisher struct{}
	132	+
	133	+	func (cliNoopEventPublisher) Publish(domain.EventType, any) error {
	134	+	return nil
	135	+	}