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.

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

Fix: [AEA-4069] - Clean up the code #10

Merged
merged 28 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ed46fba
Initial commit
kris-szlapa Oct 7, 2024
5a2a90f
Fix the build-deployment-container-image command
kris-szlapa Oct 7, 2024
41ea765
Set correct CONFLUENCE_PAGE_ID values
kris-szlapa Oct 7, 2024
9d2e91f
Add SonarCloud Scan step
kris-szlapa Oct 7, 2024
81f9916
Correct the STACK_NAME in the release_code step
kris-szlapa Oct 7, 2024
265b32b
Comment out gh-pages steps
kris-szlapa Oct 7, 2024
9241bbf
Add the gh-pages steps to thecdk release code
kris-szlapa Oct 8, 2024
3946694
Add release_prod step
kris-szlapa Oct 8, 2024
da50a9b
Comment out gh-pages steps
kris-szlapa Oct 8, 2024
2433ab6
Add the helpers resource and the entrypoint script
kris-szlapa Oct 8, 2024
3f7b798
Comment out SonarCloud Scan step
kris-szlapa Oct 8, 2024
34b8945
Correct the stack name
kris-szlapa Oct 8, 2024
2366ec1
Add debug steps
kris-szlapa Oct 8, 2024
7b4dd38
Add debug to the Dockerfile and entrypoint script
kris-szlapa Oct 8, 2024
91cc71e
Add debug comments
kris-szlapa Oct 8, 2024
175af39
Add tsconfig file
kris-szlapa Oct 8, 2024
67afd7e
Fix build-deployment-container-image command
kris-szlapa Oct 8, 2024
35fb147
Remove debug from the deployment steps
kris-szlapa Oct 8, 2024
0fe1a0c
Remove debug from the Dockerfile
kris-szlapa Oct 8, 2024
8aa189c
Remove debug from the entrypoint script
kris-szlapa Oct 8, 2024
00bf17c
Correct the lambda title to Dashboards
kris-szlapa Oct 8, 2024
9b8f2a9
Cleanup the code
kris-szlapa Oct 8, 2024
f9092d1
Merge branch 'main' of https://github.com/NHSDigital/eps-aws-dashboar…
kris-szlapa Oct 8, 2024
b4e7ea9
Amend the Dockerfile
kris-szlapa Oct 8, 2024
57a2f64
Merge branch 'main' of https://github.com/NHSDigital/eps-aws-dashboar…
kris-szlapa Oct 9, 2024
04a5bf1
Amend pre commit config file
kris-szlapa Oct 9, 2024
33853b2
Add gh-pages steps
kris-szlapa Oct 9, 2024
6b1a3f2
Add SonarCloud Scan step
kris-szlapa Oct 9, 2024
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
40 changes: 20 additions & 20 deletions .github/workflows/cdk_release_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,24 +159,24 @@ jobs:
RELEASE_TAG: ${{ inputs.VERSION_NUMBER }}
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}

# - name: Checkout gh-pages
# if: ${{ !startsWith(inputs.STACK_NAME, 'lambda-resources-pr-') }}
# uses: actions/checkout@v4
# with:
# ref: gh-pages
# path: gh-pages
- name: Checkout gh-pages
if: ${{ !startsWith(inputs.STACK_NAME, 'lambda-resources-pr-') }}
uses: actions/checkout@v4
with:
ref: gh-pages
path: gh-pages

# - name: update release tag in github pages
# if: ${{ inputs.TARGET_ENVIRONMENT != 'dev-pr' }}
# run: |
# cd gh-pages
# NOW=$(date +'%Y-%m-%dT%H:%M:%S')
# echo "tag,release_datetime" > _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
# echo "${{ inputs.VERSION_NUMBER }},${NOW}" >> _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
# echo "${{ inputs.VERSION_NUMBER }},${NOW}" >> _data/${{ inputs.TARGET_ENVIRONMENT }}_deployments.csv
# git config user.name github-actions
# git config user.email [email protected]
# git add _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
# git add _data/${{ inputs.TARGET_ENVIRONMENT }}_deployments.csv
# git commit -m 'update releases for ${{ inputs.TARGET_ENVIRONMENT }}'
# parallel --retries 10 --delay 3 ::: "git pull --rebase && git push"
- name: update release tag in github pages
if: ${{ inputs.TARGET_ENVIRONMENT != 'dev-pr' }}
run: |
cd gh-pages
NOW=$(date +'%Y-%m-%dT%H:%M:%S')
echo "tag,release_datetime" > _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
echo "${{ inputs.VERSION_NUMBER }},${NOW}" >> _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
echo "${{ inputs.VERSION_NUMBER }},${NOW}" >> _data/${{ inputs.TARGET_ENVIRONMENT }}_deployments.csv
git config user.name github-actions
git config user.email [email protected]
git add _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
git add _data/${{ inputs.TARGET_ENVIRONMENT }}_deployments.csv
git commit -m 'update releases for ${{ inputs.TARGET_ENVIRONMENT }}'
parallel --retries 10 --delay 3 ::: "git pull --rebase && git push"
10 changes: 5 additions & 5 deletions .github/workflows/quality_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ jobs:
name: cfn_guard_output
path: cfn_guard_output

# - name: SonarCloud Scan
# uses: SonarSource/sonarcloud-github-action@master
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
18 changes: 0 additions & 18 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@ repos:

- repo: local
hooks:
- id: lint-client
name: Lint client
entry: npm
args: ["run", "--prefix=packages/client", "lint"]
language: system
files: ^packages\/client
types_or: [ts, tsx, javascript, jsx, json]
pass_filenames: false

- id: lint-cdk
name: Lint cdk
entry: npm
Expand All @@ -41,15 +32,6 @@ repos:
types_or: [ts, tsx, javascript, jsx, json]
pass_filenames: false

- id: lint-server
name: Lint server
entry: npm
args: ["run", "--prefix=packages/server", "lint"]
language: system
files: ^packages\/server
types_or: [ts, tsx, javascript, jsx, json]
pass_filenames: false

- id: lint-githubactions
name: Lint github actions
entry: make
Expand Down