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

Production deploy #2712

Merged
merged 5 commits into from
Jan 29, 2024
Merged

Production deploy #2712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27e796f
chore: Drop lodash omit (#2707)
DafyddLlyr Jan 26, 2024
3743eb2
chore: Bump `planx-core` (fixes CVE-2020-8203) (#2708)
DafyddLlyr Jan 26, 2024
2bc7b7b
chore: setup staging GOV_UK_PAY_TOKEN_GLOUCESTER (#2706)
Mike-Heneghan Jan 26, 2024
6a2933a
fix: logical error with assigning gov pay secret (#2709)
Mike-Heneghan Jan 26, 2024
5cdb381
chore: Drop `BOPS_SUBMISSION_URL_<TEAM>` env vars from `.env` files (…
DafyddLlyr Jan 29, 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
5 changes: 1 addition & 4 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,8 @@ UNIFORM_CLIENT_AYLESBURY_VALE=👻
UNIFORM_CLIENT_CHILTERN=👻
UNIFORM_CLIENT_WYCOMBE=👻

## Camden
BOPS_SUBMISSION_URL_CAMDEN=👻

## Gloucester
BOPS_SUBMISSION_URL_GLOUCESTER=👻
GOV_UK_PAY_TOKEN_GLOUCESTER=👻

## Medway
GOV_UK_PAY_TOKEN_MEDWAY=👻
Expand Down
8 changes: 1 addition & 7 deletions api.planx.uk/.env.test.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,15 @@ ORDNANCE_SURVEY_API_KEY=👻
# Local authority specific integrations
## Lambeth
GOV_UK_PAY_TOKEN_LAMBETH=👻
BOPS_SUBMISSION_URL_LAMBETH=👻

## Southwark
GOV_UK_PAY_TOKEN_SOUTHWARK=👻
BOPS_SUBMISSION_URL_SOUTHWARK=👻

## Buckinghamshire
GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE=👻
BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE=👻

## Camden
BOPS_SUBMISSION_URL_CAMDEN=👻

## Gloucester
BOPS_SUBMISSION_URL_GLOUCESTER=👻
GOV_UK_PAY_TOKEN_GLOUCESTER=👻

## Medway
GOV_UK_PAY_TOKEN_MEDWAY=👻
2 changes: 1 addition & 1 deletion api.planx.uk/modules/saveAndReturn/service/validateSession.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import supertest from "supertest";
import omit from "lodash.omit";
import { omit } from "lodash";
import app from "../../../server";
import { queryMock } from "../../../tests/graphqlQueryMock";
import {
Expand Down
2 changes: 1 addition & 1 deletion api.planx.uk/modules/saveAndReturn/service/validateSession.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { gql } from "graphql-request";
import omit from "lodash.omit";
import { omit } from "lodash";
import { getMostRecentPublishedFlow } from "../../../helpers";
import { sortBreadcrumbs } from "@opensystemslab/planx-core";
import { ComponentType } from "@opensystemslab/planx-core/types";
Expand Down
4 changes: 1 addition & 3 deletions api.planx.uk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@airbrake/node": "^2.1.8",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#80579a0",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d1a224c",
"@types/isomorphic-fetch": "^0.0.36",
"adm-zip": "^0.5.10",
"aws-sdk": "^2.1467.0",
Expand Down Expand Up @@ -33,7 +33,6 @@
"jsondiffpatch": "^0.5.0",
"jsonwebtoken": "^9.0.2",
"lodash": "^4.17.21",
"lodash.omit": "^4.5.0",
"mime": "^3.0.0",
"multer": "^1.4.5-lts.1",
"nanoid": "^3.3.7",
Expand Down Expand Up @@ -83,7 +82,6 @@
"@types/jsdom": "^21.1.6",
"@types/jsonwebtoken": "^9.0.5",
"@types/lodash": "^4.14.202",
"@types/lodash.omit": "^4.5.9",
"@types/mime": "^3.0.4",
"@types/multer": "^1.4.11",
"@types/node": "^18.18.1",
Expand Down
63 changes: 5 additions & 58 deletions api.planx.uk/pnpm-lock.yaml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion api.planx.uk/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ assert(process.env.BOPS_API_TOKEN);
assert(process.env.UNIFORM_TOKEN_URL);
assert(process.env.UNIFORM_SUBMISSION_URL);

// Medway has sandbox pay only, so skip assertion as this will fail in production
// Medway & Gloucester have sandbox pay only, so skip assertion as this will fail in production
["BUCKINGHAMSHIRE", "LAMBETH", "SOUTHWARK"].forEach((authority) => {
assert(process.env[`GOV_UK_PAY_TOKEN_${authority}`]);
});
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ services:
UNIFORM_CLIENT_WYCOMBE: ${UNIFORM_CLIENT_WYCOMBE}
# Medway
GOV_UK_PAY_TOKEN_MEDWAY: ${GOV_UK_PAY_TOKEN_MEDWAY}
# Gloucester
GOV_UK_PAY_TOKEN_GLOUCESTER: ${GOV_UK_PAY_TOKEN_GLOUCESTER}

sharedb:
restart: unless-stopped
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/api-driven/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"dependencies": {
"@cucumber/cucumber": "^9.3.0",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#80579a0",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d1a224c",
"axios": "^1.6.0",
"dotenv": "^16.3.1",
"dotenv-expand": "^10.0.0",
Expand Down
59 changes: 5 additions & 54 deletions e2e/tests/api-driven/pnpm-lock.yaml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion e2e/tests/ui-driven/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"postinstall": "./install-dependencies.sh"
},
"dependencies": {
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#80579a0",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d1a224c",
"axios": "^1.6.2",
"dotenv": "^16.3.1",
"eslint": "^8.56.0",
Expand Down
Loading
Loading