Fix validation tests to not include GitHub projects

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

Author: amisevsk

Diff for: pkg/validation/projects.go

@@ -16,8 +16,6 @@ func ValidateStarterProjects(starterProjects []v1alpha2.StarterProject) error {
 		var gitSource v1alpha2.GitLikeProjectSource
 		if starterProject.Git != nil {
 			gitSource = starterProject.Git.GitLikeProjectSource
-		} else if starterProject.Github != nil {
-			gitSource = starterProject.Github.GitLikeProjectSource
 		} else {
 			continue
 		}
@@ -60,8 +58,6 @@ func ValidateProjects(projects []v1alpha2.Project) error {
 		var gitSource v1alpha2.GitLikeProjectSource
 		if project.Git != nil {
 			gitSource = project.Git.GitLikeProjectSource
-		} else if project.Github != nil {
-			gitSource = project.Github.GitLikeProjectSource
 		} else {
 			continue
 		}

Diff for: pkg/validation/projects_test.go

@@ -1,9 +1,10 @@
 package validation
 
 import (
-	"github.com/devfile/api/v2/pkg/attributes"
 	"testing"
 
+	"github.com/devfile/api/v2/pkg/attributes"
+
 	"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/stretchr/testify/assert"
 )
@@ -23,20 +24,6 @@ func generateDummyGitStarterProject(name string, checkoutRemote *v1alpha2.Checko
 	}
 }
 
-func generateDummyGithubStarterProject(name string, checkoutRemote *v1alpha2.CheckoutFrom, remotes map[string]string) v1alpha2.StarterProject {
-	return v1alpha2.StarterProject{
-		Name: name,
-		ProjectSource: v1alpha2.ProjectSource{
-			Github: &v1alpha2.GithubProjectSource{
-				GitLikeProjectSource: v1alpha2.GitLikeProjectSource{
-					Remotes:      remotes,
-					CheckoutFrom: checkoutRemote,
-				},
-			},
-		},
-	}
-}
-
 func generateDummyGitProject(name string, checkoutRemote *v1alpha2.CheckoutFrom, remotes map[string]string, projectAttribute attributes.Attributes) v1alpha2.Project {
 	return v1alpha2.Project{
 		Attributes: projectAttribute,
@@ -52,20 +39,6 @@ func generateDummyGitProject(name string, checkoutRemote *v1alpha2.CheckoutFrom,
 	}
 }
 
-func generateDummyGithubProject(name string, checkoutRemote *v1alpha2.CheckoutFrom, remotes map[string]string) v1alpha2.Project {
-	return v1alpha2.Project{
-		Name: name,
-		ProjectSource: v1alpha2.ProjectSource{
-			Github: &v1alpha2.GithubProjectSource{
-				GitLikeProjectSource: v1alpha2.GitLikeProjectSource{
-					Remotes:      remotes,
-					CheckoutFrom: checkoutRemote,
-				},
-			},
-		},
-	}
-}
-
 func TestValidateStarterProjects(t *testing.T) {
 
 	oneRemoteErr := "starterProject .* should have one remote only"
@@ -91,14 +64,14 @@ func TestValidateStarterProjects(t *testing.T) {
 		{
 			name: "Invalid Starter Project",
 			starterProjects: []v1alpha2.StarterProject{
-				generateDummyGithubStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote", "test": "testremote"}),
+				generateDummyGitStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote", "test": "testremote"}, attributes.Attributes{}),
 			},
 			wantErr: &oneRemoteErr,
 		},
 		{
 			name: "Invalid Starter Project with wrong checkout",
 			starterProjects: []v1alpha2.StarterProject{
-				generateDummyGithubStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"test": "testremote"}),
+				generateDummyGitStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"test": "testremote"}, attributes.Attributes{}),
 			},
 			wantErr: &wrongCheckoutErr,
 		},
@@ -117,8 +90,8 @@ func TestValidateStarterProjects(t *testing.T) {
 		{
 			name: "Invalid Starter Project with empty remotes",
 			starterProjects: []v1alpha2.StarterProject{
-				generateDummyGithubStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{}),
-				generateDummyGithubStarterProject("project3", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote", "test": "testremote"}),
+				generateDummyGitStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{}, attributes.Attributes{}),
+				generateDummyGitStarterProject("project3", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote", "test": "testremote"}, attributes.Attributes{}),
 			},
 			wantErr: &atleastOneRemoteErr,
 		},
@@ -162,28 +135,28 @@ func TestValidateProjects(t *testing.T) {
 			name: "Valid Project",
 			projects: []v1alpha2.Project{
 				generateDummyGitProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote"}, attributes.Attributes{}),
-				generateDummyGithubProject("project2", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote"}),
+				generateDummyGitProject("project2", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote"}, attributes.Attributes{}),
 			},
 		},
 		{
 			name: "Invalid Project with multiple remotes but no checkoutfrom",
 			projects: []v1alpha2.Project{
-				generateDummyGithubProject("project2", nil, map[string]string{"origin": "originremote", "test": "testremote"}),
+				generateDummyGitProject("project2", nil, map[string]string{"origin": "originremote", "test": "testremote"}, attributes.Attributes{}),
 			},
 			wantErr: &missingCheckOutFromRemoteErr,
 		},
 		{
 			name: "Invalid Project with multiple remote and empty checkout remote",
 			projects: []v1alpha2.Project{
 				generateDummyGitProject("project2", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote"}, attributes.Attributes{}),
-				generateDummyGithubProject("project1", &v1alpha2.CheckoutFrom{Remote: ""}, map[string]string{"origin": "originremote", "test": "testremote"}),
+				generateDummyGitProject("project1", &v1alpha2.CheckoutFrom{Remote: ""}, map[string]string{"origin": "originremote", "test": "testremote"}, attributes.Attributes{}),
 			},
 			wantErr: &missingCheckOutFromRemoteErr,
 		},
 		{
 			name: "Invalid Project with wrong checkout",
 			projects: []v1alpha2.Project{
-				generateDummyGithubProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin1"}, map[string]string{"origin": "originremote", "test": "testremote"}),
+				generateDummyGitProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin1"}, map[string]string{"origin": "originremote", "test": "testremote"}, attributes.Attributes{}),
 				generateDummyGitProject("project2", &v1alpha2.CheckoutFrom{Remote: "origin1"}, map[string]string{"origin2": "originremote2"}, attributes.Attributes{}),
 			},
 			wantErr: &wrongCheckoutErr,
@@ -198,7 +171,7 @@ func TestValidateProjects(t *testing.T) {
 			name: "Invalid Project with empty remotes",
 			projects: []v1alpha2.Project{
 				generateDummyGitProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{}, attributes.Attributes{}),
-				generateDummyGithubProject("project2", &v1alpha2.CheckoutFrom{Remote: "origins"}, map[string]string{"origin": "originremote", "test": "testremote"}),
+				generateDummyGitProject("project2", &v1alpha2.CheckoutFrom{Remote: "origins"}, map[string]string{"origin": "originremote", "test": "testremote"}, attributes.Attributes{}),
 			},
 			wantErr: &atleastOneRemoteErr,
 		},

Diff for: pkg/validation/variables/variables_project.go

@@ -89,13 +89,8 @@ func validateandReplaceForProjectSource(variables map[string]string, projectSour
 			if projectSource.Zip.Location, err = validateAndReplaceDataWithVariable(projectSource.Zip.Location, variables); err != nil {
 				checkForInvalidError(invalidKeys, err)
 			}
-		case projectSource.Git != nil || projectSource.Github != nil:
-			var gitProject *v1alpha2.GitLikeProjectSource
-			if projectSource.Git != nil {
-				gitProject = &projectSource.Git.GitLikeProjectSource
-			} else if projectSource.Github != nil {
-				gitProject = &projectSource.Github.GitLikeProjectSource
-			}
+		case projectSource.Git != nil:
+			gitProject := &projectSource.Git.GitLikeProjectSource
 
 			if gitProject.CheckoutFrom != nil {
 				// validate git checkout revision