dkirillov/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Rename History object to comply with golint

Browse source 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2015-01-02 17:54:01 -08:00
parent f1f610c6cd
commit 2653f73779
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/client_test.go
View file

@ -34,7 +34,7 @@ func TestPush(t *testing.T) {
} }
uploadLocations := make([]string, len(testBlobs)) uploadLocations := make([]string, len(testBlobs))
blobs := make([]manifest.FSLayer, len(testBlobs)) blobs := make([]manifest.FSLayer, len(testBlobs))
history := make([]manifest.ManifestHistory, len(testBlobs)) history := make([]manifest.History, len(testBlobs))
for i, blob := range testBlobs { for i, blob := range testBlobs {
// TODO(bbland): this is returning the same location for all uploads, // TODO(bbland): this is returning the same location for all uploads,
@ -43,7 +43,7 @@ func TestPush(t *testing.T) {
// to change at some point. // to change at some point.
uploadLocations[i] = fmt.Sprintf("/v2/%s/blobs/test-uuid", name) uploadLocations[i] = fmt.Sprintf("/v2/%s/blobs/test-uuid", name)
blobs[i] = manifest.FSLayer{BlobSum: blob.digest} blobs[i] = manifest.FSLayer{BlobSum: blob.digest}
history[i] = manifest.ManifestHistory{V1Compatibility: blob.digest.String()} history[i] = manifest.History{V1Compatibility: blob.digest.String()}
} }
m := &manifest.SignedManifest{ m := &manifest.SignedManifest{
@ -161,11 +161,11 @@ func TestPull(t *testing.T) {
}, },
} }
blobs := make([]manifest.FSLayer, len(testBlobs)) blobs := make([]manifest.FSLayer, len(testBlobs))
history := make([]manifest.ManifestHistory, len(testBlobs)) history := make([]manifest.History, len(testBlobs))
for i, blob := range testBlobs { for i, blob := range testBlobs {
blobs[i] = manifest.FSLayer{BlobSum: blob.digest} blobs[i] = manifest.FSLayer{BlobSum: blob.digest}
history[i] = manifest.ManifestHistory{V1Compatibility: blob.digest.String()} history[i] = manifest.History{V1Compatibility: blob.digest.String()}
} }
m := &manifest.SignedManifest{ m := &manifest.SignedManifest{
@ -273,11 +273,11 @@ func TestPullResume(t *testing.T) {
}, },
} }
layers := make([]manifest.FSLayer, len(testBlobs)) layers := make([]manifest.FSLayer, len(testBlobs))
history := make([]manifest.ManifestHistory, len(testBlobs)) history := make([]manifest.History, len(testBlobs))
for i, layer := range testBlobs { for i, layer := range testBlobs {
layers[i] = manifest.FSLayer{BlobSum: layer.digest} layers[i] = manifest.FSLayer{BlobSum: layer.digest}
history[i] = manifest.ManifestHistory{V1Compatibility: layer.digest.String()} history[i] = manifest.History{V1Compatibility: layer.digest.String()}
} }
m := &manifest.Manifest{ m := &manifest.Manifest{

6
manifest/manifest.go
View file

@ -33,7 +33,7 @@ type Manifest struct {
FSLayers []FSLayer `json:"fsLayers"` FSLayers []FSLayer `json:"fsLayers"`
// History is a list of unstructured historical data for v1 compatibility // History is a list of unstructured historical data for v1 compatibility
History []ManifestHistory `json:"history"` History []History `json:"history"`
} }
// SignedManifest provides an envelope for a signed image manifest, including // SignedManifest provides an envelope for a signed image manifest, including
@ -81,8 +81,8 @@ type FSLayer struct {
BlobSum digest.Digest `json:"blobSum"` BlobSum digest.Digest `json:"blobSum"`
} }
// ManifestHistory stores unstructured v1 compatibility information // History stores unstructured v1 compatibility information
type ManifestHistory struct { type History struct {
// V1Compatibility is the raw v1 compatibility information // V1Compatibility is the raw v1 compatibility information
V1Compatibility string `json:"v1Compatibility"` V1Compatibility string `json:"v1Compatibility"`
} }