Skip to content

Commit 830e0ea

Browse files
jessvalarezojessvalarezo
committed
Change hcsshimopts to hcsshimtypes package
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
1 parent 551579b commit 830e0ea

File tree

10 files changed

+56
-56
lines changed

10 files changed

+56
-56
lines changed

‎Protobuild.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ ignore_files = [
4949
]
5050

5151
[[descriptors]]
52-
prefix = "github.com/containerd/containerd/windows/hcsshimopts"
53-
target = "windows/hcsshimopts/next.pb.txt"
52+
prefix = "github.com/containerd/containerd/windows/hcsshimtypes"
53+
target = "windows/hcsshimtypes/next.pb.txt"
5454
ignore_files = [
5555
"google/protobuf/descriptor.proto",
5656
"gogoproto/gogo.proto"

‎cmd/ctr/ps.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"text/tabwriter"
77

8-
"github.com/containerd/containerd/windows/hcsshimopts"
8+
"github.com/containerd/containerd/windows/hcsshimtypes"
99
"github.com/pkg/errors"
1010
"github.com/urfave/cli"
1111
)
@@ -45,7 +45,7 @@ var taskPsCommand = cli.Command{
4545
fmt.Fprintln(w, "PID\tINFO")
4646
for _, ps := range processes {
4747
if ps.Info != nil {
48-
var details hcsshimopts.ProcessDetails
48+
var details hcsshimtypes.ProcessDetails
4949
if err := details.Unmarshal(ps.Info.Value); err == nil {
5050
if _, err := fmt.Fprintf(w, "%d\t%+v\n", ps.Pid, details); err != nil {
5151
return err

‎container_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/containerd/typeurl"
1818

1919
"github.com/containerd/containerd/errdefs"
20-
"github.com/containerd/containerd/windows/hcsshimopts"
20+
"github.com/containerd/containerd/windows/hcsshimtypes"
2121
gogotypes "github.com/gogo/protobuf/types"
2222
)
2323

@@ -383,9 +383,9 @@ func TestContainerPids(t *testing.T) {
383383
if processes[0].Info == nil {
384384
t.Error("expected additional process information but received nil")
385385
} else {
386-
var details hcsshimopts.ProcessDetails
386+
var details hcsshimtypes.ProcessDetails
387387
if err := details.Unmarshal(processes[0].Info.Value); err != nil {
388-
t.Errorf("expected Windows info type hcsshimopts.ProcessDetails %v", err)
388+
t.Errorf("expected Windows info type hcsshimtypes.ProcessDetails %v", err)
389389
}
390390
}
391391
default:

‎windows/hcsshimopts/doc.go‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎windows/hcsshimtypes/doc.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// hcsshimtypes holds the windows runtime specific types
2+
package hcsshimtypes

windows/hcsshimopts/hcsshim.pb.go renamed to windows/hcsshimtypes/hcsshim.pb.go

Lines changed: 35 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

windows/hcsshimopts/hcsshim.proto renamed to windows/hcsshimtypes/hcsshim.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import "gogoproto/gogo.proto";
66
import "google/protobuf/duration.proto";
77
import "google/protobuf/timestamp.proto";
88

9-
option go_package = "github.com/containerd/containerd/windows/hcsshimopts;hcsshimopts";
9+
option go_package = "github.com/containerd/containerd/windows/hcsshimtypes;hcsshimtypes";
1010

1111
message CreateOptions {
1212
google.protobuf.Duration terminate_duration = 1 [(gogoproto.stdduration) = true, (gogoproto.nullable) = false];

windows/hcsshimopts/next.pb.txt renamed to windows/hcsshimtypes/next.pb.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ file {
6161
syntax: "proto3"
6262
}
6363
file {
64-
name: "github.com/containerd/containerd/windows/hcsshimopts/hcsshim.proto"
64+
name: "github.com/containerd/containerd/windows/hcsshimtypes/hcsshim.proto"
6565
package: "containerd.windows.hcsshim"
6666
dependency: "gogoproto/gogo.proto"
6767
dependency: "google/protobuf/duration.proto"
@@ -142,7 +142,7 @@ file {
142142
}
143143
}
144144
options {
145-
go_package: "github.com/containerd/containerd/windows/hcsshimopts;hcsshimopts"
145+
go_package: "github.com/containerd/containerd/windows/hcsshimtypes;hcsshimtypes"
146146
}
147147
syntax: "proto3"
148148
}

‎windows/runtime.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/containerd/containerd/namespaces"
2121
"github.com/containerd/containerd/plugin"
2222
"github.com/containerd/containerd/runtime"
23-
"github.com/containerd/containerd/windows/hcsshimopts"
23+
"github.com/containerd/containerd/windows/hcsshimtypes"
2424
"github.com/containerd/typeurl"
2525
specs "github.com/opencontainers/runtime-spec/specs-go"
2626
"github.com/pkg/errors"
@@ -109,15 +109,15 @@ func (r *windowsRuntime) Create(ctx context.Context, id string, opts runtime.Cre
109109
}
110110
spec := s.(*specs.Spec)
111111

112-
var createOpts *hcsshimopts.CreateOptions
112+
var createOpts *hcsshimtypes.CreateOptions
113113
if opts.Options != nil {
114114
o, err := typeurl.UnmarshalAny(opts.Options)
115115
if err != nil {
116116
return nil, err
117117
}
118-
createOpts = o.(*hcsshimopts.CreateOptions)
118+
createOpts = o.(*hcsshimtypes.CreateOptions)
119119
} else {
120-
createOpts = &hcsshimopts.CreateOptions{}
120+
createOpts = &hcsshimtypes.CreateOptions{}
121121
}
122122

123123
if createOpts.TerminateDuration == 0 {
@@ -215,7 +215,7 @@ func (r *windowsRuntime) Delete(ctx context.Context, t runtime.Task) (*runtime.E
215215
return rtExit, nil
216216
}
217217

218-
func (r *windowsRuntime) newTask(ctx context.Context, namespace, id string, spec *specs.Spec, io runtime.IO, createOpts *hcsshimopts.CreateOptions) (*task, error) {
218+
func (r *windowsRuntime) newTask(ctx context.Context, namespace, id string, spec *specs.Spec, io runtime.IO, createOpts *hcsshimtypes.CreateOptions) (*task, error) {
219219
var (
220220
err error
221221
pset *pipeSet
@@ -391,7 +391,7 @@ func (r *windowsRuntime) serviceTask(ctx context.Context, namespace, id string,
391391
err error
392392
t *task
393393
io runtime.IO
394-
createOpts = &hcsshimopts.CreateOptions{
394+
createOpts = &hcsshimtypes.CreateOptions{
395395
TerminateDuration: defaultTerminateDuration,
396396
}
397397
)

‎windows/task.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/containerd/containerd/errdefs"
1313
"github.com/containerd/containerd/events"
1414
"github.com/containerd/containerd/runtime"
15-
"github.com/containerd/containerd/windows/hcsshimopts"
15+
"github.com/containerd/containerd/windows/hcsshimtypes"
1616
"github.com/containerd/typeurl"
1717
"github.com/gogo/protobuf/types"
1818
specs "github.com/opencontainers/runtime-spec/specs-go"
@@ -399,12 +399,12 @@ func (t *task) cleanup() {
399399
}
400400

401401
// convertToProcessDetails converts a given hcsshim ProcessListItem to proto ProcessDetails
402-
func (t *task) convertToProcessDetails(p hcsshim.ProcessListItem) (*hcsshimopts.ProcessDetails, error) {
402+
func (t *task) convertToProcessDetails(p hcsshim.ProcessListItem) (*hcsshimtypes.ProcessDetails, error) {
403403
protobufTime, err := types.TimestampProto(p.CreateTimestamp)
404404
if err != nil {
405405
return nil, errors.Wrapf(errdefs.ErrInvalidArgument, "failed to convert timestamp for process pid: %d\n", p.ProcessId)
406406
}
407-
return &hcsshimopts.ProcessDetails{
407+
return &hcsshimtypes.ProcessDetails{
408408
ImageName: p.ImageName,
409409
CreatedAt: protobufTime,
410410
KernelTime_100Ns: p.KernelTime100ns,

0 commit comments

Comments
 (0)