Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into dev-tool-increment
Browse files Browse the repository at this point in the history
  • Loading branch information
haworku committed Dec 26, 2023
2 parents f5df682 + 35076ec commit 3783240
Show file tree
Hide file tree
Showing 272 changed files with 12,374 additions and 15,151 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: '/language:${{matrix.language}}'
15 changes: 6 additions & 9 deletions .github/workflows/deploy-app-to-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,19 @@ jobs:
- name: Generate Code
run: npx lerna run generate

- name: Compile proto migration files
run: npx lerna run build --scope=app-proto

- name: upload app web gen directory
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: app-web-gen
name: app-web-gen deploy ${{ inputs.stage_name }}
path: ./services/app-web/src/gen

- name: upload cypress gen directory
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cypress-gen
name: cypress-gen deploy ${{ inputs.stage_name }}
path: ./services/cypress/gen

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: lambda-layers-prisma-client-migration
path: ./services/app-api/lambda-layers-prisma-client-migration
Expand All @@ -107,7 +104,7 @@ jobs:
tar -C ./services/app-api/lambda-layers-prisma-client-migration -xf ./services/app-api/lambda-layers-prisma-client-migration/nodejs.tar.gz
rm -rf ./services/app-api/lambda-layers-prisma-client-migration/nodejs.tar.gz
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: lambda-layers-prisma-client-engine
path: ./services/app-api/lambda-layers-prisma-client-engine
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,19 @@ jobs:
run: yarn test:once --coverage

- name: upload app web gen directory
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: app-web-gen
path: ./services/app-web/src/gen

- name: upload cypress gen directory
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cypress-gen
path: ./services/cypress/gen

- name: upload unit test coverage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: unit-test-coverage
path: ./services/app-web/coverage/coverage-final.json
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
yarn test:once --coverage
- name: upload api test coverage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: api-test-coverage
path: ./services/app-api/coverage/coverage-final.json
Expand Down Expand Up @@ -239,12 +239,12 @@ jobs:
working-directory: services/app-api
run: ./scripts/prepare-prisma-layer.sh

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: lambda-layers-prisma-client-migration
path: ./services/app-api/lambda-layers-prisma-client-migration

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: lambda-layers-prisma-client-engine
path: ./services/app-api/lambda-layers-prisma-client-engine
Expand Down Expand Up @@ -458,12 +458,12 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: app-web-gen
path: ./services/app-web/src/gen

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: cypress-gen
path: ./services/cypress/gen
Expand Down Expand Up @@ -508,26 +508,26 @@ jobs:
CYPRESS_VIDEOS_FOLDER: services/cypress/videos

- name: Upload cypress screenshots
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure() && steps.cypress.outcome == 'failure'
with:
name: cypress-screenshots
name: cypress-screenshots-${{ matrix.containers}}
path: services/cypress/screenshots

- name: Upload cypress video
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always() && steps.cypress.outcome != 'skipped'
with:
name: cypress-videos
name: cypress-videos-${{ matrix.containers}}
path: services/cypress/videos
- name: upload partial cypress coverage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: partial-cypress-coverage-${{ matrix.containers}}
path: ./coverage-cypress/lcov.info

- name: upload partial cypress coverage json
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cypress-json-coverage-${{ matrix.containers}}
path: ./coverage-cypress/coverage-final.json
Expand Down Expand Up @@ -560,7 +560,7 @@ jobs:
echo $(pwd)
ls
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4

- name: Create combined test coverage report
run: |
Expand Down Expand Up @@ -597,7 +597,7 @@ jobs:
cd coverage-all
echo "Coverage reports merged"
- name: Upload combined test coverage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: combined-test-coverage
path: ./coverage-all/
16 changes: 8 additions & 8 deletions .github/workflows/promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
run: PRISMA_CLI_BINARY_TARGETS=rhel-openssl-1.0.x yarn install --prefer-offline --frozen-lockfile --cache-folder ${{ steps.yarn-cache-dir-path.outputs.dir }}

- name: Generate protos
run: npx lerna run generate --scope=app-proto && npx lerna run build --scope=app-proto
run: npx lerna run generate --scope=app-proto

# Generate Prisma Client and binary that can run in a lambda environment
- name: Prepare prisma client
Expand All @@ -107,12 +107,12 @@ jobs:
working-directory: services/app-api
run: ./scripts/prepare-prisma-layer.sh

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: lambda-layers-prisma-client-migration
path: ./services/app-api/lambda-layers-prisma-client-migration

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: lambda-layers-prisma-client-engine
path: ./services/app-api/lambda-layers-prisma-client-engine
Expand Down Expand Up @@ -223,14 +223,14 @@ jobs:
- name: Setup env
uses: ./.github/actions/setup_env

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: app-web-gen
name: app-web-gen deploy prod
path: ./services/app-web/src/gen

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: cypress-gen
name: cypress-gen deploy prod
path: ./services/cypress/gen

- name: Cypress chrome fix
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
CYPRESS_VIDEOS_FOLDER: services/cypress/videos

- name: Upload cypress video
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure() && steps.cypress.outcome == 'failure'
with:
name: cypress-videos
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ gen/
todo.txt
notes/
.tool-versions
dbdump-*


# testing
Expand Down
Binary file added .images/postgres-handler-diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .images/resolver-design-diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .images/session-expired-banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .images/session-expiring.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions dev_tool/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@
]
},
"dependencies": {
"@aws-sdk/client-cloudfront": "^3.450.0",
"@aws-sdk/client-ec2": "^3.441.0",
"@aws-sdk/client-secrets-manager": "^3.441.0",
"node-ssh": "^13.1.0",
"yargs": "^17.2.1"
},
"devDependencies": {
"@types/ssh2": "^1.11.15",
"typescript": "^4.4.4"
}
}
Loading

0 comments on commit 3783240

Please sign in to comment.