Go: Bump github.com/devfile/alizer from 1.0.1 to 1.2.1 (#7126)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Armel Soro <[email protected]>

Author: dependabot[bot]

cmd/odo/alizer_test.go

@@ -53,7 +53,7 @@ func TestOdoAlizer(t *testing.T) {
 				path := "/"
 				alizerClient.EXPECT().DetectFramework(gomock.Any(), path).
 					Return(alizer.DetectedFramework{
-						Type: model.DevFileType{
+						Type: model.DevfileType{
 							Name: "framework-name",
 						},
 						DefaultVersion: "1.1.1",
@@ -94,7 +94,7 @@ func TestOdoAlizer(t *testing.T) {
 				path := "/"
 				alizerClient.EXPECT().DetectFramework(gomock.Any(), path).
 					Return(alizer.DetectedFramework{
-						Type: model.DevFileType{
+						Type: model.DevfileType{
 							Name: "framework-name",
 						},
 						DefaultVersion: "1.1.1",

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/AlecAivazis/survey/v2 v2.3.5
 	github.com/Xuanwo/go-locale v1.1.0
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/devfile/alizer v1.0.1
+	github.com/devfile/alizer v1.2.1
 	github.com/devfile/api/v2 v2.2.1-alpha.0.20230413012049-a6c32fca0dbd
 	github.com/devfile/library/v2 v2.2.1-0.20230524160049-04a8b3fc66c0
 	github.com/devfile/registry-support/index/generator v0.0.0-20230322155332-33914affc83b

go.sum

@@ -30,13 +30,13 @@ func NewAlizerClient(registryClient registry.Client) *Alizer {
 // DetectFramework uses the alizer library in order to detect the devfile
 // to use depending on the files in the path
 func (o *Alizer) DetectFramework(ctx context.Context, path string) (DetectedFramework, error) {
-	types := []model.DevFileType{}
+	types := []model.DevfileType{}
 	components, err := o.registryClient.ListDevfileStacks(ctx, "", "", "", false, false)
 	if err != nil {
 		return DetectedFramework{}, err
 	}
 	for _, component := range components.Items {
-		types = append(types, model.DevFileType{
+		types = append(types, model.DevfileType{
 			Name:        component.Name,
 			Language:    component.Language,
 			ProjectType: component.ProjectType,
@@ -144,7 +144,7 @@ func (o *Alizer) DetectPorts(path string) ([]int, error) {
 	return components[0].Ports, nil
 }
 
-func NewDetectionResult(typ model.DevFileType, registry api.Registry, appPorts []int, devfileVersion, name string) *api.DetectionResult {
+func NewDetectionResult(typ model.DevfileType, registry api.Registry, appPorts []int, devfileVersion, name string) *api.DetectionResult {
 	return &api.DetectionResult{
 		Devfile:          typ.Name,
 		DevfileRegistry:  registry.Name,

pkg/alizer/alizer.go

@@ -4,11 +4,12 @@ import (
 	"context"
 
 	"github.com/devfile/alizer/pkg/apis/model"
+
 	"github.com/redhat-developer/odo/pkg/api"
 )
 
 type DetectedFramework struct {
-	Type           model.DevFileType
+	Type           model.DevfileType
 	DefaultVersion string
 	Registry       api.Registry
 	Architectures  []string

pkg/alizer/interface.go

@@ -95,7 +95,7 @@ func TestAlizerBackend_SelectDevfile(t *testing.T) {
 				alizerClient: func(ctrl *gomock.Controller) alizer.Client {
 					alizerClient := alizer.NewMockClient(ctrl)
 					alizerClient.EXPECT().DetectFramework(gomock.Any(), gomock.Any()).Return(alizer.DetectedFramework{
-						Type: model.DevFileType{
+						Type: model.DevfileType{
 							Name: "a-devfile-name",
 						},
 						DefaultVersion: "1.0.0",
@@ -124,7 +124,7 @@ func TestAlizerBackend_SelectDevfile(t *testing.T) {
 				alizerClient: func(ctrl *gomock.Controller) alizer.Client {
 					alizerClient := alizer.NewMockClient(ctrl)
 					alizerClient.EXPECT().DetectFramework(gomock.Any(), gomock.Any()).Return(alizer.DetectedFramework{
-						Type: model.DevFileType{
+						Type: model.DevfileType{
 							Name: "a-devfile-name",
 						},
 						DefaultVersion: "1.0.0",
@@ -178,7 +178,7 @@ func TestAlizerBackend_SelectDevfile(t *testing.T) {
 				alizerClient: func(ctrl *gomock.Controller) alizer.Client {
 					alizerClient := alizer.NewMockClient(ctrl)
 					alizerClient.EXPECT().DetectFramework(gomock.Any(), gomock.Any()).Return(alizer.DetectedFramework{
-						Type: model.DevFileType{
+						Type: model.DevfileType{
 							Name: "a-devfile-name",
 						},
 						DefaultVersion: "1.0.0",

pkg/init/backend/alizer_test.go

@@ -3,6 +3,7 @@ package alizer
 import (
 	"context"
 	"errors"
+	"fmt"
 
 	"github.com/redhat-developer/odo/pkg/alizer"
 	"github.com/redhat-developer/odo/pkg/api"
@@ -56,7 +57,8 @@ func (o *AlizerOptions) RunForJsonOutput(ctx context.Context) (out interface{},
 	workingDir := odocontext.GetWorkingDirectory(ctx)
 	detected, err := o.clientset.AlizerClient.DetectFramework(ctx, workingDir)
 	if err != nil {
-		return nil, err
+		//revive:disable:error-strings This is a top-level error message displayed as is to the end user
+		return nil, fmt.Errorf("No valid devfile found for project in %s: %w", workingDir, err)
 	}
 	appPorts, err := o.clientset.AlizerClient.DetectPorts(workingDir)
 	if err != nil {

pkg/odo/cli/alizer/alizer.go

@@ -604,19 +604,23 @@ var _ = Describe("odo init interactive command tests", func() {
 
 				lines, err := helper.ExtractLines(output)
 				Expect(err).To(BeNil())
-				Expect(len(lines)).To(BeNumerically(">", 2))
-				Expect(lines[len(lines)-1]).To(Equal("Your new component 'my-dotnet-app' is ready in the current directory"))
+				Expect(len(lines)).To(BeNumerically(">", 2), output)
+				Expect(lines[len(lines)-1]).To(Equal("Your new component 'my-dotnet-app' is ready in the current directory"), output)
 
 				componentNameQuestionIdx, ok := helper.FindFirstElementIndexMatchingRegExp(lines, ".*Enter component name:.*")
-				Expect(ok).To(BeTrue())
+				Expect(ok).To(BeTrue(),
+					fmt.Sprintf("'Enter component name:' not found in output below:\n===OUTPUT===\n%s============\n", output))
 				starterProjectDownloadActionIdx, found := helper.FindFirstElementIndexMatchingRegExp(lines,
 					".*Downloading starter project \"([^\\s]+)\" \\[.*")
-				Expect(found).To(BeTrue())
-				Expect(starterProjectDownloadActionIdx).To(SatisfyAll(
-					Not(BeZero()),
-					// #5495: component name question should be displayed before starter project is actually downloaded
-					BeNumerically(">", componentNameQuestionIdx),
-				), "Action 'Downloading starter project' should have been displayed after the last interactive question ('Enter component name')")
+				Expect(found).To(BeTrue(),
+					fmt.Sprintf("'Downloading starter project \"([^\\s]+)\"' not found in output below:\n===OUTPUT===\n%s============\n", output))
+				Expect(starterProjectDownloadActionIdx).To(
+					SatisfyAll(
+						Not(BeZero()),
+						// #5495: component name question should be displayed before starter project is actually downloaded
+						BeNumerically(">", componentNameQuestionIdx)),
+					fmt.Sprintf("Action 'Downloading starter project' should have been displayed after the last interactive question ('Enter component name').\n===OUTPUT===\n%s============\n",
+						output))
 
 				Expect(helper.ListFilesInDir(commonVar.Context)).To(ContainElements("devfile.yaml"))
 			})