Merge pull request #118 from yangcao77/626-adopt-outerLoop

update library for image component type
devfile · Sep 23, 2021 · f858c8e · f858c8e
2 parents b7c2cb5 + 197718d
commit f858c8e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/pkg/devfile/parser/data/v2/common/component_helper.go b/pkg/devfile/parser/data/v2/common/component_helper.go
@@ -29,6 +29,8 @@ func GetComponentType(component v1.Component) (v1.ComponentType, error) {
 		return v1.KubernetesComponentType, nil
 	case component.Openshift != nil:
 		return v1.OpenshiftComponentType, nil
+	case component.Image != nil:
+		return v1.ImageComponentType, nil
 	case component.Custom != nil:
 		return v1.CustomComponentType, nil
 

diff --git a/pkg/devfile/parser/data/v2/common/component_helper_test.go b/pkg/devfile/parser/data/v2/common/component_helper_test.go
@@ -150,6 +150,16 @@ func TestGetComponentType(t *testing.T) {
 			},
 			componentType: v1.PluginComponentType,
 		},
+		{
+			name: "Image component",
+			component: v1.Component{
+				Name: "name",
+				ComponentUnion: v1.ComponentUnion{
+					Image: &v1.ImageComponent{},
+				},
+			},
+			componentType: v1.ImageComponentType,
+		},
 		{
 			name: "Custom component",
 			component: v1.Component{

diff --git a/pkg/devfile/parser/devfileobj.go b/pkg/devfile/parser/devfileobj.go
@@ -7,7 +7,6 @@ import (
 
 // Default filenames for create devfile
 const (
-	OutputDevfileJsonPath = "devfile.json"
 	OutputDevfileYamlPath = "devfile.yaml"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ import ( @@
     // Default filenames for create devfile
     const (
-    	OutputDevfileJsonPath = "devfile.json"
     	OutputDevfileYamlPath = "devfile.yaml"
     )
@@ Expand Down @@