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

PP-13452 refactor selfservice build system #4402

Merged
merged 3 commits into from
Jan 15, 2025
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
28 changes: 8 additions & 20 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
cypress
docs
.gitignore
.git
.github
.sass-lint.yml
CONTRIBUTING.md
env.sh
node_modules
node_modules_local
Dockerfile
Jenkinsfile
.snyk
build-local.sh
pacts
.settings
.project
*.log
*.txt
.env
# exclude everything
*
# include following
!src
!esbuild.config.mjs
!jsconfig.json
!package.json
!package-lock.json
9 changes: 7 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
## WHAT
### WHAT
_A brief description of the pull request:_

## HOW
### HOW
_Steps to test or reproduce:_

### SCREENS
_Screenshots if view has been modified:_

#### BEFORE

#### AFTER
2 changes: 2 additions & 0 deletions .github/workflows/_run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ jobs:
name: "Cypress"
needs: [ install-and-compile ]
uses: alphagov/pay-ci/.github/workflows/_run-node-cypress-tests.yml@master
with:
LIBGL_ALWAYS_SOFTWARE: "1"

pact-providers-contract-tests:
name: "Provider tests"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
branches: [ "master" ]
paths:
- 'app/**'
- 'src/**'
- 'test/**'
push:
branches: [ "master" ]
Expand Down
8 changes: 3 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
.start.pid
.project
.settings
config/dev-env.json
.env
public
govuk_modules
dist
local-certs
node_modules
node_modules_local
*/node_modules/*
pacts/
pacts
*.txt
*.log
*.pid
Expand Down
98 changes: 40 additions & 58 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -112,224 +112,206 @@
}
],
"results": {
"app/controllers/credentials.controller.test.js": [
"src/controllers/registration/registration.controller.js": [
{
"type": "Secret Keyword",
"filename": "app/controllers/credentials.controller.test.js",
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
"is_verified": false,
"line_number": 45
}
],
"app/controllers/login/login-get.controller.js": [
{
"type": "Secret Keyword",
"filename": "app/controllers/login/login-get.controller.js",
"hashed_secret": "f2bdcadcf8d49d63835d1849f397c42a74e4d811",
"is_verified": false,
"line_number": 9
}
],
"app/controllers/registration/registration.controller.js": [
{
"type": "Secret Keyword",
"filename": "app/controllers/registration/registration.controller.js",
"filename": "src/controllers/registration/registration.controller.js",
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
"is_verified": false,
"line_number": 25
},
{
"type": "Secret Keyword",
"filename": "app/controllers/registration/registration.controller.js",
"filename": "src/controllers/registration/registration.controller.js",
"hashed_secret": "cbb085747f0bcbeac56f2a583779b44c8f445d92",
"is_verified": false,
"line_number": 26
},
{
"type": "Secret Keyword",
"filename": "app/controllers/registration/registration.controller.js",
"filename": "src/controllers/registration/registration.controller.js",
"hashed_secret": "7b652417979832c620feec2e89b92c56a291ae52",
"is_verified": false,
"line_number": 108
}
],
"app/controllers/registration/registration.controller.test.js": [
"src/controllers/registration/registration.controller.test.js": [
{
"type": "Secret Keyword",
"filename": "app/controllers/registration/registration.controller.test.js",
"filename": "src/controllers/registration/registration.controller.test.js",
"hashed_secret": "9695086041c462c6598c6dd5e35d3a2c9cbbe5f8",
"is_verified": false,
"line_number": 176
},
{
"type": "Secret Keyword",
"filename": "app/controllers/registration/registration.controller.test.js",
"filename": "src/controllers/registration/registration.controller.test.js",
"hashed_secret": "7b652417979832c620feec2e89b92c56a291ae52",
"is_verified": false,
"line_number": 177
},
{
"type": "Secret Keyword",
"filename": "app/controllers/registration/registration.controller.test.js",
"filename": "src/controllers/registration/registration.controller.test.js",
"hashed_secret": "f5378ce7cd012d12a9be51e6be241b1e66240879",
"is_verified": false,
"line_number": 184
},
{
"type": "Secret Keyword",
"filename": "app/controllers/registration/registration.controller.test.js",
"filename": "src/controllers/registration/registration.controller.test.js",
"hashed_secret": "69c8d31085756bfd34bb8ca6d393289374b7d7c2",
"is_verified": false,
"line_number": 191
},
{
"type": "Secret Keyword",
"filename": "app/controllers/registration/registration.controller.test.js",
"filename": "src/controllers/registration/registration.controller.test.js",
"hashed_secret": "3f3c2dca191782c9b8b2f513d16abaa66dc543bf",
"is_verified": false,
"line_number": 198
},
{
"type": "Secret Keyword",
"filename": "app/controllers/registration/registration.controller.test.js",
"filename": "src/controllers/registration/registration.controller.test.js",
"hashed_secret": "0ee4c488221aee414cd9ae5300e28d11c2851fe5",
"is_verified": false,
"line_number": 213
},
{
"type": "Secret Keyword",
"filename": "app/controllers/registration/registration.controller.test.js",
"filename": "src/controllers/registration/registration.controller.test.js",
"hashed_secret": "d8fe3060b1c00ad00ece5d205e493764b113b94c",
"is_verified": false,
"line_number": 219
},
{
"type": "Secret Keyword",
"filename": "app/controllers/registration/registration.controller.test.js",
"filename": "src/controllers/registration/registration.controller.test.js",
"hashed_secret": "a04fccdd7f93b63162cd0d3e015761cd3a24d86a",
"is_verified": false,
"line_number": 327
}
],
"app/controllers/your-psp/worldpay-3ds-flex-validations.test.js": [
"src/controllers/your-psp/worldpay-3ds-flex-validations.test.js": [
{
"type": "Hex High Entropy String",
"filename": "app/controllers/your-psp/worldpay-3ds-flex-validations.test.js",
"filename": "src/controllers/your-psp/worldpay-3ds-flex-validations.test.js",
"hashed_secret": "455151f5f2ca3b6b2d441e67eb1aa52a57c26a3d",
"is_verified": false,
"line_number": 10
},
{
"type": "Hex High Entropy String",
"filename": "app/controllers/your-psp/worldpay-3ds-flex-validations.test.js",
"filename": "src/controllers/your-psp/worldpay-3ds-flex-validations.test.js",
"hashed_secret": "379f1968f09d8a343338667844e01a2f433f0a3f",
"is_verified": false,
"line_number": 25
}
],
"app/services/auth.service.test.js": [
"src/services/auth.service.test.js": [
{
"type": "Secret Keyword",
"filename": "app/services/auth.service.test.js",
"filename": "src/services/auth.service.test.js",
"hashed_secret": "72e7b9d7b8d7fc2fde549d437043f8259b8a524b",
"is_verified": false,
"line_number": 111
},
{
"type": "Secret Keyword",
"filename": "app/services/auth.service.test.js",
"filename": "src/services/auth.service.test.js",
"hashed_secret": "232facd917e1b5696dc9b55b336a9bcb6bb43341",
"is_verified": false,
"line_number": 136
}
],
"app/services/clients/utils/legacy-connector-parity-util.test.js": [
"src/services/clients/utils/legacy-connector-parity-util.test.js": [
{
"type": "Hex High Entropy String",
"filename": "app/services/clients/utils/legacy-connector-parity-util.test.js",
"filename": "src/services/clients/utils/legacy-connector-parity-util.test.js",
"hashed_secret": "0724011c30d66fd9ce2f6cc22f6194cab69858d8",
"is_verified": false,
"line_number": 29
}
],
"app/utils/is-a-potential-pan.test.js": [
"src/utils/is-a-potential-pan.test.js": [
{
"type": "Hex High Entropy String",
"filename": "app/utils/is-a-potential-pan.test.js",
"filename": "src/utils/is-a-potential-pan.test.js",
"hashed_secret": "b7195506cd55ef0c804669340edf26476adb8751",
"is_verified": false,
"line_number": 29
}
],
"app/utils/validation/field-validation-checks-worldpay-3ds-flex.test.js": [
"src/utils/validation/field-validation-checks-worldpay-3ds-flex.test.js": [
{
"type": "Hex High Entropy String",
"filename": "app/utils/validation/field-validation-checks-worldpay-3ds-flex.test.js",
"filename": "src/utils/validation/field-validation-checks-worldpay-3ds-flex.test.js",
"hashed_secret": "15b2c9b424ee41a90212461ec7231d9230200920",
"is_verified": false,
"line_number": 15
},
{
"type": "Hex High Entropy String",
"filename": "app/utils/validation/field-validation-checks-worldpay-3ds-flex.test.js",
"filename": "src/utils/validation/field-validation-checks-worldpay-3ds-flex.test.js",
"hashed_secret": "5eb946d796f4977105bed7a581b149fe085239d0",
"is_verified": false,
"line_number": 19
},
{
"type": "Hex High Entropy String",
"filename": "app/utils/validation/field-validation-checks-worldpay-3ds-flex.test.js",
"filename": "src/utils/validation/field-validation-checks-worldpay-3ds-flex.test.js",
"hashed_secret": "fe51df43f7b477a219f12f2eaea89e2baa4b5a21",
"is_verified": false,
"line_number": 23
},
{
"type": "Hex High Entropy String",
"filename": "app/utils/validation/field-validation-checks-worldpay-3ds-flex.test.js",
"filename": "src/utils/validation/field-validation-checks-worldpay-3ds-flex.test.js",
"hashed_secret": "345d3214d7921c9fd9db82a8f5f8d29d681a4a45",
"is_verified": false,
"line_number": 27
}
],
"app/views/transactions/index.njk": [
"src/views/transactions/index.njk": [
{
"type": "Base64 High Entropy String",
"filename": "app/views/transactions/index.njk",
"filename": "src/views/transactions/index.njk",
"hashed_secret": "8a764e7de8baf91c09a0141c9d0653d6c62300fa",
"is_verified": false,
"line_number": 17
},
{
"type": "Base64 High Entropy String",
"filename": "app/views/transactions/index.njk",
"filename": "src/views/transactions/index.njk",
"hashed_secret": "c15bfbed4cf339878d4c69339491df034b592627",
"is_verified": false,
"line_number": 18
},
{
"type": "Base64 High Entropy String",
"filename": "app/views/transactions/index.njk",
"filename": "src/views/transactions/index.njk",
"hashed_secret": "09ea33e2341efbf111c4eb12a709ae94c96a7e51",
"is_verified": false,
"line_number": 22
},
{
"type": "Base64 High Entropy String",
"filename": "app/views/transactions/index.njk",
"filename": "src/views/transactions/index.njk",
"hashed_secret": "d9d993cc5556aa0fa6e18b26fdfd4fa8527db044",
"is_verified": false,
"line_number": 23
},
{
"type": "Base64 High Entropy String",
"filename": "app/views/transactions/index.njk",
"filename": "src/views/transactions/index.njk",
"hashed_secret": "ce50854e96f8dd430451450f2e7334e4b48db7f0",
"is_verified": false,
"line_number": 24
},
{
"type": "Base64 High Entropy String",
"filename": "app/views/transactions/index.njk",
"filename": "src/views/transactions/index.njk",
"hashed_secret": "34f47d2f3c482850fd7f6de8564a8aa73afe87bc",
"is_verified": false,
"line_number": 25
Expand Down Expand Up @@ -768,21 +750,21 @@
"filename": "test/integration/forgotten-password.ft.test.js",
"hashed_secret": "614770647df3ab100b871bfc0d20e72c8625a5c4",
"is_verified": false,
"line_number": 123
"line_number": 122
},
{
"type": "Secret Keyword",
"filename": "test/integration/forgotten-password.ft.test.js",
"hashed_secret": "a0f4ea7d91495df92bbac2e2149dfb850fe81396",
"is_verified": false,
"line_number": 181
"line_number": 180
},
{
"type": "Secret Keyword",
"filename": "test/integration/forgotten-password.ft.test.js",
"hashed_secret": "69c8d31085756bfd34bb8ca6d393289374b7d7c2",
"is_verified": false,
"line_number": 196
"line_number": 195
}
],
"test/integration/login.controller.ft.test.js": [
Expand All @@ -791,7 +773,7 @@
"filename": "test/integration/login.controller.ft.test.js",
"hashed_secret": "0a6f4e1251c72c635e2bdfc6e1aa46d336d80d4f",
"is_verified": false,
"line_number": 235
"line_number": 232
}
],
"test/pact/adminusers-client/authenticate/authenticate.pact.test.js": [
Expand Down Expand Up @@ -926,5 +908,5 @@
}
]
},
"generated_at": "2024-10-16T10:23:57Z"
"generated_at": "2025-01-13T19:08:27Z"
}
Loading
Loading