Align code to match order of fields

This is just cosmetic; alighn the fields with the order in which they appear
in the struct (and JSON output).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

manifest/manifestlist/manifestlist_test.go

@@ -44,9 +44,9 @@ func makeTestManifestList(t *testing.T, mediaType string) ([]ManifestDescriptor,
 	manifestDescriptors := []ManifestDescriptor{
 		{
 			Descriptor: distribution.Descriptor{
+				MediaType: "application/vnd.docker.distribution.manifest.v2+json",
 				Digest:    "sha256:1a9ec845ee94c202b2d5da74a24f0ed2058318bfa9879fa541efaecba272e86b",
 				Size:      985,
-				MediaType: "application/vnd.docker.distribution.manifest.v2+json",
 			},
 			Platform: PlatformSpec{
 				Architecture: "amd64",
@@ -56,9 +56,9 @@ func makeTestManifestList(t *testing.T, mediaType string) ([]ManifestDescriptor,
 		},
 		{
 			Descriptor: distribution.Descriptor{
+				MediaType: "application/vnd.docker.distribution.manifest.v2+json",
 				Digest:    "sha256:6346340964309634683409684360934680934608934608934608934068934608",
 				Size:      2392,
-				MediaType: "application/vnd.docker.distribution.manifest.v2+json",
 			},
 			Platform: PlatformSpec{
 				Architecture: "sun4m",
@@ -183,9 +183,9 @@ func makeTestOCIImageIndex(t *testing.T, mediaType string) ([]ManifestDescriptor
 	manifestDescriptors := []ManifestDescriptor{
 		{
 			Descriptor: distribution.Descriptor{
+				MediaType: "application/vnd.oci.image.manifest.v1+json",
 				Digest:    "sha256:1a9ec845ee94c202b2d5da74a24f0ed2058318bfa9879fa541efaecba272e86b",
 				Size:      985,
-				MediaType: "application/vnd.oci.image.manifest.v1+json",
 			},
 			Platform: PlatformSpec{
 				Architecture: "amd64",
@@ -195,17 +195,17 @@ func makeTestOCIImageIndex(t *testing.T, mediaType string) ([]ManifestDescriptor
 		},
 		{
 			Descriptor: distribution.Descriptor{
+				MediaType:   "application/vnd.oci.image.manifest.v1+json",
 				Digest:      "sha256:1a9ec845ee94c202b2d5da74a24f0ed2058318bfa9879fa541efaecba272e86b",
 				Size:        985,
-				MediaType:   "application/vnd.oci.image.manifest.v1+json",
 				Annotations: map[string]string{"platform": "none"},
 			},
 		},
 		{
 			Descriptor: distribution.Descriptor{
+				MediaType:   "application/vnd.oci.image.manifest.v1+json",
 				Digest:      "sha256:6346340964309634683409684360934680934608934608934608934068934608",
 				Size:        2392,
-				MediaType:   "application/vnd.oci.image.manifest.v1+json",
 				Annotations: map[string]string{"what": "for"},
 			},
 			Platform: PlatformSpec{

manifest/ocischema/builder_test.go

@@ -92,20 +92,20 @@ func TestBuilder(t *testing.T) {
 
 	descriptors := []distribution.Descriptor{
 		{
+			MediaType:   v1.MediaTypeImageLayerGzip,
 			Digest:      digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"),
 			Size:        5312,
-			MediaType:   v1.MediaTypeImageLayerGzip,
 			Annotations: map[string]string{"apple": "orange", "lettuce": "wrap"},
 		},
 		{
+			MediaType: v1.MediaTypeImageLayerGzip,
 			Digest:    digest.Digest("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa"),
 			Size:      235231,
-			MediaType: v1.MediaTypeImageLayerGzip,
 		},
 		{
+			MediaType: v1.MediaTypeImageLayerGzip,
 			Digest:    digest.Digest("sha256:b4ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"),
 			Size:      639152,
-			MediaType: v1.MediaTypeImageLayerGzip,
 		},
 	}
 	annotations := map[string]string{"hot": "potato"}

manifest/ocischema/manifest_test.go

@@ -46,16 +46,16 @@ func makeTestManifest(mediaType string) Manifest {
 			MediaType:     mediaType,
 		},
 		Config: distribution.Descriptor{
+			MediaType:   v1.MediaTypeImageConfig,
 			Digest:      "sha256:1a9ec845ee94c202b2d5da74a24f0ed2058318bfa9879fa541efaecba272e86b",
 			Size:        985,
-			MediaType:   v1.MediaTypeImageConfig,
 			Annotations: map[string]string{"apple": "orange"},
 		},
 		Layers: []distribution.Descriptor{
 			{
+				MediaType:   v1.MediaTypeImageLayerGzip,
 				Digest:      "sha256:62d8908bee94c202b2d35224a221aaa2058318bfa9879fa541efaecba272331b",
 				Size:        153263,
-				MediaType:   v1.MediaTypeImageLayerGzip,
 				Annotations: map[string]string{"lettuce": "wrap"},
 			},
 		},

manifest/schema1/config_builder_test.go

@@ -29,9 +29,9 @@ func (bs *mockBlobService) Stat(ctx context.Context, dgst digest.Digest) (distri
 
 func (bs *mockBlobService) Put(ctx context.Context, mediaType string, p []byte) (distribution.Descriptor, error) {
 	d := distribution.Descriptor{
+		MediaType: mediaType,
 		Digest:    digest.FromBytes(p),
 		Size:      int64(len(p)),
-		MediaType: mediaType,
 	}
 	bs.descriptors[d.Digest] = d
 	return d, nil

manifest/schema1/manifest.go

@@ -35,9 +35,9 @@ func init() {
 		}
 
 		desc := distribution.Descriptor{
+			MediaType: MediaTypeSignedManifest,
 			Digest:    digest.FromBytes(sm.Canonical),
 			Size:      int64(len(sm.Canonical)),
-			MediaType: MediaTypeSignedManifest,
 		}
 		return sm, desc, err
 	}

manifest/schema2/builder_test.go

@@ -23,9 +23,9 @@ func (bs *mockBlobService) Stat(ctx context.Context, dgst digest.Digest) (distri
 
 func (bs *mockBlobService) Put(ctx context.Context, mediaType string, p []byte) (distribution.Descriptor, error) {
 	d := distribution.Descriptor{
+		MediaType: "application/octet-stream",
 		Digest:    digest.FromBytes(p),
 		Size:      int64(len(p)),
-		MediaType: "application/octet-stream",
 	}
 	bs.descriptors[d.Digest] = d
 	return d, nil
@@ -134,19 +134,19 @@ func TestBuilder(t *testing.T) {
 
 	descriptors := []distribution.Descriptor{
 		{
+			MediaType: MediaTypeLayer,
 			Digest:    digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"),
 			Size:      5312,
-			MediaType: MediaTypeLayer,
 		},
 		{
+			MediaType: MediaTypeLayer,
 			Digest:    digest.Digest("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa"),
 			Size:      235231,
-			MediaType: MediaTypeLayer,
 		},
 		{
+			MediaType: MediaTypeLayer,
 			Digest:    digest.Digest("sha256:b4ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"),
 			Size:      639152,
-			MediaType: MediaTypeLayer,
 		},
 	}
 

manifest/schema2/manifest_test.go

@@ -34,15 +34,15 @@ func makeTestManifest(mediaType string) Manifest {
 			MediaType:     mediaType,
 		},
 		Config: distribution.Descriptor{
+			MediaType: MediaTypeImageConfig,
 			Digest:    "sha256:1a9ec845ee94c202b2d5da74a24f0ed2058318bfa9879fa541efaecba272e86b",
 			Size:      985,
-			MediaType: MediaTypeImageConfig,
 		},
 		Layers: []distribution.Descriptor{
 			{
+				MediaType: MediaTypeLayer,
 				Digest:    "sha256:62d8908bee94c202b2d35224a221aaa2058318bfa9879fa541efaecba272331b",
 				Size:      153263,
-				MediaType: MediaTypeLayer,
 			},
 		},
 	}

notifications/bridge.go

@@ -150,9 +150,9 @@ func (b *bridge) createManifestEvent(action string, repo reference.Named, sm dis
 	}
 
 	event.Target.MediaType = mt
-	event.Target.Length = desc.Size
-	event.Target.Size = desc.Size
 	event.Target.Digest = desc.Digest
+	event.Target.Size = desc.Size
+	event.Target.Length = desc.Size
 	if b.includeReferences {
 		event.Target.References = append(event.Target.References, manifest.References()...)
 	}

notifications/event_test.go

@@ -116,28 +116,28 @@ func TestEventEnvelopeJSONFormat(t *testing.T) {
 
 	manifestPush := prototype
 	manifestPush.ID = "asdf-asdf-asdf-asdf-0"
-	manifestPush.Target.Digest = "sha256:0123456789abcdef0"
-	manifestPush.Target.Length = 1
-	manifestPush.Target.Size = 1
 	manifestPush.Target.MediaType = schema1.MediaTypeSignedManifest
+	manifestPush.Target.Digest = "sha256:0123456789abcdef0"
+	manifestPush.Target.Size = 1
+	manifestPush.Target.Length = 1
 	manifestPush.Target.Repository = "library/test"
 	manifestPush.Target.URL = "http://example.com/v2/library/test/manifests/latest"
 
 	layerPush0 := prototype
 	layerPush0.ID = "asdf-asdf-asdf-asdf-1"
-	layerPush0.Target.Digest = "sha256:3b3692957d439ac1928219a83fac91e7bf96c153725526874673ae1f2023f8d5"
-	layerPush0.Target.Length = 2
-	layerPush0.Target.Size = 2
 	layerPush0.Target.MediaType = layerMediaType
+	layerPush0.Target.Digest = "sha256:3b3692957d439ac1928219a83fac91e7bf96c153725526874673ae1f2023f8d5"
+	layerPush0.Target.Size = 2
+	layerPush0.Target.Length = 2
 	layerPush0.Target.Repository = "library/test"
 	layerPush0.Target.URL = "http://example.com/v2/library/test/manifests/latest"
 
 	layerPush1 := prototype
 	layerPush1.ID = "asdf-asdf-asdf-asdf-2"
-	layerPush1.Target.Digest = "sha256:3b3692957d439ac1928219a83fac91e7bf96c153725526874673ae1f2023f8d6"
-	layerPush1.Target.Length = 3
-	layerPush1.Target.Size = 3
 	layerPush1.Target.MediaType = layerMediaType
+	layerPush1.Target.Digest = "sha256:3b3692957d439ac1928219a83fac91e7bf96c153725526874673ae1f2023f8d6"
+	layerPush1.Target.Size = 3
+	layerPush1.Target.Length = 3
 	layerPush1.Target.Repository = "library/test"
 	layerPush1.Target.URL = "http://example.com/v2/library/test/manifests/latest"