From 8dedaebcf7603ed2d67b520cfabc3825b1cc15ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Mon, 24 May 2021 00:11:58 +0300
Subject: [PATCH] move tree/ to rootfs/

---
 internal/tree/BUILD                    | 15 ---------------
 rootfs/BUILD                           | 11 ++++++-----
 rootfs/rootfs.go                       |  7 +++----
 {internal/tree => rootfs}/tree.go      |  2 +-
 {internal/tree => rootfs}/tree_test.go |  2 +-
 5 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 internal/tree/BUILD
 rename {internal/tree => rootfs}/tree.go (99%)
 rename {internal/tree => rootfs}/tree_test.go (99%)

diff --git a/internal/tree/BUILD b/internal/tree/BUILD
deleted file mode 100644
index 08fc59b..0000000
--- a/internal/tree/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["tree.go"],
-    importpath = "github.com/motiejus/code/undocker/internal/tree",
-    visibility = ["//src:__subpackages__"],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["tree_test.go"],
-    embed = [":go_default_library"],
-    deps = ["@com_github_stretchr_testify//assert:go_default_library"],
-)
diff --git a/rootfs/BUILD b/rootfs/BUILD
index 7a278a0..08183c2 100644
--- a/rootfs/BUILD
+++ b/rootfs/BUILD
@@ -5,18 +5,19 @@ go_library(
     srcs = [
         "doc.go",
         "rootfs.go",
+        "tree.go",
     ],
     importpath = "github.com/motiejus/code/undocker/rootfs",
     visibility = ["//visibility:public"],
-    deps = [
-        "//src/undocker/internal/tree:go_default_library",
-        "@org_uber_go_multierr//:go_default_library",
-    ],
+    deps = ["@org_uber_go_multierr//:go_default_library"],
 )
 
 go_test(
     name = "go_default_test",
-    srcs = ["rootfs_test.go"],
+    srcs = [
+        "rootfs_test.go",
+        "tree_test.go",
+    ],
     embed = [":go_default_library"],
     deps = [
         "@com_github_stretchr_testify//assert:go_default_library",
diff --git a/rootfs/rootfs.go b/rootfs/rootfs.go
index 41839b8..ea4cb73 100644
--- a/rootfs/rootfs.go
+++ b/rootfs/rootfs.go
@@ -9,7 +9,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/motiejus/code/undocker/internal/tree"
 	"go.uber.org/multierr"
 )
 
@@ -194,10 +193,10 @@ func writeFile(tr *tar.Reader, tw *tar.Writer, hdr *tar.Header) error {
 	return nil
 }
 
-func whiteoutDirs(whreaddir map[string]int, nlayers int) []*tree.Tree {
-	ret := make([]*tree.Tree, nlayers)
+func whiteoutDirs(whreaddir map[string]int, nlayers int) []*Tree {
+	ret := make([]*Tree, nlayers)
 	for i := range ret {
-		ret[i] = tree.New()
+		ret[i] = New()
 	}
 	for fname, layer := range whreaddir {
 		if layer == 0 {
diff --git a/internal/tree/tree.go b/rootfs/tree.go
similarity index 99%
rename from internal/tree/tree.go
rename to rootfs/tree.go
index 518b0ef..06d9bce 100644
--- a/internal/tree/tree.go
+++ b/rootfs/tree.go
@@ -1,4 +1,4 @@
-package tree
+package rootfs
 
 import (
 	"path/filepath"
diff --git a/internal/tree/tree_test.go b/rootfs/tree_test.go
similarity index 99%
rename from internal/tree/tree_test.go
rename to rootfs/tree_test.go
index 66b9632..4b44af8 100644
--- a/internal/tree/tree_test.go
+++ b/rootfs/tree_test.go
@@ -1,4 +1,4 @@
-package tree
+package rootfs
 
 import (
 	"testing"