From 852e70f54d323cbad6beb4736f5b86a988b0942c Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Fri, 5 Jun 2020 22:14:30 -0700
Subject: [PATCH] Don't require nodeup tasks to have SetName()

---
 upup/pkg/fi/cloudup/loader.go              | 2 +-
 upup/pkg/fi/named.go                       | 6 +++++-
 upup/pkg/fi/nodeup/nodetasks/archive.go    | 4 ----
 upup/pkg/fi/nodeup/nodetasks/bindmount.go  | 4 ----
 upup/pkg/fi/nodeup/nodetasks/chattr.go     | 4 ----
 upup/pkg/fi/nodeup/nodetasks/file.go       | 4 ----
 upup/pkg/fi/nodeup/nodetasks/group.go      | 4 ----
 upup/pkg/fi/nodeup/nodetasks/issue_cert.go | 4 ----
 upup/pkg/fi/nodeup/nodetasks/load_image.go | 4 ----
 upup/pkg/fi/nodeup/nodetasks/package.go    | 4 ----
 upup/pkg/fi/nodeup/nodetasks/service.go    | 4 ----
 upup/pkg/fi/nodeup/nodetasks/user.go       | 4 ----
 12 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/upup/pkg/fi/cloudup/loader.go b/upup/pkg/fi/cloudup/loader.go
index 889173418d..a08b053a27 100644
--- a/upup/pkg/fi/cloudup/loader.go
+++ b/upup/pkg/fi/cloudup/loader.go
@@ -466,7 +466,7 @@ func (l *Loader) loadObjectMap(key string, data map[string]interface{}) (map[str
 		klog.V(4).Infof("Built %s:%s => %v", key, k, o.Interface())
 
 		if inferredName {
-			hn, ok := o.Interface().(fi.HasName)
+			hn, ok := o.Interface().(fi.HasSetName)
 			if ok {
 				hn.SetName(name)
 			}
diff --git a/upup/pkg/fi/named.go b/upup/pkg/fi/named.go
index 32af8a9227..904aeab0fd 100644
--- a/upup/pkg/fi/named.go
+++ b/upup/pkg/fi/named.go
@@ -16,8 +16,12 @@ limitations under the License.
 
 package fi
 
-// HasName indicates that the task has a Name
+// HasName indicates that the task has a Name.
 type HasName interface {
 	GetName() *string
+}
+
+// HasSetName indicates that the task can set its Name.
+type HasSetName interface {
 	SetName(name string)
 }
diff --git a/upup/pkg/fi/nodeup/nodetasks/archive.go b/upup/pkg/fi/nodeup/nodetasks/archive.go
index 7ff47400bd..52d7eb2d0f 100644
--- a/upup/pkg/fi/nodeup/nodetasks/archive.go
+++ b/upup/pkg/fi/nodeup/nodetasks/archive.go
@@ -77,10 +77,6 @@ func (e *Archive) GetName() *string {
 	return &e.Name
 }
 
-func (e *Archive) SetName(name string) {
-	e.Name = name
-}
-
 // String returns a string representation, implementing the Stringer interface
 func (e *Archive) String() string {
 	return fmt.Sprintf("Archive: %s %s->%s", e.Name, e.Source, e.TargetDir)
diff --git a/upup/pkg/fi/nodeup/nodetasks/bindmount.go b/upup/pkg/fi/nodeup/nodetasks/bindmount.go
index fa250e107f..0d9726e98d 100644
--- a/upup/pkg/fi/nodeup/nodetasks/bindmount.go
+++ b/upup/pkg/fi/nodeup/nodetasks/bindmount.go
@@ -55,10 +55,6 @@ func (e *BindMount) GetName() *string {
 	return fi.String("BindMount-" + e.Mountpoint)
 }
 
-func (e *BindMount) SetName(name string) {
-	klog.Fatalf("SetName not supported for BindMount task")
-}
-
 var _ fi.HasDependencies = &BindMount{}
 
 // GetDependencies implements HasDependencies::GetDependencies
diff --git a/upup/pkg/fi/nodeup/nodetasks/chattr.go b/upup/pkg/fi/nodeup/nodetasks/chattr.go
index 5558564dfc..781c469c17 100644
--- a/upup/pkg/fi/nodeup/nodetasks/chattr.go
+++ b/upup/pkg/fi/nodeup/nodetasks/chattr.go
@@ -46,10 +46,6 @@ func (e *Chattr) GetName() *string {
 	return fi.String("Chattr-" + e.File)
 }
 
-func (e *Chattr) SetName(name string) {
-	klog.Fatalf("SetName not supported for Chattr task")
-}
-
 var _ fi.HasDependencies = &Chattr{}
 
 // GetDependencies implements HasDependencies::GetDependencies
diff --git a/upup/pkg/fi/nodeup/nodetasks/file.go b/upup/pkg/fi/nodeup/nodetasks/file.go
index 279180142d..f9d1efc576 100644
--- a/upup/pkg/fi/nodeup/nodetasks/file.go
+++ b/upup/pkg/fi/nodeup/nodetasks/file.go
@@ -122,10 +122,6 @@ func (f *File) GetName() *string {
 	return &f.Path
 }
 
-func (f *File) SetName(name string) {
-	klog.Fatalf("SetName not supported for File task")
-}
-
 func (f *File) String() string {
 	return fmt.Sprintf("File: %q", f.Path)
 }
diff --git a/upup/pkg/fi/nodeup/nodetasks/group.go b/upup/pkg/fi/nodeup/nodetasks/group.go
index 07230026ab..1440470b3b 100644
--- a/upup/pkg/fi/nodeup/nodetasks/group.go
+++ b/upup/pkg/fi/nodeup/nodetasks/group.go
@@ -47,10 +47,6 @@ func (f *GroupTask) GetName() *string {
 	return &f.Name
 }
 
-func (f *GroupTask) SetName(name string) {
-	klog.Fatalf("SetName not supported for Group task")
-}
-
 func (e *GroupTask) Find(c *fi.Context) (*GroupTask, error) {
 	info, err := fi.LookupGroup(e.Name)
 	if err != nil {
diff --git a/upup/pkg/fi/nodeup/nodetasks/issue_cert.go b/upup/pkg/fi/nodeup/nodetasks/issue_cert.go
index 0647935d35..cc157b4d0d 100644
--- a/upup/pkg/fi/nodeup/nodetasks/issue_cert.go
+++ b/upup/pkg/fi/nodeup/nodetasks/issue_cert.go
@@ -48,10 +48,6 @@ func (i *IssueCert) GetName() *string {
 	return &i.Name
 }
 
-func (i *IssueCert) SetName(name string) {
-	i.Name = name
-}
-
 // String returns a string representation, implementing the Stringer interface
 func (i *IssueCert) String() string {
 	return fmt.Sprintf("IssueCert: %s", i.Name)
diff --git a/upup/pkg/fi/nodeup/nodetasks/load_image.go b/upup/pkg/fi/nodeup/nodetasks/load_image.go
index 8f6513d63e..787894e7e6 100644
--- a/upup/pkg/fi/nodeup/nodetasks/load_image.go
+++ b/upup/pkg/fi/nodeup/nodetasks/load_image.go
@@ -74,10 +74,6 @@ func (t *LoadImageTask) GetName() *string {
 	return &t.Name
 }
 
-func (t *LoadImageTask) SetName(name string) {
-	klog.Fatalf("SetName not supported for LoadImageTask")
-}
-
 func (t *LoadImageTask) String() string {
 	return fmt.Sprintf("LoadImageTask: %v", t.Sources)
 }
diff --git a/upup/pkg/fi/nodeup/nodetasks/package.go b/upup/pkg/fi/nodeup/nodetasks/package.go
index ffd48c3bc7..fbf654bf2f 100644
--- a/upup/pkg/fi/nodeup/nodetasks/package.go
+++ b/upup/pkg/fi/nodeup/nodetasks/package.go
@@ -117,10 +117,6 @@ func (f *Package) GetName() *string {
 	return &f.Name
 }
 
-func (f *Package) SetName(name string) {
-	f.Name = name
-}
-
 // isOSPackage returns true if this is an OS provided package (as opposed to a bare .deb, for example)
 func (p *Package) isOSPackage() bool {
 	return fi.StringValue(p.Source) == ""
diff --git a/upup/pkg/fi/nodeup/nodetasks/service.go b/upup/pkg/fi/nodeup/nodetasks/service.go
index dd099feeee..2889e7e76f 100644
--- a/upup/pkg/fi/nodeup/nodetasks/service.go
+++ b/upup/pkg/fi/nodeup/nodetasks/service.go
@@ -381,7 +381,3 @@ var _ fi.HasName = &Service{}
 func (f *Service) GetName() *string {
 	return &f.Name
 }
-
-func (f *Service) SetName(name string) {
-	klog.Fatalf("SetName not supported for Service task")
-}
diff --git a/upup/pkg/fi/nodeup/nodetasks/user.go b/upup/pkg/fi/nodeup/nodetasks/user.go
index 13268cb763..8e479d6ab3 100644
--- a/upup/pkg/fi/nodeup/nodetasks/user.go
+++ b/upup/pkg/fi/nodeup/nodetasks/user.go
@@ -49,10 +49,6 @@ func (f *UserTask) GetName() *string {
 	return &f.Name
 }
 
-func (f *UserTask) SetName(name string) {
-	klog.Fatalf("SetName not supported for User task")
-}
-
 func (e *UserTask) Find(c *fi.Context) (*UserTask, error) {
 	info, err := fi.LookupUser(e.Name)
 	if err != nil {