From 8e29435e55ebdb246c95212d9fbcacdb5d601f9f Mon Sep 17 00:00:00 2001
From: GraceRuan <grace.ruan@gov.bc.ca>
Date: Mon, 20 Jan 2025 15:02:03 -0800
Subject: [PATCH 1/2] feat: add broker JWT to jenkins job for github package

---
 generators/gh-maven-build/templates/deploy.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generators/gh-maven-build/templates/deploy.yaml b/generators/gh-maven-build/templates/deploy.yaml
index 84238e0..f5c063c 100644
--- a/generators/gh-maven-build/templates/deploy.yaml
+++ b/generators/gh-maven-build/templates/deploy.yaml
@@ -195,6 +195,7 @@ jobs:
           curl \
           --data-urlencode "token=${{ secrets.JENKINS_TOKEN }}" \
           --data-urlencode "githubToken=${{ secrets.GITHUB_TOKEN }}" \
+          --data-urlencode "brokerJwt=${{ secrets.<%= brokerJwt %> }}" \
           --data-urlencode "artifactSha256=${ARTIFACT_SHA256}" \
           --data-urlencode "projectVersion=${PROJECT_VERSION}" \
           --data-urlencode "gitBranch=${{ github.ref_name }}" \

From ae91df1aff7da14ad0b024f38e23fad1f80e3b77 Mon Sep 17 00:00:00 2001
From: GraceRuan <grace.ruan@gov.bc.ca>
Date: Mon, 20 Jan 2025 15:22:52 -0800
Subject: [PATCH 2/2] rescope if statement for downloadType only

---
 .../gh-maven-build/templates/deploy.yaml      | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/generators/gh-maven-build/templates/deploy.yaml b/generators/gh-maven-build/templates/deploy.yaml
index f5c063c..89697fc 100644
--- a/generators/gh-maven-build/templates/deploy.yaml
+++ b/generators/gh-maven-build/templates/deploy.yaml
@@ -190,7 +190,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Submit a job to Jenkins
-<% if (gitHubPackages) { -%>
         run: |
           curl \
           --data-urlencode "token=${{ secrets.JENKINS_TOKEN }}" \
@@ -203,26 +202,9 @@ jobs:
           --data-urlencode "gitTag=${{ (startsWith(github.ref, 'refs/tags/') && github.ref_name) || '' }}" \
           --data-urlencode "configBranch=${{ inputs.config_branch || '' }}" \
           --data-urlencode "downloadUrl=${DOWNLOAD_URL}" \
-          --data-urlencode "downloadType=GITHUB" \
+          --data-urlencode "downloadType=<% if (gitHubPackages) { -%>GITHUB<% } else { -%>ARTIFACTORY<% } -%>" \
           -H "Connection: close" \
           ${{ env.URL }}/${{ env.JOB }}
-<% } else { -%>
-        run: |
-          curl \
-          --data-urlencode "token=${{ secrets.JENKINS_TOKEN }}" \
-          --data-urlencode "githubToken=${{ secrets.GITHUB_TOKEN }}" \
-          --data-urlencode "brokerJwt=${{ secrets.<%= brokerJwt %> }}" \
-          --data-urlencode "artifactSha256=${ARTIFACT_SHA256}" \
-          --data-urlencode "projectVersion=${PROJECT_VERSION}" \
-          --data-urlencode "gitBranch=${{ github.ref_name }}" \
-          --data-urlencode "intentionId=${BUILD_GUID}" \
-          --data-urlencode "gitTag=${{ (startsWith(github.ref, 'refs/tags/') && github.ref_name) || '' }}" \
-          --data-urlencode "configBranch=${{ inputs.config_branch || '' }}" \
-          --data-urlencode "downloadUrl=${DOWNLOAD_URL}" \
-          --data-urlencode "downloadType=ARTIFACTORY" \
-          -H "Connection: close" \
-          ${{ env.URL }}/${{ env.JOB }}
-<% } -%>
         env:
           PROJECT_VERSION: ${{ needs.deploy-build.outputs.project_version || needs.deploy-tag.outputs.project_version }}
           BUILD_GUID: ${{ needs.deploy-build.outputs.build_guid || needs.deploy-tag.outputs.build_guid }}