From eb94877ee9e027cac7a3b31fda53368910fc61b2 Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Mon, 20 Jul 2020 22:10:46 -0700
Subject: [PATCH] Revert move to explicit dependencies

The change to explicit dependencies lost the dependencies
that were previously found by reflection.
---
 upup/pkg/fi/cloudup/alitasks/launchconfiguration.go | 5 -----
 upup/pkg/fi/cloudup/awstasks/launchconfiguration.go | 5 -----
 upup/pkg/fi/cloudup/dotasks/droplet.go              | 5 -----
 upup/pkg/fi/cloudup/gcetasks/instancetemplate.go    | 9 ---------
 4 files changed, 24 deletions(-)

diff --git a/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go b/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go
index 6b8d51f2e5..5ae9fea680 100644
--- a/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go
+++ b/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go
@@ -74,16 +74,11 @@ type LaunchConfiguration struct {
 
 var _ fi.Task = &LaunchConfiguration{}
 var _ fi.CompareWithID = &LaunchConfiguration{}
-var _ fi.HasDependencies = &LaunchConfiguration{}
 
 func (l *LaunchConfiguration) CompareWithID() *string {
 	return l.ID
 }
 
-func (l *LaunchConfiguration) GetDependencies(tasks map[string]fi.Task) []fi.Task {
-	return l.UserData.GetDependencies(tasks)
-}
-
 func (l *LaunchConfiguration) Find(c *fi.Context) (*LaunchConfiguration, error) {
 	if l.ScalingGroup == nil || l.ScalingGroup.ScalingGroupId == nil {
 		klog.V(4).Infof("ScalingGroup / ScalingGroupId not found for %s, skipping Find", fi.StringValue(l.Name))
diff --git a/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go b/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go
index 0ae476d35c..7f8921bf78 100644
--- a/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go
+++ b/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go
@@ -94,17 +94,12 @@ type LaunchConfiguration struct {
 }
 
 var _ fi.CompareWithID = &LaunchConfiguration{}
-var _ fi.HasDependencies = &LaunchConfiguration{}
 var _ fi.ProducesDeletions = &LaunchConfiguration{}
 
 func (e *LaunchConfiguration) CompareWithID() *string {
 	return e.ID
 }
 
-func (l *LaunchConfiguration) GetDependencies(tasks map[string]fi.Task) []fi.Task {
-	return l.UserData.GetDependencies(tasks)
-}
-
 // findLaunchConfigurations returns matching LaunchConfigurations, sorted by CreatedTime (ascending)
 func (e *LaunchConfiguration) findLaunchConfigurations(c *fi.Context) ([]*autoscaling.LaunchConfiguration, error) {
 	cloud := c.Cloud.(awsup.AWSCloud)
diff --git a/upup/pkg/fi/cloudup/dotasks/droplet.go b/upup/pkg/fi/cloudup/dotasks/droplet.go
index b67b083355..1e667b6b50 100644
--- a/upup/pkg/fi/cloudup/dotasks/droplet.go
+++ b/upup/pkg/fi/cloudup/dotasks/droplet.go
@@ -47,16 +47,11 @@ type Droplet struct {
 
 var _ fi.Task = &Droplet{}
 var _ fi.CompareWithID = &Droplet{}
-var _ fi.HasDependencies = &Droplet{}
 
 func (d *Droplet) CompareWithID() *string {
 	return d.Name
 }
 
-func (l *Droplet) GetDependencies(tasks map[string]fi.Task) []fi.Task {
-	return l.UserData.GetDependencies(tasks)
-}
-
 func (d *Droplet) Find(c *fi.Context) (*Droplet, error) {
 	cloud := c.Cloud.(*digitalocean.Cloud)
 
diff --git a/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go b/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go
index 8431d73f49..1143cbe2e3 100644
--- a/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go
+++ b/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go
@@ -70,20 +70,11 @@ type InstanceTemplate struct {
 
 var _ fi.Task = &InstanceTemplate{}
 var _ fi.CompareWithID = &InstanceTemplate{}
-var _ fi.HasDependencies = &InstanceTemplate{}
 
 func (e *InstanceTemplate) CompareWithID() *string {
 	return e.ID
 }
 
-func (l *InstanceTemplate) GetDependencies(tasks map[string]fi.Task) []fi.Task {
-	var deps []fi.Task
-	for _, resource := range l.Metadata {
-		deps = append(deps, resource.GetDependencies(tasks)...)
-	}
-	return deps
-}
-
 func (e *InstanceTemplate) Find(c *fi.Context) (*InstanceTemplate, error) {
 	cloud := c.Cloud.(gce.GCECloud)