Skip to content

Commit

Permalink
Merge pull request #80 from bcgov/fix/nodeJsParams
Browse files Browse the repository at this point in the history
fix: nodejs answers
  • Loading branch information
mbystedt authored Jan 16, 2025
2 parents ed8b12b + 09b0258 commit d7f9436
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 265 deletions.
89 changes: 11 additions & 78 deletions generators/gh-nodejs-build/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,32 +149,6 @@ export default class extends Generator {
message: 'Path to unit tests (./.github/workflows/test.yaml):',
default: '',
},
{
type: 'confirm',
name: 'gitHubPackages',
message: 'Publish to GitHub Packages:',
default: false,
},
{
type: 'input',
name: 'gitHubOwnerPack',
message: 'GitHub Owner with repo path (e.g. bcgov-nr/results-war):',
when: (answers) => answers.gitHubPackages,
},
{
type: 'input',
name: 'artifactoryProject',
message: 'Artifactory:',
default: 'cc20',
when: (answers) => !answers.gitHubPackages,
},
{
type: 'input',
name: 'artifactoryPackageType',
message: 'Artifactory Package Type (maven, ivy, npm):',
default: 'maven',
when: (answers) => !answers.gitHubPackages,
},
{
type: 'confirm',
name: 'deployOnPrem',
Expand All @@ -188,32 +162,6 @@ export default class extends Generator {
default: 'playbooks',
when: (answers) => answers.deployOnPrem,
},
{
type: 'input',
name: 'tomcatContext',
message: 'Tomcat Context (e.g. ext#results):',
when: (answers) => answers.deployOnPrem,
},
{
type: 'confirm',
name: 'useAltAppDirName',
message: 'Use alternative webapp directory:',
default: false,
when: (answers) => answers.deployOnPrem,
},
{
type: 'input',
name: 'altAppDirName',
message: 'Alternative webapp directory name:',
when: (answers) => answers.useAltAppDirName,
},
{
type: 'confirm',
name: 'addWebadeConfig',
message: 'Add Webade configuration:',
default: false,
when: (answers) => answers.deployOnPrem,
},
]
.filter(
generateSetAnswerPropPredicate(this.answers, !backstageAnswer.skip),
Expand Down Expand Up @@ -247,12 +195,7 @@ export default class extends Generator {
projectName: this.answers.projectName,
serviceName: this.answers.serviceName,
brokerJwt,
artifactoryProject: this.answers.artifactoryProject,
pomRoot: this.answers.pomRoot,
unitTestsPath: this.answers.unitTestsPath,
gitHubPackages: this.answers.gitHubPackages,
artifactoryPackageType: this.answers.artifactoryPackageType,
gitHubOwnerPack: this.answers.gitHubOwnerPack,
},
);
this.fs.copyTpl(
Expand Down Expand Up @@ -280,11 +223,6 @@ export default class extends Generator {
projectName: this.answers.projectName,
serviceName: this.answers.serviceName,
brokerJwt,
artifactoryProject: this.answers.artifactoryProject,
pomRoot: this.answers.pomRoot,
gitHubPackages: this.answers.gitHubPackages,
artifactoryPackageType: this.answers.artifactoryPackageType,
gitHubOwnerPack: this.answers.gitHubOwnerPack,
},
);
this.fs.copyTpl(
Expand All @@ -295,22 +233,17 @@ export default class extends Generator {
serviceName: this.answers.serviceName,
},
);
const playbook_args = [
this.answers.projectName,
this.answers.serviceName,
this.answers.playbookPath,
this.answers.tomcatContext,
this.answers.altAppDirName,
];
const playbook_options = {
addWebadeConfig: this.answers.addWebadeConfig,
altAppDirName: this.answers.altAppDirName,
};
this.composeWith(
'nr-repository-composer:pd-ansible-playbook',
playbook_args,
playbook_options,
);
// const playbook_args = [
// this.answers.projectName,
// this.answers.serviceName,
// this.answers.playbookPath,
// ];
// const playbook_options = {};
// this.composeWith(
// 'nr-repository-composer:pd-ansible-playbook',
// playbook_args,
// playbook_options,
// );
}
}

Expand Down
187 changes: 0 additions & 187 deletions generators/gh-nodejs-build/templates/deploy.yaml
Original file line number Diff line number Diff line change
@@ -1,187 +0,0 @@
name: Deploy

on:
workflow_dispatch:
inputs:
config_branch:
description: 'Use branch for testing configuration changes'
required: false
type: string

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
SERVICE_PROJECT: <%= projectName %>
SERVICE_NAME: <%= serviceName %>
JOB: buildByToken/buildWithParameters?job=<%= projectName %>/<%= serviceName %>
URL: https://cd.io.nrs.gov.bc.ca
PACKAGE_REPO: https://maven.pkg.github.com/<%= gitHubOwnerPack %>
jobs:
check_token_expiration:
uses: ./.github/workflows/check-token.yaml
secrets:
token: ${{ secrets.<%= brokerJwt %> }}
deploy-build:
name: Deploy development version
if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
runs-on: ubuntu-latest
needs: check_token_expiration
outputs:
project_version: ${{ steps.set-build-output.outputs.project_version }}
build_guid: ${{ steps.set-build-output.outputs.build_guid }}
build_number: ${{ steps.set-build-output.outputs.build_number }}
artifact_name: ${{ steps.set-build-output.outputs.artifact_name }}
artifact_sha256: ${{ steps.set-build-output.outputs.artifact_sha256 }}
download_url: ${{ steps.set-download-url.outputs.download_url }}
steps:
- name: Set build output
id: set-build-output
run: |
RESPONSE=$(curl -s -X 'POST' \
"${BROKER_URL}/v1/intention/search?where=%7B%22actions.action%22%3A%22package-build%22%2C%22actions.service.project%22%3A%22${SERVICE_PROJECT}%22%2C%22actions.service.name%22%3A%22${SERVICE_NAME}%22%2C%22actions.package.buildVersion%22%3A%22${GITHUB_SHA}%22%7D&offset=0&limit=1" \
-H 'accept: application/json' \
-H 'Authorization: Bearer '"${BROKER_JWT}"'' \
-d '')
if echo "$RESPONSE" | jq -e '.statusCode == 401' > /dev/null; then
echo "Status code is 401. This indicates an authorization error."
echo "Please check if your Broker Token is valid. Teams can generate a new one in Broker if needed."
echo "Link: https://broker.io.nrs.gov.bc.ca/browse/brokerAccount"
echo "Exiting..."
exit 1
fi
echo "project_version=$(echo ${RESPONSE} | jq -r '.data[].actions[].package.version')" >> $GITHUB_OUTPUT
echo "build_guid=$(echo ${RESPONSE} | jq -r '.data[].id')" >> $GITHUB_OUTPUT
echo "build_number=$(echo ${RESPONSE} | jq -r '.data[].actions[].package.buildNumber')" >> $GITHUB_OUTPUT
echo "artifact_name=$(echo ${RESPONSE} | jq -r '.data[].actions[].artifacts[].name')" >> $GITHUB_OUTPUT
artifact_checksum=$(echo ${RESPONSE} | jq -r '.data[].actions[].artifacts[].checksum')
echo "artifact_sha256=${artifact_checksum#sha256:}" >> $GITHUB_OUTPUT
env:
BROKER_URL: https://broker.io.nrs.gov.bc.ca
BROKER_JWT: ${{ secrets.<%= brokerJwt %> }}
SERVICE_PROJECT: ${{ env.SERVICE_PROJECT }}
SERVICE_NAME: ${{ env.SERVICE_NAME }}
GITHUB_SHA: ${{ github.sha }}
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
ref: ${{ github.ref }}
- name: Set download URL
id: set-download-url
run: |
sudo apt-get -qq install libxml2-utils
GROUP_ID=$(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file <%= pomRoot %>pom.xml)
GROUP_ID_PATH="${GROUP_ID//.//}"
PACKAGE_TYPE=$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file <%= pomRoot %>pom.xml)
curl -LO "${PACKAGE_REPO}/${GROUP_ID_PATH}/${SERVICE_NAME}/${PROJECT_VERSION}/maven-metadata.xml" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}"
TIMESTAMP=$(xmllint --xpath '//metadata/versioning/snapshot/timestamp/text()' maven-metadata.xml)
BUILD_NUMBER=$(xmllint --xpath '//metadata/versioning/snapshot/buildNumber/text()' maven-metadata.xml)
SNAPSHOT_VERSION="${PROJECT_VERSION//SNAPSHOT/$TIMESTAMP-$BUILD_NUMBER}"
ARTIFACT_NAME="${SERVICE_NAME}-${SNAPSHOT_VERSION}.${PACKAGE_TYPE}"
DOWNLOAD_URL="${PACKAGE_REPO}/${GROUP_ID_PATH}/${SERVICE_NAME}/${PROJECT_VERSION}/${ARTIFACT_NAME}"
echo "${DOWNLOAD_URL}"
echo "download_url=$(echo ${DOWNLOAD_URL})" >> $GITHUB_OUTPUT
env:
SERVICE_NAME: ${{ env.SERVICE_NAME }}
PROJECT_VERSION: ${{ steps.set-build-output.outputs.project_version }}
PACKAGE_REPO: ${{ env.PACKAGE_REPO }}
deploy-tag:
name: Deploy release version
if: ${{ startsWith(github.ref, 'refs/tags/') }}
runs-on: ubuntu-latest
needs: check_token_expiration
outputs:
project_version: ${{ steps.set-tag-output.outputs.project_version }}
build_guid: ${{ steps.set-tag-output.outputs.build_guid }}
build_number: ${{ steps.set-tag-output.outputs.build_number }}
artifact_name: ${{ steps.set-tag-output.outputs.artifact_name }}
artifact_sha256: ${{ steps.set-tag-output.outputs.artifact_sha256 }}
download_url: ${{ steps.set-download-url.outputs.download_url }}
steps:
- name: Set tag output
id: set-tag-output
run: |
TAG=${{ github.ref_name }}
PROJECT_VERSION=${TAG#v}
RESPONSE=$(curl -s -X 'POST' \
"${BROKER_URL}/v1/intention/search?where=%7B%22actions.action%22%3A%22package-build%22%2C%22actions.service.project%22%3A%22${SERVICE_PROJECT}%22%2C%22actions.service.name%22%3A%22${SERVICE_NAME}%22%2C%22actions.package.version%22%3A%22${PROJECT_VERSION}%22%7D&offset=0&limit=1" \
-H 'accept: application/json' \
-H 'Authorization: Bearer '"${BROKER_JWT}"'' \
-d '')
if echo "$RESPONSE" | jq -e '.statusCode == 401' > /dev/null; then
echo "Status code is 401. This indicates an authorization error."
echo "Please check if your Broker Token is valid. Teams can generate a new one in Broker if needed."
echo "Link: https://broker.io.nrs.gov.bc.ca/browse/brokerAccount"
echo "Exiting..."
exit 1
fi
echo "project_version=${PROJECT_VERSION}" >> $GITHUB_OUTPUT
echo "build_guid=$(echo ${RESPONSE} | jq -r '.data[].id')" >> $GITHUB_OUTPUT
echo "build_number=$(echo ${RESPONSE} | jq -r '.data[].actions[].package.buildNumber')" >> $GITHUB_OUTPUT
echo "artifact_name=$(echo ${RESPONSE} | jq -r '.data[].actions[].artifacts[].name')" >> $GITHUB_OUTPUT
artifact_checksum=$(echo ${RESPONSE} | jq -r '.data[].actions[].artifacts[].checksum')
echo "artifact_sha256=${artifact_checksum#sha256:}" >> $GITHUB_OUTPUT
env:
BROKER_URL: https://broker.io.nrs.gov.bc.ca
BROKER_JWT: ${{ secrets.<%= brokerJwt %> }}
SERVICE_PROJECT: ${{ env.SERVICE_PROJECT }}
SERVICE_NAME: ${{ env.SERVICE_NAME }}
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
ref: ${{ github.ref }}
- name: Set download URL
id: set-download-url
run: |
sudo apt-get -qq install libxml2-utils
GROUP_ID=$(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file <%= pomRoot %>pom.xml)
GROUP_ID_PATH="${GROUP_ID//.//}"
PACKAGE_TYPE=$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file <%= pomRoot %>pom.xml)
ARTIFACT_NAME="${SERVICE_NAME}-${PROJECT_VERSION}.${PACKAGE_TYPE}"
DOWNLOAD_URL="${PACKAGE_REPO}/${GROUP_ID_PATH}/${SERVICE_NAME}/${PROJECT_VERSION}/${ARTIFACT_NAME}"
echo "${DOWNLOAD_URL}"
echo "download_url=$(echo ${DOWNLOAD_URL})" >> $GITHUB_OUTPUT
env:
SERVICE_NAME: ${{ env.SERVICE_NAME }}
PROJECT_VERSION: ${{ steps.set-tag-output.outputs.project_version }}
PACKAGE_REPO: ${{ env.PACKAGE_REPO }}
submit-job:
name: Submit job
if: |
always() &&
((needs.deploy-build.result == 'success' && needs.deploy-tag.result == 'skipped') ||
(needs.deploy-build.result == 'skipped' && needs.deploy-tag.result == 'success'))
needs: [deploy-build, deploy-tag]
runs-on: ubuntu-latest
steps:
- name: Submit a job to Jenkins
run: |
curl \
--data-urlencode "token=${{ secrets.JENKINS_TOKEN }}" \
--data-urlencode "githubToken=${{ secrets.GITHUB_TOKEN }}" \
--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=GITHUB" \
-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 }}
BUILD_NUMBER: ${{ needs.deploy-build.outputs.build_number || needs.deploy-tag.outputs.build_number }}
ARTIFACT_SHA256: ${{ needs.deploy-build.outputs.artifact_sha256 || needs.deploy-tag.outputs.artifact_sha256 }}
DOWNLOAD_URL: ${{ needs.deploy-build.outputs.download_url || needs.deploy-tag.outputs.download_url }}
# The automatically generated GitHub token will expire when the workflow ends. We need to wait so the job has time to clone the repo
# and download the package
- name: Sleep
run: sleep 90s
shell: bash
59 changes: 59 additions & 0 deletions generators/gh-nodejs-build/templates/deployment-intention.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"event": {
"provider": "EVENT_PROVIDER",
"reason": "Job triggered",
"url": "JOB_URL"
},
"actions": [
{
"action": "server-access",
"id": "login",
"provision": ["token/self"],
"service": {
"name": "<%= serviceName %>",
"project": "<%= projectName %>",
"environment": "",
"target": {
"name": "jenkins-apps",
"project": "jenkins",
"environment": "production"
}
}
},
{
"action": "package-configure",
"id": "configure",
"provision": ["token/self"],
"service": {
"name": "<%= serviceName %>",
"project": "<%= projectName %>",
"environment": ""
}
},
{
"action": "package-installation",
"id": "install",
"provision": [],
"cloud": {
"target": {
"provider": "dxcas"
}
},
"service": {
"name": "<%= serviceName %>",
"project": "<%= projectName %>",
"environment": ""
},
"package": {
"version": "",
"buildGuid": ""
},
"source": {
"action": "package-build#build"
}
}
],
"user": {
"name": "USER_ID"
}
}

0 comments on commit d7f9436

Please sign in to comment.