From 86036dc43bd7df0277645bbcd9b5dc1e6b5b7971 Mon Sep 17 00:00:00 2001 From: Arvind Choudhary Date: Mon, 28 Oct 2024 23:03:12 +0000 Subject: [PATCH] feat: [AH-586]: Fix OCI tests and enable check on gitness repo (#2885) * [AH-586]: Fix OCI tests and enable check on gitness repo --- Makefile | 8 +++++--- registry/app/api/middleware/bandwidth_stats.go | 9 ++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index f46d7f23d..863e490b9 100644 --- a/Makefile +++ b/Makefile @@ -55,16 +55,18 @@ test: generate ## Run the go tests # ############################################################################### -run: clean build +run: ar-clean build ./gitness server .local.env || true -ar-conformance-test: clean build +ar-conformance-test: ar-clean build ./gitness server .local.env > logfile.log 2>&1 & echo $$! > server.PID @sleep 10 - ./registry/tests/conformance_test.sh localhost:3000 || true + ./registry/tests/conformance_test.sh localhost:3000 + EXIT_CODE=$$?; kill `cat server.PID` @rm server.PID @rm logfile.log + exit $$EXIT_CODE ar-hot-conformance-test: rm -rf distribution-spec || true diff --git a/registry/app/api/middleware/bandwidth_stats.go b/registry/app/api/middleware/bandwidth_stats.go index eb9957ef7..b941ba532 100644 --- a/registry/app/api/middleware/bandwidth_stats.go +++ b/registry/app/api/middleware/bandwidth_stats.go @@ -81,7 +81,7 @@ func TrackBandwidthStat(h *oci.Handler) func(http.Handler) http.Handler { info, err := h.GetRegistryInfo(r, true) if err != nil { log.Ctx(ctx).Error().Stack().Str("middleware", - "TrackBandwidthStat").Err(err).Msgf("error while putting bandwidth stat of artifact, %v", + "TrackBandwidthStat").Err(err).Msgf("error while putting bandwidth stat for artifact, %v", err) return } @@ -89,8 +89,8 @@ func TrackBandwidthStat(h *oci.Handler) func(http.Handler) http.Handler { err = dbBandwidthStat(ctx, h.Controller, info, bandwidthType) if err != nil { log.Ctx(ctx).Error().Stack().Str("middleware", - "TrackBandwidthStat").Err(err).Msgf("error while putting bandwidth stat of artifact, %v", - err) + "TrackBandwidthStat").Err(err).Msgf("error while putting bandwidth stat for artifact [%s:%s], %v", + info.RegIdentifier, info.Image, err) return } }, @@ -147,6 +147,5 @@ func getImageFromUpstreamProxy(ctx context.Context, c *docker.Controller, info p return image, nil } } - //nolint:nilnil - return nil, nil + return nil, errors.New("image not found in upstream proxy") }