Adapt conversion code for v1alpha2 attributes field

* Add conversion functions for going from map[string]string to
attributes.Attributes
* Implement conversion of command attributes for Commands
* Adapt tests to handle new incompatibility (parent commands cannot have
attributes)

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

pkg/apis/workspaces/v1alpha1/attributes_conversion.go

@@ -0,0 +1,43 @@
+package v1alpha1
+
+import (
+	"fmt"
+	"github.com/devfile/api/pkg/attributes"
+)
+
+func convertAttributesTo_v1alpha2(src map[string]string, dest *attributes.Attributes) {
+	dest.FromStringMap(src)
+}
+
+func convertAttributesFrom_v1alpha2(src *attributes.Attributes, dest map[string]string) error {
+	if dest == nil {
+		return fmt.Errorf("trying to insert into a nil map")
+	}
+	var err error
+	stringAttributes := src.Strings(&err)
+	if err != nil {
+		return err
+	}
+	for k, v := range stringAttributes {
+		dest[k] = v
+	}
+	return nil
+}
+
+func getCommandAttributes(command *Command) map[string]string {
+	switch {
+	case command.Exec != nil:
+		return command.Exec.Attributes
+	case command.Apply != nil:
+		return command.Apply.Attributes
+	case command.VscodeTask != nil:
+		return command.VscodeTask.Attributes
+	case command.VscodeLaunch != nil:
+		return command.VscodeLaunch.Attributes
+	case command.Composite != nil:
+		return command.Composite.Attributes
+	case command.Custom != nil:
+		return command.Custom.Attributes
+	}
+	return nil
+}

pkg/apis/workspaces/v1alpha1/commands_conversion.go

@@ -2,6 +2,7 @@ package v1alpha1
 
 import (
 	"encoding/json"
+	"github.com/devfile/api/pkg/attributes"
 
 	"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
 )
@@ -19,6 +20,25 @@ func convertCommandTo_v1alpha2(src *Command, dest *v1alpha2.Command) error {
 	if err != nil {
 		return err
 	}
+	var srcAttributes map[string]string
+	switch {
+	case src.Exec != nil:
+		srcAttributes = src.Exec.Attributes
+	case src.Apply != nil:
+		srcAttributes = src.Apply.Attributes
+	case src.VscodeTask != nil:
+		srcAttributes = src.VscodeTask.Attributes
+	case src.VscodeLaunch != nil:
+		srcAttributes = src.VscodeLaunch.Attributes
+	case src.Composite != nil:
+		srcAttributes = src.Composite.Attributes
+	case src.Custom != nil:
+		srcAttributes = src.Custom.Attributes
+	}
+	if srcAttributes != nil {
+		dest.Attributes = attributes.Attributes{}
+		convertAttributesTo_v1alpha2(srcAttributes, &dest.Attributes)
+	}
 	dest.Id = id
 	return nil
 }
@@ -30,19 +50,37 @@ func convertCommandFrom_v1alpha2(src *v1alpha2.Command, dest *Command) error {
 		return err
 	}
 	err = json.Unmarshal(jsonCommand, dest)
+	if err != nil {
+		return err
+	}
+	var destAttributes map[string]string
+	if src.Attributes != nil {
+		destAttributes = make(map[string]string)
+		err = convertAttributesFrom_v1alpha2(&src.Attributes, destAttributes)
+		if err != nil {
+			return err
+		}
+	}
+
 	switch {
 	case dest.Apply != nil:
+		dest.Apply.Attributes = destAttributes
 		dest.Apply.Id = id
 	case dest.Composite != nil:
+		dest.Composite.Attributes = destAttributes
 		dest.Composite.Id = id
 	case dest.Custom != nil:
+		dest.Custom.Attributes = destAttributes
 		dest.Custom.Id = id
 	case dest.Exec != nil:
+		dest.Exec.Attributes = destAttributes
 		dest.Exec.Id = id
 	case dest.VscodeLaunch != nil:
+		dest.VscodeLaunch.Attributes = destAttributes
 		dest.VscodeLaunch.Id = id
 	case dest.VscodeTask != nil:
+		dest.VscodeTask.Attributes = destAttributes
 		dest.VscodeTask.Id = id
 	}
-	return nil
+	return err
 }

pkg/apis/workspaces/v1alpha1/conversion_test.go

@@ -129,17 +129,33 @@ var parentComponentFuzzFunc = func(component *Component, c fuzz.Continue) {
 
 var parentCommandFuzzFunc = func(command *Command, c fuzz.Continue) {
 	// Do not generate Custom commands for Parents
+	// Also: commands in Parents cannot have attributes.
 	switch c.Intn(5) {
 	case 0:
 		c.Fuzz(&command.Apply)
+		if command.Apply != nil {
+			command.Apply.Attributes = nil
+		}
 	case 1:
 		c.Fuzz(&command.Composite)
+		if command.Composite != nil {
+			command.Composite.Attributes = nil
+		}
 	case 2:
 		c.Fuzz(&command.Exec)
+		if command.Exec != nil {
+			command.Exec.Attributes = nil
+		}
 	case 3:
 		c.Fuzz(&command.VscodeLaunch)
+		if command.VscodeLaunch != nil {
+			command.VscodeLaunch.Attributes = nil
+		}
 	case 4:
 		c.Fuzz(&command.VscodeTask)
+		if command.VscodeTask != nil {
+			command.VscodeTask.Attributes = nil
+		}
 	}
 }