Address DevfileOptions feedback

Signed-off-by: Maysun J Faisal <[email protected]>

pkg/devfile/parser/data/v2/commands.go

@@ -1,6 +1,7 @@
 package v2
 
 import (
+	"reflect"
 	"strings"
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
@@ -10,6 +11,10 @@ import (
 // GetCommands returns the slice of Command objects parsed from the Devfile
 func (d *DevfileV2) GetCommands(options common.DevfileOptions) ([]v1.Command, error) {
 
+	if reflect.DeepEqual(options, common.DevfileOptions{}) {
+		return d.Commands, nil
+	}
+
 	var commands []v1.Command
 	for _, command := range d.Commands {
 		// Filter Command Attributes
@@ -37,7 +42,6 @@ func (d *DevfileV2) GetCommands(options common.DevfileOptions) ([]v1.Command, er
 			continue
 		}
 
-		command.Id = strings.ToLower(command.Id)
 		commands = append(commands, command)
 	}
 

pkg/devfile/parser/data/v2/commands_test.go

@@ -153,10 +153,18 @@ func TestDevfile200_GetCommands(t *testing.T) {
 			name: "Wrong command type",
 			currentCommands: []v1.Command{
 				{
-					Id:           "command1",
+					Id: "command1",
+					Attributes: attributes.Attributes{}.FromStringMap(map[string]string{
+						"firstString": "firstStringValue",
+					}),
 					CommandUnion: v1.CommandUnion{},
 				},
 			},
+			filterOptions: common.DevfileOptions{
+				Filter: map[string]interface{}{
+					"firstString": "firstStringValue",
+				},
+			},
 			wantErr: true,
 		},
 	}

pkg/devfile/parser/data/v2/common/project_helper.go

@@ -42,7 +42,7 @@ func GetDefaultSource(ps v1.GitLikeProjectSource) (remoteName string, remoteURL
 
 }
 
-// GetProjectSourceType returns the source type of a given project
+// GetProjectSourceType returns the source type of a given project source
 func GetProjectSourceType(projectSrc v1.ProjectSource) (v1.ProjectSourceType, error) {
 	switch {
 	case projectSrc.Git != nil:

pkg/devfile/parser/data/v2/components.go

@@ -1,13 +1,19 @@
 package v2
 
 import (
+	"reflect"
+
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
 )
 
 // GetComponents returns the slice of Component objects parsed from the Devfile
 func (d *DevfileV2) GetComponents(options common.DevfileOptions) ([]v1.Component, error) {
 
+	if reflect.DeepEqual(options, common.DevfileOptions{}) {
+		return d.Components, nil
+	}
+
 	var components []v1.Component
 	for _, component := range d.Components {
 		// Filter Component Attributes
@@ -33,7 +39,8 @@ func (d *DevfileV2) GetComponents(options common.DevfileOptions) ([]v1.Component
 	return components, nil
 }
 
-// GetDevfileContainerComponents iterates through the components in the devfile and returns a list of devfile container components. Deprecated, use GetComponents() with the DevfileOptions.
+// GetDevfileContainerComponents iterates through the components in the devfile and returns a list of devfile container components.
+// Deprecated, use GetComponents() with the DevfileOptions.
 func (d *DevfileV2) GetDevfileContainerComponents(options common.DevfileOptions) ([]v1.Component, error) {
 	var components []v1.Component
 	devfileComponents, err := d.GetComponents(options)
@@ -48,7 +55,8 @@ func (d *DevfileV2) GetDevfileContainerComponents(options common.DevfileOptions)
 	return components, nil
 }
 
-// GetDevfileVolumeComponents iterates through the components in the devfile and returns a list of devfile volume components. Deprecated, use GetComponents() with the DevfileOptions.
+// GetDevfileVolumeComponents iterates through the components in the devfile and returns a list of devfile volume components.
+// Deprecated, use GetComponents() with the DevfileOptions.
 func (d *DevfileV2) GetDevfileVolumeComponents(options common.DevfileOptions) ([]v1.Component, error) {
 	var components []v1.Component
 	devfileComponents, err := d.GetComponents(options)

pkg/devfile/parser/data/v2/components_test.go

@@ -278,10 +278,18 @@ func TestGetDevfileComponents(t *testing.T) {
 			name: "Wrong component type",
 			component: []v1.Component{
 				{
-					Name:           "comp1",
+					Name: "comp1",
+					Attributes: attributes.Attributes{}.FromStringMap(map[string]string{
+						"firstString": "firstStringValue",
+					}),
 					ComponentUnion: v1.ComponentUnion{},
 				},
 			},
+			filterOptions: common.DevfileOptions{
+				Filter: map[string]interface{}{
+					"firstString": "firstStringValue",
+				},
+			},
 			wantErr: true,
 		},
 	}

pkg/devfile/parser/data/v2/projects.go

@@ -1,6 +1,7 @@
 package v2
 
 import (
+	"reflect"
 	"strings"
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
@@ -9,8 +10,12 @@ import (
 
 // GetProjects returns the Project Object parsed from devfile
 func (d *DevfileV2) GetProjects(options common.DevfileOptions) ([]v1.Project, error) {
-	var projects []v1.Project
 
+	if reflect.DeepEqual(options, common.DevfileOptions{}) {
+		return d.Projects, nil
+	}
+
+	var projects []v1.Project
 	for _, project := range d.Projects {
 		// Filter Project Attributes
 		filterIn, err := common.FilterDevfileObject(project.Attributes, options)
@@ -80,8 +85,12 @@ func (d *DevfileV2) DeleteProject(name string) error {
 
 //GetStarterProjects returns the DevfileStarterProject parsed from devfile
 func (d *DevfileV2) GetStarterProjects(options common.DevfileOptions) ([]v1.StarterProject, error) {
-	var starterProjects []v1.StarterProject
 
+	if reflect.DeepEqual(options, common.DevfileOptions{}) {
+		return d.StarterProjects, nil
+	}
+
+	var starterProjects []v1.StarterProject
 	for _, starterProject := range d.StarterProjects {
 		// Filter Starter Project Attributes
 		filterIn, err := common.FilterDevfileObject(starterProject.Attributes, options)

pkg/devfile/parser/data/v2/projects_test.go

@@ -111,13 +111,21 @@ func TestDevfile200_GetProjects(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "Wrong project type",
+			name: "Wrong project src type",
 			currentProjects: []v1.Project{
 				{
-					Name:          "project1",
+					Name: "project1",
+					Attributes: attributes.Attributes{}.FromStringMap(map[string]string{
+						"firstString": "firstStringValue",
+					}),
 					ProjectSource: v1.ProjectSource{},
 				},
 			},
+			filterOptions: common.DevfileOptions{
+				Filter: map[string]interface{}{
+					"firstString": "firstStringValue",
+				},
+			},
 			wantErr: true,
 		},
 	}
@@ -493,13 +501,21 @@ func TestDevfile200_GetStarterProjects(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "Wrong starter project type",
+			name: "Wrong starter project src type",
 			currentStarterProjects: []v1.StarterProject{
 				{
-					Name:          "project1",
+					Name: "project1",
+					Attributes: attributes.Attributes{}.FromStringMap(map[string]string{
+						"firstString": "firstStringValue",
+					}),
 					ProjectSource: v1.ProjectSource{},
 				},
 			},
+			filterOptions: common.DevfileOptions{
+				Filter: map[string]interface{}{
+					"firstString": "firstStringValue",
+				},
+			},
 			wantErr: true,
 		},
 	}