From 841cbfeabdfc1ab0b684cca176d83ab4ee817316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Fri, 9 Mar 2018 13:48:23 +0100 Subject: [PATCH] Remove storageReference.name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miloslav Trmač --- storage/storage_image.go | 1 - storage/storage_reference.go | 6 ++---- storage/storage_test.go | 20 ++++++++++---------- storage/storage_transport.go | 2 +- storage/storage_transport_test.go | 4 ++-- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/storage/storage_image.go b/storage/storage_image.go index 6f71cc3a..495e7cf6 100644 --- a/storage/storage_image.go +++ b/storage/storage_image.go @@ -249,7 +249,6 @@ func newImageDestination(imageRef storageReference) (*storageImageDestination, e // reference that mentions the no-longer-correct digest. publicRef := imageRef publicRef.breakDockerReference = true // FIXME: this does not change .StringWithinTransport(), but modifies DockerReference() - publicRef.name = nil image := &storageImageDestination{ imageRef: imageRef, publicRef: publicRef, diff --git a/storage/storage_reference.go b/storage/storage_reference.go index ed061faf..fdd39d30 100644 --- a/storage/storage_reference.go +++ b/storage/storage_reference.go @@ -21,11 +21,10 @@ type storageReference struct { completeReference reference.Named // may include a tag and/or a digest reference string id string - name reference.Named // May include a tag, not a digest - breakDockerReference bool // Possibly set by newImageDestination. FIXME: Figure out another way. + breakDockerReference bool // Possibly set by newImageDestination. FIXME: Figure out another way. } -func newReference(transport storageTransport, completeReference reference.Named, reference, id string, name reference.Named) *storageReference { +func newReference(transport storageTransport, completeReference reference.Named, reference, id string) *storageReference { // We take a copy of the transport, which contains a pointer to the // store that it used for resolving this reference, so that the // transport that we'll return from Transport() won't be affected by @@ -35,7 +34,6 @@ func newReference(transport storageTransport, completeReference reference.Named, completeReference: completeReference, reference: reference, id: id, - name: name, } } diff --git a/storage/storage_test.go b/storage/storage_test.go index 9d2be6be..3e29fddc 100644 --- a/storage/storage_test.go +++ b/storage/storage_test.go @@ -136,24 +136,24 @@ func TestParse(t *testing.T) { } _references := []storageReference{ { - name: ref.(*storageReference).name, - reference: ref.(*storageReference).name.String(), - id: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", - transport: transport, + completeReference: ref.(*storageReference).completeReference, + reference: ref.(*storageReference).completeReference.String(), + id: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + transport: transport, }, { - name: ref.(*storageReference).name, - reference: ref.(*storageReference).name.String(), - transport: transport, + completeReference: ref.(*storageReference).completeReference, + reference: ref.(*storageReference).completeReference.String(), + transport: transport, }, { id: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", transport: transport, }, { - name: ref.DockerReference(), - reference: ref.DockerReference().String(), - transport: transport, + completeReference: ref.DockerReference(), + reference: ref.DockerReference().String(), + transport: transport, }, } for _, reference := range _references { diff --git a/storage/storage_transport.go b/storage/storage_transport.go index 1e98555c..73a65927 100644 --- a/storage/storage_transport.go +++ b/storage/storage_transport.go @@ -245,7 +245,7 @@ func (s storageTransport) ParseStoreReference(store storage.Store, ref string) ( } else { logrus.Debugf("parsed reference to refname@id into %q", storeSpec+refname+"@"+id) } - return newReference(storageTransport{store: store, defaultUIDMap: s.defaultUIDMap, defaultGIDMap: s.defaultGIDMap}, completeReference, refname, id, name), nil + return newReference(storageTransport{store: store, defaultUIDMap: s.defaultUIDMap, defaultGIDMap: s.defaultGIDMap}, completeReference, refname, id), nil } func (s *storageTransport) GetStore() (storage.Store, error) { diff --git a/storage/storage_transport_test.go b/storage/storage_transport_test.go index 579c4d08..1c60f6fb 100644 --- a/storage/storage_transport_test.go +++ b/storage/storage_transport_test.go @@ -74,11 +74,11 @@ func TestTransportParseStoreReference(t *testing.T) { assert.Equal(t, c.expectedRef, storageRef.reference, c.input) assert.Equal(t, c.expectedID, storageRef.id, c.input) if c.expectedRef == "" { - assert.Nil(t, storageRef.name, c.input) + assert.Nil(t, storageRef.completeReference, c.input) } else { dockerRef, err := reference.ParseNormalizedNamed(c.expectedRef) require.NoError(t, err) - require.NotNil(t, storageRef.name, c.input) + require.NotNil(t, storageRef.completeReference, c.input) assert.Equal(t, dockerRef.String(), storageRef.reference) assert.Equal(t, dockerRef.String(), storageRef.DockerReference().String()) }