From b8be6aec1c074d42be151652eb953558947e0697 Mon Sep 17 00:00:00 2001
From: Stephanie <yangcao@redhat.com>
Date: Thu, 13 May 2021 12:41:58 -0400
Subject: [PATCH] resolve concersion test failure

Signed-off-by: Stephanie <yangcao@redhat.com>
---
 .../workspaces/v1alpha1/conversion_test.go     | 18 ++++++++++++++++++
 .../test-fixtures/all/devfile-bad.yaml         |  3 ---
 pkg/validation/variables/variables_project.go  |  7 -------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkg/apis/workspaces/v1alpha1/conversion_test.go b/pkg/apis/workspaces/v1alpha1/conversion_test.go
index 6a1b4f0d3..09c86cd42 100644
--- a/pkg/apis/workspaces/v1alpha1/conversion_test.go
+++ b/pkg/apis/workspaces/v1alpha1/conversion_test.go
@@ -151,10 +151,19 @@ var parentProjectFuzzFunc = func(project *Project, c fuzz.Continue) {
 	switch c.Intn(3) {
 	case 0:
 		c.Fuzz(&project.Git)
+		if project.Git != nil {
+			project.Git.CommonProjectSource = CommonProjectSource{}
+		}
 	case 1:
 		c.Fuzz(&project.Github)
+		if project.Github != nil {
+			project.Github.CommonProjectSource = CommonProjectSource{}
+		}
 	case 2:
 		c.Fuzz(&project.Zip)
+		if project.Zip != nil {
+			project.Zip.CommonProjectSource = CommonProjectSource{}
+		}
 	}
 }
 
@@ -162,10 +171,19 @@ var projectFuzzFunc = func(project *Project, c fuzz.Continue) {
 	switch c.Intn(4) {
 	case 0:
 		c.Fuzz(&project.Git)
+		if project.Git != nil {
+			project.Git.CommonProjectSource = CommonProjectSource{}
+		}
 	case 1:
 		c.Fuzz(&project.Github)
+		if project.Github != nil {
+			project.Github.CommonProjectSource = CommonProjectSource{}
+		}
 	case 2:
 		c.Fuzz(&project.Zip)
+		if project.Zip != nil {
+			project.Zip.CommonProjectSource = CommonProjectSource{}
+		}
 	case 3:
 		c.Fuzz(&project.Custom)
 	}
diff --git a/pkg/validation/variables/test-fixtures/all/devfile-bad.yaml b/pkg/validation/variables/test-fixtures/all/devfile-bad.yaml
index 7e46bc4c6..690025410 100644
--- a/pkg/validation/variables/test-fixtures/all/devfile-bad.yaml
+++ b/pkg/validation/variables/test-fixtures/all/devfile-bad.yaml
@@ -3,9 +3,6 @@ variables:
 projects:
 - name: project1
   clonePath: "{{path}}"
-  sparseCheckoutDirs:
-    - xyz
-    - "{{dir}}"
   git:
     checkoutFrom:
       revision: "{{tag}}"
diff --git a/pkg/validation/variables/variables_project.go b/pkg/validation/variables/variables_project.go
index 078a94d36..09d1cdab1 100644
--- a/pkg/validation/variables/variables_project.go
+++ b/pkg/validation/variables/variables_project.go
@@ -20,13 +20,6 @@ func ValidateAndReplaceForProjects(variables map[string]string, projects []v1alp
 			checkForInvalidError(invalidKeys, err)
 		}
 
-		// Validate project sparse checkout dir
-		for j := range projects[i].SparseCheckoutDirs {
-			if projects[i].SparseCheckoutDirs[j], err = validateAndReplaceDataWithVariable(projects[i].SparseCheckoutDirs[j], variables); err != nil {
-				checkForInvalidError(invalidKeys, err)
-			}
-		}
-
 		// Validate project source
 		if err = validateandReplaceForProjectSource(variables, &projects[i].ProjectSource); err != nil {
 			checkForInvalidError(invalidKeys, err)