Merge pull request #1170 from wking/drop-destroy-cluster-name

pkg/destroy/aws: remove un-used cluster_name field
openshift · Feb 1, 2019 · 450dfe6 · 450dfe6
2 parents 7412627 + 9ad20c3
commit 450dfe6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/pkg/destroy/aws.go b/pkg/destroy/aws.go
@@ -14,10 +14,9 @@ func NewAWS(logger logrus.FieldLogger, metadata *types.ClusterMetadata) (Destroy
 	}
 
 	return &aws.ClusterUninstaller{
-		Filters:     filters,
-		Region:      metadata.ClusterPlatformMetadata.AWS.Region,
-		ClusterName: metadata.ClusterName,
-		Logger:      logger,
+		Filters: filters,
+		Region:  metadata.ClusterPlatformMetadata.AWS.Region,
+		Logger:  logger,
 	}, nil
 }
 

diff --git a/pkg/destroy/aws/aws.go b/pkg/destroy/aws/aws.go
@@ -47,19 +47,15 @@ type ClusterUninstaller struct {
 	//   }
 	//
 	// will match resources with (a:b and c:d) or d:e.
-	Filters     []Filter // filter(s) we will be searching for
-	Logger      logrus.FieldLogger
-	Region      string
-	ClusterName string
+	Filters []Filter // filter(s) we will be searching for
+	Logger  logrus.FieldLogger
+	Region  string
 }
 
 func (o *ClusterUninstaller) validate() error {
 	if len(o.Filters) == 0 {
 		return errors.Errorf("you must specify at least one tag filter")
 	}
-	if len(o.ClusterName) == 0 {
-		return errors.Errorf("you must specify cluster-name")
-	}
 	return nil
 }