From 2653f7377965ee7a8a177fcaa98e663194536afc Mon Sep 17 00:00:00 2001 From: Stephen J Day Date: Fri, 2 Jan 2015 17:54:01 -0800 Subject: [PATCH] Rename History object to comply with golint Signed-off-by: Stephen J Day --- client/client_test.go | 12 ++++++------ manifest/manifest.go | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index f32bc8f4..76867bcf 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -34,7 +34,7 @@ func TestPush(t *testing.T) { } uploadLocations := make([]string, 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 { // 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. uploadLocations[i] = fmt.Sprintf("/v2/%s/blobs/test-uuid", name) 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{ @@ -161,11 +161,11 @@ func TestPull(t *testing.T) { }, } blobs := make([]manifest.FSLayer, len(testBlobs)) - history := make([]manifest.ManifestHistory, len(testBlobs)) + history := make([]manifest.History, len(testBlobs)) for i, blob := range testBlobs { 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{ @@ -273,11 +273,11 @@ func TestPullResume(t *testing.T) { }, } layers := make([]manifest.FSLayer, len(testBlobs)) - history := make([]manifest.ManifestHistory, len(testBlobs)) + history := make([]manifest.History, len(testBlobs)) for i, layer := range testBlobs { 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{ diff --git a/manifest/manifest.go b/manifest/manifest.go index 3fc1dc45..ad3ecd00 100644 --- a/manifest/manifest.go +++ b/manifest/manifest.go @@ -33,7 +33,7 @@ type Manifest struct { FSLayers []FSLayer `json:"fsLayers"` // 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 @@ -81,8 +81,8 @@ type FSLayer struct { BlobSum digest.Digest `json:"blobSum"` } -// ManifestHistory stores unstructured v1 compatibility information -type ManifestHistory struct { +// History stores unstructured v1 compatibility information +type History struct { // V1Compatibility is the raw v1 compatibility information V1Compatibility string `json:"v1Compatibility"` }