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

build: release v6.112.0 #7126

Merged
merged 5 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .ebextensions/env-file-creation.config
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ files:
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}-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_TYPE}-wogaa" --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
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,24 @@ 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.112.0](https://github.com/opengovsg/FormSG/compare/v6.112.0...v6.112.0)

- fix: add wogaa config into .env [`#7125`](https://github.com/opengovsg/FormSG/pull/7125)

#### [v6.112.0](https://github.com/opengovsg/FormSG/compare/v6.111.0...v6.112.0)

> 6 March 2024

- feat(tracking): wogaa tracking [`#7123`](https://github.com/opengovsg/FormSG/pull/7123)
- chore(deps-dev): bump json5 from 1.0.1 to 1.0.2 [`#7119`](https://github.com/opengovsg/FormSG/pull/7119)
- build: merge v6.111.0 back into develop [`#7118`](https://github.com/opengovsg/FormSG/pull/7118)
- build: release v6.111.0 [`#7117`](https://github.com/opengovsg/FormSG/pull/7117)
- chore: bump version to v6.112.0 [`54946e9`](https://github.com/opengovsg/FormSG/commit/54946e99d101d48512fce17e0c4d6f9c09db315a)

#### [v6.111.0](https://github.com/opengovsg/FormSG/compare/v6.110.0...v6.111.0)

> 4 March 2024

- feat(fe): update copy, copy btn [`#7116`](https://github.com/opengovsg/FormSG/pull/7116)
- feat(virus-scanner): allow endpoint to be specified [`#7114`](https://github.com/opengovsg/FormSG/pull/7114)
- chore: remove Anguilla from country listing [`#7108`](https://github.com/opengovsg/FormSG/pull/7108)
Expand All @@ -15,6 +31,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- chore(OSS): add FerretDB migration instructions [`#7107`](https://github.com/opengovsg/FormSG/pull/7107)
- build: merge v6.110.0 back into develop [`#7105`](https://github.com/opengovsg/FormSG/pull/7105)
- build: release v6.110.0 [`#7104`](https://github.com/opengovsg/FormSG/pull/7104)
- chore: bump version to v6.111.0 [`d71e1bf`](https://github.com/opengovsg/FormSG/commit/d71e1bf707c8bd10d16266dc49d04979fb2cdfec)

#### [v6.110.0](https://github.com/opengovsg/FormSG/compare/v6.109.0...v6.110.0)

Expand Down
5 changes: 5 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@ services:
- GROWTHBOOK_CLIENT_KEY
# env vars for virus scanner
- VIRUS_SCANNER_LAMBDA_FUNCTION_NAME=function
- WOGAA_SECRET_KEY
- WOGAA_START_ENDPOINT
- WOGAA_SUBMIT_ENDPOINT
- WOGAA_FEEDBACK_ENDPOINT


mockpass:
build: https://github.com/opengovsg/mockpass.git#v4.0.4
Expand Down
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "form-frontend",
"version": "6.111.0",
"version": "6.112.0",
"homepage": ".",
"private": true,
"dependencies": {
Expand Down
73 changes: 59 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "FormSG",
"description": "Form Manager for Government",
"version": "6.111.0",
"version": "6.112.0",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG <formsg@data.gov.sg>"
Expand Down Expand Up @@ -152,6 +152,7 @@
"uid-generator": "^2.0.0",
"ulid": "^2.3.0",
"uuid": "^9.0.0",
"uuid-by-string": "^4.0.0",
"validator": "^13.7.0",
"web-streams-polyfill": "^3.2.1",
"whatwg-fetch": "^3.6.2",
Expand Down
39 changes: 39 additions & 0 deletions src/app/config/features/wogaa.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import convict, { Schema } from 'convict'

export interface IWogaa {
wogaaSecretKey: string
wogaaStartEndpoint: string
wogaaSubmitEndpoint: string
wogaaFeedbackEndpoint: string
}

const wogaaSchema: Schema<IWogaa> = {
wogaaSecretKey: {
doc: 'Wogaa shared secret key',
format: String,
default: '',
env: 'WOGAA_SECRET_KEY',
},
wogaaStartEndpoint: {
doc: 'Wogaa endpoint when a form is loaded',
format: String,
default: '',
env: 'WOGAA_START_ENDPOINT',
},
wogaaSubmitEndpoint: {
doc: 'Wogaa endpoint when a form is loaded',
format: String,
default: '',
env: 'WOGAA_SUBMIT_ENDPOINT',
},
wogaaFeedbackEndpoint: {
doc: 'Wogaa endpoint when a form is loaded',
format: String,
default: '',
env: 'WOGAA_FEEDBACK_ENDPOINT',
},
}

export const wogaaConfig = convict(wogaaSchema)
.validate({ allowed: 'strict' })
.getProperties()
Loading
Loading