From 2afc5484d01dd776de4b35ddafd9ff72a86b8409 Mon Sep 17 00:00:00 2001 From: ccronca Date: Tue, 13 Aug 2024 11:17:50 +0200 Subject: [PATCH 1/2] fix(KONFLUX-3663): format Tekton PipelineRun files Format PipelineRun files with yq for consistent indentation and format Signed-off-by: ccronca --- .tekton/application-service-pull-request.yaml | 12 ++++-------- .tekton/application-service-push.yaml | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.tekton/application-service-pull-request.yaml b/.tekton/application-service-pull-request.yaml index 0ab614775..10796bf7d 100644 --- a/.tekton/application-service-pull-request.yaml +++ b/.tekton/application-service-pull-request.yaml @@ -7,8 +7,7 @@ metadata: build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "main" + pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" creationTimestamp: null labels: appstudio.openshift.io/application: application-service @@ -78,13 +77,11 @@ spec: name: output-image type: string - default: . - description: Path to the source code of an application's component from where - to build image. + description: Path to the source code of an application's component from where to build image. name: path-context type: string - default: Dockerfile - description: Path to the Dockerfile inside the context specified by parameter - path-context + description: Path to the Dockerfile inside the context specified by parameter path-context name: dockerfile type: string - default: "false" @@ -108,8 +105,7 @@ spec: name: java type: string - default: "" - description: Image tag expiration time, time values could be something like - 1h, 2d, 3w for hours, days, and weeks, respectively. + description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively. name: image-expires-after - default: "false" description: Build a source image. diff --git a/.tekton/application-service-push.yaml b/.tekton/application-service-push.yaml index db01cc0cc..dde611725 100644 --- a/.tekton/application-service-push.yaml +++ b/.tekton/application-service-push.yaml @@ -6,8 +6,7 @@ metadata: build.appstudio.redhat.com/commit_sha: '{{revision}}' build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "main" + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" creationTimestamp: null labels: appstudio.openshift.io/application: application-service @@ -75,13 +74,11 @@ spec: name: output-image type: string - default: . - description: Path to the source code of an application's component from where - to build image. + description: Path to the source code of an application's component from where to build image. name: path-context type: string - default: Dockerfile - description: Path to the Dockerfile inside the context specified by parameter - path-context + description: Path to the Dockerfile inside the context specified by parameter path-context name: dockerfile type: string - default: "false" @@ -105,8 +102,7 @@ spec: name: java type: string - default: "" - description: Image tag expiration time, time values could be something like - 1h, 2d, 3w for hours, days, and weeks, respectively. + description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively. name: image-expires-after - default: "false" description: Build a source image. From 63fbfd67ed012955f8f9f6ab81995c03df83dd24 Mon Sep 17 00:00:00 2001 From: ccronca Date: Tue, 13 Aug 2024 11:17:50 +0200 Subject: [PATCH 2/2] fix(KONFLUX-3663): upload SAST results to quay.io Configure the SAST task to upload SARIF results to quay.io for long-term storage Signed-off-by: ccronca --- .tekton/application-service-pull-request.yaml | 7 ++++++- .tekton/application-service-push.yaml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.tekton/application-service-pull-request.yaml b/.tekton/application-service-pull-request.yaml index 10796bf7d..53535f63b 100644 --- a/.tekton/application-service-pull-request.yaml +++ b/.tekton/application-service-pull-request.yaml @@ -307,7 +307,7 @@ spec: - "false" - name: sast-snyk-check runAfter: - - clone-repository + - build-container taskRef: params: - name: name @@ -325,6 +325,11 @@ spec: workspaces: - name: workspace workspace: workspace + params: + - name: image-digest + value: $(tasks.build-container.results.IMAGE_DIGEST) + - name: image-url + value: $(tasks.build-container.results.IMAGE_URL) - name: clamav-scan params: - name: image-digest diff --git a/.tekton/application-service-push.yaml b/.tekton/application-service-push.yaml index dde611725..85c799c12 100644 --- a/.tekton/application-service-push.yaml +++ b/.tekton/application-service-push.yaml @@ -304,7 +304,7 @@ spec: - "false" - name: sast-snyk-check runAfter: - - clone-repository + - build-container taskRef: params: - name: name @@ -322,6 +322,11 @@ spec: workspaces: - name: workspace workspace: workspace + params: + - name: image-digest + value: $(tasks.build-container.results.IMAGE_DIGEST) + - name: image-url + value: $(tasks.build-container.results.IMAGE_URL) - name: clamav-scan params: - name: image-digest