vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2388 from tiborvass/remove-misused-context

Browse source 
Remove context in NewRegistry and NewRepository
This commit is contained in:
Derek McGowan 2017-09-05 13:44:47 -07:00 committed by GitHub
commit 5db89f0ca6
3 changed files with 32 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
registry/client/repository.go
View file

@ -62,7 +62,7 @@ func checkHTTPRedirect(req *http.Request, via []*http.Request) error {
} }
// NewRegistry creates a registry namespace which can be used to get a listing of repositories // NewRegistry creates a registry namespace which can be used to get a listing of repositories
func NewRegistry(ctx context.Context, baseURL string, transport http.RoundTripper) (Registry, error) { func NewRegistry(baseURL string, transport http.RoundTripper) (Registry, error) {
ub, err := v2.NewURLBuilderFromString(baseURL, false) ub, err := v2.NewURLBuilderFromString(baseURL, false)
if err != nil { if err != nil {
return nil, err return nil, err
@ -75,9 +75,8 @@ func NewRegistry(ctx context.Context, baseURL string, transport http.RoundTrippe
} }
return &registry{ return &registry{
client: client, client: client,
ub: ub, ub: ub,
context: ctx,
}, nil }, nil
} }
@ -133,7 +132,7 @@ func (r *registry) Repositories(ctx context.Context, entries []string, last stri
} }
// NewRepository creates a new Repository for the given repository name and base URL. // NewRepository creates a new Repository for the given repository name and base URL.
func NewRepository(ctx context.Context, name reference.Named, baseURL string, transport http.RoundTripper) (distribution.Repository, error) { func NewRepository(name reference.Named, baseURL string, transport http.RoundTripper) (distribution.Repository, error) {
ub, err := v2.NewURLBuilderFromString(baseURL, false) ub, err := v2.NewURLBuilderFromString(baseURL, false)
if err != nil { if err != nil {
return nil, err return nil, err
@ -146,10 +145,9 @@ func NewRepository(ctx context.Context, name reference.Named, baseURL string, tr
} }
return &repository{ return &repository{
client: client, client: client,
ub: ub, ub: ub,
name: name, name: name,
context: ctx,
}, nil }, nil
} }
@ -190,19 +188,17 @@ func (r *repository) Manifests(ctx context.Context, options ...distribution.Mani
func (r *repository) Tags(ctx context.Context) distribution.TagService { func (r *repository) Tags(ctx context.Context) distribution.TagService {
return &tags{ return &tags{
client: r.client, client: r.client,
ub: r.ub, ub: r.ub,
context: r.context, name: r.Named(),
name: r.Named(),
} }
} }
// tags implements remote tagging operations. // tags implements remote tagging operations.
type tags struct { type tags struct {
client *http.Client client *http.Client
ub *v2.URLBuilder ub *v2.URLBuilder
context context.Context name reference.Named
name reference.Named
} }
// All returns all tags // All returns all tags

36
registry/client/repository_test.go
View file

@ -118,7 +118,7 @@ func TestBlobDelete(t *testing.T) {
defer c() defer c()
ctx := context.Background() ctx := context.Background()
r, err := NewRepository(ctx, repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -140,7 +140,7 @@ func TestBlobFetch(t *testing.T) {
ctx := context.Background() ctx := context.Background()
repo, _ := reference.WithName("test.example.com/repo1") repo, _ := reference.WithName("test.example.com/repo1")
r, err := NewRepository(ctx, repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -194,7 +194,7 @@ func TestBlobExistsNoContentLength(t *testing.T) {
defer c() defer c()
ctx := context.Background() ctx := context.Background()
r, err := NewRepository(ctx, repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -220,7 +220,7 @@ func TestBlobExists(t *testing.T) {
ctx := context.Background() ctx := context.Background()
repo, _ := reference.WithName("test.example.com/repo1") repo, _ := reference.WithName("test.example.com/repo1")
r, err := NewRepository(ctx, repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -325,7 +325,7 @@ func TestBlobUploadChunked(t *testing.T) {
defer c() defer c()
ctx := context.Background() ctx := context.Background()
r, err := NewRepository(ctx, repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -435,7 +435,7 @@ func TestBlobUploadMonolithic(t *testing.T) {
defer c() defer c()
ctx := context.Background() ctx := context.Background()
r, err := NewRepository(ctx, repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -512,7 +512,7 @@ func TestBlobMount(t *testing.T) {
defer c() defer c()
ctx := context.Background() ctx := context.Background()
r, err := NewRepository(ctx, repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -723,7 +723,7 @@ func TestV1ManifestFetch(t *testing.T) {
e, c := testServer(m) e, c := testServer(m)
defer c() defer c()
r, err := NewRepository(context.Background(), repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -795,7 +795,7 @@ func TestManifestFetchWithEtag(t *testing.T) {
defer c() defer c()
ctx := context.Background() ctx := context.Background()
r, err := NewRepository(ctx, repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -836,7 +836,7 @@ func TestManifestDelete(t *testing.T) {
e, c := testServer(m) e, c := testServer(m)
defer c() defer c()
r, err := NewRepository(context.Background(), repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -899,7 +899,7 @@ func TestManifestPut(t *testing.T) {
e, c := testServer(m) e, c := testServer(m)
defer c() defer c()
r, err := NewRepository(context.Background(), repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -952,7 +952,7 @@ func TestManifestTags(t *testing.T) {
e, c := testServer(m) e, c := testServer(m)
defer c() defer c()
r, err := NewRepository(context.Background(), repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1009,7 +1009,7 @@ func TestObtainsErrorForMissingTag(t *testing.T) {
defer c() defer c()
ctx := context.Background() ctx := context.Background()
r, err := NewRepository(ctx, repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1040,7 +1040,7 @@ func TestObtainsManifestForTagWithoutHeaders(t *testing.T) {
defer c() defer c()
ctx := context.Background() ctx := context.Background()
r, err := NewRepository(ctx, repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1098,7 +1098,7 @@ func TestManifestTagsPaginated(t *testing.T) {
s.Config.Handler = testutil.NewHandler(m) s.Config.Handler = testutil.NewHandler(m)
r, err := NewRepository(context.Background(), repo, s.URL, nil) r, err := NewRepository(repo, s.URL, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1146,7 +1146,7 @@ func TestManifestUnauthorized(t *testing.T) {
e, c := testServer(m) e, c := testServer(m)
defer c() defer c()
r, err := NewRepository(context.Background(), repo, e, nil) r, err := NewRepository(repo, e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1183,7 +1183,7 @@ func TestCatalog(t *testing.T) {
entries := make([]string, 5) entries := make([]string, 5)
r, err := NewRegistry(context.Background(), e, nil) r, err := NewRegistry(e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1215,7 +1215,7 @@ func TestCatalogInParts(t *testing.T) {
entries := make([]string, 2) entries := make([]string, 2)
r, err := NewRegistry(context.Background(), e, nil) r, err := NewRegistry(e, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

2
registry/proxy/proxyregistry.go
View file

@ -146,7 +146,7 @@ func (pr *proxyingRegistry) Repository(ctx context.Context, name reference.Named
return nil, err return nil, err
} }
remoteRepo, err := client.NewRepository(ctx, name, pr.remoteURL.String(), tr) remoteRepo, err := client.NewRepository(name, pr.remoteURL.String(), tr)
if err != nil { if err != nil {
return nil, err return nil, err
} }