Skip to content

Commit 9ad20c3

Browse files
committed
pkg/destroy/aws: Remove ClusterName consumer
We used to use this for AWS teardown, but e24c7dc (pkg/destroy/aws: Use the resource-groups service for tag->ARN lookup, 2019-01-10, cluster name for deletion. Personally, I'd like to drop this from the cluster metadata entirely (and move it into libvirt-specific metadata), but Abhinav is concerned about other metadata.json uses [1], so I'm punting on that for now. [1]: #1170 (comment)
1 parent 4cea5ca commit 9ad20c3

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

pkg/destroy/aws.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ func NewAWS(logger logrus.FieldLogger, metadata *types.ClusterMetadata) (Destroy
1414
}
1515

1616
return &aws.ClusterUninstaller{
17-
Filters: filters,
18-
Region: metadata.ClusterPlatformMetadata.AWS.Region,
19-
ClusterName: metadata.ClusterName,
20-
Logger: logger,
17+
Filters: filters,
18+
Region: metadata.ClusterPlatformMetadata.AWS.Region,
19+
Logger: logger,
2120
}, nil
2221
}
2322

pkg/destroy/aws/aws.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,15 @@ type ClusterUninstaller struct {
4747
// }
4848
//
4949
// will match resources with (a:b and c:d) or d:e.
50-
Filters []Filter // filter(s) we will be searching for
51-
Logger logrus.FieldLogger
52-
Region string
53-
ClusterName string
50+
Filters []Filter // filter(s) we will be searching for
51+
Logger logrus.FieldLogger
52+
Region string
5453
}
5554

5655
func (o *ClusterUninstaller) validate() error {
5756
if len(o.Filters) == 0 {
5857
return errors.Errorf("you must specify at least one tag filter")
5958
}
60-
if len(o.ClusterName) == 0 {
61-
return errors.Errorf("you must specify cluster-name")
62-
}
6359
return nil
6460
}
6561

0 commit comments

Comments
 (0)