Adds resource support to conditions

Allow condition to declare pipeline resources in their definitions.
The resource can be accessed by the condition container during a check.
Only input resources are supported. The declared resources can be specified
in a PipelineTaskCondition and variable substitution for the resource is
supported just like with a `TaskResource`.

Signed-off-by: Dibyo Mukherjee <dibyo@google.com>

Author: dibyom

docs/conditions.md

@@ -9,6 +9,7 @@ This document defines `Conditions` and their capabilities.
 - [Syntax](#syntax)
   - [Check](#check)
   - [Parameters](#parameters)
+  - [Resources](#resources)
 - [Examples](#examples)
 
 ## Syntax
@@ -57,10 +58,31 @@ only start with alpha characters and `_`. For example, `fooIs-Bar_` is a valid
 parameter name, `barIsBa$` or `0banana` are not.
 
 Each declared parameter has a type field, assumed to be string if not provided by the user. 
-The other possible type is array — useful, checking a pushed branch name doesn't match any of 
+The other possible type is array — useful, for instance, checking that a pushed branch name doesn't match any of 
 multiple protected branch names. When the actual parameter value is supplied, its parsed type 
 is validated against the type field.
 
+### Resources
+
+Conditions can declare input [`PipelineResources`](resources.md)  via the `resources` field to 
+provide the Condition container step with data or context that is needed to perform the check.
+
+Input resources, like source code (git), are dumped at path
+`/workspace/resource_name` within a mounted
+[volume](https://kubernetes.io/docs/concepts/storage/volumes/). The condition container can use the `path`
+[template](./tasks.md#Templating) key to refer to the local path to the mounted resource.
+
+```yaml
+spec:
+  resources:
+    - name: workspace
+      type: git
+  check:
+    image: alpine
+    command: ["/bin/sh"]
+    args: ['-c', 'test -f ${resources.workspace.path}/README.md']
+```
+
 ## Examples
 
 For complete examples, see

docs/pipelines.md

@@ -304,6 +304,12 @@ tasks:
       name: build-push
     conditions:
       - conditionRef: my-condition
+        params:
+          - name: my-param
+            value: my-value
+        resources:
+          - name: workspace
+            resource: source-repo
 ```
 
 In this example, `my-condition` refers to a [Condition](#conditions) custom resource. The `build-push` 

examples/pipelineruns/conditional-pipelinerun.yaml

@@ -1,17 +1,33 @@
+#apiVersion: tekton.dev/v1alpha1
+#kind: Condition
+#metadata:
+#  name: strings-equal
+#spec:
+# params:
+#   - name: "x"
+#     type: string
+#   - name: "y"
+#     type: string
+# check:
+#    image: alpine
+#    command: ["/bin/sh"]
+#    args: ['-c', 'echo "Comparing ${params.x} and ${params.y}" && [ "${params.x}" == "${params.y}" ]']
+---
 apiVersion: tekton.dev/v1alpha1
 kind: Condition
 metadata:
-  name: strings-equal
+  name: file-exists
 spec:
- params:
-   - name: "x"
-     type: string
-   - name: "y"
-     type: string
- check:
+  params:
+    - name: "path"
+      type: string
+  resources:
+    - name: workspace
+      type: git
+  check:
     image: alpine
     command: ["/bin/sh"]
-    args: ['-c', 'echo "Comparing ${params.x} and ${params.y}" && [ "${params.x}" == "${params.y}" ]']
+    args: ['-c', 'test -f ${resources.workspace.path}/${params.path}']
 ---
 apiVersion: tekton.dev/v1alpha1
 kind: PipelineResource
@@ -49,21 +65,20 @@ spec:
     - name: source-repo
       type: git
   params:
-    - name: "x"
-      default: "abc"
-    - name: "y"
-      default: "abc"
+    - name: "path"
+      default: "README.md"
   tasks:
     - name: list-files-1
       taskRef:
         name: list-files
       conditions:
-        - conditionRef: "strings-equal"
+        - conditionRef: "file-exists"
           params:
-            - name: "x"
-              value: "${params.x}"
-            - name: "y"
-              value: "${params.y}"
+            - name: "path"
+              value: "${params.path}"
+          resources:
+            - name: workspace
+              resource: source-repo
       resources:
         inputs:
           - name: workspace

pkg/apis/pipeline/v1alpha1/condition_types.go

@@ -73,6 +73,26 @@ type ConditionSpec struct {
 	// is evaluated
 	// +optional
 	Params []ParamSpec `json:"params,omitempty"`
+
+	// Resources is a list of the ConditionResources required to run the condition.
+	// +optional
+	Resources []ConditionResource `json:"resources,omitempty"`
+}
+
+// ConditionResource defines an input PipelineResource declared as a requirement
+// by a Task. The Name field will be used to refer to these Resources within
+// the Condition definition and  will be the path to the volume mounted containing this
+// Resource as an input (e.g. an Resource named `workspace` will be mounted at `/workspace`).
+type ConditionResource struct {
+	// Name declares the name by which a resource is referenced in the Condition's
+	// definition.
+	Name string `json:"name"`
+	// Type is the type of this resource;
+	Type PipelineResourceType `json:"type"`
+	// TargetPath is the path in workspace directory where the resource
+	// will be copied.
+	// +optional
+	TargetPath string `json:"targetPath"`
 }
 
 // ConditionCheck represents a single evaluation of a Condition step.

pkg/apis/pipeline/v1alpha1/pipeline_types.go

@@ -120,6 +120,9 @@ type PipelineTaskCondition struct {
 	// Params declare parameters passed to this Condition
 	// +optional
 	Params []Param `json:"params,omitempty"`
+
+	// Resources declare the resources provided to this Condition as input
+	Resources []PipelineConditionResource `json:"resources,omitempty"`
 }
 
 // PipelineDeclaredResource is used by a Pipeline to declare the types of the
@@ -135,6 +138,15 @@ type PipelineDeclaredResource struct {
 	Type PipelineResourceType `json:"type"`
 }
 
+// PipelineTaskResources allows a Pipeline to declare how its DeclaredPipelineResources
+// should be provided to a Condition as its inputs.
+type PipelineConditionResource struct {
+	// Name is the name of the PipelineResource as declared by the Condition.
+	Name string `json:"name"`
+	// Resource is the name of the DeclaredPipelineResource to use.
+	Resource string `json:"resource"`
+}
+
 // PipelineTaskResources allows a Pipeline to declare how its DeclaredPipelineResources
 // should be provided to a Task as its inputs and outputs.
 type PipelineTaskResources struct {

pkg/apis/pipeline/v1alpha1/zz_generated.deepcopy.go

@@ -581,7 +581,7 @@ func getTaskRunTimeout(pr *v1alpha1.PipelineRun) *metav1.Duration {
 }
 
 func getServiceAccount(pr *v1alpha1.PipelineRun, pipelineTaskName string) string {
-	// If service account is configured for a given PipelineTask, override PipelineRun's seviceAccount
+	// If service account is configured for a given PipelineTask, override PipelineRun's serviceAccount
 	serviceAccount := pr.Spec.ServiceAccount
 	for _, sa := range pr.Spec.ServiceAccounts {
 		if sa.TaskName == pipelineTaskName {
@@ -626,6 +626,11 @@ func (c *Reconciler) makeConditionCheckContainer(rprt *resources.ResolvedPipelin
 	labels := getTaskrunLabels(pr, rprt.PipelineTask.Name)
 	labels[pipeline.GroupName+pipeline.ConditionCheckKey] = rcc.ConditionCheckName
 
+	taskSpec, err := rcc.ConditionToTaskSpec()
+	if err != nil {
+		return nil, err
+	}
+
 	tr := &v1alpha1.TaskRun{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:            rcc.ConditionCheckName,
@@ -635,10 +640,11 @@ func (c *Reconciler) makeConditionCheckContainer(rprt *resources.ResolvedPipelin
 			Annotations:     getTaskrunAnnotations(pr), // Propagate annotations from PipelineRun to TaskRun.
 		},
 		Spec: v1alpha1.TaskRunSpec{
-			TaskSpec:       rcc.ConditionToTaskSpec(),
+			TaskSpec:       taskSpec,
 			ServiceAccount: getServiceAccount(pr, rprt.PipelineTask.Name),
 			Inputs: v1alpha1.TaskRunInputs{
-				Params: rcc.PipelineTaskCondition.Params,
+				Params:    rcc.PipelineTaskCondition.Params,
+				Resources: rcc.ToTaskResourceBindings(),
 			},
 			Timeout:      getTaskRunTimeout(pr),
 			NodeSelector: pr.Spec.NodeSelector,

pkg/reconciler/v1alpha1/pipelinerun/pipelinerun.go

@@ -1405,7 +1405,10 @@ func makeExpectedTr(condName, ccName string) *v1alpha1.TaskRun {
 		tb.TaskRunLabel("tekton.dev/conditionCheck", ccName),
 		tb.TaskRunAnnotation("PipelineRunAnnotation", "PipelineRunValue"),
 		tb.TaskRunSpec(
-			tb.TaskRunTaskSpec(tb.Step("condition-check-"+condName, "foo", tb.Args("bar"))),
+			tb.TaskRunTaskSpec(
+				tb.Step("condition-check-"+condName, "foo", tb.Args("bar")),
+				tb.TaskInputs(),
+			),
 			tb.TaskRunServiceAccount("test-sa"),
 		),
 	)