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

Jump to bottom

removed keys #488

Closed
wants to merge 11 commits into from
Closed

removed keys #488

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1da1ea2
removed keys
Jennings-HMCTS Jul 14, 2021
cccce75
Update application.properties
Jennings-HMCTS Jul 15, 2021
7a0e293
Merge branch 'master' into sec-clean-git
Jennings-HMCTS Jul 16, 2021
50ee821
Merge branch 'sec-clean-git' of https://github.com/hmcts/bar-api into…
Jennings-HMCTS Jul 16, 2021
a231649
environmental variables added
Jennings-HMCTS Jul 27, 2021
7a896df
Update application.properties
Jennings-HMCTS Jul 27, 2021
cdaf5e9
secret added for appInsightsKey
Jennings-HMCTS Jul 27, 2021
eb12b42
added override env values
Jennings-HMCTS Jul 27, 2021
cca1c15
added override env values
Jennings-HMCTS Jul 27, 2021
e01ae2d
added override env values with ccpay vault
Jennings-HMCTS Jul 27, 2021
9719389
Bumping chart version/ fixing aliases
hmcts-jenkins-a-to-c[bot] Oct 26, 2022
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 api/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ management.health.probes.enabled=true

# auth.idam.client.baseUrl=${IDAM_CLIENT_BASE_URL:https://idam-test.dev.ccidam.reform.hmcts.net}
auth.idam.client.baseUrl=${IDAM_CLIENT_BASE_URL:http://localhost:23443}
idam.s2s-auth.totp_secret=${S2S_SECRET:ABCD1F2BABCD1F2B}
idam.s2s-auth.totp_secret=${S2S_SECRET:dummy}
idam.s2s-auth.microservice=bar_api
idam.s2s-auth.url=${S2S_AUTH_URL:http://localhost:23443}
payment.api.url=${PAYMENT_API_URL:http://localhost:23443}
Expand Down
26 changes: 13 additions & 13 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ services:
environment:
- SPRING_DATASOURCE_URL=jdbc:postgresql://bar-database:5432/bar
- SPRING_DATASOURCE_USERNAME=bar
- SPRING_DATASOURCE_PASSWORD=bar
- SPRING_DATASOURCE_PASSWORD=dummy
- auth.idam.client.baseUrl=http://idam-api:5000
- payment.api.url=http://payments-api:8080
- idam.s2s-auth.url=http://service-auth-provider-api:8489
- idam.s2s-auth.microservice=bar_api
- idam.s2s-auth.totp_secret=DUMMYSECRET12345
- idam.s2s-auth.totp_secret=DUMMY
- site.api.url=http://bar-api:8080
ports:
- 8185:8080
Expand All @@ -31,7 +31,7 @@ services:
image: postgres:11-alpine
environment:
- POSTGRES_USER=bar
- POSTGRES_PASSWORD=bar
- POSTGRES_PASSWORD=dummy
- POSTGRES_DB=bar
ports:
- 5182:5432
Expand Down Expand Up @@ -100,7 +100,7 @@ services:
- REFORM_TEAM=cc
- SPRING_DATASOURCE_URL=jdbc:postgresql://payments-database:5432/payment
- SPRING_DATASOURCE_USERNAME=payment
- SPRING_DATASOURCE_PASSWORD=payment
- SPRING_DATASOURCE_PASSWORD=dummy
- SPRING_LIQUIBASE_ENABLED=true
- SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=true
- SPRING_MAIL_PROPERTIES_MAIL_SMTP_SSL_TRUST=*
Expand All @@ -122,7 +122,7 @@ services:
image: postgres:11-alpine
environment:
- POSTGRES_USER=payment
- POSTGRES_PASSWORD=payment
- POSTGRES_PASSWORD=dummy_8
- POSTGRES_DB=payment
ports:
- 5430:5432
Expand All @@ -133,7 +133,7 @@ services:
environment:
- SPRING_DATASOURCE_URL=jdbc:postgresql://ccfr-fees-database:5432/fees_register
- SPRING_DATASOURCE_USERNAME=fees_register
- SPRING_DATASOURCE_PASSWORD=fees_register
- SPRING_DATASOURCE_PASSWORD=dummy_7
- AUTH_IDAM_CLIENT_BASEURL=https://idam-test.dev.ccidam.reform.hmcts.net
ports:
- 8182:8080
Expand All @@ -145,7 +145,7 @@ services:
image: postgres:11-alpine
environment:
- POSTGRES_USER=fees_register
- POSTGRES_PASSWORD=fees_register
- POSTGRES_PASSWORD=dummy_6
- POSTGRES_DB=fees_register
ports:
- 5183:5432
Expand All @@ -154,7 +154,7 @@ services:
image: hmctspublic.azurecr.io/rpe/service-auth-provider
environment:
- microserviceKeys_payment_app=AAAAAAAAAAAAAAAB
- microserviceKeys_bar_api=DUMMYSECRET12345
- microserviceKeys_bar_api=DUMMY
ports:
- 8085:8489

Expand Down Expand Up @@ -206,19 +206,19 @@ services:
- SPRING_PROFILES_ACTIVE=local
- SPRING_DATASOURCE_URL=jdbc:postgresql://shared-db:5432/openidm?currentSchema=fridam
- SPRING_DATASOURCE_USERNAME=openidm
- SPRING_DATASOURCE_PASSWORD=openidm
- SECURITY_OAUTH2_CLIENT_CLIENTSECRET=password
- SPRING_DATASOURCE_PASSWORD=dummy_5
- SECURITY_OAUTH2_CLIENT_CLIENTSECRET=dummy_4
- SECURITY_OAUTH2_CLIENT_PRE_ESTABLISHED_REDIRECT_URI=http://idam-web-public:9002/login
- SECURITY_OAUTH2_CLIENT_REGISTERED_REDIRECT_URI=http://idam-web-public:9002/login
- IDAM_SPI_FORGEROCK_AM_ROOT=http://fr-am:8080/openam
- IDAM_SPI_FORGEROCK_AM_TOPLEVELHOST=fr-am
- IDAM_SPI_FORGEROCK_AM_USERNAME=amadmin
- IDAM_SPI_FORGEROCK_AM_PASSWORD=Pa55word11
- IDAM_SPI_FORGEROCK_AM_PASSWORD=dummy_3
- IDAM_SPI_FORGEROCK_AM_JWKSURIFOROAUTH2CLIENTS=http://fr-am:8080/openam/oauth2/hmcts/connect/jwk_uri
- IDAM_SPI_FORGEROCK_IDM_ROOT=http://fr-idm:18080/openidm
- IDAM_SPI_FORGEROCK_IDM_USERNAME=openidm-admin
- IDAM_SPI_FORGEROCK_IDM_PASSWORD=openidm-admin
- IDAM_SPI_FORGEROCK_IDM_PIN_DEFAULTPASSWORD=BlaBlaBlackSh33p
- IDAM_SPI_FORGEROCK_IDM_PASSWORD=dummy_2
- IDAM_SPI_FORGEROCK_IDM_PIN_DEFAULTPASSWORD=dummy_1
- APPSETTING_NODE_PATH=/opt/app

idam-web-public:
Expand Down