Fix/lp 1923561

cmd/juju/caas/eks.go

@@ -106,11 +106,45 @@ func (e *eks) interactiveParams(ctx *cmd.Context, p *clusterParams) (*clusterPar
 	return p, nil
 }
 
-type eksDetail struct {
+type eksDetailLegacy struct {
 	Name   string `json:"name"`
 	Region string `json:"region"`
 }
 
+type eksStatus struct {
+	EKSCTLCreated string `json:"eksctlCreated"`
+}
+
+type eksDetail struct {
+	MetaData eksDetailLegacy `json:"metadata"`
+	Status   eksStatus       `json:"status"`
+}
+
+func getClusterNames(data []byte) (out []string, err error) {
+	var clusterDetails []eksDetail
+	if err := json.Unmarshal(data, &clusterDetails); err == nil {
+		for _, detail := range clusterDetails {
+			if len(detail.MetaData.Name) > 0 {
+				out = append(out, detail.MetaData.Name)
+			}
+		}
+	}
+	if len(out) > 0 {
+		return out, nil
+	}
+	var clusterDetailsLegacy []eksDetailLegacy
+	if err := json.Unmarshal(data, &clusterDetailsLegacy); err != nil {
+		return nil, errors.Trace(err)
+	}
+	for _, detail := range clusterDetailsLegacy {
+		if len(detail.Name) > 0 {
+			out = append(out, detail.Name)
+		}
+	}
+
+	return out, nil
+}
+
 func (e *eks) listClusters(region string) (clusters []string, err error) {
 	cmd := []string{
 		e.tool, "get", "cluster", "--region", region, "-o", "json",
@@ -122,14 +156,5 @@ func (e *eks) listClusters(region string) (clusters []string, err error) {
 	if result.Code != 0 {
 		return nil, errors.New(string(result.Stderr))
 	}
-
-	var eksClusters []eksDetail
-	if err := json.Unmarshal(result.Stdout, &eksClusters); err != nil {
-		return nil, errors.Trace(err)
-	}
-
-	for _, item := range eksClusters {
-		clusters = append(clusters, item.Name)
-	}
-	return clusters, nil
+	return getClusterNames(result.Stdout)
 }

cmd/juju/caas/eks_test.go

@@ -158,7 +158,7 @@ Enter region:
 	c.Check(cmdtesting.Stdout(ctx), gc.Equals, expected)
 }
 
-func (s *eksSuite) TestInteractiveParamMultiClusters(c *gc.C) {
+func (s *eksSuite) TestInteractiveParamMultiClustersLegacyCLI(c *gc.C) {
 	ctrl := gomock.NewController(c)
 	defer ctrl.Finish()
 
@@ -215,6 +215,73 @@ Select cluster [mycluster]:
 	})
 }
 
+func (s *eksSuite) TestInteractiveParamMultiClusters(c *gc.C) {
+	ctrl := gomock.NewController(c)
+	defer ctrl.Finish()
+
+	mockRunner := mocks.NewMockCommandRunner(ctrl)
+	eksCMD := &eks{
+		tool:          "eksctl",
+		CommandRunner: mockRunner,
+	}
+	clusterJSONResp := `
+[
+    {
+        "metadata": {
+            "name": "nw-deploy-kubeflow-1272",
+            "region": "ap-southeast-2"
+        },
+        "status": {
+            "eksctlCreated": "True"
+        }
+    },
+    {
+        "metadata": {
+            "name": "k1",
+            "region": "ap-southeast-2"
+        },
+        "status": {
+            "eksctlCreated": "True"
+        }
+    }
+]`
+
+	gomock.InOrder(
+		mockRunner.EXPECT().RunCommands(exec.RunParams{
+			Commands:    "eksctl get cluster --region ap-southeast-2 -o json",
+			Environment: os.Environ(),
+		}).
+			Return(&exec.ExecResponse{
+				Code:   0,
+				Stdout: []byte(clusterJSONResp),
+			}, nil),
+	)
+	stdin := strings.NewReader("ap-southeast-2\nk1\n")
+	out := &bytes.Buffer{}
+	ctx := &cmd.Context{
+		Dir:    c.MkDir(),
+		Stdout: out,
+		Stderr: ioutil.Discard,
+		Stdin:  stdin,
+	}
+	expected := `
+Enter region: 
+Available Clusters In Ap-Southeast-2
+  nw-deploy-kubeflow-1272
+  k1
+
+Select cluster [nw-deploy-kubeflow-1272]: 
+`[1:]
+
+	outParams, err := eksCMD.interactiveParams(ctx, &clusterParams{})
+	c.Check(err, jc.ErrorIsNil)
+	c.Check(cmdtesting.Stdout(ctx), gc.Equals, expected)
+	c.Assert(outParams, jc.DeepEquals, &clusterParams{
+		name:   "k1",
+		region: "ap-southeast-2",
+	})
+}
+
 func (s *eksSuite) TestEnsureExecutable(c *gc.C) {
 	ctrl := gomock.NewController(c)
 	defer ctrl.Finish()