No matching rules does not generate a PipelineRun.

This changes the Convert function for the dsl to return a nil
PipelineRun if there are no tasks (apart from the git-clone task).

Author: bigkevmcd

pkg/dsl/dsl_handler.go

@@ -105,6 +105,9 @@ func (h *Handler) push(ctx context.Context, evt *scm.PushHook, w http.ResponseWr
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
+	if pr == nil {
+		return
+	}
 	created, err := h.pipelineClient.TektonV1beta1().PipelineRuns(h.namespace).Create(pr)
 	if err != nil {
 		h.log.Errorf("error creating pipelinerun file: %s", err)

pkg/dsl/dsl_handler_test.go

@@ -127,6 +127,34 @@ func TestHandlePushEventNoPipeline(t *testing.T) {
 	}
 }
 
+func TestHandlePushEventNoMatchingRules(t *testing.T) {
+	as := test.MakeAPIServer(t, "/api/v3/repos/Codertocat/Hello-World/contents/.tekton_ci.yaml", "6113728f27ae82c7b1a177c8d03f9e96e0adf246", "testdata/content_match_only_master.json")
+	defer as.Close()
+	scmClient, err := factory.NewClient("github", as.URL, "", factory.Client(as.Client()))
+	if err != nil {
+		t.Fatal(err)
+	}
+	gitClient := git.New(scmClient, secrets.NewMock(), metrics.NewMock())
+	fakeTektonClient := fakeclientset.NewSimpleClientset()
+	fakeClient := fake.NewSimpleClientset()
+	vc := volumes.New(fakeClient)
+	logger := zaptest.NewLogger(t, zaptest.Level(zap.WarnLevel))
+	h := New(gitClient, fakeTektonClient, vc, metrics.NewMock(), testConfiguration(), testNS, logger.Sugar())
+	req := test.MakeHookRequest(t, "../testdata/github_push.json", "push")
+	rec := httptest.NewRecorder()
+
+	h.ServeHTTP(rec, req)
+
+	w := rec.Result()
+	if w.StatusCode != http.StatusOK {
+		t.Fatalf("got %d, want %d: %s", w.StatusCode, http.StatusOK, mustReadBody(t, w))
+	}
+	_, err = fakeTektonClient.TektonV1beta1().PipelineRuns(testNS).Get("", metav1.GetOptions{})
+	if !errors.IsNotFound(err) {
+		t.Fatalf("pipelinerun was created with no matching rules")
+	}
+}
+
 func mustReadBody(t *testing.T, req *http.Response) []byte {
 	t.Helper()
 	b, err := ioutil.ReadAll(req.Body)

pkg/dsl/scripts.go

@@ -91,6 +91,9 @@ func Convert(p *ci.Pipeline, log logger.Logger, config *Configuration, src *Sour
 	if len(p.AfterScript) > 0 {
 		tasks = append(tasks, makeScriptTask(afterStepTaskName, previous, env, p.Image, p.AfterScript))
 	}
+	if len(tasks) == 1 {
+		return nil, nil
+	}
 	spec := pipelinev1.PipelineRunSpec{
 		ServiceAccountName: config.DefaultServiceAccountName,
 		Workspaces: []pipelinev1.WorkspaceBinding{

pkg/dsl/scripts_test.go

@@ -425,10 +425,10 @@ func readPipelineRunFixture(t *testing.T, filename string) *pipelinev1.PipelineR
 	if err != nil {
 		t.Fatalf("failed to read %s: %s", filename, err)
 	}
-	var pr pipelinev1.PipelineRun
+	var pr *pipelinev1.PipelineRun
 	err = yaml.Unmarshal(b, &pr)
 	if err != nil {
 		t.Fatalf("failed to unmarshal %s: %s", filename, err)
 	}
-	return &pr
+	return pr
 }

pkg/dsl/testdata/content_match_only_master.json

@@ -0,0 +1,18 @@
+{
+  "name": ".tekton_ci.yml",
+  "path": ".tekton_ci.yml",
+  "sha": "980a0d5f19a64b4b30a87d4206aade58726b60e3",
+  "size": 13,
+  "url": "https://api.github.com/repos/octocat/Hello-World/contents/README?ref=7fd1a60b01f91b314f59955a4e4d4e80d8edf11d",
+  "html_url": "https://github.com/octocat/Hello-World/blob/7fd1a60b01f91b314f59955a4e4d4e80d8edf11d/README",
+  "git_url": "https://api.github.com/repos/octocat/Hello-World/git/blobs/980a0d5f19a64b4b30a87d4206aade58726b60e3",
+  "download_url": "https://raw.githubusercontent.com/octocat/Hello-World/7fd1a60b01f91b314f59955a4e4d4e80d8edf11d/README",
+  "type": "file",
+  "content": "aW1hZ2U6IGdvbGFuZzpsYXRlc3QKdmFyaWFibGVzOgogIFJFUE9fTkFNRTogZ2l0aHViLmNvbS9iaWdrZXZtY2QvZ2l0aHViLXRvb2wKCnN0YWdlczoKICAtIHRlc3QKCmZvcm1hdDoKICBzdGFnZTogdGVzdAogIHNjcmlwdDoKICAgIC0gZ28gdGVzdCAtcmFjZSAkKGdvIGxpc3QgLi8uLi4gfCBncmVwIC12IC92ZW5kb3IvKQogIHJ1bGVzOgogICAgLSBpZjogdmFycy5DSV9DT01NSVRfQlJBTkNIICE9ICJtYXN0ZXIiCiAgICAgIHdoZW46IG5ldmVyCg==",
+  "encoding": "base64",
+  "_links": {
+    "self": "https://api.github.com/repos/octocat/Hello-World/contents/README?ref=7fd1a60b01f91b314f59955a4e4d4e80d8edf11d",
+    "git": "https://api.github.com/repos/octocat/Hello-World/git/blobs/980a0d5f19a64b4b30a87d4206aade58726b60e3",
+    "html": "https://github.com/octocat/Hello-World/blob/7fd1a60b01f91b314f59955a4e4d4e80d8edf11d/README"
+  }
+}

pkg/dsl/testdata/script_with_rules_pipeline_run.yaml

@@ -1,48 +1 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  annotations:
-    tekton.dev/ci-source-ref: refs/pulls/4
-    tekton.dev/ci-source-url: https://github.com/bigkevmcd/github-tool.git
-    tekton.dev/ci-hook-id: "26400635-d8f4-4cf5-a45f-bd03856bdf2b"
-  creationTimestamp: null
-  generateName: my-pipeline-run-
-  labels:
-    app.kubernetes.io/managed-by: dsl
-    app.kubernetes.io/part-of: Tekton-CI
-spec:
-  pipelineSpec:
-    tasks:
-    - name: git-clone
-      taskSpec:
-        steps:
-        - command:
-          - /ko-app/git-init
-          - -url
-          - https://github.com/bigkevmcd/github-tool.git
-          - -revision
-          - refs/pulls/4
-          - -path
-          - $(workspaces.source.path)
-          env:
-          - name: REPO_NAME
-            value: github.com/bigkevmcd/github-tool
-          - name: CI_PROJECT_DIR
-            value: $(workspaces.source.path)
-          - name: TEKTON_RESOURCE_NAME
-            value: tekton-ci-git-clone
-          image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/git-init
-          name: git-clone
-          resources: {}
-        workspaces:
-        - name: source
-      workspaces:
-      - name: source
-        workspace: git-checkout
-    workspaces:
-    - name: git-checkout
-  serviceAccountName: test-account
-  workspaces:
-  - name: git-checkout
-    persistentVolumeClaim:
-      claimName: my-volume-claim-123
+null