Cleanup of interface funcs

Signed-off-by: Maysun J Faisal <maysunaneek@gmail.com>
devfile · Mar 1, 2021 · 6518216 · 6518216
1 parent b17b135
commit 6518216
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/pkg/devfile/parser/data/interface.go b/pkg/devfile/parser/data/interface.go
@@ -42,7 +42,7 @@ type DevfileData interface {
 
 	// command related methods
 	GetCommands(common.DevfileOptions) ([]v1.Command, error)
-	AddCommands(commands ...v1.Command) error
+	AddCommands(commands []v1.Command) error
 	UpdateCommand(command v1.Command)
 	DeleteCommand(id string) error
 

diff --git a/pkg/devfile/parser/data/v2/commands.go b/pkg/devfile/parser/data/v2/commands.go
@@ -31,14 +31,10 @@ func (d *DevfileV2) GetCommands(options common.DevfileOptions) ([]v1.Command, er
 
 // AddCommands adds the slice of Command objects to the Devfile's commands
 // if a command is already defined, error out
-func (d *DevfileV2) AddCommands(commands ...v1.Command) error {
-	devfileCommands, err := d.GetCommands(common.DevfileOptions{})
-	if err != nil {
-		return err
-	}
+func (d *DevfileV2) AddCommands(commands []v1.Command) error {
 
 	for _, command := range commands {
-		for _, devfileCommand := range devfileCommands {
+		for _, devfileCommand := range d.Commands {
 			if command.Id == devfileCommand.Id {
 				return &common.FieldAlreadyExistError{Name: command.Id, Field: "command"}
 			}

diff --git a/pkg/devfile/parser/data/v2/commands_test.go b/pkg/devfile/parser/data/v2/commands_test.go
@@ -217,7 +217,7 @@ func TestDevfile200_AddCommands(t *testing.T) {
 				},
 			}
 
-			got := d.AddCommands(tt.newCommands...)
+			got := d.AddCommands(tt.newCommands)
 			if !tt.wantErr && got != nil {
 				t.Errorf("TestDevfile200_AddCommands() unexpected error - %v", got)
 			} else if tt.wantErr && got == nil {

diff --git a/pkg/devfile/parser/data/v2/components.go b/pkg/devfile/parser/data/v2/components.go
@@ -60,17 +60,13 @@ func (d *DevfileV2) GetDevfileVolumeComponents(options common.DevfileOptions) ([
 // if a component is already defined, error out
 func (d *DevfileV2) AddComponents(components []v1.Component) error {
 
-	componentMap := make(map[string]bool)
-
-	for _, component := range d.Components {
-		componentMap[component.Name] = true
-	}
 	for _, component := range components {
-		if _, ok := componentMap[component.Name]; !ok {
-			d.Components = append(d.Components, component)
-		} else {
-			return &common.FieldAlreadyExistError{Name: component.Name, Field: "component"}
+		for _, devfileComponent := range d.Components {
+			if component.Name == devfileComponent.Name {
+				return &common.FieldAlreadyExistError{Name: component.Name, Field: "component"}
+			}
 		}
+		d.Components = append(d.Components, component)
 	}
 	return nil
 }