Ignore showing clusters PR url for statuses other than creation/delet…

…ion (#1117) * Update if condition to check if status is pullRequestCreated * print pr url in get cluster by name * Add review changes
weaveworks · Nov 22, 2021 · 9450e7c · 9450e7c
1 parent 350e78d
commit 9450e7c
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 24 deletions.
diff --git a/pkg/clusters/clusters.go b/pkg/clusters/clusters.go
@@ -37,19 +37,7 @@ func GetClusters(r ClustersRetriever, w io.Writer) error {
 		fmt.Fprintf(w, "NAME\tSTATUS\tSTATUS_MESSAGE\n")
 
 		for _, c := range cs {
-			if c.PullRequest.Type == "create" {
-				c.Status = "Creation PR"
-			} else if c.PullRequest.Type == "delete" {
-				c.Status = "Deletion PR"
-			}
-
-			if c.Status == "Creation PR" || c.Status == "Deletion PR" {
-				fmt.Fprintf(w, "%s\t%s\t%s", c.Name, c.Status, c.PullRequest.Url)
-				fmt.Fprintln(w, "")
-			} else {
-				fmt.Fprintf(w, "%s\t%s", c.Name, c.Status)
-				fmt.Fprintln(w, "")
-			}
+			printCluster(c, w)
 		}
 
 		return nil
@@ -69,18 +57,11 @@ func GetClusterByName(name string, r ClustersRetriever, w io.Writer) error {
 	}
 
 	if len(cs) > 0 {
-		fmt.Fprintf(w, "NAME\tSTATUS\n")
+		fmt.Fprintf(w, "NAME\tSTATUS\tSTATUS_MESSAGE\n")
 
 		for _, c := range cs {
 			if c.Name == name {
-				if c.PullRequest.Type == "create" {
-					c.Status = "Creation PR"
-				} else if c.PullRequest.Type == "delete" {
-					c.Status = "Deletion PR"
-				}
-
-				fmt.Fprintf(w, "%s\t%s", c.Name, c.Status)
-				fmt.Fprintln(w, "")
+				printCluster(c, w)
 			}
 		}
 
@@ -124,3 +105,19 @@ type DeleteClustersParams struct {
 	ClustersNames    []string
 	CommitMessage    string
 }
+
+func printCluster(c Cluster, w io.Writer) {
+	if c.Status == "pullRequestCreated" && c.PullRequest.Type == "create" {
+		c.Status = "Creation PR"
+	} else if c.PullRequest.Type == "delete" {
+		c.Status = "Deletion PR"
+	}
+
+	if c.Status == "Creation PR" || c.Status == "Deletion PR" {
+		fmt.Fprintf(w, "%s\t%s\t%s", c.Name, c.Status, c.PullRequest.Url)
+		fmt.Fprintln(w, "")
+	} else {
+		fmt.Fprintf(w, "%s\t%s", c.Name, c.Status)
+		fmt.Fprintln(w, "")
+	}
+}
diff --git a/pkg/clusters/clusters_test.go b/pkg/clusters/clusters_test.go
@@ -76,7 +76,7 @@ func TestGetClusters(t *testing.T) {
 					Name:   "cluster-b",
 					Status: "foo",
 					PullRequest: clusters.PullRequest{
-						Type: "foo",
+						Type: "create",
 						Url:  "https://github.com/org/repo/pull/1",
 					},
 				},
@@ -120,7 +120,22 @@ func TestGetClusterByName(t *testing.T) {
 					Status: "status-a",
 				},
 			},
-			expected: "NAME\tSTATUS\ncluster-a\tstatus-a\n",
+			expected: "NAME\tSTATUS\tSTATUS_MESSAGE\ncluster-a\tstatus-a\n",
+		},
+		{
+			name:        "Print cluster PR url",
+			clusterName: "cluster-a",
+			cs: []clusters.Cluster{
+				{
+					Name:   "cluster-a",
+					Status: "pullRequestCreated",
+					PullRequest: clusters.PullRequest{
+						Type: "create",
+						Url:  "https://github.com/org/repo/pull/1",
+					},
+				},
+			},
+			expected: "NAME\tSTATUS\tSTATUS_MESSAGE\ncluster-a\tCreation PR\thttps://github.com/org/repo/pull/1\n",
 		},
 	}