Fix regression by sparse checkout dir PR (#3258)

fix regression caused by rebase to master.
Also add github, zip as supported project types.

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

@@ -47,10 +47,8 @@ func (d *Devfile100) GetProjects() []common.DevfileProject {
 
 	var projects []common.DevfileProject
 	for _, v := range d.Projects {
-		// We are only supporting ProjectType git in V1
-		if v.Source.Type == ProjectTypeGit {
-			projects = append(projects, convertV1ProjectToCommon(v))
-		}
+		projects = append(projects, convertV1ProjectToCommon(v))
+
 	}
 
 	return projects
@@ -166,21 +164,42 @@ func convertV1VolumeToCommon(v DockerimageVolume) common.VolumeMount {
 }
 
 func convertV1ProjectToCommon(p Project) common.DevfileProject {
+	var project = common.DevfileProject{
+		ClonePath: p.ClonePath,
+		Name:      p.Name,
+	}
+
+	switch p.Source.Type {
+	case ProjectTypeGit:
+		git := common.Git{
+			Branch:            p.Source.Branch,
+			Location:          p.Source.Location,
+			SparseCheckoutDir: p.Source.SparseCheckoutDir,
+			StartPoint:        p.Source.StartPoint,
+		}
 
-	git := common.Git{
-		Branch:            p.Source.Branch,
-		Location:          p.Source.Location,
-		SparseCheckoutDir: p.Source.SparseCheckoutDir,
-		StartPoint:        p.Source.StartPoint,
-	}
+		project.Git = &git
+
+	case ProjectTypeGitHub:
+		github := common.Github{
+			Branch:            p.Source.Branch,
+			Location:          p.Source.Location,
+			SparseCheckoutDir: p.Source.SparseCheckoutDir,
+			StartPoint:        p.Source.StartPoint,
+		}
+		project.Github = &github
+
+	case ProjectTypeZip:
+		zip := common.Zip{
+			Location:          p.Source.Location,
+			SparseCheckoutDir: p.Source.SparseCheckoutDir,
+		}
+		project.Zip = &zip
 
-	return common.DevfileProject{
-		ClonePath:  p.ClonePath,
-		Git:        &git,
-		Name:       p.Name,
-		SourceType: common.GitProjectSourceType,
 	}
 
+	return project
+
 }
 
 func getGroup(name string) *common.Group {

pkg/devfile/parser/data/1.0.0/types.go

@@ -26,7 +26,9 @@ type Devfile100 struct {
 type ProjectType string
 
 const (
-	ProjectTypeGit ProjectType = "git"
+	ProjectTypeGit    ProjectType = "git"
+	ProjectTypeGitHub ProjectType = "github"
+	ProjectTypeZip    ProjectType = "zip"
 )
 
 var SupportedProjectTypes = []ProjectType{ProjectTypeGit}

pkg/odo/cli/component/create.go

@@ -770,13 +770,14 @@ func (co *CreateOptions) downloadProject(projectPassed string) error {
 		return err
 	}
 
-	var url string
+	var url, sparseDir string
 	if project.Git != nil {
 		if strings.Contains(project.Git.Location, "github.com") {
 			url, err = util.GetGitHubZipURL(project.Git.Location)
 			if err != nil {
 				return err
 			}
+			sparseDir = project.Git.SparseCheckoutDir
 		} else {
 			return errors.Errorf("Project type git with non github url not supported")
 		}
@@ -785,13 +786,15 @@ func (co *CreateOptions) downloadProject(projectPassed string) error {
 		if err != nil {
 			return err
 		}
+		sparseDir = project.Github.SparseCheckoutDir
 	} else if project.Zip != nil {
 		url = project.Zip.Location
+		sparseDir = project.Github.SparseCheckoutDir
 	} else {
 		return errors.Errorf("Project type not supported")
 	}
 
-	err = checkoutProject(project, url, path)
+	err = checkoutProject(sparseDir, url, path)
 
 	if err != nil {
 		return err
@@ -904,15 +907,8 @@ func ensureAndLogProperResourceUsage(resource, resourceMin, resourceMax, resourc
 	}
 }
 
-func checkoutProject(project common.DevfileProject, zipURL, path string) error {
-	var sparseCheckoutDir string
-	if project.Git.SparseCheckoutDir != "" {
-		sparseCheckoutDir = project.Git.SparseCheckoutDir
-	} else if project.Github.SparseCheckoutDir != "" {
-		sparseCheckoutDir = project.Github.SparseCheckoutDir
-	} else if project.Zip.SparseCheckoutDir != "" {
-		sparseCheckoutDir = project.Zip.SparseCheckoutDir
-	}
+func checkoutProject(sparseCheckoutDir, zipURL, path string) error {
+
 	if sparseCheckoutDir != "" {
 		err := util.GetAndExtractZip(zipURL, path, sparseCheckoutDir)
 		if err != nil {