12c0daa9c9
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>
82 lines
1.7 KiB
Go
82 lines
1.7 KiB
Go
package diff
|
|
|
|
import (
|
|
diffapi "github.com/containerd/containerd/api/services/diff/v1"
|
|
"github.com/containerd/containerd/api/types"
|
|
"github.com/containerd/containerd/mount"
|
|
"github.com/containerd/containerd/plugin"
|
|
"golang.org/x/net/context"
|
|
"google.golang.org/grpc"
|
|
)
|
|
|
|
func init() {
|
|
plugin.Register(&plugin.Registration{
|
|
Type: plugin.GRPCPlugin,
|
|
ID: "diff",
|
|
Requires: []plugin.PluginType{
|
|
plugin.DiffPlugin,
|
|
},
|
|
Init: func(ic *plugin.InitContext) (interface{}, error) {
|
|
d, err := ic.Get(plugin.DiffPlugin)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &service{
|
|
diff: d.(plugin.Differ),
|
|
}, nil
|
|
},
|
|
})
|
|
}
|
|
|
|
type service struct {
|
|
diff plugin.Differ
|
|
}
|
|
|
|
func (s *service) Register(gs *grpc.Server) error {
|
|
diffapi.RegisterDiffServer(gs, s)
|
|
return nil
|
|
}
|
|
|
|
func (s *service) Apply(ctx context.Context, er *diffapi.ApplyRequest) (*diffapi.ApplyResponse, error) {
|
|
desc := toDescriptor(er.Diff)
|
|
// TODO: Check for supported media types
|
|
|
|
mounts := toMounts(er.Mounts)
|
|
|
|
ocidesc, err := s.diff.Apply(ctx, desc, mounts)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &diffapi.ApplyResponse{
|
|
Applied: fromDescriptor(ocidesc),
|
|
}, nil
|
|
|
|
}
|
|
|
|
func (s *service) Diff(ctx context.Context, dr *diffapi.DiffRequest) (*diffapi.DiffResponse, error) {
|
|
aMounts := toMounts(dr.Left)
|
|
bMounts := toMounts(dr.Right)
|
|
|
|
ocidesc, err := s.diff.DiffMounts(ctx, aMounts, bMounts, dr.MediaType, dr.Ref)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &diffapi.DiffResponse{
|
|
Diff: fromDescriptor(ocidesc),
|
|
}, nil
|
|
}
|
|
|
|
func toMounts(apim []*types.Mount) []mount.Mount {
|
|
mounts := make([]mount.Mount, len(apim))
|
|
for i, m := range apim {
|
|
mounts[i] = mount.Mount{
|
|
Type: m.Type,
|
|
Source: m.Source,
|
|
Options: m.Options,
|
|
}
|
|
}
|
|
return mounts
|
|
}
|