Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patched version #42

Draft
wants to merge 54 commits into
base: commit_6a9382bb
Choose a base branch
from
Draft

Patched version #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
5bd62d7
Trigger CICD
afmam Apr 10, 2023
93db838
Revise sqon returned during error handling
afmam Apr 11, 2023
42f50b1
Merge pull request #14 from PilotDataPlatform/PILOT-2716
jianglai3303 Apr 11, 2023
64c833a
Add CORS header to response
afmam Apr 21, 2023
520249d
Merge pull request #15 from PilotDataPlatform/PILOT-2735
jianglai3303 Apr 21, 2023
c33c613
PILOT-2593: Replace deprecated github actions and commands
dafelipe130 May 17, 2023
56dff7f
Merge pull request #21 from PilotDataPlatform/PILOT-2593-replace-depr…
andricDu May 17, 2023
c7f403b
Add facet selections to download filter
afmam Jun 12, 2023
d5c5240
Merge pull request #22 from PilotDataPlatform/PILOT-3069
jianglai3303 Jun 12, 2023
b411abb
PILOT-3065: Replace sha id with semver for app tagging
dafelipe130 Jun 12, 2023
50db2a8
Merge pull request #23 from PilotDataPlatform/PILOT-3065-replace-sha-…
dafelipe130 Jun 12, 2023
a8b3459
Update download endpoint to check sqon existence
afmam Jun 16, 2023
1ddbbae
Merge pull request #24 from PilotDataPlatform/PILOT-3069
jianglai3303 Jun 16, 2023
078f211
Trigger rebuild of server filter
afmam Sep 28, 2023
b6cbc91
Add sqon support for project folders
afmam Nov 20, 2023
7f6941d
Remove test code
afmam Nov 20, 2023
e4e8ee1
Update project folder class
afmam Nov 20, 2023
ae1421d
Update zone labels for auth call
afmam Nov 27, 2023
c150424
Merge pull request #33 from PilotDataPlatform/PILOT-3972
jianglai3303 Jan 11, 2024
92f936a
Update RBAC logic for project folders
afmam Jan 19, 2024
66a8f6d
Fix check for namefolder in particular zone
afmam Jan 22, 2024
2b1170f
Remove unused method
afmam Jan 22, 2024
691e15a
Merge pull request #34 from PilotDataPlatform/PILOT-bugfixtest
jianglai3303 Jan 22, 2024
cc0b51a
Update logic to simplify project folder query
afmam Feb 21, 2024
a3258ba
Update auth filter for project admin
afmam Feb 22, 2024
a8495cf
Merge pull request #35 from PilotDataPlatform/PILOT-3972-refactor
jianglai3303 Feb 22, 2024
a500882
Add server filter for nextflow
afmam Feb 26, 2024
263b6f1
Revert package lock changes
afmam Feb 27, 2024
fa29f82
Update storybook to call admin api independently
afmam Feb 27, 2024
422bed4
Update config values
afmam Feb 27, 2024
9488c6e
Merge pull request #36 from PilotDataPlatform/PILOT-4624
jianglai3303 Feb 28, 2024
be381ba
Replace namefolder prefix with users
afmam Apr 22, 2024
ffea7ec
Merge pull request #37 from PilotDataPlatform/PILOT-4969-1
jianglai3303 Apr 26, 2024
10842fc
Add parent path query param to metadata call
afmam Apr 30, 2024
92b4058
Merge pull request #38 from PilotDataPlatform/PILOT-5112
jianglai3303 Apr 30, 2024
60d0b03
[PILOT-5250] Added new deployment pipeline
vbezbakh-indocsystems May 23, 2024
c6677d3
[PILOT-5250] Additional changes
vbezbakh-indocsystems May 23, 2024
ac0096e
[PILOT-5250] Changed pilot pipeline for arranger admin server
vbezbakh-indocsystems Jun 5, 2024
abc2e76
[PILOT-5250] Additional changes
vbezbakh-indocsystems Jun 5, 2024
eb23a2c
[PILOT-5250] Additional changes
vbezbakh-indocsystems Jun 5, 2024
6a51838
[PILOT-5250] Additional changes
vbezbakh-indocsystems Jun 5, 2024
5811351
[PILOT-5250] Added deployment trigger for arranger admin server
vbezbakh-indocsystems Jun 5, 2024
c43c56c
[PILOT-5250] Additional changes
vbezbakh-indocsystems Jun 5, 2024
bc31111
[PILOT-5250] Additional changes
vbezbakh-indocsystems Jun 5, 2024
4ae6dce
[PILOT-5250] Additional changes
vbezbakh-indocsystems Jun 5, 2024
6ffa0a4
[PILOT-5250] Additional changes
vbezbakh-indocsystems Jun 5, 2024
cb54645
[PILOT-5250] Additional changes
vbezbakh-indocsystems Jun 5, 2024
e4bc6eb
[PILOT-5250] Added CODEOWNERS and modified arranger admin ui and serv…
vbezbakh-indocsystems Jun 5, 2024
b5f323a
[PILOT-5250] Additional changes
vbezbakh-indocsystems Jun 5, 2024
0f0d530
[PILOT-5250] Additional changes
vbezbakh-indocsystems Jun 5, 2024
3254f0c
[PILOT-5250] Additional changes
vbezbakh-indocsystems Jun 5, 2024
339fb92
Merge pull request #39 from PilotDataPlatform/PILOT-5250
vbezbakh-indocsystems Jun 5, 2024
cc12d5b
[PILOT-5663] Added trivy step (#40)
vbezbakh-indocsystems Jul 23, 2024
9bc3e1e
Pilot 6081 - Added .trivyignore checking logic (#46)
alexli-indoc Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added .github/.trivyignore
View file
Open in desktop
Empty file.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Code owners for the .github directory
/.github/ @PilotDataPlatform/indoc-devops
28 changes: 17 additions & 11 deletions .github/workflows/build-and-publish-admin-server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,25 @@ jobs:
- name: Extract Branch Name
id: extract_branch
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
get-version:
runs-on: ubuntu-20.04
outputs:
app_version: ${{steps.get-version.outputs.app_version}}
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Get Version
id: get-version
shell: bash
run: echo "app_version=`sed -n 's/^ *"version":.*"\([^"]*\)".*/\1/p' package.json`" >> $GITHUB_OUTPUT
run: |
BRANCH=${GITHUB_REF#refs/heads/}
BASE_VERSION=`sed -n 's/^ *"version":.*"\([^"]*\)".*/\1/p' package.json`
if [ $BRANCH == "patched-version" ]; then
echo "app_version=$BASE_VERSION-`git rev-parse --short HEAD`" >> $GITHUB_OUTPUT
else
echo "app_version=$BASE_VERSION" >> $GITHUB_OUTPUT
fi

build-and-push-docker-image:
needs: [extract-branch-name, get-version]
Expand All @@ -34,12 +41,12 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
- name: Login to Github Packages
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: pilotdataplatform.azurecr.io
username: ${{ secrets.ACR_CLIENT }}
Expand All @@ -54,12 +61,11 @@ jobs:
# generate Docker tags based on the following events/attributes
sep-tags: ','
tags: |
type=sha,enable=true,prefix=arranger-admin-server-,suffix=,format=short
type=raw,prefix=arranger-admin-server-,suffix=,value=${{needs.get-version.outputs.app_version}}, enable=${{needs.extract-branch-name.outputs.branch=='patched-version'}}
type=raw,prefix=arranger-admin-server-,suffix=,value=${{needs.get-version.outputs.app_version}}
# - name: Image digest
# run: echo ${{ steps.meta.outputs.tags }}
- name: Build image and push to GitHub Container Registry
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
# relative path to the place where source code with Dockerfile is located
context: .
Expand All @@ -71,7 +77,7 @@ jobs:
target: arranger-admin-server

Trigger:
needs: [build-and-push-docker-image, extract-branch-name]
needs: [build-and-push-docker-image, extract-branch-name, get-version]
#if: ${{ (github.event.workflow_run.conclusion == 'success' && needs.extract-branch-name.outputs.branch == 'patched-version') || (needs.extract-branch-name.outputs.branch == 'main') }}
if: ${{ (needs.extract-branch-name.outputs.branch == 'patched-version') || (needs.extract-branch-name.outputs.branch == 'main') }}
name: Trigger jenkins job
Expand Down Expand Up @@ -99,7 +105,7 @@ jobs:
target_release=arranger-admin-server
env=${ENV}
echo "The CI external URL is ${CI_EXTERNAL_URL}"
curl --silent -i -X POST -m 60 -L -o output.txt --user jenkins:${CI_API_TOKEN} ${CI_EXTERNAL_URL}/job/Infra/job/UpdateAppVersion/buildWithParameters --data TF_TARGET_ENV=$env --data TARGET_RELEASE=$target_release --data NEW_APP_VERSION="${{ env.SHA }}"
curl --silent -i -X POST -m 60 -L -o output.txt --user jenkins:${CI_API_TOKEN} ${CI_EXTERNAL_URL}/job/Infra/job/UpdateAppVersion/buildWithParameters --data TF_TARGET_ENV=$env --data TARGET_RELEASE=$target_release --data NEW_APP_VERSION="${{needs.get-version.outputs.app_version}}"
location=$(cat output.txt | grep location | cut -d " " -f2 | sed 's/\r//')
link=${location}api/json && echo $link && echo -n "location_link=$link" >> $GITHUB_ENV
- name: getting the json
Expand Down
28 changes: 17 additions & 11 deletions .github/workflows/build-and-publish-admin-ui.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,25 @@ jobs:
- name: Extract Branch Name
id: extract_branch
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
get-version:
runs-on: ubuntu-20.04
outputs:
app_version: ${{steps.get-version.outputs.app_version}}
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Get Version
id: get-version
shell: bash
run: echo "app_version=`sed -n 's/^ *"version":.*"\([^"]*\)".*/\1/p' package.json`" >> $GITHUB_OUTPUT
run: |
BRANCH=${GITHUB_REF#refs/heads/}
BASE_VERSION=`sed -n 's/^ *"version":.*"\([^"]*\)".*/\1/p' package.json`
if [ $BRANCH == "patched-version" ]; then
echo "app_version=$BASE_VERSION-`git rev-parse --short HEAD`" >> $GITHUB_OUTPUT
else
echo "app_version=$BASE_VERSION" >> $GITHUB_OUTPUT
fi

build-and-push-docker-image:
needs: [extract-branch-name, get-version]
Expand All @@ -34,12 +41,12 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
- name: Login to Github Packages
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: pilotdataplatform.azurecr.io
username: ${{ secrets.ACR_CLIENT }}
Expand All @@ -54,12 +61,11 @@ jobs:
# generate Docker tags based on the following events/attributes
sep-tags: ','
tags: |
type=sha,enable=true,prefix=arranger-admin-ui-,suffix=,format=short
type=raw,prefix=arranger-admin-ui-,suffix=,value=${{needs.get-version.outputs.app_version}}, enable=${{needs.extract-branch-name.outputs.branch=='patched-version'}}
type=raw,prefix=arranger-admin-ui-,suffix=,value=${{needs.get-version.outputs.app_version}}
# - name: Image digest
# run: echo ${{ steps.meta.outputs.tags }}
- name: Build image and push to GitHub Container Registry
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
# relative path to the place where source code with Dockerfile is located
context: .
Expand All @@ -71,7 +77,7 @@ jobs:
target: arranger-admin-ui

Trigger:
needs: [build-and-push-docker-image, extract-branch-name]
needs: [build-and-push-docker-image, extract-branch-name, get-version]
#if: ${{ (github.event.workflow_run.conclusion == 'success' && needs.extract-branch-name.outputs.branch == 'patched-version') || (needs.extract-branch-name.outputs.branch == 'main') }}
if: ${{ (needs.extract-branch-name.outputs.branch == 'patched-version') || (needs.extract-branch-name.outputs.branch == 'main') }}
name: Trigger jenkins job
Expand Down Expand Up @@ -99,7 +105,7 @@ jobs:
target_release=arranger-admin-ui
env=${ENV}
echo "The CI external URL is ${CI_EXTERNAL_URL}"
curl --silent -i -X POST -m 60 -L -o output.txt --user jenkins:${CI_API_TOKEN} ${CI_EXTERNAL_URL}/job/Infra/job/UpdateAppVersion/buildWithParameters --data TF_TARGET_ENV=$env --data TARGET_RELEASE=$target_release --data NEW_APP_VERSION="${{ env.SHA }}"
curl --silent -i -X POST -m 60 -L -o output.txt --user jenkins:${CI_API_TOKEN} ${CI_EXTERNAL_URL}/job/Infra/job/UpdateAppVersion/buildWithParameters --data TF_TARGET_ENV=$env --data TARGET_RELEASE=$target_release --data NEW_APP_VERSION="${{needs.get-version.outputs.app_version}}"
location=$(cat output.txt | grep location | cut -d " " -f2 | sed 's/\r//')
link=${location}api/json && echo $link && echo -n "location_link=$link" >> $GITHUB_ENV
- name: getting the json
Expand Down
28 changes: 17 additions & 11 deletions .github/workflows/build-and-publish-server-filter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,25 @@ jobs:
- name: Extract Branch Name
id: extract_branch
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
get-version:
runs-on: ubuntu-20.04
outputs:
app_version: ${{steps.get-version.outputs.app_version}}
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Get Version
id: get-version
shell: bash
run: echo "app_version=`sed -n 's/^ *"version":.*"\([^"]*\)".*/\1/p' package.json`" >> $GITHUB_OUTPUT
run: |
BRANCH=${GITHUB_REF#refs/heads/}
BASE_VERSION=`sed -n 's/^ *"version":.*"\([^"]*\)".*/\1/p' package.json`
if [ $BRANCH == "patched-version" ]; then
echo "app_version=$BASE_VERSION-`git rev-parse --short HEAD`" >> $GITHUB_OUTPUT
else
echo "app_version=$BASE_VERSION" >> $GITHUB_OUTPUT
fi

build-and-push-docker-image:
needs: [extract-branch-name, get-version]
Expand All @@ -34,12 +41,12 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
- name: Login to Github Packages
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: pilotdataplatform.azurecr.io
username: ${{ secrets.ACR_CLIENT }}
Expand All @@ -54,12 +61,11 @@ jobs:
# generate Docker tags based on the following events/attributes
sep-tags: ','
tags: |
type=sha,enable=true,prefix=arranger-server-filter-,suffix=,format=short
type=raw,prefix=arranger-server-filter-,suffix=,value=${{needs.get-version.outputs.app_version}}, enable=${{needs.extract-branch-name.outputs.branch=='patched-version'}}
type=raw,prefix=arranger-server-filter-,suffix=,value=${{needs.get-version.outputs.app_version}}
# - name: Image digest
# run: echo ${{ steps.meta.outputs.tags }}
- name: Build image and push to GitHub Container Registry
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
# relative path to the place where source code with Dockerfile is located
context: .
Expand All @@ -71,7 +77,7 @@ jobs:
target: arranger-server

Trigger:
needs: [build-and-push-docker-image, extract-branch-name]
needs: [build-and-push-docker-image, extract-branch-name, get-version]
#if: ${{ (github.event.workflow_run.conclusion == 'success' && needs.extract-branch-name.outputs.branch == 'patched-version') || (needs.extract-branch-name.outputs.branch == 'main') }}
if: ${{ (needs.extract-branch-name.outputs.branch == 'patched-version') || (needs.extract-branch-name.outputs.branch == 'main') }}
name: Trigger jenkins job
Expand Down Expand Up @@ -99,7 +105,7 @@ jobs:
target_release=arranger-server-filter
env=${ENV}
echo "The CI external URL is ${CI_EXTERNAL_URL}"
curl --silent -i -X POST -m 60 -L -o output.txt --user jenkins:${CI_API_TOKEN} ${CI_EXTERNAL_URL}/job/Infra/job/UpdateAppVersion/buildWithParameters --data TF_TARGET_ENV=$env --data TARGET_RELEASE=$target_release --data NEW_APP_VERSION="${{ env.SHA }}"
curl --silent -i -X POST -m 60 -L -o output.txt --user jenkins:${CI_API_TOKEN} ${CI_EXTERNAL_URL}/job/Infra/job/UpdateAppVersion/buildWithParameters --data TF_TARGET_ENV=$env --data TARGET_RELEASE=$target_release --data NEW_APP_VERSION="${{needs.get-version.outputs.app_version}}"
location=$(cat output.txt | grep location | cut -d " " -f2 | sed 's/\r//')
link=${location}api/json && echo $link && echo -n "location_link=$link" >> $GITHUB_ENV
- name: getting the json
Expand Down
Loading