diff --git a/.env.example b/.env.example index 9923f8542a..3668091671 100644 --- a/.env.example +++ b/.env.example @@ -62,7 +62,6 @@ PRODUCTION_PG_URL_FOR_USER_GITHUB_ACTIONS=👻 SHAREDB_PORT=7003 # Integrations (local and pull request environments point to third party staging environments) -BOPS_API_ROOT_DOMAIN=👻 BOPS_API_TOKEN=👻 GOVUK_NOTIFY_API_KEY=👻 @@ -88,26 +87,16 @@ SUPPRESS_LOGS=true ## Lambeth GOV_UK_PAY_TOKEN_LAMBETH=👻 UNIFORM_CLIENT_LAMBETH=👻 -BOPS_SUBMISSION_URL_LAMBETH=https://lambeth.${BOPS_API_ROOT_DOMAIN} ## Southwark GOV_UK_PAY_TOKEN_SOUTHWARK=👻 UNIFORM_CLIENT_SOUTHWARK=👻 -BOPS_SUBMISSION_URL_SOUTHWARK=https://southwark.${BOPS_API_ROOT_DOMAIN} ## Buckinghamshire GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE=👻 UNIFORM_CLIENT_AYLESBURY_VALE=👻 UNIFORM_CLIENT_CHILTERN=👻 UNIFORM_CLIENT_WYCOMBE=👻 -BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE=https://buckinghamshire.${BOPS_API_ROOT_DOMAIN} - -## Camden -BOPS_SUBMISSION_URL_CAMDEN=https://camden.${BOPS_API_ROOT_DOMAIN} - -## Gloucester -BOPS_SUBMISSION_URL_GLOUCESTER=https://gloucester.${BOPS_API_ROOT_DOMAIN} ## End-to-end test team (borrows Lambeth's details) GOV_UK_PAY_TOKEN_E2E=👻 -BOPS_SUBMISSION_URL_E2E=https://lambeth.${BOPS_API_ROOT_DOMAIN} diff --git a/api.planx.uk/.env.test.example b/api.planx.uk/.env.test.example index 9228e40306..ec929642ee 100644 --- a/api.planx.uk/.env.test.example +++ b/api.planx.uk/.env.test.example @@ -24,7 +24,6 @@ HASURA_GRAPHQL_URL=http://hasura:8080/v1/graphql HASURA_PLANX_API_KEY=👻 # Integrations -BOPS_API_ROOT_DOMAIN=👻 BOPS_API_TOKEN=👻 GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE=👻 @@ -41,18 +40,9 @@ SLACK_WEBHOOK_URL=👻 # Local authority specific integrations ## Lambeth GOV_UK_PAY_TOKEN_LAMBETH=👻 -BOPS_SUBMISSION_URL_LAMBETH=https://lambeth.${BOPS_API_ROOT_DOMAIN} ## Southwark GOV_UK_PAY_TOKEN_SOUTHWARK=👻 -BOPS_SUBMISSION_URL_SOUTHWARK=https://southwark.${BOPS_API_ROOT_DOMAIN} ## Buckinghamshire -GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE=👻 -BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE=https://buckinghamshire.${BOPS_API_ROOT_DOMAIN} - -## Camden -BOPS_SUBMISSION_URL_CAMDEN=https://camden.${BOPS_API_ROOT_DOMAIN} - -## Gloucester -BOPS_SUBMISSION_URL_GLOUCESTER=https://gloucester.${BOPS_API_ROOT_DOMAIN} +GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE=👻 \ No newline at end of file diff --git a/api.planx.uk/modules/send/bops/bops.test.ts b/api.planx.uk/modules/send/bops/bops.test.ts index 4f44b0bbe3..819862adc7 100644 --- a/api.planx.uk/modules/send/bops/bops.test.ts +++ b/api.planx.uk/modules/send/bops/bops.test.ts @@ -27,9 +27,9 @@ jest.mock("@opensystemslab/planx-core", () => { }; }); -const submissionURL = process.env.BOPS_SUBMISSION_URL_SOUTHWARK; - describe(`sending an application to BOPS`, () => { + const submissionURL = "https://test.bops-test.com"; + beforeEach(() => { queryMock.mockQuery({ name: "FindApplication", @@ -46,6 +46,38 @@ describe(`sending an application to BOPS`, () => { insertBopsApplication: { id: 22 }, }, }); + + queryMock.mockQuery({ + name: "GetStagingBopsSubmissionURL", + data: { + teams: [ + { + integrations: { + bopsSubmissionURL: submissionURL, + }, + }, + ], + }, + variables: { + slug: "southwark", + }, + }); + + queryMock.mockQuery({ + name: "GetStagingBopsSubmissionURL", + data: { + teams: [ + { + integrations: { + bopsSubmissionURL: null, + }, + }, + ], + }, + variables: { + slug: "unsupported-team", + }, + }); }); it("proxies request and returns hasura id", async () => { diff --git a/api.planx.uk/modules/send/bops/bops.ts b/api.planx.uk/modules/send/bops/bops.ts index 61014b50a3..f8f9921d88 100644 --- a/api.planx.uk/modules/send/bops/bops.ts +++ b/api.planx.uk/modules/send/bops/bops.ts @@ -43,8 +43,11 @@ const sendToBOPS = async (req: Request, res: Response, next: NextFunction) => { // a local or staging API instance should send to the BOPS staging endpoint // production should send to the BOPS production endpoint const localAuthority = req.params.localAuthority; - const bopsSubmissionURLEnvName = `BOPS_SUBMISSION_URL_${localAuthority.toUpperCase()}`; - const bopsSubmissionURL = process.env[bopsSubmissionURLEnvName]; + const env = process.env.NODE_ENV === "production" ? "production" : "staging"; + const bopsSubmissionURL = await $api.team.getBopsSubmissionURL( + localAuthority, + env, + ); const isSupported = Boolean(bopsSubmissionURL); if (!isSupported) { return next( diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json index 502ee2be47..68807bf1e2 100644 --- a/api.planx.uk/package.json +++ b/api.planx.uk/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@airbrake/node": "^2.1.8", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d38a7d3", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#e19754f", "@types/isomorphic-fetch": "^0.0.36", "adm-zip": "^0.5.10", "aws-sdk": "^2.1467.0", diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml index 370578d940..682cd02fd4 100644 --- a/api.planx.uk/pnpm-lock.yaml +++ b/api.planx.uk/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^2.1.8 version: 2.1.8 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#d38a7d3 - version: github.com/theopensystemslab/planx-core/d38a7d3 + specifier: git+https://github.com/theopensystemslab/planx-core#e19754f + version: github.com/theopensystemslab/planx-core/e19754f '@types/isomorphic-fetch': specifier: ^0.0.36 version: 0.0.36 @@ -2218,10 +2218,6 @@ packages: resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==} dev: false - /@types/prop-types@15.7.9: - resolution: {integrity: sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g==} - dev: false - /@types/qs@6.9.7: resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==} @@ -2237,7 +2233,7 @@ packages: /@types/react@18.2.14: resolution: {integrity: sha512-A0zjq+QN/O0Kpe30hA1GidzyFjatVvrpIvWLxD+xv67Vt91TWWgco9IvrJBkeyHm1trGaFS/FSGqPlhyeZRm0g==} dependencies: - '@types/prop-types': 15.7.9 + '@types/prop-types': 15.7.11 '@types/scheduler': 0.16.3 csstype: 3.1.2 dev: false @@ -8531,8 +8527,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/d38a7d3: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d38a7d3} + github.com/theopensystemslab/planx-core/e19754f: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/e19754f} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/api.planx.uk/server.ts b/api.planx.uk/server.ts index 89d4f6f335..9c0d7b9d61 100644 --- a/api.planx.uk/server.ts +++ b/api.planx.uk/server.ts @@ -76,11 +76,6 @@ app.use(helmet()); assert(process.env.GOVUK_NOTIFY_API_KEY); assert(process.env.HASURA_PLANX_API_KEY); assert(process.env.BOPS_API_TOKEN); -assert(process.env.BOPS_SUBMISSION_URL_LAMBETH); -assert(process.env.BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE); -assert(process.env.BOPS_SUBMISSION_URL_SOUTHWARK); -assert(process.env.BOPS_SUBMISSION_URL_CAMDEN); -assert(process.env.BOPS_SUBMISSION_URL_GLOUCESTER); assert(process.env.UNIFORM_TOKEN_URL); assert(process.env.UNIFORM_SUBMISSION_URL); diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml index a3d09eba89..b3ce738817 100644 --- a/docker-compose.e2e.yml +++ b/docker-compose.e2e.yml @@ -29,5 +29,4 @@ services: UNIFORM_SUBMISSION_URL: http://mock-server:8080 UNIFORM_TOKEN_URL: http://mock-server:8080 UNIFORM_CLIENT_E2E: e2e:123 - GOV_UK_PAY_TOKEN_E2E: ${GOV_UK_PAY_TOKEN_E2E} - BOPS_SUBMISSION_URL_E2E: http://mock-server:8080 \ No newline at end of file + GOV_UK_PAY_TOKEN_E2E: ${GOV_UK_PAY_TOKEN_E2E} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1f2e6aa6e4..195c62117a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -144,21 +144,14 @@ services: # Lambeth GOV_UK_PAY_TOKEN_LAMBETH: ${GOV_UK_PAY_TOKEN_LAMBETH} UNIFORM_CLIENT_LAMBETH: ${UNIFORM_CLIENT_LAMBETH} - BOPS_SUBMISSION_URL_LAMBETH: ${BOPS_SUBMISSION_URL_LAMBETH} # Southwark GOV_UK_PAY_TOKEN_SOUTHWARK: ${GOV_UK_PAY_TOKEN_SOUTHWARK} UNIFORM_CLIENT_SOUTHWARK: ${UNIFORM_CLIENT_SOUTHWARK} - BOPS_SUBMISSION_URL_SOUTHWARK: ${BOPS_SUBMISSION_URL_SOUTHWARK} # Buckinghamshire GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE: ${GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE} UNIFORM_CLIENT_AYLESBURY_VALE: ${UNIFORM_CLIENT_AYLESBURY_VALE} UNIFORM_CLIENT_CHILTERN: ${UNIFORM_CLIENT_CHILTERN} UNIFORM_CLIENT_WYCOMBE: ${UNIFORM_CLIENT_WYCOMBE} - BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE: ${BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE} - # Camden - BOPS_SUBMISSION_URL_CAMDEN: ${BOPS_SUBMISSION_URL_CAMDEN} - # Gloucester - BOPS_SUBMISSION_URL_GLOUCESTER: ${BOPS_SUBMISSION_URL_GLOUCESTER} sharedb: restart: unless-stopped diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json index 24d94c7145..156cfe08cf 100644 --- a/e2e/tests/api-driven/package.json +++ b/e2e/tests/api-driven/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@cucumber/cucumber": "^9.3.0", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d38a7d3", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#e19754f", "axios": "^1.6.0", "dotenv": "^16.3.1", "dotenv-expand": "^10.0.0", diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml index e447ef22b1..0e34d90204 100644 --- a/e2e/tests/api-driven/pnpm-lock.yaml +++ b/e2e/tests/api-driven/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^9.3.0 version: 9.3.0 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#d38a7d3 - version: github.com/theopensystemslab/planx-core/d38a7d3 + specifier: git+https://github.com/theopensystemslab/planx-core#e19754f + version: github.com/theopensystemslab/planx-core/e19754f axios: specifier: ^1.6.0 version: 1.6.0 @@ -741,10 +741,6 @@ packages: resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==} dev: false - /@types/prop-types@15.7.9: - resolution: {integrity: sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g==} - dev: false - /@types/react-transition-group@4.4.8: resolution: {integrity: sha512-QmQ22q+Pb+HQSn04NL3HtrqHwYMf4h3QKArOy5F8U5nEVMaihBs3SR10WiOM1iwPz5jIo8x/u11al+iEGZZrvg==} dependencies: @@ -754,7 +750,7 @@ packages: /@types/react@18.2.18: resolution: {integrity: sha512-da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ==} dependencies: - '@types/prop-types': 15.7.9 + '@types/prop-types': 15.7.11 '@types/scheduler': 0.16.3 csstype: 3.1.2 dev: false @@ -2825,8 +2821,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/d38a7d3: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d38a7d3} + github.com/theopensystemslab/planx-core/e19754f: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/e19754f} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/api-driven/src/invite-to-pay/helpers.ts b/e2e/tests/api-driven/src/invite-to-pay/helpers.ts index bb906a1656..e736da0b39 100644 --- a/e2e/tests/api-driven/src/invite-to-pay/helpers.ts +++ b/e2e/tests/api-driven/src/invite-to-pay/helpers.ts @@ -14,6 +14,7 @@ import { import { $admin } from "../client"; import { TEST_EMAIL } from "../../../ui-driven/src/globalHelpers"; import { createTeam, createUser } from "../globalHelpers"; +import gql from "graphql-tag"; export async function setUpMocks() { const serverMockFile = readFileSync(`${__dirname}/mocks/server-mocks.yaml`); @@ -159,12 +160,37 @@ export async function cleanup({ } } +const setupMockBopsSubmissionUrl = async (teamId: number) => { + await $admin.client.request( + gql` + mutation SetupTeamIntegrationE2E( + $staging_bops_submission_url: String + $team_id: Int + ) { + insert_team_integrations_one( + object: { + teamId: $team_id + stagingBopsSubmissionUrl: $staging_bops_submission_url + } + ) { + id + } + } + `, + { + teamId, + stagingBopsSubmissionUrl: "http://mock-server:8080", + }, + ); +}; + export const setup = async () => { await setUpMocks(); - const world = { - teamId: await createTeam(), - userId: await createUser(), - }; + const teamId = await createTeam(); + const userId = await createUser(); + await setupMockBopsSubmissionUrl(teamId); + + const world = { teamId, userId }; return world; }; diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json index 137563cf06..c6e8d668ed 100644 --- a/e2e/tests/ui-driven/package.json +++ b/e2e/tests/ui-driven/package.json @@ -8,7 +8,7 @@ "postinstall": "./install-dependencies.sh" }, "dependencies": { - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d38a7d3", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#e19754f", "axios": "^1.6.0", "dotenv": "^16.3.1", "eslint": "^8.44.0", diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml index c39afbb54c..45975c4055 100644 --- a/e2e/tests/ui-driven/pnpm-lock.yaml +++ b/e2e/tests/ui-driven/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#d38a7d3 - version: github.com/theopensystemslab/planx-core/d38a7d3 + specifier: git+https://github.com/theopensystemslab/planx-core#e19754f + version: github.com/theopensystemslab/planx-core/e19754f axios: specifier: ^1.6.0 version: 1.6.0 @@ -590,10 +590,6 @@ packages: resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==} dev: false - /@types/prop-types@15.7.9: - resolution: {integrity: sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g==} - dev: false - /@types/react-transition-group@4.4.8: resolution: {integrity: sha512-QmQ22q+Pb+HQSn04NL3HtrqHwYMf4h3QKArOy5F8U5nEVMaihBs3SR10WiOM1iwPz5jIo8x/u11al+iEGZZrvg==} dependencies: @@ -603,7 +599,7 @@ packages: /@types/react@18.2.20: resolution: {integrity: sha512-WKNtmsLWJM/3D5mG4U84cysVY31ivmyw85dE84fOCk5Hx78wezB/XEjVPWl2JTZ5FkEeaTJf+VgUAUn3PE7Isw==} dependencies: - '@types/prop-types': 15.7.9 + '@types/prop-types': 15.7.11 '@types/scheduler': 0.16.3 csstype: 3.1.2 dev: false @@ -2629,8 +2625,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/d38a7d3: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d38a7d3} + github.com/theopensystemslab/planx-core/e19754f: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/e19754f} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json index bbe9fd4576..2d4a8d17d0 100644 --- a/editor.planx.uk/package.json +++ b/editor.planx.uk/package.json @@ -14,7 +14,7 @@ "@mui/styles": "^5.14.5", "@mui/utils": "^5.14.5", "@opensystemslab/map": "^0.7.5", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d38a7d3", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#e19754f", "@tiptap/core": "^2.0.3", "@tiptap/extension-bold": "^2.0.3", "@tiptap/extension-bubble-menu": "^2.1.6", diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml index 6de742818e..839d2aa5d6 100644 --- a/editor.planx.uk/pnpm-lock.yaml +++ b/editor.planx.uk/pnpm-lock.yaml @@ -45,8 +45,8 @@ dependencies: specifier: ^0.7.5 version: 0.7.5 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#d38a7d3 - version: github.com/theopensystemslab/planx-core/d38a7d3(@types/react@18.2.20) + specifier: git+https://github.com/theopensystemslab/planx-core#e19754f + version: github.com/theopensystemslab/planx-core/e19754f(@types/react@18.2.20) '@tiptap/core': specifier: ^2.0.3 version: 2.0.3(@tiptap/pm@2.0.3) @@ -20780,9 +20780,9 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - github.com/theopensystemslab/planx-core/d38a7d3(@types/react@18.2.20): - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d38a7d3} - id: github.com/theopensystemslab/planx-core/d38a7d3 + github.com/theopensystemslab/planx-core/e19754f(@types/react@18.2.20): + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/e19754f} + id: github.com/theopensystemslab/planx-core/e19754f name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/infrastructure/application/Pulumi.production.yaml b/infrastructure/application/Pulumi.production.yaml index b8b5b08bba..bdf7fddf50 100644 --- a/infrastructure/application/Pulumi.production.yaml +++ b/infrastructure/application/Pulumi.production.yaml @@ -3,7 +3,6 @@ config: secure: AAABAE+ZtQZO26XlmfAS7tG1DkwQ+G5OP82Roe4EOuk/tG1bMsI= application:airbrake-project-key: secure: AAABAPIGB+gWevPn0SzWnuSuV1RmdwpLOlWKnu8cM/kxLfslvdCIRcU0n0M0XNJ3jwj4EdFn7/llsL1Kg2XnDA== - application:bops-api-root-domain: bops.services application:bops-api-token: secure: AAABALRtSjQMRjERtkHs6WBOI7MBMw4bFOuHO8qLLPe9Pfg8Nlbp61XalZA1pmXsRt/T+59fGcdqbKA5WRkOZVibhFo= application:cloudflare-zone-id: a9b9933f28e786ec4cfd4bb596f5a519 diff --git a/infrastructure/application/Pulumi.sandbox.yaml b/infrastructure/application/Pulumi.sandbox.yaml index 5ea7dbbf20..d3ac496e30 100644 --- a/infrastructure/application/Pulumi.sandbox.yaml +++ b/infrastructure/application/Pulumi.sandbox.yaml @@ -2,7 +2,6 @@ config: application:airbrake-project-id: "329753" application:airbrake-project-key: secure: AAABAO8NgmVNdkwajWpiKwi+dxGicFACbAQzK66FREUCp+OUbSRyNAb9dSQHq/n9fZb8xWBdvYBCQ9eBr2jqPQ== - application:bops-api-root-domain: bops-staging.services application:bops-api-token: secure: AAABAHLQf7CFOK073geL2TbTYycQCzPYUy3Xi66UniwIrTlOAqve2YBikJXzMJ2xS9v4dGUZMUmwUba0OpTz8KAMXJ8= application:cloudflare-zone-id: 9cdfc35484748e96b0ed2b1d303a694f diff --git a/infrastructure/application/Pulumi.staging.yaml b/infrastructure/application/Pulumi.staging.yaml index c2a9691dfd..00da9c67f6 100644 --- a/infrastructure/application/Pulumi.staging.yaml +++ b/infrastructure/application/Pulumi.staging.yaml @@ -3,7 +3,6 @@ config: secure: AAABABxcp8r3CZAw1kXuXkwPZ8cKRDQyOg4+gVvqzKuCFWb8BEU= application:airbrake-project-key: secure: AAABABujxMHxU8Abj4QpyQTz7bLt3AP2wBFaypVkDZ2khzc6eh6lHLljTEkzpLUncno3gNNDXnrmxzXvqKnQdQ== - application:bops-api-root-domain: bops-staging.services application:bops-api-token: secure: AAABAJx2KnnFeuEmwRB5VyE790TeYxiKmWFuVXVY8Lb7+HDNRYND8Pfd9d61zjwPzi9Jf2ZlT0OH++1MXYafhdQO28Y= application:cloudflare-zone-id: diff --git a/infrastructure/application/index.ts b/infrastructure/application/index.ts index 2dec97ad36..36293b4cfc 100644 --- a/infrastructure/application/index.ts +++ b/infrastructure/application/index.ts @@ -322,26 +322,6 @@ export = async () => { }, { name: "SESSION_SECRET", value: config.requireSecret("session-secret") }, { name: "API_URL_EXT", value: `https://api.${DOMAIN}` }, - { - name: "BOPS_SUBMISSION_URL_LAMBETH", - value: pulumi.interpolate`https://lambeth.${config.requireSecret("bops-api-root-domain")}`, - }, - { - name: "BOPS_SUBMISSION_URL_SOUTHWARK", - value: pulumi.interpolate`https://southwark.${config.requireSecret("bops-api-root-domain")}`, - }, - { - name: "BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE", - value: pulumi.interpolate`https://buckinghamshire.${config.requireSecret("bops-api-root-domain")}`, - }, - { - name: "BOPS_SUBMISSION_URL_CAMDEN", - value: pulumi.interpolate`https://camden.${config.requireSecret("bops-api-root-domain")}`, - }, - { - name: "BOPS_SUBMISSION_URL_GLOUCESTER", - value: pulumi.interpolate`https://gloucester.${config.requireSecret("bops-api-root-domain")}`, - }, { name: "BOPS_API_TOKEN", value: config.requireSecret("bops-api-token") }, { name: "JWT_SECRET", value: config.requireSecret("jwt-secret") }, { name: "PORT", value: String(API_PORT) },