Skip to content

Commit

Permalink
Merge pull request #6823 from opengovsg/release_v6.83.0
Browse files Browse the repository at this point in the history
build: release v6.83.0
  • Loading branch information
wanlingt authored Oct 19, 2023
2 parents d850d31 + 5f1ae2d commit 78cd2b3
Show file tree
Hide file tree
Showing 42 changed files with 1,301 additions and 461 deletions.
2 changes: 1 addition & 1 deletion .ebextensions/env-file-creation.config
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ files:
aws ssm get-parameter --name "${ENV_TYPE}-sentry" --with-decryption --region $AWS_REGION | jq -r '.Parameter.Value' >> $TARGET_DIR/.env
aws ssm get-parameter --name "${ENV_TYPE}-sms" --with-decryption --region $AWS_REGION | jq -r '.Parameter.Value' >> $TARGET_DIR/.env
aws ssm get-parameter --name "${ENV_TYPE}-ndi" --with-decryption --region $AWS_REGION | jq -r '.Parameter.Value' >> $TARGET_DIR/.env
aws ssm get-parameter --name "${ENV_TYPE}-sgid" --with-decryption --region $AWS_REGION | jq -r '.Parameter.Value' >> $TARGET_DIR/.env
aws ssm get-parameter --name "${ENV_TYPE}-verified-fields" --with-decryption --region $AWS_REGION | jq -r '.Parameter.Value' >> $TARGET_DIR/.env
aws ssm get-parameter --name "${ENV_TYPE}-webhook-verified-content" --with-decryption --region $AWS_REGION | jq -r '.Parameter.Value' >> $TARGET_DIR/.env
aws ssm get-parameter --name "${ENV_SITE_NAME}-sgid" --with-decryption --region $AWS_REGION | jq -r '.Parameter.Value' >> $TARGET_DIR/.env
aws ssm get-parameter --name "${ENV_SITE_NAME}-payment" --with-decryption --region $AWS_REGION | jq -r '.Parameter.Value' >> $TARGET_DIR/.env
aws ssm get-parameter --name "${ENV_SITE_NAME}-cron-payment" --with-decryption --region $AWS_REGION | jq -r '.Parameter.Value' >> $TARGET_DIR/.env

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
- name: Install dependencies
run: npm i
# 👇 Adds Chromatic as a step in the workflow
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-virus-scanner-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
uses: ./.github/workflows/aws-deploy-scanner.yml
with:
environment: 'production'
provisionedConcurrency: 5
provisionedConcurrency: 10
checkoutBranch: 'release-al2'
secrets: inherit
23 changes: 21 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v6.82.0](https://github.com/opengovsg/FormSG/compare/v6.82.0...v6.82.0)
#### [v6.83.0](https://github.com/opengovsg/FormSG/compare/v6.83.0...v6.83.0)

- fix(sgid-login): add graceful handling of errors when work email is invalid [`#6819`](https://github.com/opengovsg/FormSG/pull/6819)
- test: fix error message for InvalidFileKeyError [`#6821`](https://github.com/opengovsg/FormSG/pull/6821)
- chore: update serverless package.json [`#6820`](https://github.com/opengovsg/FormSG/pull/6820)
- fix(storybook): build crash, and missing NumberField customVal [`#6808`](https://github.com/opengovsg/FormSG/pull/6808)

#### [v6.83.0](https://github.com/opengovsg/FormSG/compare/v6.82.0...v6.83.0)

> 19 October 2023

- chore: increase hot lambda to 10 [`#6815`](https://github.com/opengovsg/FormSG/pull/6815)
- feat(sgid-myinfo): add even more sgid myinfo fields [`#6807`](https://github.com/opengovsg/FormSG/pull/6807)
- chore(deps-dev): bump @babel/traverse from 7.22.11 to 7.23.2 in /serverless/virus-scanner [`#6809`](https://github.com/opengovsg/FormSG/pull/6809)
- chore(deps-dev): bump @babel/traverse from 7.20.1 to 7.23.2 in /frontend [`#6810`](https://github.com/opengovsg/FormSG/pull/6810)
- build: merge release 6.82.0 into develop [`#6801`](https://github.com/opengovsg/FormSG/pull/6801)
- feat(sgid-login): general availability and multi-employment [`#6763`](https://github.com/opengovsg/FormSG/pull/6763)
- feat: add more myinfo sgid fields [`#6766`](https://github.com/opengovsg/FormSG/pull/6766)
- build: release v6.82.0 [`#6800`](https://github.com/opengovsg/FormSG/pull/6800)
- chore: bump version to v6.83.0 [`0e9c4bc`](https://github.com/opengovsg/FormSG/commit/0e9c4bc2b154d9d8e77e9e36a2105ef7d85d209b)

#### [v6.82.0](https://github.com/opengovsg/FormSG/compare/v6.81.0...v6.82.0)

Expand All @@ -19,7 +38,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix(deps): bump type-fest from 4.3.1 to 4.4.0 in /shared [`#6782`](https://github.com/opengovsg/FormSG/pull/6782)
- chore(ci): backend jest config [`#6772`](https://github.com/opengovsg/FormSG/pull/6772)
- build: release v6.81.0 [`#6777`](https://github.com/opengovsg/FormSG/pull/6777)
- chore: bump version to v6.82.0 [`5dab965`](https://github.com/opengovsg/FormSG/commit/5dab965019d626ccd3ff6ef20f4d9f6c386db8c8)
- chore: bump version to v6.82.0 [`9b23483`](https://github.com/opengovsg/FormSG/commit/9b234831c1eb84b6ffca9b13d10f54a029b43202)

#### [v6.81.0](https://github.com/opengovsg/FormSG/compare/v6.80.0...v6.81.0)

Expand Down
5 changes: 4 additions & 1 deletion __tests__/e2e/fixtures/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ export const test = baseTest.extend({
await page.goto(LOGIN_PAGE)

await page.getByRole('textbox', { name: /log in/i }).fill(ADMIN_EMAIL)
await page.getByRole('button', { name: /log in/i }).click()
await page
.getByRole('button', { name: /log in/i })
.first()
.click()

// Ensure OTP success message is seen
await expect(
Expand Down
15 changes: 12 additions & 3 deletions __tests__/e2e/login.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ test.describe('login', () => {
.getByRole('textbox', { name: /log in/i })
.fill('[email protected]')

await page.getByRole('button', { name: /log in/i }).click()
await page
.getByRole('button', { name: /log in/i })
.first()
.click()

// Ensure error message is seen
await expect(
Expand All @@ -36,7 +39,10 @@ test.describe('login', () => {
await expect(page).toHaveURL(LOGIN_PAGE)

await page.getByRole('textbox', { name: /log in/i }).fill(legitUserEmail)
await page.getByRole('button', { name: /log in/i }).click()
await page
.getByRole('button', { name: /log in/i })
.first()
.click()

// Ensure OTP success message is seen
await expect(
Expand All @@ -61,7 +67,10 @@ test.describe('login', () => {
await expect(page).toHaveURL(LOGIN_PAGE)

await page.getByRole('textbox', { name: /log in/i }).fill(legitUserEmail)
await page.getByRole('button', { name: /log in/i }).click()
await page
.getByRole('button', { name: /log in/i })
.first()
.click()

// Ensure OTP success message is seen
await expect(
Expand Down
Loading

0 comments on commit 78cd2b3

Please sign in to comment.