Fix nodetask.File dependency on owner

kubernetes · May 24, 2020 · 9cd4516 · 9cd4516
1 parent e6d73b5
commit 9cd4516
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 17 deletions.
diff --git a/upup/pkg/fi/nodeup/nodetasks/BUILD.bazel b/upup/pkg/fi/nodeup/nodetasks/BUILD.bazel
@@ -11,7 +11,6 @@ go_library(
         "file.go",
         "group.go",
         "load_image.go",
-        "mount_disk.go",
         "package.go",
         "service.go",
         "update_packages.go",
@@ -29,8 +28,6 @@ go_library(
         "//util/pkg/hashing:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
-        "//vendor/k8s.io/utils/exec:go_default_library",
-        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

diff --git a/upup/pkg/fi/nodeup/nodetasks/file.go b/upup/pkg/fi/nodeup/nodetasks/file.go
@@ -86,7 +86,7 @@ var _ fi.HasDependencies = &File{}
 func (e *File) GetDependencies(tasks map[string]fi.Task) []fi.Task {
 	var deps []fi.Task
 	if e.Owner != nil {
-		ownerTask := tasks["user/"+*e.Owner]
+		ownerTask := tasks["UserTask/"+*e.Owner]
 		if ownerTask == nil {
 			// The user might be a pre-existing user (e.g. admin)
 			klog.Warningf("Unable to find task %q", "user/"+*e.Owner)

diff --git a/upup/pkg/fi/nodeup/nodetasks/file_test.go b/upup/pkg/fi/nodeup/nodetasks/file_test.go
@@ -27,10 +27,39 @@ func TestFileDependencies(t *testing.T) {
 	childFileName := "/dependent"
 
 	grid := []struct {
+		name   string
 		parent fi.Task
 		child  fi.Task
 	}{
 		{
+			name: "user",
+			parent: &UserTask{
+				Name:  "owner",
+				UID:   3,
+				Shell: "/bin/shell",
+				Home:  "/home/owner",
+			},
+			child: &File{
+				Owner:    fi.String("owner"),
+				Path:     childFileName,
+				Contents: fi.NewStringResource("I depend on an owner"),
+				Type:     FileType_File,
+			},
+		},
+		{
+			name: "parentDir",
+			parent: &File{
+				Path: parentFileName,
+				Type: FileType_Directory,
+			},
+			child: &File{
+				Path:     parentFileName + "/" + childFileName,
+				Contents: fi.NewStringResource("I depend on my parent directory"),
+				Type:     FileType_File,
+			},
+		},
+		{
+			name: "afterFiles",
 			parent: &File{
 				Path:     parentFileName,
 				Contents: fi.NewStringResource("I am depended on by " + childFileName),
@@ -46,18 +75,24 @@ func TestFileDependencies(t *testing.T) {
 	}
 
 	for _, g := range grid {
-		allTasks := make(map[string]fi.Task)
-		allTasks["parent"] = g.parent
-		allTasks["child"] = g.child
-
-		deps := g.parent.(fi.HasDependencies).GetDependencies(allTasks)
-		if len(deps) != 0 {
-			t.Errorf("found unexpected dependencies for parent: %v %v", g.parent, deps)
-		}
-
-		childDeps := g.child.(fi.HasDependencies).GetDependencies(allTasks)
-		if len(childDeps) != 1 {
-			t.Errorf("found unexpected dependencies for child: %v %v", g.child, childDeps)
-		}
+		t.Run(g.name, func(t *testing.T) {
+			context := &fi.ModelBuilderContext{
+				Tasks: make(map[string]fi.Task),
+			}
+			context.AddTask(g.parent)
+			context.AddTask(g.child)
+
+			if _, ok := g.parent.(fi.HasDependencies); ok {
+				deps := g.parent.(fi.HasDependencies).GetDependencies(context.Tasks)
+				if len(deps) != 0 {
+					t.Errorf("found unexpected dependencies for parent: %v %v", g.parent, deps)
+				}
+			}
+
+			childDeps := g.child.(fi.HasDependencies).GetDependencies(context.Tasks)
+			if len(childDeps) != 1 {
+				t.Errorf("found unexpected dependencies for child: %v %v", g.child, childDeps)
+			}
+		})
 	}
 }