Merge pull request #517 from weaveworks/fix-cluster-name-getters

Fix regression in `getClusterName` helper

.gitignore

@@ -31,3 +31,4 @@ coverage.out
 # Test results
 test-results/
 
+integration/kubeconfig-*

pkg/cfn/manager/cluster.go

@@ -146,13 +146,9 @@ func (c *StackCollection) AppendNewClusterStackResource(dryRun bool) error {
 }
 
 func getClusterName(s *Stack) string {
-	for _, tag := range s.Tags {
-		if *tag.Key == api.ClusterNameTag {
-			if strings.HasSuffix(*s.StackName, "-cluster") ||
-				strings.Contains(*s.StackName, "-nodegroup-") {
-
-				return *tag.Value
-			}
+	if strings.HasSuffix(*s.StackName, "-cluster") {
+		if v := getClusterNameTag(s); v != "" {
+			return v
 		}
 	}
 
@@ -161,3 +157,12 @@ func getClusterName(s *Stack) string {
 	}
 	return ""
 }
+
+func getClusterNameTag(s *Stack) string {
+	for _, tag := range s.Tags {
+		if *tag.Key == api.ClusterNameTag {
+			return *tag.Value
+		}
+	}
+	return ""
+}

pkg/cfn/manager/nodegroup.go

@@ -223,7 +223,7 @@ func (c *StackCollection) mapStackToNodeGroupSummary(stack *Stack) (*NodeGroupSu
 		return nil, errors.Wrapf(err, "error getting Cloudformation template for stack %s", *stack.StackName)
 	}
 
-	cluster := getClusterName(stack)
+	cluster := getClusterNameTag(stack)
 	name := getNodeGroupName(stack)
 	maxSize := gjson.Get(template, maxSizePath)
 	minSize := gjson.Get(template, minSizePath)