dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-09 09:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49714 from thaJeztah/distribution_cleanups

Browse Source 
distribution: cleanup tests, and remove unused fields
This commit is contained in:
Paweł Gronowski
2025-04-03 09:26:31 +00:00
committed by GitHub
parent 2e92272753 83aaa3428f
commit 36295bb9ed
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
distribution/push_v2.go
View File

@@ -82,7 +82,8 @@ func (p *pusher) push(ctx context.Context) (err error) {
}
if err = p.pushRepository(ctx); err != nil {
if continueOnError(err, p.endpoint.Mirror) {
// [Service.LookupPushEndpoints] never returns mirror endpoint.
if continueOnError(err, false) {
return fallbackError{
err: err,
transportOK: true,
@@ -155,7 +156,6 @@ func (p *pusher) pushTag(ctx context.Context, ref reference.NamedTagged, id dige
hmacKey: hmacKey,
repoName: p.repoName,
ref: p.ref,
endpoint: p.endpoint,
repo: p.repo,
pushState: &p.pushState,
}
@@ -276,7 +276,6 @@ type pushDescriptor struct {
hmacKey []byte
repoName reference.Named
ref reference.Named
endpoint registry.APIEndpoint
repo distribution.Repository
pushState *pushState
remoteDescriptor distribution.Descriptor

33
distribution/registry_unit_test.go
View File

@@ -8,10 +8,10 @@ import (
"strings"
"testing"
"github.com/containerd/log"
"github.com/distribution/reference"
"github.com/docker/docker/api/types/registry"
registrypkg "github.com/docker/docker/registry"
"gotest.tools/v3/assert"
)
const secretRegistryToken = "mysecrettoken"
@@ -25,7 +25,7 @@ type tokenPassThruHandler struct {
func (h *tokenPassThruHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
h.reached = true
if strings.Contains(r.Header.Get("Authorization"), secretRegistryToken) {
log.G(context.TODO()).Debug("Detected registry token in auth header")
// Detected registry token in auth header
h.gotToken = true
}
if h.shouldSend401 == nil || h.shouldSend401(r.RequestURI) {
@@ -36,11 +36,11 @@ func (h *tokenPassThruHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
func testTokenPassThru(t *testing.T, ts *httptest.Server) {
uri, err := url.Parse(ts.URL)
if err != nil {
t.Fatalf("could not parse url from test server: %v", err)
}
assert.NilError(t, err, "could not parse url from test server")
repoName, err := reference.ParseNormalizedNamed("testremotename")
assert.NilError(t, err)
repoName, _ := reference.ParseNormalizedNamed("testremotename")
imagePullConfig := &ImagePullConfig{
Config: Config{
MetaHeaders: http.Header{},
@@ -56,9 +56,10 @@ func testTokenPassThru(t *testing.T, ts *httptest.Server) {
t.Fatal(err)
}
log.G(ctx).Debug("About to pull")
tag, err := reference.WithTag(repoName, "tag_goes_here")
assert.NilError(t, err)
// We expect it to fail, since we haven't mock'd the full registry exchange in our handler above
tag, _ := reference.WithTag(repoName, "tag_goes_here")
_ = p.pullRepository(ctx, tag)
}
@@ -69,12 +70,8 @@ func TestTokenPassThru(t *testing.T) {
testTokenPassThru(t, ts)
if !handler.reached {
t.Fatal("Handler not reached")
}
if !handler.gotToken {
t.Fatal("Failed to receive registry token")
}
assert.Check(t, handler.reached, "Handler not reached")
assert.Check(t, handler.gotToken, "Failed to receive registry token")
}
func TestTokenPassThruDifferentHost(t *testing.T) {
@@ -94,10 +91,6 @@ func TestTokenPassThruDifferentHost(t *testing.T) {
testTokenPassThru(t, tsredirect)
if !handler.reached {
t.Fatal("Handler not reached")
}
if handler.gotToken {
t.Fatal("Redirect should not forward Authorization header to another host")
}
assert.Check(t, handler.reached, "Handler not reached")
assert.Check(t, !handler.gotToken, "Redirect should not forward Authorization header to another host")
}