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

Production Deploy #2785

Merged
merged 4 commits into from
Feb 14, 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Our public-facing live services were last audited by the [Digital Accessibility

### Security

Our whole stack was last assessed by [Jumpsec](https://www.jumpsec.com/) on 27th July 2022. Their penetration test concluded that our infrastructure and application environments are securely configured to follow best practices. We have since additionally resolved a handful of low- and informational-risk issues uncovered during the assessment to maintain a high standard of security.
Our whole stack was last assessed by [Jumpsec](https://www.jumpsec.com/) between the 21st and 30th November 2023. JUMPSEC then performed a retest of the issues identified in the initial test on the 8th of February 2024. This included verifying that fixes had been successfully applied and that no further risks were introduced as a result of the remediation work carried out. Their penetration test concluded that - "the security posture of PlanX was strong, and following industry best practices. JUMPSEC commend the PlanX team on their dedication to security and ability to both maintain and mitigate issues in a responsible and timely manner".


## Related packages
Expand Down
4 changes: 1 addition & 3 deletions api.planx.uk/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,7 @@ const makeUniqueFlow = (
};

const isLiveEnv = () =>
["production", "staging", "pizza", "sandbox"].includes(
process.env.NODE_ENV || "",
);
["production", "staging", "pizza"].includes(process.env.NODE_ENV || "");

/**
* Get current environment, formatted for display
Expand Down
2 changes: 1 addition & 1 deletion api.planx.uk/package.json
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#1959a5d",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#b184ea9",
"@types/isomorphic-fetch": "^0.0.36",
"adm-zip": "^0.5.10",
"aws-sdk": "^2.1467.0",
Expand Down
27 changes: 17 additions & 10 deletions api.planx.uk/pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion doc/how-to/how-to-setup-aws-sso-credentials.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ As part of onboarding, you should be set up to access AWS via [the SSO portal](h
1. Download the AWS CLI
1. Run `aws configure sso` - the required details can be found via the SSO portal
1. For the "profile" field please use the format `planx-<STACK>`, e.g. `planx-staging`
1. Repeat for all environments (sandbox, staging, production)
1. Repeat for all environments (staging, production)
1. Test! You should be able to call commands using the CLI, for example `aws sts get-caller-identity --profile planx-staging` and get the expected result.

Occasionally, you'll be prompted to refresh your credentials, this can be done via `aws sso login --profile <PROFILE>`
2 changes: 1 addition & 1 deletion doc/how-to/how-to-setup-planning-constraints.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Our /gis API sets the passport variable `article4` by default for _any_ entities
## Process ⚙️
1. **Council** - Shares & publishes their data on planning.data.gov.uk

2. **Planx** - Updates `teams.settings` jsonb database record on production with `{ "hasPlanningData": true }` to enable queries. This will automatically sync to staging on the next scheduled Github Action run, or you can kick it off manually.
2. **Planx** - Updates `team_integrations.has_planning_data` record on production with `true` to enable queries. This will automatically sync to staging on the next scheduled Github Action run, or you can kick it off manually.

(Note that it's common for councils to be ready to complete steps 1 & 2 well before steps 3-5; that's completely okay for testing, but all steps should be completed before a service "goes live".)

Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/api-driven/package.json
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#1959a5d",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#b184ea9",
"axios": "^1.6.0",
"dotenv": "^16.3.1",
"dotenv-expand": "^10.0.0",
Expand Down
20 changes: 10 additions & 10 deletions e2e/tests/api-driven/pnpm-lock.yaml

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
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#1959a5d",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#b184ea9",
"axios": "^1.6.2",
"dotenv": "^16.3.1",
"eslint": "^8.56.0",
Expand Down
20 changes: 10 additions & 10 deletions e2e/tests/ui-driven/pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion editor.planx.uk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@mui/styles": "^5.15.2",
"@mui/utils": "^5.15.2",
"@opensystemslab/map": "^0.8.0",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#1959a5d",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#b184ea9",
"@tiptap/core": "^2.0.3",
"@tiptap/extension-bold": "^2.0.3",
"@tiptap/extension-bubble-menu": "^2.1.13",
Expand Down
23 changes: 14 additions & 9 deletions editor.planx.uk/pnpm-lock.yaml

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

Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function Component(props: Props) {
// Check if this team should query Planning Data (or continue to use custom GIS) and set URL params accordingly
// In future, Planning Data will theoretically support any UK address and this db setting won't be necessary, but data collection still limited to select councils!
const hasPlanningData = useStore(
(state) => state.teamSettings?.hasPlanningData,
(state) => state.teamIntegrations?.hasPlanningData,
);

const digitalLandParams: Record<string, string> = {
Expand Down
6 changes: 6 additions & 0 deletions editor.planx.uk/src/components/Header.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ const mockTeam1: Team = {
id: 123,
name: "Open Systems Lab",
slug: "opensystemslab",
integrations: {
hasPlanningData: false,
},
theme: {
logo: "logo.jpg",
primaryColour: "#0010A4",
Expand All @@ -29,6 +32,9 @@ const mockTeam2: Team = {
id: 456,
name: "Closed Systems Lab",
slug: "closedsystemslab",
integrations: {
hasPlanningData: false,
},
theme: {
logo: null,
primaryColour: "#0010A4",
Expand Down
Loading
Loading