github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

api/types: consolidate types package

Browse Source 
To simplify use of types, we have consolidate the packages for the mount
and descriptor protobuf types into a single Go package. We also drop the
versioning from the type packages, as these types will remain the same
between versions.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day
2017-06-22 19:51:26 -07:00
parent 40f2627ce1
commit 12c0daa9c9
26 changed files with 496 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/images/helpers.go
View File

@@ -2,7 +2,7 @@ package images
import (
imagesapi "github.com/containerd/containerd/api/services/images/v1"
"github.com/containerd/containerd/api/types/descriptor"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/namespaces"
@@ -46,7 +46,7 @@ func imageFromProto(imagepb *imagesapi.Image) images.Image {
}
}
func descFromProto(desc *descriptor.Descriptor) ocispec.Descriptor {
func descFromProto(desc *types.Descriptor) ocispec.Descriptor {
return ocispec.Descriptor{
MediaType: desc.MediaType,
Size: desc.Size_,
@@ -54,8 +54,8 @@ func descFromProto(desc *descriptor.Descriptor) ocispec.Descriptor {
}
}
func descToProto(desc *ocispec.Descriptor) descriptor.Descriptor {
return descriptor.Descriptor{
func descToProto(desc *ocispec.Descriptor) types.Descriptor {
return types.Descriptor{
MediaType: desc.MediaType,
Size_: desc.Size,
Digest: desc.Digest,