diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 59b321d1e1..ed4a4a282d 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -8,7 +8,6 @@ dnsprovider/pkg/dnsprovider/providers/google/clouddns/internal/stubs node-authorizer/pkg/authorizers/aws node-authorizer/pkg/server pkg/resources/ali -pkg/resources/aws pkg/resources/digitalocean pkg/resources/digitalocean/dns pkg/resources/openstack diff --git a/pkg/resources/aws/aws.go b/pkg/resources/aws/aws.go index aaa0cb7637..a52d080dcf 100644 --- a/pkg/resources/aws/aws.go +++ b/pkg/resources/aws/aws.go @@ -17,8 +17,6 @@ limitations under the License. package aws import ( - "bufio" - "bytes" "errors" "fmt" "strings" @@ -1361,54 +1359,6 @@ func FindNatGateways(cloud fi.Cloud, routeTables map[string]*resources.Resource, return resourceTrackers, nil } -// extractClusterName performs string-matching / parsing to determine the ClusterName in some instance-data -// It returns "" if it could not be (uniquely) determined -func extractClusterName(userData string) string { - clusterName := "" - - scanner := bufio.NewScanner(bytes.NewReader([]byte(userData))) - scanner.Split(bufio.ScanLines) - - for scanner.Scan() { - line := scanner.Text() - line = strings.TrimSpace(line) - - if strings.HasPrefix(line, "INSTANCE_PREFIX:") { - // kube-up - // Match: - // INSTANCE_PREFIX: 'clustername' - // INSTANCE_PREFIX: "clustername" - // INSTANCE_PREFIX: clustername - line = strings.TrimPrefix(line, "INSTANCE_PREFIX:") - } else if strings.HasPrefix(line, "ClusterName:") { - // kops - // Match: - // ClusterName: 'clustername' - // ClusterName: "clustername" - // ClusterName: clustername - line = strings.TrimPrefix(line, "ClusterName:") - } else { - continue - } - - line = strings.TrimSpace(line) - line = strings.Trim(line, "'\"") - if clusterName != "" && clusterName != line { - klog.Warningf("cannot uniquely determine cluster-name, found %q and %q", line, clusterName) - return "" - } - clusterName = line - - } - if err := scanner.Err(); err != nil { - klog.Warningf("error scanning UserData: %v", err) - return "" - } - - return clusterName - -} - // DeleteAutoScalingGroupLaunchTemplate deletes func DeleteAutoScalingGroupLaunchTemplate(cloud fi.Cloud, r *resources.Resource) error { c, ok := cloud.(awsup.AWSCloud)