address comments

Author: vinamra28

docs/cmd/tkn_clustertask_start.md

@@ -40,7 +40,7 @@ For passing the workspaces via flags:
      requests:
        storage: 1Gi
 - In case of binding a CSI workspace, you can pass it like -w name=my-csi,csiFile=csi.yaml
-  but before you need to create a csi.yaml file. Sample contents of the file are as follows:
+  but you need to create a csi.yaml file before hand. Sample contents of the file are as follows:
 
   driver: secrets-store.csi.k8s.io
   readOnly: true

docs/cmd/tkn_task_start.md

@@ -39,7 +39,7 @@ For passing the workspaces via flags:
      requests:
        storage: 1Gi
 - In case of binding a CSI workspace, you can pass it like -w name=my-csi,csiFile=csi.yaml
-  but before you need to create a csi.yaml file. Sample contents of the file are as follows:
+  but you need to create a csi.yaml file before hand. Sample contents of the file are as follows:
 
   driver: secrets-store.csi.k8s.io
   readOnly: true

docs/man/man1/tkn-clustertask-start.1

@@ -159,7 +159,7 @@ storage: 1Gi
 .RE
 .IP \(bu 2
 In case of binding a CSI workspace, you can pass it like \-w name=my\-csi,csiFile=csi.yaml
-but before you need to create a csi.yaml file. Sample contents of the file are as follows:
+but you need to create a csi.yaml file before hand. Sample contents of the file are as follows:
 
 .br
 

docs/man/man1/tkn-task-start.1

@@ -159,7 +159,7 @@ storage: 1Gi
 .RE
 .IP \(bu 2
 In case of binding a CSI workspace, you can pass it like \-w name=my\-csi,csiFile=csi.yaml
-but before you need to create a csi.yaml file. Sample contents of the file are as follows:
+but you need to create a csi.yaml file before hand. Sample contents of the file are as follows:
 
 .br
 

pkg/cmd/clustertask/start.go

@@ -141,7 +141,7 @@ For passing the workspaces via flags:
      requests:
        storage: 1Gi
 - In case of binding a CSI workspace, you can pass it like -w name=my-csi,csiFile=csi.yaml
-  but before you need to create a csi.yaml file. Sample contents of the file are as follows:
+  but you need to create a csi.yaml file before hand. Sample contents of the file are as follows:
   
   driver: secrets-store.csi.k8s.io
   readOnly: true

pkg/cmd/pipeline/start.go

@@ -136,7 +136,7 @@ For passing the workspaces via flags:
      requests:
        storage: 1Gi
 - In case of binding a CSI workspace, you can pass it like -w name=my-csi,csiFile=csi.yaml
-  but before you need to create a csi.yaml file. Sample contents of the file are as follows:
+  but you need to create a csi.yaml file before hand. Sample contents of the file are as follows:
   
   driver: secrets-store.csi.k8s.io
   readOnly: true

pkg/cmd/task/start.go

@@ -149,7 +149,7 @@ For passing the workspaces via flags:
      requests:
        storage: 1Gi
 - In case of binding a CSI workspace, you can pass it like -w name=my-csi,csiFile=csi.yaml
-  but before you need to create a csi.yaml file. Sample contents of the file are as follows:
+  but you need to create a csi.yaml file before hand. Sample contents of the file are as follows:
   
   driver: secrets-store.csi.k8s.io
   readOnly: true

pkg/workspaces/workspaces.go

@@ -89,56 +89,54 @@ func parseWorkspace(w []string, httpClient http.Client) (map[string]v1beta1.Work
 			return nil, err
 		}
 
-		// check for volumeClaimTemplate
-		vctFile, err := getPar(r, volumeClaimTemplateFile)
-		if err != nil {
-			csiFile, err := getPar(r, csiFile)
+		if vctFile, err := getPar(r, volumeClaimTemplateFile); err == nil {
+			err = setWorkspaceVCTemplate(r, &wB, vctFile, httpClient)
 			if err != nil {
-				err = setWorkspaceConfig(r, &wB)
-				if err == nil {
-					ws[name] = wB
-					nWB++
-				} else if err != errNotFoundParam {
-					return nil, err
-				}
-
-				err = setWorkspaceSecret(r, &wB)
-				if err == nil {
-					ws[name] = wB
-					nWB++
-				} else if err != errNotFoundParam {
-					return nil, err
-				}
-
-				err = setWorkspaceEmptyDir(r, &wB)
-				if err == nil {
-					ws[name] = wB
-					nWB++
-				}
-
-				err = setWorkspacePVC(r, &wB)
-				if err == nil {
-					ws[name] = wB
-					nWB++
-				}
-
-				if nWB != 1 {
-					return nil, errors.New(invalidWorkspace + v)
-				}
-			} else {
-				err = setWorkspaceCSITemplate(r, &wB, csiFile, httpClient)
-				if err != nil {
-					return nil, err
-				}
-				ws[name] = wB
+				return nil, err
 			}
-		} else {
-			err = setWorkspaceVCTemplate(r, &wB, vctFile, httpClient)
+			ws[name] = wB
+			continue
+		}
+
+		if csiFile, err := getPar(r, csiFile); err == nil {
+			err = setWorkspaceCSITemplate(r, &wB, csiFile, httpClient)
 			if err != nil {
 				return nil, err
 			}
 			ws[name] = wB
+			continue
+		}
+
+		err = setWorkspaceConfig(r, &wB)
+		if err == nil {
+			ws[name] = wB
+			nWB++
+		} else if err != errNotFoundParam {
+			return nil, err
+		}
+
+		err = setWorkspaceSecret(r, &wB)
+		if err == nil {
+			ws[name] = wB
+			nWB++
+		} else if err != errNotFoundParam {
+			return nil, err
 		}
+
+		if err = setWorkspaceEmptyDir(r, &wB); err == nil {
+			ws[name] = wB
+			nWB++
+		}
+
+		if err = setWorkspacePVC(r, &wB); err == nil {
+			ws[name] = wB
+			nWB++
+		}
+
+		if nWB != 1 {
+			return nil, errors.New(invalidWorkspace + v)
+		}
+
 	}
 
 	return ws, nil