Merge pull request #251 from kzys/add-v2

Rename the package to github.com/containerd/cgroups/v2

Author: Kazuyoshi Kato

.github/workflows/ci.yml

@@ -110,8 +110,11 @@ jobs:
 
       - name: Run cgroup tests
         run: |
-          sudo -E PATH=$PATH GOPATH=$GOPATH \
-            $(command -v go) test -v -race -coverprofile=coverage.txt -covermode=atomic ./...
+          $(command -v go) test -exec sudo -v -race -coverprofile=coverage.txt -covermode=atomic ./...
+        working-directory: src/github.com/containerd/cgroups
+
+      - name: Build cgctl
+        run: make all
         working-directory: src/github.com/containerd/cgroups
 
   proto:
@@ -144,8 +147,8 @@ jobs:
       - name: Install proto-related tools for Go
         run: |
           go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
-          go install github.com/containerd/protobuild@v0.2.0
-          go install github.com/containerd/protobuild/cmd/go-fix-acronym@v0.2.0
+          go install github.com/containerd/protobuild@v0.3.0
+          go install github.com/containerd/protobuild/cmd/go-fix-acronym@v0.3.0
 
       - name: Compare auto-generated Go files
         run: |

Makefile

@@ -23,4 +23,4 @@ cgutil:
 proto:
 	protobuild --quiet ${PACKAGES}
 	# Keep them Go-idiomatic and backward-compatible with the gogo/protobuf era.
-	go-fix-acronym -w -a '(Cpu|Tcp|Rss)' $(shell find stats/v1/ v2/stats/ -name '*.pb.go')
+	go-fix-acronym -w -a '(Cpu|Tcp|Rss)' $(shell find stats/v1/ cgroup2/stats/ -name '*.pb.go')

Protobuild.toml

@@ -21,8 +21,11 @@ ignore_files = [
 	"google/protobuf/descriptor.proto",
 ]
 [[descriptors]]
-prefix = "github.com/containerd/cgroups/v2/stats"
-target = "v2/stats/metrics.pb.txt"
+prefix = "github.com/containerd/cgroups/cgroup2/stats"
+target = "cgroup2/stats/metrics.pb.txt"
 ignore_files = [
 	"google/protobuf/descriptor.proto",
 ]
+
+[parameters.go]
+paths = "source_relative"

blkio.go

@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/stats/v1"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 

blkio_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	v1 "github.com/containerd/cgroups/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/stats/v1"
 )
 
 const data = `major minor  #blocks  name
@@ -45,7 +45,7 @@ func TestGetDevices(t *testing.T) {
 		t.Fatal(err)
 	}
 	for dev, expected := range map[deviceKey]string{
-		deviceKey{7, 0}: "/dev/loop0",
+		deviceKey{7, 0}:   "/dev/loop0",
 		deviceKey{259, 0}: "/dev/nvme0n1",
 		deviceKey{259, 1}: "/dev/nvme0n1p1",
 	} {

cgroup.go

@@ -28,7 +28,7 @@ import (
 	"syscall"
 	"time"
 
-	v1 "github.com/containerd/cgroups/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/stats/v1"
 
 	"github.com/opencontainers/runtime-spec/specs-go"
 )

v2/cpu.go cgroup2/cpu.gov2/cpu.go renamed to cgroup2/cpu.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"math"

v2/cpuv2_test.go cgroup2/cpuv2_test.gov2/cpuv2_test.go renamed to cgroup2/cpuv2_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"fmt"

v2/devicefilter.go cgroup2/devicefilter.gov2/devicefilter.go renamed to cgroup2/devicefilter.go

@@ -24,7 +24,7 @@
 // This particular Go implementation based on runc version
 // https://github.com/opencontainers/runc/blob/master/libcontainer/cgroups/ebpf/devicefilter/devicefilter.go
 
-package v2
+package cgroup2
 
 import (
 	"errors"

v2/devicefilter_test.go cgroup2/devicefilter_test.gov2/devicefilter_test.go renamed to cgroup2/devicefilter_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"strings"