Skip to content

Commit 96ca973

Browse files
dmcgowandmcgowan
authored
Merge pull request containerd#1797 from jessvalarezo/rename-packages
rename snapshot->snapshots packages, add aliases
2 parents 04dab2a + 1dd6f33 commit 96ca973

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+508
-503
lines changed

‎api/next.pb.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2793,7 +2793,7 @@ file {
27932793
syntax: "proto3"
27942794
}
27952795
file {
2796-
name: "github.com/containerd/containerd/api/services/snapshot/v1/snapshots.proto"
2796+
name: "github.com/containerd/containerd/api/services/snapshots/v1/snapshots.proto"
27972797
package: "containerd.services.snapshots.v1"
27982798
dependency: "gogoproto/gogo.proto"
27992799
dependency: "google/protobuf/empty.proto"
@@ -3317,7 +3317,7 @@ file {
33173317
}
33183318
}
33193319
options {
3320-
go_package: "github.com/containerd/containerd/api/services/snapshot/v1;snapshot"
3320+
go_package: "github.com/containerd/containerd/api/services/snapshots/v1;snapshots"
33213321
}
33223322
weak_dependency: 0
33233323
syntax: "proto3"

api/services/snapshot/v1/snapshots.pb.go renamed to api/services/snapshots/v1/snapshots.pb.go

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

api/services/snapshot/v1/snapshots.proto renamed to api/services/snapshots/v1/snapshots.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import "google/protobuf/field_mask.proto";
88
import "google/protobuf/timestamp.proto";
99
import "github.com/containerd/containerd/api/types/mount.proto";
1010

11-
option go_package = "github.com/containerd/containerd/api/services/snapshot/v1;snapshot";
11+
option go_package = "github.com/containerd/containerd/api/services/snapshots/v1;snapshots";
1212

1313
// Snapshot service manages snapshots
1414
service Snapshots {

‎client.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
imagesapi "github.com/containerd/containerd/api/services/images/v1"
1818
introspectionapi "github.com/containerd/containerd/api/services/introspection/v1"
1919
namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
20-
snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
20+
snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1"
2121
"github.com/containerd/containerd/api/services/tasks/v1"
2222
versionservice "github.com/containerd/containerd/api/services/version/v1"
2323
"github.com/containerd/containerd/containers"
@@ -33,7 +33,7 @@ import (
3333
"github.com/containerd/containerd/remotes"
3434
"github.com/containerd/containerd/remotes/docker"
3535
"github.com/containerd/containerd/remotes/docker/schema1"
36-
"github.com/containerd/containerd/snapshot"
36+
"github.com/containerd/containerd/snapshots"
3737
"github.com/containerd/typeurl"
3838
ptypes "github.com/gogo/protobuf/types"
3939
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -435,8 +435,8 @@ func (c *Client) ContentStore() content.Store {
435435
}
436436

437437
// SnapshotService returns the underlying snapshotter for the provided snapshotter name
438-
func (c *Client) SnapshotService(snapshotterName string) snapshot.Snapshotter {
439-
return NewSnapshotterFromClient(snapshotapi.NewSnapshotsClient(c.conn), snapshotterName)
438+
func (c *Client) SnapshotService(snapshotterName string) snapshots.Snapshotter {
439+
return NewSnapshotterFromClient(snapshotsapi.NewSnapshotsClient(c.conn), snapshotterName)
440440
}
441441

442442
// TaskService returns the underlying TasksClient

‎cmd/containerd/builtins.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
_ "github.com/containerd/containerd/services/introspection"
1414
_ "github.com/containerd/containerd/services/leases"
1515
_ "github.com/containerd/containerd/services/namespaces"
16-
_ "github.com/containerd/containerd/services/snapshot"
16+
_ "github.com/containerd/containerd/services/snapshots"
1717
_ "github.com/containerd/containerd/services/tasks"
1818
_ "github.com/containerd/containerd/services/version"
1919
)

‎cmd/containerd/builtins_btrfs_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
package main
44

5-
import _ "github.com/containerd/containerd/snapshot/btrfs"
5+
import _ "github.com/containerd/containerd/snapshots/btrfs"

‎cmd/containerd/builtins_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ package main
33
import (
44
_ "github.com/containerd/containerd/linux"
55
_ "github.com/containerd/containerd/metrics/cgroups"
6-
_ "github.com/containerd/containerd/snapshot/overlay"
6+
_ "github.com/containerd/containerd/snapshots/overlay"
77
)

‎cmd/containerd/builtins_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
package main
44

55
import (
6-
_ "github.com/containerd/containerd/snapshot/naive"
6+
_ "github.com/containerd/containerd/snapshots/naive"
77
)

‎cmd/containerd/builtins_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package main
22

33
import (
4-
_ "github.com/containerd/containerd/snapshot/windows"
4+
_ "github.com/containerd/containerd/snapshots/windows"
55
_ "github.com/containerd/containerd/windows"
66
)

‎cmd/ctr/commands/containers/containers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
var Command = cli.Command{
1919
Name: "containers",
2020
Usage: "manage containers",
21-
Aliases: []string{"c"},
21+
Aliases: []string{"c", "container"},
2222
Subcommands: []cli.Command{
2323
deleteCommand,
2424
infoCommand,

0 commit comments

Comments
 (0)