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

Merge pull request #1626 from jessvalarezo/windows-changes

Browse Source 
Change hcsshimopts to hcsshimtypes package
This commit is contained in:
Phil Estes 2017-10-11 15:00:52 -04:00 committed by GitHub
commit b5152f2746
10 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Protobuild.toml
View File

@ -49,8 +49,8 @@ ignore_files = [
]
[[descriptors]]
prefix = "github.com/containerd/containerd/windows/hcsshimopts"
target = "windows/hcsshimopts/next.pb.txt"
prefix = "github.com/containerd/containerd/windows/hcsshimtypes"
target = "windows/hcsshimtypes/next.pb.txt"
ignore_files = [
"google/protobuf/descriptor.proto",
"gogoproto/gogo.proto"

4
cmd/ctr/ps.go
View File

@ -5,7 +5,7 @@ import (
"os"
"text/tabwriter"
"github.com/containerd/containerd/windows/hcsshimopts"
"github.com/containerd/containerd/windows/hcsshimtypes"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
@ -45,7 +45,7 @@ var taskPsCommand = cli.Command{
fmt.Fprintln(w, "PID\tINFO")
for _, ps := range processes {
if ps.Info != nil {
var details hcsshimopts.ProcessDetails
var details hcsshimtypes.ProcessDetails
if err := details.Unmarshal(ps.Info.Value); err == nil {
if _, err := fmt.Fprintf(w, "%d\t%+v\n", ps.Pid, details); err != nil {
return err

6
container_test.go
View File

@ -17,7 +17,7 @@ import (
"github.com/containerd/typeurl"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/windows/hcsshimopts"
"github.com/containerd/containerd/windows/hcsshimtypes"
gogotypes "github.com/gogo/protobuf/types"
)
@ -383,9 +383,9 @@ func TestContainerPids(t *testing.T) {
if processes[0].Info == nil {
t.Error("expected additional process information but received nil")
} else {
var details hcsshimopts.ProcessDetails
var details hcsshimtypes.ProcessDetails
if err := details.Unmarshal(processes[0].Info.Value); err != nil {
t.Errorf("expected Windows info type hcsshimopts.ProcessDetails %v", err)
t.Errorf("expected Windows info type hcsshimtypes.ProcessDetails %v", err)
}
}
default:

2
windows/hcsshimopts/doc.go
View File

@ -1,2 +0,0 @@
// hcsshimopts holds the windows runtime specific options
package hcsshimopts

2
windows/hcsshimtypes/doc.go Normal file
View File

@ -0,0 +1,2 @@
// hcsshimtypes holds the windows runtime specific types
package hcsshimtypes

70
windows/hcsshimopts/hcsshim.pb.go → windows/hcsshimtypes/hcsshim.pb.go
View File

@ -1,18 +1,18 @@
// Code generated by protoc-gen-gogo.
// source: github.com/containerd/containerd/windows/hcsshimopts/hcsshim.proto
// source: github.com/containerd/containerd/windows/hcsshimtypes/hcsshim.proto
// DO NOT EDIT!
/*
Package hcsshimopts is a generated protocol buffer package.
Package hcsshimtypes is a generated protocol buffer package.
It is generated from these files:
github.com/containerd/containerd/windows/hcsshimopts/hcsshim.proto
github.com/containerd/containerd/windows/hcsshimtypes/hcsshim.proto
It has these top-level messages:
CreateOptions
ProcessDetails
*/
package hcsshimopts
package hcsshimtypes
import proto "github.com/gogo/protobuf/proto"
import fmt "fmt"
@ -688,39 +688,39 @@ var (
)
func init() {
proto.RegisterFile("github.com/containerd/containerd/windows/hcsshimopts/hcsshim.proto", fileDescriptorHcsshim)
proto.RegisterFile("github.com/containerd/containerd/windows/hcsshimtypes/hcsshim.proto", fileDescriptorHcsshim)
}
var fileDescriptorHcsshim = []byte{
// 473 bytes of a gzipped FileDescriptorProto
// 474 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xc1, 0x6e, 0xd3, 0x30,
0x1c, 0xc6, 0x1b, 0x36, 0xc6, 0x6a, 0x54, 0x60, 0x86, 0x43, 0x28, 0x90, 0x54, 0xbb, 0x50, 0x09,
0x94, 0x74, 0x70, 0x42, 0x5c, 0x20, 0xab, 0x90, 0x76, 0x19, 0x53, 0x86, 0x84, 0xb4, 0x8b, 0xe5,
0x26, 0x7f, 0x52, 0x6b, 0xb5, 0x1d, 0xd9, 0x2e, 0xd5, 0x6e, 0x3c, 0x06, 0x0f, 0xc1, 0x83, 0xf4,
0xc8, 0x91, 0xd3, 0x60, 0x79, 0x12, 0x14, 0xdb, 0x2d, 0x63, 0x70, 0xda, 0xed, 0x1f, 0x7f, 0xbf,
0xef, 0xfb, 0xc7, 0x5f, 0x82, 0xb2, 0x8a, 0x99, 0xe9, 0x7c, 0x92, 0x14, 0x92, 0xa7, 0x85, 0x14,
0x86, 0x32, 0x01, 0xaa, 0xbc, 0x3c, 0x2e, 0x98, 0x28, 0xe5, 0x42, 0xa7, 0xd3, 0x42, 0xeb, 0x29,
0xe3, 0xb2, 0x36, 0xeb, 0x39, 0xa9, 0x95, 0x34, 0x12, 0xf7, 0xff, 0xd0, 0x89, 0xa7, 0x13, 0x4f,
0xf4, 0x1f, 0x54, 0xb2, 0x92, 0x16, 0x4b, 0xdb, 0xc9, 0x39, 0xfa, 0x51, 0x25, 0x65, 0x35, 0x83,
0xd4, 0x3e, 0x4d, 0xe6, 0x9f, 0xd2, 0x72, 0xae, 0xa8, 0x61, 0x52, 0x78, 0x3d, 0xbe, 0xaa, 0x1b,
0xc6, 0x41, 0x1b, 0xca, 0x6b, 0x07, 0xec, 0x16, 0xa8, 0xb7, 0xaf, 0x80, 0x1a, 0x78, 0x5f, 0xb7,
0x36, 0x8d, 0x73, 0x84, 0x0d, 0x28, 0xce, 0x04, 0x35, 0x40, 0x56, 0x69, 0x61, 0x30, 0x08, 0x86,
0xb7, 0x5f, 0x3c, 0x4c, 0x5c, 0x5c, 0xb2, 0x8a, 0x4b, 0xc6, 0x1e, 0xc8, 0xb6, 0x97, 0xe7, 0x71,
0xe7, 0xeb, 0xcf, 0x38, 0xc8, 0x77, 0xd6, 0xf6, 0x95, 0xb8, 0xfb, 0x6d, 0x03, 0xdd, 0x39, 0x52,
0xb2, 0x00, 0xad, 0xc7, 0x60, 0x28, 0x9b, 0x69, 0xfc, 0x04, 0x21, 0xc6, 0x69, 0x05, 0x44, 0x50,
0x0e, 0x36, 0xbe, 0x9b, 0x77, 0xed, 0xc9, 0x21, 0xe5, 0x80, 0x5f, 0x21, 0x54, 0xd8, 0xd7, 0x2a,
0x09, 0x35, 0xe1, 0x0d, 0xbb, 0xbd, 0xff, 0xcf, 0xf6, 0x0f, 0xab, 0xcb, 0xe4, 0x5d, 0x4f, 0xbf,
0x35, 0xf8, 0x19, 0xc2, 0xa7, 0xa0, 0x04, 0xcc, 0x48, 0x7b, 0x57, 0xb2, 0x37, 0x1a, 0x11, 0xa1,
0xc3, 0x8d, 0x41, 0x30, 0xdc, 0xcc, 0xef, 0x3a, 0xa5, 0xf5, 0xed, 0x8d, 0x46, 0x87, 0x1a, 0x27,
0xe8, 0x3e, 0x07, 0x2e, 0xd5, 0x19, 0x29, 0x24, 0xe7, 0xcc, 0x90, 0xc9, 0x99, 0x01, 0x1d, 0x6e,
0x5a, 0x7a, 0xc7, 0x49, 0xfb, 0x56, 0xc9, 0x5a, 0x01, 0xbf, 0x43, 0x03, 0xcf, 0x2f, 0xa4, 0x3a,
0x65, 0xa2, 0x22, 0x1a, 0x0c, 0xa9, 0x15, 0xfb, 0xdc, 0xd6, 0xe5, 0xcc, 0x37, 0xad, 0xf9, 0xb1,
0xe3, 0x3e, 0x3a, 0xec, 0x18, 0xcc, 0x91, 0x83, 0x5c, 0xce, 0x18, 0xc5, 0xff, 0xc9, 0xd1, 0x53,
0xaa, 0xa0, 0xf4, 0x31, 0x5b, 0x36, 0xe6, 0xd1, 0xd5, 0x98, 0x63, 0xcb, 0xb8, 0x94, 0xe7, 0x08,
0xd5, 0xae, 0x56, 0xc2, 0xca, 0xf0, 0xd6, 0x20, 0x18, 0xf6, 0xb2, 0x5e, 0x73, 0x1e, 0x77, 0x7d,
0xd9, 0x07, 0xe3, 0xbc, 0xeb, 0x81, 0x83, 0x12, 0x3f, 0x45, 0xf7, 0xe6, 0x1a, 0xd4, 0x5f, 0xb5,
0x6c, 0xdb, 0x25, 0xbd, 0xf6, 0x7c, 0x5d, 0x4a, 0x76, 0xb2, 0xbc, 0x88, 0x3a, 0x3f, 0x2e, 0xa2,
0xce, 0x97, 0x26, 0x0a, 0x96, 0x4d, 0x14, 0x7c, 0x6f, 0xa2, 0xe0, 0x57, 0x13, 0x05, 0x27, 0x6f,
0xae, 0xf3, 0x93, 0xbf, 0xbe, 0x34, 0x4f, 0xb6, 0xec, 0xc7, 0x7b, 0xf9, 0x3b, 0x00, 0x00, 0xff,
0xff, 0x75, 0x5d, 0xc9, 0xa6, 0x2f, 0x03, 0x00, 0x00,
0x1c, 0xc6, 0x1b, 0x36, 0xc6, 0x62, 0x54, 0x60, 0x86, 0x43, 0x28, 0x90, 0x54, 0xbb, 0x50, 0x09,
0x94, 0x74, 0x70, 0x42, 0x9c, 0x48, 0x2b, 0xa4, 0x5d, 0xc6, 0x94, 0x21, 0x21, 0x21, 0x24, 0xcb,
0x4d, 0xfe, 0xa4, 0xd6, 0xea, 0x38, 0xb2, 0x5d, 0xaa, 0xde, 0x78, 0x0c, 0x1e, 0x82, 0x07, 0xe9,
0x91, 0x23, 0xa7, 0xc1, 0xf2, 0x24, 0x28, 0xb6, 0x5b, 0x46, 0xe1, 0xc4, 0xcd, 0x7f, 0x7f, 0xbf,
0xef, 0xfb, 0xd7, 0x5f, 0x83, 0x46, 0x25, 0xd3, 0xd3, 0xf9, 0x24, 0xce, 0x05, 0x4f, 0x72, 0x51,
0x69, 0xca, 0x2a, 0x90, 0xc5, 0xd5, 0xe3, 0x82, 0x55, 0x85, 0x58, 0xa8, 0x64, 0x9a, 0x2b, 0x35,
0x65, 0x5c, 0x2f, 0x6b, 0xd8, 0x0c, 0x71, 0x2d, 0x85, 0x16, 0xb8, 0xf7, 0x1b, 0x8f, 0x1d, 0x1e,
0x3b, 0xa2, 0x77, 0xaf, 0x14, 0xa5, 0x30, 0x58, 0xd2, 0x9e, 0xac, 0xa3, 0x17, 0x96, 0x42, 0x94,
0x33, 0x48, 0xcc, 0x34, 0x99, 0x7f, 0x4c, 0x8a, 0xb9, 0xa4, 0x9a, 0x89, 0xca, 0xe9, 0xd1, 0xb6,
0xae, 0x19, 0x07, 0xa5, 0x29, 0xaf, 0x2d, 0x70, 0x98, 0xa3, 0xee, 0x48, 0x02, 0xd5, 0xf0, 0xa6,
0x6e, 0x6d, 0x0a, 0x67, 0x08, 0x6b, 0x90, 0x9c, 0x55, 0x54, 0x03, 0x59, 0xa7, 0x05, 0x5e, 0xdf,
0x1b, 0xdc, 0x7c, 0x76, 0x3f, 0xb6, 0x71, 0xf1, 0x3a, 0x2e, 0x1e, 0x3b, 0x20, 0xdd, 0x5f, 0x5d,
0x44, 0x9d, 0x2f, 0x3f, 0x22, 0x2f, 0x3b, 0xd8, 0xd8, 0xd7, 0xe2, 0xe1, 0xd7, 0x1d, 0x74, 0xeb,
0x54, 0x8a, 0x1c, 0x94, 0x1a, 0x83, 0xa6, 0x6c, 0xa6, 0xf0, 0x23, 0x84, 0x18, 0xa7, 0x25, 0x90,
0x8a, 0x72, 0x30, 0xf1, 0x7e, 0xe6, 0x9b, 0x9b, 0x13, 0xca, 0x01, 0xbf, 0x40, 0x28, 0x37, 0x3f,
0xab, 0x20, 0x54, 0x07, 0xd7, 0xcc, 0xf6, 0xde, 0x5f, 0xdb, 0xdf, 0xae, 0x1f, 0x93, 0xf9, 0x8e,
0x7e, 0xa5, 0xf1, 0x13, 0x84, 0xcf, 0x41, 0x56, 0x30, 0x23, 0xed, 0x5b, 0xc9, 0xd1, 0x70, 0x48,
0x2a, 0x15, 0xec, 0xf4, 0xbd, 0xc1, 0x6e, 0x76, 0xdb, 0x2a, 0xad, 0xef, 0x68, 0x38, 0x3c, 0x51,
0x38, 0x46, 0x77, 0x39, 0x70, 0x21, 0x97, 0x24, 0x17, 0x9c, 0x33, 0x4d, 0x26, 0x4b, 0x0d, 0x2a,
0xd8, 0x35, 0xf4, 0x81, 0x95, 0x46, 0x46, 0x49, 0x5b, 0x01, 0xbf, 0x46, 0x7d, 0xc7, 0x2f, 0x84,
0x3c, 0x67, 0x55, 0x49, 0x14, 0x68, 0x52, 0x4b, 0xf6, 0xa9, 0xad, 0xcb, 0x9a, 0xaf, 0x1b, 0xf3,
0x43, 0xcb, 0xbd, 0xb3, 0xd8, 0x19, 0xe8, 0x53, 0x0b, 0xd9, 0x9c, 0x31, 0x8a, 0xfe, 0x91, 0xa3,
0xa6, 0x54, 0x42, 0xe1, 0x62, 0xf6, 0x4c, 0xcc, 0x83, 0xed, 0x98, 0x33, 0xc3, 0xd8, 0x94, 0xa7,
0x08, 0xd5, 0xb6, 0x56, 0xc2, 0x8a, 0xe0, 0x46, 0xdf, 0x1b, 0x74, 0xd3, 0x6e, 0x73, 0x11, 0xf9,
0xae, 0xec, 0xe3, 0x71, 0xe6, 0x3b, 0xe0, 0xb8, 0xc0, 0x8f, 0xd1, 0x9d, 0xb9, 0x02, 0xf9, 0x47,
0x2d, 0xfb, 0x66, 0x49, 0xb7, 0xbd, 0xdf, 0x94, 0x92, 0x7e, 0x58, 0x5d, 0x86, 0x9d, 0xef, 0x97,
0x61, 0xe7, 0x73, 0x13, 0x7a, 0xab, 0x26, 0xf4, 0xbe, 0x35, 0xa1, 0xf7, 0xb3, 0x09, 0xbd, 0xf7,
0xe9, 0x7f, 0x7d, 0xe5, 0x2f, 0xaf, 0x0e, 0x93, 0x3d, 0xf3, 0xf7, 0x3d, 0xff, 0x15, 0x00, 0x00,
0xff, 0xff, 0x55, 0x4d, 0x8c, 0x0a, 0x32, 0x03, 0x00, 0x00,
}

2
windows/hcsshimopts/hcsshim.proto → windows/hcsshimtypes/hcsshim.proto
View File

@ -6,7 +6,7 @@ import "gogoproto/gogo.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";
option go_package = "github.com/containerd/containerd/windows/hcsshimopts;hcsshimopts";
option go_package = "github.com/containerd/containerd/windows/hcsshimtypes;hcsshimtypes";
message CreateOptions {
google.protobuf.Duration terminate_duration = 1 [(gogoproto.stdduration) = true, (gogoproto.nullable) = false];

4
windows/hcsshimopts/next.pb.txt → windows/hcsshimtypes/next.pb.txt
View File

@ -61,7 +61,7 @@ file {
syntax: "proto3"
}
file {
name: "github.com/containerd/containerd/windows/hcsshimopts/hcsshim.proto"
name: "github.com/containerd/containerd/windows/hcsshimtypes/hcsshim.proto"
package: "containerd.windows.hcsshim"
dependency: "gogoproto/gogo.proto"
dependency: "google/protobuf/duration.proto"
@ -142,7 +142,7 @@ file {
}
}
options {
go_package: "github.com/containerd/containerd/windows/hcsshimopts;hcsshimopts"
go_package: "github.com/containerd/containerd/windows/hcsshimtypes;hcsshimtypes"
}
syntax: "proto3"
}

12
windows/runtime.go
View File

@ -20,7 +20,7 @@ import (
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/windows/hcsshimopts"
"github.com/containerd/containerd/windows/hcsshimtypes"
"github.com/containerd/typeurl"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
@ -109,15 +109,15 @@ func (r *windowsRuntime) Create(ctx context.Context, id string, opts runtime.Cre
}
spec := s.(*specs.Spec)
var createOpts *hcsshimopts.CreateOptions
var createOpts *hcsshimtypes.CreateOptions
if opts.Options != nil {
o, err := typeurl.UnmarshalAny(opts.Options)
if err != nil {
return nil, err
}
createOpts = o.(*hcsshimopts.CreateOptions)
createOpts = o.(*hcsshimtypes.CreateOptions)
} else {
createOpts = &hcsshimopts.CreateOptions{}
createOpts = &hcsshimtypes.CreateOptions{}
}
if createOpts.TerminateDuration == 0 {
@ -215,7 +215,7 @@ func (r *windowsRuntime) Delete(ctx context.Context, t runtime.Task) (*runtime.E
return rtExit, nil
}
func (r *windowsRuntime) newTask(ctx context.Context, namespace, id string, spec *specs.Spec, io runtime.IO, createOpts *hcsshimopts.CreateOptions) (*task, error) {
func (r *windowsRuntime) newTask(ctx context.Context, namespace, id string, spec *specs.Spec, io runtime.IO, createOpts *hcsshimtypes.CreateOptions) (*task, error) {
var (
err error
pset *pipeSet
@ -391,7 +391,7 @@ func (r *windowsRuntime) serviceTask(ctx context.Context, namespace, id string,
err error
t *task
io runtime.IO
createOpts = &hcsshimopts.CreateOptions{
createOpts = &hcsshimtypes.CreateOptions{
TerminateDuration: defaultTerminateDuration,
}
)

6
windows/task.go
View File

@ -12,7 +12,7 @@ import (
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/windows/hcsshimopts"
"github.com/containerd/containerd/windows/hcsshimtypes"
"github.com/containerd/typeurl"
"github.com/gogo/protobuf/types"
specs "github.com/opencontainers/runtime-spec/specs-go"
@ -399,12 +399,12 @@ func (t *task) cleanup() {
}
// convertToProcessDetails converts a given hcsshim ProcessListItem to proto ProcessDetails
func (t *task) convertToProcessDetails(p hcsshim.ProcessListItem) (*hcsshimopts.ProcessDetails, error) {
func (t *task) convertToProcessDetails(p hcsshim.ProcessListItem) (*hcsshimtypes.ProcessDetails, error) {
protobufTime, err := types.TimestampProto(p.CreateTimestamp)
if err != nil {
return nil, errors.Wrapf(errdefs.ErrInvalidArgument, "failed to convert timestamp for process pid: %d\n", p.ProcessId)
}
return &hcsshimopts.ProcessDetails{
return &hcsshimtypes.ProcessDetails{
ImageName: p.ImageName,
CreatedAt: protobufTime,
KernelTime_100Ns: p.KernelTime100ns,