Copy annotations around where necessary

stefanberger · Jared Cordasco · commit 2364b037202c · 2019-05-03T21:31:39.000-05:00
Make sure that the newly added annotations are copied around appropriately. Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> (cherry picked from commit 0b711d6) Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
diff --git a/diff.go b/diff.go
@@ -80,17 +80,19 @@ func (r *diffRemote) Compare(ctx context.Context, a, b []mount.Mount, opts ...di
 
 func toDescriptor(d *types.Descriptor) ocispec.Descriptor {
 	return ocispec.Descriptor{
-		MediaType: d.MediaType,
-		Digest:    d.Digest,
-		Size:      d.Size_,
+		MediaType:   d.MediaType,
+		Digest:      d.Digest,
+		Size:        d.Size_,
+		Annotations: d.Annotations,
 	}
 }
 
 func fromDescriptor(d ocispec.Descriptor) *types.Descriptor {
 	return &types.Descriptor{
-		MediaType: d.MediaType,
-		Digest:    d.Digest,
-		Size_:     d.Size,
+		MediaType:   d.MediaType,
+		Digest:      d.Digest,
+		Size_:       d.Size,
+		Annotations: d.Annotations,
 	}
 }
 
diff --git a/image_store.go b/image_store.go
@@ -137,16 +137,18 @@ func imagesFromProto(imagespb []imagesapi.Image) []images.Image {
 
 func descFromProto(desc *types.Descriptor) ocispec.Descriptor {
 	return ocispec.Descriptor{
-		MediaType: desc.MediaType,
-		Size:      desc.Size_,
-		Digest:    desc.Digest,
+		MediaType:   desc.MediaType,
+		Size:        desc.Size_,
+		Digest:      desc.Digest,
+		Annotations: desc.Annotations,
 	}
 }
 
 func descToProto(desc *ocispec.Descriptor) types.Descriptor {
 	return types.Descriptor{
-		MediaType: desc.MediaType,
-		Size_:     desc.Size,
-		Digest:    desc.Digest,
+		MediaType:   desc.MediaType,
+		Size_:       desc.Size,
+		Digest:      desc.Digest,
+		Annotations: desc.Annotations,
 	}
 }
diff --git a/services/diff/local.go b/services/diff/local.go
@@ -164,16 +164,18 @@ func toMounts(apim []*types.Mount) []mount.Mount {
 
 func toDescriptor(d *types.Descriptor) ocispec.Descriptor {
 	return ocispec.Descriptor{
-		MediaType: d.MediaType,
-		Digest:    d.Digest,
-		Size:      d.Size_,
+		MediaType:   d.MediaType,
+		Digest:      d.Digest,
+		Size:        d.Size_,
+		Annotations: d.Annotations,
 	}
 }
 
 func fromDescriptor(d ocispec.Descriptor) *types.Descriptor {
 	return &types.Descriptor{
-		MediaType: d.MediaType,
-		Digest:    d.Digest,
-		Size_:     d.Size,
+		MediaType:   d.MediaType,
+		Digest:      d.Digest,
+		Size_:       d.Size,
+		Annotations: d.Annotations,
 	}
 }
diff --git a/services/images/helpers.go b/services/images/helpers.go
@@ -55,16 +55,18 @@ func imageFromProto(imagepb *imagesapi.Image) images.Image {
 
 func descFromProto(desc *types.Descriptor) ocispec.Descriptor {
 	return ocispec.Descriptor{
-		MediaType: desc.MediaType,
-		Size:      desc.Size_,
-		Digest:    desc.Digest,
+		MediaType:   desc.MediaType,
+		Size:        desc.Size_,
+		Digest:      desc.Digest,
+		Annotations: desc.Annotations,
 	}
 }
 
 func descToProto(desc *ocispec.Descriptor) types.Descriptor {
 	return types.Descriptor{
-		MediaType: desc.MediaType,
-		Size_:     desc.Size,
-		Digest:    desc.Digest,
+		MediaType:   desc.MediaType,
+		Size_:       desc.Size,
+		Digest:      desc.Digest,
+		Annotations: desc.Annotations,
 	}
 }
diff --git a/services/tasks/local.go b/services/tasks/local.go
@@ -136,9 +136,10 @@ func (l *local) Create(ctx context.Context, r *api.CreateTaskRequest, _ ...grpc.
 			return nil, fmt.Errorf("unsupported checkpoint type %q", r.Checkpoint.MediaType)
 		}
 		reader, err := l.store.ReaderAt(ctx, ocispec.Descriptor{
-			MediaType: r.Checkpoint.MediaType,
-			Digest:    r.Checkpoint.Digest,
-			Size:      r.Checkpoint.Size_,
+			MediaType:   r.Checkpoint.MediaType,
+			Digest:      r.Checkpoint.Digest,
+			Size:        r.Checkpoint.Size_,
+			Annotations: r.Checkpoint.Annotations,
 		})
 		if err != nil {
 			return nil, err
@@ -605,9 +606,10 @@ func (l *local) writeContent(ctx context.Context, mediaType, ref string, r io.Re
 		return nil, err
 	}
 	return &types.Descriptor{
-		MediaType: mediaType,
-		Digest:    writer.Digest(),
-		Size_:     size,
+		MediaType:   mediaType,
+		Digest:      writer.Digest(),
+		Size_:       size,
+		Annotations: make(map[string]string),
 	}, nil
 }
 
diff --git a/task.go b/task.go
@@ -554,6 +554,7 @@ func (t *task) checkpointTask(ctx context.Context, index *v1.Index, request *tas
 				OS:           goruntime.GOOS,
 				Architecture: goruntime.GOARCH,
 			},
+			Annotations: d.Annotations,
 		})
 	}
 	return nil
diff --git a/task_opts.go b/task_opts.go
@@ -57,9 +57,10 @@ func WithTaskCheckpoint(im Image) NewTaskOpts {
 		for _, m := range index.Manifests {
 			if m.MediaType == images.MediaTypeContainerd1Checkpoint {
 				info.Checkpoint = &types.Descriptor{
-					MediaType: m.MediaType,
-					Size_:     m.Size,
-					Digest:    m.Digest,
+					MediaType:   m.MediaType,
+					Size_:       m.Size,
+					Digest:      m.Digest,
+					Annotations: m.Annotations,
 				}
 				return nil
 			}

Original file line number	Diff line number	Diff line change
`@@ -80,17 +80,19 @@ func (r *diffRemote) Compare(ctx context.Context, a, b []mount.Mount, opts ...di`
`80`	`80`
`81`	`81`	`func toDescriptor(d *types.Descriptor) ocispec.Descriptor {`
`82`	`82`	`return ocispec.Descriptor{`
`83`		`- MediaType: d.MediaType,`
`84`		`- Digest: d.Digest,`
`85`		`- Size: d.Size_,`
	`83`	`+ MediaType: d.MediaType,`
	`84`	`+ Digest: d.Digest,`
	`85`	`+ Size: d.Size_,`
	`86`	`+ Annotations: d.Annotations,`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`func fromDescriptor(d ocispec.Descriptor) *types.Descriptor {`
`90`	`91`	`return &types.Descriptor{`
`91`		`- MediaType: d.MediaType,`
`92`		`- Digest: d.Digest,`
`93`		`- Size_: d.Size,`
	`92`	`+ MediaType: d.MediaType,`
	`93`	`+ Digest: d.Digest,`
	`94`	`+ Size_: d.Size,`
	`95`	`+ Annotations: d.Annotations,`
`94`	`96`	`}`
`95`	`97`	`}`
`96`	`98`
Original file line number	Diff line number	Diff line change
`@@ -137,16 +137,18 @@ func imagesFromProto(imagespb []imagesapi.Image) []images.Image {`
`137`	`137`
`138`	`138`	`func descFromProto(desc *types.Descriptor) ocispec.Descriptor {`
`139`	`139`	`return ocispec.Descriptor{`
`140`		`- MediaType: desc.MediaType,`
`141`		`- Size: desc.Size_,`
`142`		`- Digest: desc.Digest,`
	`140`	`+ MediaType: desc.MediaType,`
	`141`	`+ Size: desc.Size_,`
	`142`	`+ Digest: desc.Digest,`
	`143`	`+ Annotations: desc.Annotations,`
`143`	`144`	`}`
`144`	`145`	`}`
`145`	`146`
`146`	`147`	`func descToProto(desc *ocispec.Descriptor) types.Descriptor {`
`147`	`148`	`return types.Descriptor{`
`148`		`- MediaType: desc.MediaType,`
`149`		`- Size_: desc.Size,`
`150`		`- Digest: desc.Digest,`
	`149`	`+ MediaType: desc.MediaType,`
	`150`	`+ Size_: desc.Size,`
	`151`	`+ Digest: desc.Digest,`
	`152`	`+ Annotations: desc.Annotations,`
`151`	`153`	`}`
`152`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,16 +164,18 @@ func toMounts(apim []*types.Mount) []mount.Mount {`
`164`	`164`
`165`	`165`	`func toDescriptor(d *types.Descriptor) ocispec.Descriptor {`
`166`	`166`	`return ocispec.Descriptor{`
`167`		`- MediaType: d.MediaType,`
`168`		`- Digest: d.Digest,`
`169`		`- Size: d.Size_,`
	`167`	`+ MediaType: d.MediaType,`
	`168`	`+ Digest: d.Digest,`
	`169`	`+ Size: d.Size_,`
	`170`	`+ Annotations: d.Annotations,`
`170`	`171`	`}`
`171`	`172`	`}`
`172`	`173`
`173`	`174`	`func fromDescriptor(d ocispec.Descriptor) *types.Descriptor {`
`174`	`175`	`return &types.Descriptor{`
`175`		`- MediaType: d.MediaType,`
`176`		`- Digest: d.Digest,`
`177`		`- Size_: d.Size,`
	`176`	`+ MediaType: d.MediaType,`
	`177`	`+ Digest: d.Digest,`
	`178`	`+ Size_: d.Size,`
	`179`	`+ Annotations: d.Annotations,`
`178`	`180`	`}`
`179`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,16 +55,18 @@ func imageFromProto(imagepb *imagesapi.Image) images.Image {`
`55`	`55`
`56`	`56`	`func descFromProto(desc *types.Descriptor) ocispec.Descriptor {`
`57`	`57`	`return ocispec.Descriptor{`
`58`		`- MediaType: desc.MediaType,`
`59`		`- Size: desc.Size_,`
`60`		`- Digest: desc.Digest,`
	`58`	`+ MediaType: desc.MediaType,`
	`59`	`+ Size: desc.Size_,`
	`60`	`+ Digest: desc.Digest,`
	`61`	`+ Annotations: desc.Annotations,`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`func descToProto(desc *ocispec.Descriptor) types.Descriptor {`
`65`	`66`	`return types.Descriptor{`
`66`		`- MediaType: desc.MediaType,`
`67`		`- Size_: desc.Size,`
`68`		`- Digest: desc.Digest,`
	`67`	`+ MediaType: desc.MediaType,`
	`68`	`+ Size_: desc.Size,`
	`69`	`+ Digest: desc.Digest,`
	`70`	`+ Annotations: desc.Annotations,`
`69`	`71`	`}`
`70`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -554,6 +554,7 @@ func (t task) checkpointTask(ctx context.Context, index v1.Index, request *tas`
`554`	`554`	`OS: goruntime.GOOS,`
`555`	`555`	`Architecture: goruntime.GOARCH,`
`556`	`556`	`},`
	`557`	`+ Annotations: d.Annotations,`
`557`	`558`	`})`
`558`	`559`	`}`
`559`	`560`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,10 @@ func WithTaskCheckpoint(im Image) NewTaskOpts {`
`57`	`57`	`for _, m := range index.Manifests {`
`58`	`58`	`if m.MediaType == images.MediaTypeContainerd1Checkpoint {`
`59`	`59`	`info.Checkpoint = &types.Descriptor{`
`60`		`- MediaType: m.MediaType,`
`61`		`- Size_: m.Size,`
`62`		`- Digest: m.Digest,`
	`60`	`+ MediaType: m.MediaType,`
	`61`	`+ Size_: m.Size,`
	`62`	`+ Digest: m.Digest,`
	`63`	`+ Annotations: m.Annotations,`
`63`	`64`	`}`
`64`	`65`	`return nil`
`65`	`66`	`}`