Move v2/ to cgroup2/

Kazuyoshi Kato · Kazuyoshi Kato · commit 5650e1c80009 · 2022-11-07T20:56:08.000Z
Signed-off-by: Kazuyoshi Kato &lt;katokazu@amazon.com&gt;
diff --git a/Makefile b/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')
diff --git a/Protobuild.toml b/Protobuild.toml
@@ -21,8 +21,8 @@ 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",
 ]
diff --git a/cgroup2/cpu.go b/cgroup2/cpu.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"math"
diff --git a/cgroup2/cpuv2_test.go b/cgroup2/cpuv2_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"fmt"
diff --git a/cgroup2/devicefilter.go b/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"
diff --git a/cgroup2/devicefilter_test.go b/cgroup2/devicefilter_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"strings"
diff --git a/cgroup2/ebpf.go b/cgroup2/ebpf.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"fmt"
diff --git a/cgroup2/errors.go b/cgroup2/errors.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"errors"
diff --git a/cgroup2/hugetlb.go b/cgroup2/hugetlb.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import "strings"
 
diff --git a/cgroup2/hugetlbv2_test.go b/cgroup2/hugetlbv2_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"fmt"
diff --git a/cgroup2/io.go b/cgroup2/io.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import "fmt"
 
diff --git a/cgroup2/iov2_test.go b/cgroup2/iov2_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"fmt"
diff --git a/cgroup2/manager.go b/cgroup2/manager.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"bufio"
@@ -30,7 +30,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containerd/cgroups/v2/v2/stats"
+	"github.com/containerd/cgroups/v2/cgroup2/stats"
 
 	systemdDbus "github.com/coreos/go-systemd/v22/dbus"
 	"github.com/godbus/dbus/v5"
diff --git a/cgroup2/manager_test.go b/cgroup2/manager_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"fmt"
diff --git a/cgroup2/memory.go b/cgroup2/memory.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 type Memory struct {
 	Swap *int64
diff --git a/cgroup2/memoryv2_test.go b/cgroup2/memoryv2_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"fmt"
diff --git a/cgroup2/paths.go b/cgroup2/paths.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"fmt"
diff --git a/cgroup2/paths_test.go b/cgroup2/paths_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"testing"
diff --git a/cgroup2/pids.go b/cgroup2/pids.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import "strconv"
 
diff --git a/cgroup2/pidsv2_test.go b/cgroup2/pidsv2_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"fmt"
diff --git a/cgroup2/rdma.go b/cgroup2/rdma.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"fmt"
diff --git a/cgroup2/state.go b/cgroup2/state.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package v2
+package cgroup2
 
 import (
 	"os"
diff --git a/cgroup2/stats/doc.go b/cgroup2/stats/doc.go
diff --git a/cgroup2/stats/metrics.pb.go b/cgroup2/stats/metrics.pb.go
diff --git a/cgroup2/stats/metrics.pb.txt b/cgroup2/stats/metrics.pb.txt
diff --git a/cgroup2/stats/metrics.proto b/cgroup2/stats/metrics.proto
diff --git a/cgroup2/testutils_test.go b/cgroup2/testutils_test.go
diff --git a/cgroup2/utils.go b/cgroup2/utils.go
diff --git a/cgroup2/utils_test.go b/cgroup2/utils_test.go
diff --git a/cmd/cgctl/main.go b/cmd/cgctl/main.go

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ ignore_files = [`
`21`	`21`	`"google/protobuf/descriptor.proto",`
`22`	`22`	`]`
`23`	`23`	`[[descriptors]]`
`24`		`-prefix = "github.com/containerd/cgroups/v2/stats"`
`25`		`-target = "v2/stats/metrics.pb.txt"`
	`24`	`+prefix = "github.com/containerd/cgroups/cgroup2/stats"`
	`25`	`+target = "cgroup2/stats/metrics.pb.txt"`
`26`	`26`	`ignore_files = [`
`27`	`27`	`"google/protobuf/descriptor.proto",`
`28`	`28`	`]`