From e7e8cb3c91311dae5f9b8f9923c47a7242d84073 Mon Sep 17 00:00:00 2001
From: Philippe Martin <phmartin@redhat.com>
Date: Tue, 7 Jun 2022 14:01:24 +0200
Subject: [PATCH] Return odo analyze result as an array (#5799)

---
 .../version-3.0.0/command-reference/json-output.md | 14 ++++++++------
 pkg/odo/cli/alizer/alizer.go                       |  3 ++-
 tests/integration/devfile/cmd_analyze_test.go      |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/docs/website/versioned_docs/version-3.0.0/command-reference/json-output.md b/docs/website/versioned_docs/version-3.0.0/command-reference/json-output.md
index 800df9f122a..aa9575d1d11 100644
--- a/docs/website/versioned_docs/version-3.0.0/command-reference/json-output.md
+++ b/docs/website/versioned_docs/version-3.0.0/command-reference/json-output.md
@@ -19,17 +19,19 @@ The structures used to return information using JSON output are defined in [the
 
 ## odo analyze -o json
 
-The `analyze` command analyzes the files in the current directory to select the best devfile to use,
+The `analyze` command analyzes the files in the current directory to select the best devfiles to use,
 from the devfiles in the registries defined in the list of preferred registries with the command `odo preference registry`.
 
-The output of this command contains a devfile name and a registry name:
+The output of this command contains a list of devfile name and registry name:
 
 ```bash
 $ odo analyze -o json
-{
-    "devfile": "nodejs",
-    "devfileRegistry": "DefaultDevfileRegistry"
-}
+[
+	{
+	    "devfile": "nodejs",
+	    "devfileRegistry": "DefaultDevfileRegistry"
+	}
+]
 $ echo $?
 0
 ```
diff --git a/pkg/odo/cli/alizer/alizer.go b/pkg/odo/cli/alizer/alizer.go
index a1a74019b4a..4470eab5abf 100644
--- a/pkg/odo/cli/alizer/alizer.go
+++ b/pkg/odo/cli/alizer/alizer.go
@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/redhat-developer/odo/pkg/alizer"
+	"github.com/redhat-developer/odo/pkg/api"
 	"github.com/redhat-developer/odo/pkg/machineoutput"
 	"github.com/redhat-developer/odo/pkg/odo/cmdline"
 	"github.com/redhat-developer/odo/pkg/odo/genericclioptions"
@@ -53,7 +54,7 @@ func (o *AlizerOptions) RunForJsonOutput(ctx context.Context) (out interface{},
 		return nil, err
 	}
 	result := alizer.GetDevfileLocationFromDetection(df, reg)
-	return result, nil
+	return []api.DevfileLocation{*result}, nil
 }
 
 func NewCmdAlizer(name, fullName string) *cobra.Command {
diff --git a/tests/integration/devfile/cmd_analyze_test.go b/tests/integration/devfile/cmd_analyze_test.go
index ef44716a7f0..e7cd0a13f5d 100644
--- a/tests/integration/devfile/cmd_analyze_test.go
+++ b/tests/integration/devfile/cmd_analyze_test.go
@@ -33,8 +33,8 @@ var _ = Describe("odo analyze command tests", func() {
 			stdout, stderr := res.Out(), res.Err()
 			Expect(stderr).To(BeEmpty())
 			Expect(helper.IsJSON(stdout)).To(BeTrue())
-			helper.JsonPathContentIs(stdout, "devfile", "nodejs")
-			helper.JsonPathContentIs(stdout, "devfileRegistry", "DefaultDevfileRegistry")
+			helper.JsonPathContentIs(stdout, "0.devfile", "nodejs")
+			helper.JsonPathContentIs(stdout, "0.devfileRegistry", "DefaultDevfileRegistry")
 		})
 	})