Skip to content

Commit

Permalink
merge master to demo (#364)
Browse files Browse the repository at this point in the history 
* Adding back the prod deployment blocker (#189)

* extra tests for code quality (#196)

* Removing blocker for go live

* Load vault secrets fix

* Security fix

* Adding go live blocker

* Securityscan master (#197)

* adding security scan config

* update public uRI

* adding fun-output dir to gitignore

* adding aat url

* Exclude jquery from the zap scanners.

* [PREVIEW] Fixing the pipeline (#211)

* [PREVIEW] SIDM-3007 SIDM-3089 SIDM-3090 Fix PR asp_name, update Dockerfile, add CVE suppression (#201)

* fix(local.asp_name): add conditional case for asp_name when running PRs

By using the asp_name_override for idam-api, idam-web-public and idam-web-admin for PRs, pipelines
cannot run in parallel as they clash with each other. Do not use asp_name_override for PRs.

* feat(security suppression): add suppression for pitest related to CVE-2019-15052

pitest 1.3.0 and 1.4.0 are flagged under CVE-2019-15052 but are only used in testing. 1.4.0 is the latest release

SIDM-3090

* fix(base image/insights agent): update Dockerfile as base image is no longer available

* Change ref in the terraform file.

* [PREVIEW] Minor content changes for 1.4.1 (#210)

* SIDM-3130 Contact Us screen - Update SSCS details.

* SIDM-2904 Update Survey feedback link across IDAM public screens.

* [PREVIEW] 1.4.1 Scope Change (#216) (#218)

* SIDM-2904 Manually revert SIDM-2904.

* SIDM-2757 Fix double apostrophe in a message. (#187)

* [PREVIEW] footer pages update (#194)

* Add 'Family Public Law' section to the 'Contact Us' page.

* Add Family Public Law Service info to cookies and privacy policy pages.

* A few adjustements.

* Remove repetition.

* Add a space.

* SIDM-2412 Remove records about 2 cookies which are not used in the Family Public Law Service. (#204)

* Add CVE-14540 and 16335 supressions

* Adding prod blocker

* Disable functional tests

* Web public tests 1.5 (#267)

* special character password test

* added password characters

* changed password characters

* redued wait time

* Sidm 3294 mfa e2e tests (#256)

* add mfa otp login tests

* add missing file

* fix typo

* add missing code

* fix test failures

* add more waits

* add more waits

* add exiplit wait

* add block policy scenario

* feat(SIDM-3410-ips): filter out internal ips from policy valuation (#270)

* feat(SIDM-3410-ips): filter out internal ips from policy valuation

* feat(SIDM-3410-ips): simplify and merge methods

* feat(SIDM-3410-ips): simplify regex

* This should fix the ArrAffinity token problem (#277)

* feat(SIDM-3441-sso): Policy eval: remove bearer auth token (#283)

* Include fix for 1.5 (#275)

* feat(SIDM-3410-ips-preview): remove filter pattern in preview (#272)

* Updating with for suggestions (#273)

* Updating with for suggestions

* Need to escape the dot

* feat(sidm-3410-rc2): merge 3410 preview into RC (#284)

* Updating with for suggestions (#273)

* fix(vnet_private_ip_pattern): update escape syntax (#281)

* feat(SIDM-3410-fix-def): use same escaping as preview which is tested (#285)

* feat(SIDM-3437-redir): login/mfa: redirecting using slash (#280) (#287)

* Adding prod blocker

* Duplicated code fix

* Enable functionals

* Update contact us details. (#253)

* Removing prod blocker

* Eliminating vulnerabilities

* Removing blocker

* Disable functionals

* Adding support for multiple affinity cookies (#332)

Co-authored-by: Nikola Naydenov <nikolanaydenov@AML0232.local>

* Apply suggestions from code review

* remove waits and add suggestions

* fix test failure

* add wait for failing tests

* ci(prod blocker): add

* fix hmcts policy set for block user test

* fix(aat deployment): add credential and environment overrides

* 2.0 RC (#330)

* Eliminating vulnerabilities

* fix unknown char in email links (#317)

* SIDM-3511 - Update chart-java release 2.16.0 (#318)

* build(chart-java): update chart-java release to 2.16.0

* refactor(cicd): remove deprecated enableDockerBuild()

* feat(staging deployment): add aat values for helm

* feat(sidm-3483-fr6): 6.5 web-public (#315) (#321)

* feat(sidm-3483-fr6): update test regex to extract activation parssword

* feat(sidm-3483-fr6): password reset working but had to change some of the codecepts waits

* feat(sidm-3483-fr6): add 2s wait after Sign In to fix flappy test

* feat(sidm-3483-fr6): remove waits because it was fixed by Shravs changes on codecept conf

* chore(ase asp): disable legacy deployments (#323)

* ci(env name): add override for env name for build with aks (#325)

* Sidm 3561 compare screenshot test (#308)

* screen shot compare test

* updated code

* updated cnp file

* added base screen shot folder to repo

* added functional-output to git ignore

* taking base screen shot is set to false

* added diff folder to screenshot folder

* added diff folder and ignore functional output

* removed some images from base folder

* added f-output folder to gitignore

* removed some images from base folder

* removed some images from base folder

* set base image to false in ui tests

* added foutput folder to gitignore

* update policy check test

* added foutput to gitignore

* updated code to run all functional tests

* updated policy check test

* added foutput to gitignore

* change name of base screen shot

* removed foutpit from gitignore

* added wait to failed tests

* added foitput to gitignore

* added ignore screen compare code

* added wait

* updates screen shot

* removed screen shot

* added foutput folder to gitignore

* applied retry

* added resemblence helper to package.json

* added resemblance helper

* enabled screen shot for visual testing

* cleaned up code

* added functional output folder to gitignore

* ingored package.lock.json

* Delete package-lock.json

* added dependencies

* added node fetch dependency

* updared lockout test

Co-authored-by: Shravan Mechineni <shravanmechineni5@gmail.com>

* Idam nightly tests (#326)

* Adding back the prod deployment blocker (#189)

* extra tests for code quality (#196)

* Removing blocker for go live

* Load vault secrets fix

* Security fix

* Adding go live blocker

* Securityscan master (#197)

* adding security scan config

* update public uRI

* adding fun-output dir to gitignore

* adding aat url

* Exclude jquery from the zap scanners.

* [PREVIEW] Fixing the pipeline (#211)

* [PREVIEW] SIDM-3007 SIDM-3089 SIDM-3090 Fix PR asp_name, update Dockerfile, add CVE suppression (#201)

* fix(local.asp_name): add conditional case for asp_name when running PRs

By using the asp_name_override for idam-api, idam-web-public and idam-web-admin for PRs, pipelines
cannot run in parallel as they clash with each other. Do not use asp_name_override for PRs.

* feat(security suppression): add suppression for pitest related to CVE-2019-15052

pitest 1.3.0 and 1.4.0 are flagged under CVE-2019-15052 but are only used in testing. 1.4.0 is the latest release

SIDM-3090

* fix(base image/insights agent): update Dockerfile as base image is no longer available

* Change ref in the terraform file.

* [PREVIEW] Minor content changes for 1.4.1 (#210)

* SIDM-3130 Contact Us screen - Update SSCS details.

* SIDM-2904 Update Survey feedback link across IDAM public screens.

* [PREVIEW] 1.4.1 Scope Change (#216) (#218)

* SIDM-2904 Manually revert SIDM-2904.

* SIDM-2757 Fix double apostrophe in a message. (#187)

* [PREVIEW] footer pages update (#194)

* Add 'Family Public Law' section to the 'Contact Us' page.

* Add Family Public Law Service info to cookies and privacy policy pages.

* A few adjustements.

* Remove repetition.

* Add a space.

* SIDM-2412 Remove records about 2 cookies which are not used in the Family Public Law Service. (#204)

* Add CVE-14540 and 16335 supressions

* Adding prod blocker

* Disable functional tests

* Web public tests 1.5 (#267)

* special character password test

* added password characters

* changed password characters

* redued wait time

* Sidm 3294 mfa e2e tests (#256)

* add mfa otp login tests

* add missing file

* fix typo

* add missing code

* fix test failures

* add more waits

* add more waits

* add exiplit wait

* add block policy scenario

* feat(SIDM-3410-ips): filter out internal ips from policy valuation (#270)

* feat(SIDM-3410-ips): filter out internal ips from policy valuation

* feat(SIDM-3410-ips): simplify and merge methods

* feat(SIDM-3410-ips): simplify regex

* This should fix the ArrAffinity token problem (#277)

* feat(SIDM-3441-sso): Policy eval: remove bearer auth token (#283)

* Include fix for 1.5 (#275)

* feat(SIDM-3410-ips-preview): remove filter pattern in preview (#272)

* Updating with for suggestions (#273)

* Updating with for suggestions

* Need to escape the dot

* feat(sidm-3410-rc2): merge 3410 preview into RC (#284)

* Updating with for suggestions (#273)

* fix(vnet_private_ip_pattern): update escape syntax (#281)

* feat(SIDM-3410-fix-def): use same escaping as preview which is tested (#285)

* feat(SIDM-3437-redir): login/mfa: redirecting using slash (#280) (#287)

* Adding prod blocker

* Duplicated code fix

* updated security.sh file

* updated security.sh file

* added false positives to audit.json file

* added false positived to audit.json fike

* added false positives

* added false positives

* updated environment

* removed unwanted code

* updated functional tag

* updated secrets env to aat

* updated secrets env to aat

* updated url to external url

* enabled mutation tests

* added false positives to audit file

* updated audit file

* removed spaces

* removed spaces

* added false positives

* added false positives

* added false positives

* added false positives

* updated jenkins-nightly

* added false positives

* updated jenkins nightly

Co-authored-by: kremi <34029797+kremi@users.noreply.github.com>
Co-authored-by: NikolaNaydenov <47004340+NikolaNaydenov@users.noreply.github.com>
Co-authored-by: James Burke <james.burke@amido.com>
Co-authored-by: dfourn <dpatynski@gmail.com>
Co-authored-by: nikola-naydenov-hmcts <47384516+nikola-naydenov-hmcts@users.noreply.github.com>
Co-authored-by: Shravan Mechineni <shravanmechineni5@gmail.com>
Co-authored-by: tbamido <50667636+tbamido@users.noreply.github.com>

* Upgrade to tomcat 9.0.31 to address CVE-2020-1938

* Affinity cookie name is different

* Upgrade to tomcat 9.0.31 to address CVE-2020-1938

* Affinity cookie name is different

* Adding support for multiple affinity cookies (#332)

Co-authored-by: Nikola Naydenov <nikolanaydenov@AML0232.local>

* Apply suggestions from code review

* remove waits and add suggestions

* fix test failure

* add wait for failing tests

* ci(prod blocker): add

* fix hmcts policy set for block user test

* fix(aat deployment): add credential and environment overrides

Co-authored-by: Nikola Naydenov <nikola.naydenov@amido.com>
Co-authored-by: Shravan Mechineni <shravanmechineni5@gmail.com>
Co-authored-by: Henry Dobson <henrydobson@me.com>
Co-authored-by: tbamido <50667636+tbamido@users.noreply.github.com>
Co-authored-by: sudhasane <vanisekhar75@gmail.com>
Co-authored-by: NikolaNaydenov <47004340+NikolaNaydenov@users.noreply.github.com>
Co-authored-by: James Burke <james.burke@amido.com>
Co-authored-by: dfourn <dpatynski@gmail.com>
Co-authored-by: nikola-naydenov-hmcts <47384516+nikola-naydenov-hmcts@users.noreply.github.com>
Co-authored-by: Nikola Naydenov <nikolanaydenov@AML0232.local>
Co-authored-by: Shravan Mechineni <shravan.mechineni@ladbrokescoral.com>

* feat(chart): aat values

* 2.0.0 RC1 aat values (#336)

* Eliminating vulnerabilities

* fix unknown char in email links (#317)

* SIDM-3511 - Update chart-java release 2.16.0 (#318)

* build(chart-java): update chart-java release to 2.16.0

* refactor(cicd): remove deprecated enableDockerBuild()

* feat(staging deployment): add aat values for helm

* feat(sidm-3483-fr6): 6.5 web-public (#315) (#321)

* feat(sidm-3483-fr6): update test regex to extract activation parssword

* feat(sidm-3483-fr6): password reset working but had to change some of the codecepts waits

* feat(sidm-3483-fr6): add 2s wait after Sign In to fix flappy test

* feat(sidm-3483-fr6): remove waits because it was fixed by Shravs changes on codecept conf

* chore(ase asp): disable legacy deployments (#323)

* ci(env name): add override for env name for build with aks (#325)

* Sidm 3561 compare screenshot test (#308)

* screen shot compare test

* updated code

* updated cnp file

* added base screen shot folder to repo

* added functional-output to git ignore

* taking base screen shot is set to false

* added diff folder to screenshot folder

* added diff folder and ignore functional output

* removed some images from base folder

* added f-output folder to gitignore

* removed some images from base folder

* removed some images from base folder

* set base image to false in ui tests

* added foutput folder to gitignore

* update policy check test

* added foutput to gitignore

* updated code to run all functional tests

* updated policy check test

* added foutput to gitignore

* change name of base screen shot

* removed foutpit from gitignore

* added wait to failed tests

* added foitput to gitignore

* added ignore screen compare code

* added wait

* updates screen shot

* removed screen shot

* added foutput folder to gitignore

* applied retry

* added resemblence helper to package.json

* added resemblance helper

* enabled screen shot for visual testing

* cleaned up code

* added functional output folder to gitignore

* ingored package.lock.json

* Delete package-lock.json

* added dependencies

* added node fetch dependency

* updared lockout test

Co-authored-by: Shravan Mechineni <shravanmechineni5@gmail.com>

* Idam nightly tests (#326)

* Adding back the prod deployment blocker (#189)

* extra tests for code quality (#196)

* Removing blocker for go live

* Load vault secrets fix

* Security fix

* Adding go live blocker

* Securityscan master (#197)

* adding security scan config

* update public uRI

* adding fun-output dir to gitignore

* adding aat url

* Exclude jquery from the zap scanners.

* [PREVIEW] Fixing the pipeline (#211)

* [PREVIEW] SIDM-3007 SIDM-3089 SIDM-3090 Fix PR asp_name, update Dockerfile, add CVE suppression (#201)

* fix(local.asp_name): add conditional case for asp_name when running PRs

By using the asp_name_override for idam-api, idam-web-public and idam-web-admin for PRs, pipelines
cannot run in parallel as they clash with each other. Do not use asp_name_override for PRs.

* feat(security suppression): add suppression for pitest related to CVE-2019-15052

pitest 1.3.0 and 1.4.0 are flagged under CVE-2019-15052 but are only used in testing. 1.4.0 is the latest release

SIDM-3090

* fix(base image/insights agent): update Dockerfile as base image is no longer available

* Change ref in the terraform file.

* [PREVIEW] Minor content changes for 1.4.1 (#210)

* SIDM-3130 Contact Us screen - Update SSCS details.

* SIDM-2904 Update Survey feedback link across IDAM public screens.

* [PREVIEW] 1.4.1 Scope Change (#216) (#218)

* SIDM-2904 Manually revert SIDM-2904.

* SIDM-2757 Fix double apostrophe in a message. (#187)

* [PREVIEW] footer pages update (#194)

* Add 'Family Public Law' section to the 'Contact Us' page.

* Add Family Public Law Service info to cookies and privacy policy pages.

* A few adjustements.

* Remove repetition.

* Add a space.

* SIDM-2412 Remove records about 2 cookies which are not used in the Family Public Law Service. (#204)

* Add CVE-14540 and 16335 supressions

* Adding prod blocker

* Disable functional tests

* Web public tests 1.5 (#267)

* special character password test

* added password characters

* changed password characters

* redued wait time

* Sidm 3294 mfa e2e tests (#256)

* add mfa otp login tests

* add missing file

* fix typo

* add missing code

* fix test failures

* add more waits

* add more waits

* add exiplit wait

* add block policy scenario

* feat(SIDM-3410-ips): filter out internal ips from policy valuation (#270)

* feat(SIDM-3410-ips): filter out internal ips from policy valuation

* feat(SIDM-3410-ips): simplify and merge methods

* feat(SIDM-3410-ips): simplify regex

* This should fix the ArrAffinity token problem (#277)

* feat(SIDM-3441-sso): Policy eval: remove bearer auth token (#283)

* Include fix for 1.5 (#275)

* feat(SIDM-3410-ips-preview): remove filter pattern in preview (#272)

* Updating with for suggestions (#273)

* Updating with for suggestions

* Need to escape the dot

* feat(sidm-3410-rc2): merge 3410 preview into RC (#284)

* Updating with for suggestions (#273)

* fix(vnet_private_ip_pattern): update escape syntax (#281)

* feat(SIDM-3410-fix-def): use same escaping as preview which is tested (#285)

* feat(SIDM-3437-redir): login/mfa: redirecting using slash (#280) (#287)

* Adding prod blocker

* Duplicated code fix

* updated security.sh file

* updated security.sh file

* added false positives to audit.json file

* added false positived to audit.json fike

* added false positives

* added false positives

* updated environment

* removed unwanted code

* updated functional tag

* updated secrets env to aat

* updated secrets env to aat

* updated url to external url

* enabled mutation tests

* added false positives to audit file

* updated audit file

* removed spaces

* removed spaces

* added false positives

* added false positives

* added false positives

* added false positives

* updated jenkins-nightly

* added false positives

* updated jenkins nightly

Co-authored-by: kremi <34029797+kremi@users.noreply.github.com>
Co-authored-by: NikolaNaydenov <47004340+NikolaNaydenov@users.noreply.github.com>
Co-authored-by: James Burke <james.burke@amido.com>
Co-authored-by: dfourn <dpatynski@gmail.com>
Co-authored-by: nikola-naydenov-hmcts <47384516+nikola-naydenov-hmcts@users.noreply.github.com>
Co-authored-by: Shravan Mechineni <shravanmechineni5@gmail.com>
Co-authored-by: tbamido <50667636+tbamido@users.noreply.github.com>

* Upgrade to tomcat 9.0.31 to address CVE-2020-1938

* Affinity cookie name is different

* Upgrade to tomcat 9.0.31 to address CVE-2020-1938

* Affinity cookie name is different

* Adding support for multiple affinity cookies (#332)

Co-authored-by: Nikola Naydenov <nikolanaydenov@AML0232.local>

* Apply suggestions from code review

* remove waits and add suggestions

* fix test failure

* add wait for failing tests

* ci(prod blocker): add

* fix hmcts policy set for block user test

* fix(aat deployment): add credential and environment overrides

* feat(chart): aat values

Co-authored-by: Nikola Naydenov <nikola.naydenov@amido.com>
Co-authored-by: Shravan Mechineni <shravanmechineni5@gmail.com>
Co-authored-by: tbamido <50667636+tbamido@users.noreply.github.com>
Co-authored-by: sudhasane <vanisekhar75@gmail.com>
Co-authored-by: kremi <34029797+kremi@users.noreply.github.com>
Co-authored-by: NikolaNaydenov <47004340+NikolaNaydenov@users.noreply.github.com>
Co-authored-by: James Burke <james.burke@amido.com>
Co-authored-by: dfourn <dpatynski@gmail.com>
Co-authored-by: nikola-naydenov-hmcts <47384516+nikola-naydenov-hmcts@users.noreply.github.com>
Co-authored-by: Kremi Nenkova <kremi.nenkova@gmail.com>
Co-authored-by: Nikola Naydenov <nikolanaydenov@AML0232.local>
Co-authored-by: Shravan Mechineni <shravan.mechineni@ladbrokescoral.com>

* fix(docker): flexvolume mapping to property

* fix(idam-aat): add test variables (#338)

* SIDM-2868 - Add nightly tests for 2.0.0 (#341)

* fix(idam-aat): add test variables

* SIDM-2686 - Add nightly tests for 2.0.0  (#339)

* feat(qa): cross browser tests'

* revert(delete): remove file

* fix dependencies

* fix codecept unknown option scan error

Co-authored-by: Shravan Mechineni <shravan.mechineni@ladbrokescoral.com>

Co-authored-by: Shravan Mechineni <shravan.mechineni@ladbrokescoral.com>

* SIDM-3977 - v2 fix selfservice (#351)

* fix(idam-aat): add test variables

* SIDM-2686 - Add nightly tests for 2.0.0  (#339)

* feat(qa): cross browser tests'

* revert(delete): remove file

* fix dependencies

* fix codecept unknown option scan error

Co-authored-by: Shravan Mechineni <shravan.mechineni@ladbrokescoral.com>

* COVID-19 contatcus page changes

* SIDM-3977 Add test to check if activation link can be used after the user has registered. (#349)

* SIDM-3977 Add test to check if activation link can be used after the user has registered.

* SIDM-3977 Make it a new scenario.

* SIDM-3977 self_registration_test: Fix text

Co-authored-by: Tiago Braun <tiago.braun@amido.com>

Co-authored-by: Shravan Mechineni <shravan.mechineni@ladbrokescoral.com>
Co-authored-by: Nikola Naydenov <nikolanaydenov@aml0232.home>
Co-authored-by: dfourn <daniel.patynski@amido.com>
Co-authored-by: Tiago Braun <tiago.braun@amido.com>

* chore(idam-prod): remove prod blocker (#358)

Co-authored-by: kremi <34029797+kremi@users.noreply.github.com>
Co-authored-by: Nikola Naydenov <nikola.naydenov@amido.com>
Co-authored-by: James Burke <james.burke@amido.com>
Co-authored-by: dfourn <daniel.patynski@amido.com>
Co-authored-by: nikola-naydenov-hmcts <47384516+nikola-naydenov-hmcts@users.noreply.github.com>
Co-authored-by: Shravan Mechineni <shravanmechineni5@gmail.com>
Co-authored-by: tbamido <50667636+tbamido@users.noreply.github.com>
Co-authored-by: Nikola Naydenov <nikolanaydenov@AML0232.local>
Co-authored-by: Henry Dobson <henrydobson@me.com>
Co-authored-by: Shravan Mechineni <shravan.mechineni@ladbrokescoral.com>
Co-authored-by: sudhasane <vanisekhar75@gmail.com>
Co-authored-by: NikolaNaydenov <47004340+NikolaNaydenov@users.noreply.github.com>
Co-authored-by: dfourn <dpatynski@gmail.com>
Co-authored-by: Kremi Nenkova <kremi.nenkova@gmail.com>
Co-authored-by: Nikola Naydenov <nikolanaydenov@aml0232.home>
Co-authored-by: Tiago Braun <tiago.braun@amido.com>
  • Loading branch information
@kremi @NikolaNaydenov
@dfourn @nikola-naydenov-hmcts @shravanmechineni @tbamido @henrydobson @sudhasane
17 people authored Apr 29, 2020
1 parent af4f7b4 commit fc1a17f
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 11 deletions.
20 changes: 18 additions & 2 deletions Jenkinsfile_CNP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ def product = "idam"
def component = "web-public"

env.NONPROD_ENVIRONMENT_NAME = 'idam-aat'
env.PROD_ENVIRONMENT_NAME = 'idam-prod'
env.DEMO_ENVIRONMENT_NAME = 'idam-demo'
env.PROD_ENVIRONMENT_NAME = 'idam-prod'
env.DEMO_ENVIRONMENT_NAME = 'idam-demo'
env.PREVIEW_ENVIRONMENT_NAME = 'idam-preview'
env.PERFTEST_ENVIRONMENT_NAME = 'idam-perftest'
env.ITHC_ENVIRONMENT_NAME = 'idam-ithc'
Expand Down Expand Up @@ -69,6 +69,22 @@ withPipeline(type, product, component) {
Using IDAMAPI: ${env.IDAMAPI}""".stripIndent()
}

before('smoketest-aks:idam-aat') {
env.NONPROD_ENVIRONMENT_NAME = 'aat'
env.IDAMAPI = "https://idam-api-staging.service.core-compute-aat.internal"
println """\
Using NONPROD_ENVIRONMENT_NAME: ${env.NONPROD_ENVIRONMENT_NAME}
Using IDAMAPI: ${env.IDAMAPI}""".stripIndent()
}

before('functionalTest-aks:idam-aat') {
env.NONPROD_ENVIRONMENT_NAME = 'aat'
env.IDAMAPI = "https://idam-api-staging.service.core-compute-aat.internal"
println """\
Using NONPROD_ENVIRONMENT_NAME: ${env.NONPROD_ENVIRONMENT_NAME}
Using IDAMAPI: ${env.IDAMAPI}""".stripIndent()
}

before('buildinfra:idam-ithc') {
env.ITHC_ENVIRONMENT_NAME = 'ithc'
println """\
Expand Down
6 changes: 5 additions & 1 deletion charts/idam-web-public/values.aat.template.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@ java:
image: ${IMAGE_NAME}
ingressHost: ${SERVICE_FQDN}
ingressIP: ${INGRESS_IP}
consulIP: ${CONSUL_LB_IP}
consulIP: ${CONSUL_LB_IP}
replicas: 1
aadIdentityName: idam
environment:
STRATEGIC_SERVICE_URL: http://idam-api-staging.service.core-compute-aat.internal
2 changes: 1 addition & 1 deletion security.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ while !(curl -s http://0.0.0.0:1001) > /dev/null
cp *.html functional-output/
zap-cli -p 1001 alerts -l Informational
zap-cli --zap-url http://0.0.0.0 -p 1001 alerts -l High --exit-code False
curl --fail http://0.0.0.0:1001/OTHER/core/other/jsonreport/?formMethod=GET --output report.json
curl --fail http://0.0.0.0:1001/OTHER/core/other/jsonreport/?formMethod=GET --output report.json
2 changes: 1 addition & 1 deletion src/main/resources/bootstrap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ spring:
prefixed: false
paths: /mnt/secrets/idam-idam
aliases:
AppInsightsInstrumentationKey: APP_INSIGHTS_INSTRUMENTATION_KEY
AppInsightsInstrumentationKey: azure.application-insights.instrumentation-key
6 changes: 3 additions & 3 deletions src/test/js/policy_check_functional_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ AfterSuite(async (I) => {
]);
});

Scenario('@functional @policy As a citizen with policies blocking me from login I should see an error message', async (I) => {
Scenario('@functional @policy @debug As a citizen with policies blocking me from login I should see an error message', async (I) => {
const loginUrl = `${TestData.WEB_PUBLIC_URL}/login?redirect_uri=${TestData.SERVICE_REDIRECT_URI}&client_id=${serviceName}`;

I.amOnPage(loginUrl);
I.waitForText('Sign in', 20, 'h1');
I.fillField('#username', citizenEmail.toUpperCase());
I.fillField('#password', TestData.PASSWORD);
I.click('Sign in');
I.saveScreenshot( 'Polycheck-login.png');
I.seeVisualDiff('Polycheck-login.png', {tolerance: 6, prepareBaseImage: false, ignoredBox: box});
I.saveScreenshot( 'Polycheck-login.png')
// I.seeVisualDiff('Polycheck-login.png', {tolerance: 6, prepareBaseImage: false, ignoredBox: box});
I.waitForText('Policies check failed', 10, 'h2');

}).retry(TestData.SCENARIO_RETRY_LIMIT);
2 changes: 1 addition & 1 deletion src/test/js/reset_password_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,4 +213,4 @@ Scenario('@functional @resetpass As a citizen user I can reset my password with
I.see('code=');
I.dontSee('error=');
I.resetRequestInterception();
});
});
2 changes: 1 addition & 1 deletion src/test/js/self_registration_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,4 +343,4 @@ Scenario('@functional @selfregister @passwordvalidation Validation displayed whe
I.click('Continue');
I.waitForText('There was a problem with the password you entered', 20, 'h2');
I.see("Your password is too easy to guess");
}).retry(TestData.SCENARIO_RETRY_LIMIT);
}).retry(TestData.SCENARIO_RETRY_LIMIT);
2 changes: 1 addition & 1 deletion src/test/js/shared/idam_helper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -722,4 +722,4 @@ class IdamHelper extends Helper {
}
}

module.exports = IdamHelper;
module.exports = IdamHelper;

0 comments on commit fc1a17f

Please sign in to comment.