Bump rack-cors from 2.0.1 to 2.0.2 #694
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?s=60&v=4){kind=small}
dependabot
bot
added
the
dependencies
Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2. - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](cyu/rack-cors@v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: rack-cors dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
dependabot
bot
force-pushed
the
dependabot/bundler/rack-cors-2.0.2
branch
from
da1a641
to
825869a
Compare
tberey
approved these changes
May 29, 2024
tberey
added a commit
that referenced
this pull request
Jun 3, 2024
* fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). * PPG-1127-Search-for-addition-identifiers-when-DUNs-Spotlight (#718) * Bump rdoc from 6.6.2 to 6.6.3.1 (#696) Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1. - [Release notes](https://github.com/ruby/rdoc/releases) - [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc) - [Commits](ruby/rdoc@v6.6.2...v6.6.3.1) --- updated-dependencies: - dependency-name: rdoc dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#717) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-REXML-6861566 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#716) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274386 - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274387 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-6228056 - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274383 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274384 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274385 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack-cors from 2.0.1 to 2.0.2 (#694) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2. - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](cyu/rack-cors@v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: rack-cors dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Update application.rb (#673) Filter sensitive fields from logs Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack from 2.2.8 to 3.0.9.1 (#693) Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 3.0.9.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@v2.2.8...v3.0.9.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * [Snyk] Security upgrade puma from 5.6.7 to 5.6.8 (#670) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-PUMA-6146928 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com>
tberey
added a commit
that referenced
this pull request
Jun 3, 2024
* GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Updates Test environment (#719) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). * PPG-1127-Search-for-addition-identifiers-when-DUNs-Spotlight (#718) * Bump rdoc from 6.6.2 to 6.6.3.1 (#696) Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1. - [Release notes](https://github.com/ruby/rdoc/releases) - [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc) - [Commits](ruby/rdoc@v6.6.2...v6.6.3.1) --- updated-dependencies: - dependency-name: rdoc dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#717) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-REXML-6861566 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#716) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274386 - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274387 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-6228056 - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274383 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274384 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274385 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack-cors from 2.0.1 to 2.0.2 (#694) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2. - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](cyu/rack-cors@v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: rack-cors dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Update application.rb (#673) Filter sensitive fields from logs Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack from 2.2.8 to 3.0.9.1 (#693) Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 3.0.9.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@v2.2.8...v3.0.9.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * [Snyk] Security upgrade puma from 5.6.7 to 5.6.8 (#670) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-PUMA-6146928 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com>
tberey
added a commit
that referenced
this pull request
Jun 10, 2024
* Update api_helper.rb PPG-923 ticket needs to test fax num without country code. * Revert "PPG-923 ticket needs to test fax num without country code." * GMBP-213: Add Dockerfile (Integration) (#675) --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * push to Cloud-watch logs Integration (#687) * AWS logs for all enviroment send logs to cloud-watch * Updated rollbar * Merge staging into int (#711) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Merge staging into integration (#720) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Updates Test environment (#719) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). * PPG-1127-Search-for-addition-identifiers-when-DUNs-Spotlight (#718) * Bump rdoc from 6.6.2 to 6.6.3.1 (#696) Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1. - [Release notes](https://github.com/ruby/rdoc/releases) - [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc) - [Commits](ruby/rdoc@v6.6.2...v6.6.3.1) --- updated-dependencies: - dependency-name: rdoc dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#717) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-REXML-6861566 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#716) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274386 - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274387 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-6228056 - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274383 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274384 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274385 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack-cors from 2.0.1 to 2.0.2 (#694) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2. - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](cyu/rack-cors@v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: rack-cors dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Update application.rb (#673) Filter sensitive fields from logs Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack from 2.2.8 to 3.0.9.1 (#693) Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 3.0.9.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@v2.2.8...v3.0.9.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * [Snyk] Security upgrade puma from 5.6.7 to 5.6.8 (#670) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-PUMA-6146928 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com>
tberey
added a commit
that referenced
this pull request
Jun 11, 2024
* Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (UAT) (#677) --------- Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> * push to Cloud-watch logs UAT (#685) * push to Cloud-watch logs * Updated rollbar * Merge integration into uat (#712) * Update api_helper.rb PPG-923 ticket needs to test fax num without country code. * Revert "PPG-923 ticket needs to test fax num without country code." * GMBP-213: Add Dockerfile (Integration) (#675) --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * push to Cloud-watch logs Integration (#687) * AWS logs for all enviroment send logs to cloud-watch * Updated rollbar * Merge staging into int (#711) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Merge integration into uat (#724) * Update api_helper.rb PPG-923 ticket needs to test fax num without country code. * Revert "PPG-923 ticket needs to test fax num without country code." * GMBP-213: Add Dockerfile (Integration) (#675) --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * push to Cloud-watch logs Integration (#687) * AWS logs for all enviroment send logs to cloud-watch * Updated rollbar * Merge staging into int (#711) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Merge staging into integration (#720) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Updates Test environment (#719) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). * PPG-1127-Search-for-addition-identifiers-when-DUNs-Spotlight (#718) * Bump rdoc from 6.6.2 to 6.6.3.1 (#696) Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1. - [Release notes](https://github.com/ruby/rdoc/releases) - [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc) - [Commits](ruby/rdoc@v6.6.2...v6.6.3.1) --- updated-dependencies: - dependency-name: rdoc dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#717) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-REXML-6861566 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#716) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274386 - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274387 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-6228056 - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274383 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274384 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274385 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack-cors from 2.0.1 to 2.0.2 (#694) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2. - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](cyu/rack-cors@v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: rack-cors dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Update application.rb (#673) Filter sensitive fields from logs Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack from 2.2.8 to 3.0.9.1 (#693) Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 3.0.9.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@v2.2.8...v3.0.9.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * [Snyk] Security upgrade puma from 5.6.7 to 5.6.8 (#670) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-PUMA-6146928 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com>
tberey
added a commit
that referenced
this pull request
Jun 11, 2024
* Update LICENSE * GMBP-213: Add Dockerfile (NFT) (#676) --------- Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * push to Cloud-watch logs NFT (#686) * updated config for cloudwatch * Updated rollbar * Merge uat into nft (#713) * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (UAT) (#677) --------- Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> * push to Cloud-watch logs UAT (#685) * push to Cloud-watch logs * Updated rollbar * Merge integration into uat (#712) * Update api_helper.rb PPG-923 ticket needs to test fax num without country code. * Revert "PPG-923 ticket needs to test fax num without country code." * GMBP-213: Add Dockerfile (Integration) (#675) --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * push to Cloud-watch logs Integration (#687) * AWS logs for all enviroment send logs to cloud-watch * Updated rollbar * Merge staging into int (#711) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf45ba676665ee70b91d218f4448b57b464a. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Merge uat into nft (#725) * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (UAT) (#677) --------- Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> * push to Cloud-watch logs UAT (#685) * push to Cloud-watch logs * Updated rollbar * Merge integration into uat (#712) * Update api_helper.rb PPG-923 ticket needs to test fax num without country code. * Revert "PPG-923 ticket needs to test fax num without country code." * GMBP-213: Add Dockerfile (Integration) (#675) --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * push to Cloud-watch logs Integration (#687) * AWS logs for all enviroment send logs to cloud-watch * Updated rollbar * Merge staging into int (#711) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf45ba676665ee70b91d218f4448b57b464a. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Merge integration into uat (#724) * Update api_helper.rb PPG-923 ticket needs to test fax num without country code. * Revert "PPG-923 ticket needs to test fax num without country code." * GMBP-213: Add Dockerfile (Integration) (#675) --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * push to Cloud-watch logs Integration (#687) * AWS logs for all enviroment send logs to cloud-watch * Updated rollbar * Merge staging into int (#711) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf45ba676665ee70b91d218f4448b57b464a. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Merge staging into integration (#720) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf45ba676665ee70b91d218f4448b57b464a. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Updates Test environment (#719) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf45ba676665ee70b91d218f4448b57b464a. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). * PPG-1127-Search-for-addition-identifiers-when-DUNs-Spotlight (#718) * Bump rdoc from 6.6.2 to 6.6.3.1 (#696) Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1. - [Release notes](https://github.com/ruby/rdoc/releases) - [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rdoc/compare/v6.6.2...v6.6.3.1) --- updated-dependencies: - dependency-name: rdoc dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#717) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-REXML-6861566 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#716) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274386 - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274387 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-6228056 - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274383 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274384 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274385 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack-cors from 2.0.1 to 2.0.2 (#694) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2. - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](https://github.com/cyu/rack-cors/compare/v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: rack-cors dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Update application.rb (#673) Filter sensitive fields from logs Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack from 2.2.8 to 3.0.9.1 (#693) Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 3.0.9.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.9.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * [Snyk] Security upgrade puma from 5.6.7 to 5.6.8 (#670) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-PUMA-6146928 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: ghill95 <72445096+ghill95@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com>
tberey
added a commit
that referenced
this pull request
Jun 11, 2024
* Update api_helper.rb Removed country code * GMBP-213: Add Dockerfile (Pre-Production) (#678) Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> * Revert "Update api_helper.rb for country code test" (#681) * push to Cloud-watch logs Pre-Production (#684) * push to Cloud-watch logs * update rollbar * Update production.rb * Merge nft into pre prod (#714) * Update LICENSE * GMBP-213: Add Dockerfile (NFT) (#676) --------- Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * push to Cloud-watch logs NFT (#686) * updated config for cloudwatch * Updated rollbar * Merge uat into nft (#713) * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (UAT) (#677) --------- Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> * push to Cloud-watch logs UAT (#685) * push to Cloud-watch logs * Updated rollbar * Merge integration into uat (#712) * Update api_helper.rb PPG-923 ticket needs to test fax num without country code. * Revert "PPG-923 ticket needs to test fax num without country code." * GMBP-213: Add Dockerfile (Integration) (#675) --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * push to Cloud-watch logs Integration (#687) * AWS logs for all enviroment send logs to cloud-watch * Updated rollbar * Merge staging into int (#711) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf45ba676665ee70b91d218f4448b57b464a. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: ghill95 <72445096+ghill95@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Merge nft into preproduction (#726) * Update LICENSE * GMBP-213: Add Dockerfile (NFT) (#676) --------- Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * push to Cloud-watch logs NFT (#686) * updated config for cloudwatch * Updated rollbar * Merge uat into nft (#713) * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (UAT) (#677) --------- Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> * push to Cloud-watch logs UAT (#685) * push to Cloud-watch logs * Updated rollbar * Merge integration into uat (#712) * Update api_helper.rb PPG-923 ticket needs to test fax num without country code. * Revert "PPG-923 ticket needs to test fax num without country code." * GMBP-213: Add Dockerfile (Integration) (#675) --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * push to Cloud-watch logs Integration (#687) * AWS logs for all enviroment send logs to cloud-watch * Updated rollbar * Merge staging into int (#711) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf45ba676665ee70b91d218f4448b57b464a. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Merge uat into nft (#725) * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (UAT) (#677) --------- Co-authored-by: ghill95 <george.hill@crowncommercial.gov.uk> * push to Cloud-watch logs UAT (#685) * push to Cloud-watch logs * Updated rollbar * Merge integration into uat (#712) * Update api_helper.rb PPG-923 ticket needs to test fax num without country code. * Revert "PPG-923 ticket needs to test fax num without country code." * GMBP-213: Add Dockerfile (Integration) (#675) --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * push to Cloud-watch logs Integration (#687) * AWS logs for all enviroment send logs to cloud-watch * Updated rollbar * Merge staging into int (#711) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf45ba676665ee70b91d218f4448b57b464a. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Merge integration into uat (#724) * Update api_helper.rb PPG-923 ticket needs to test fax num without country code. * Revert "PPG-923 ticket needs to test fax num without country code." * GMBP-213: Add Dockerfile (Integration) (#675) --------- Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * push to Cloud-watch logs Integration (#687) * AWS logs for all enviroment send logs to cloud-watch * Updated rollbar * Merge staging into int (#711) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf45ba676665ee70b91d218f4448b57b464a. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> --------- Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Merge staging into integration (#720) * GMBP-213: Add Dockerfile (Staging/Test) (#674) * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * Merge develop into testing (#710) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf45ba676665ee70b91d218f4448b57b464a. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> * Updates Test environment (#719) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcafda47986a34d9f3b98f6795e07536c35aa. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf45ba676665ee70b91d218f4448b57b464a. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). * PPG-1127-Search-for-addition-identifiers-when-DUNs-Spotlight (#718) * Bump rdoc from 6.6.2 to 6.6.3.1 (#696) Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1. - [Release notes](https://github.com/ruby/rdoc/releases) - [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rdoc/compare/v6.6.2...v6.6.3.1) --- updated-dependencies: - dependency-name: rdoc dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#717) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-REXML-6861566 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#716) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274386 - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274387 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-6228056 - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274383 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274384 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274385 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack-cors from 2.0.1 to 2.0.2 (#694) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2. - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](https://github.com/cyu/rack-cors/compare/v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: rack-cors dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Update application.rb (#673) Filter sensitive fields from logs Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack from 2.2.8 to 3.0.9.1 (#693) Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 3.0.9.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.9.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * [Sny…
tberey
added a commit
that referenced
this pull request
Aug 5, 2024
* fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). * PPG-1127-Search-for-addition-identifiers-when-DUNs-Spotlight (#718) * Bump rdoc from 6.6.2 to 6.6.3.1 (#696) Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1. - [Release notes](https://github.com/ruby/rdoc/releases) - [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc) - [Commits](ruby/rdoc@v6.6.2...v6.6.3.1) --- updated-dependencies: - dependency-name: rdoc dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#717) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-REXML-6861566 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#716) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274386 - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274387 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-6228056 - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274383 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274384 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274385 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack-cors from 2.0.1 to 2.0.2 (#694) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2. - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](cyu/rack-cors@v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: rack-cors dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Update application.rb (#673) Filter sensitive fields from logs Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack from 2.2.8 to 3.0.9.1 (#693) Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 3.0.9.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@v2.2.8...v3.0.9.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * [Snyk] Security upgrade puma from 5.6.7 to 5.6.8 (#670) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-PUMA-6146928 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * PPG-1332-Fix-issues-around-additional-identifiers (#732) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com>
tberey
added a commit
that referenced
this pull request
Aug 6, 2024
* fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update .travis.yml Fix for the travis issue caused by drop of support for postgres appt package. * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * updated controller with registry check * fix rubocop * Added to org manag controller registry update * Updated registry Removed from controller registry update * GMBP-213: Add Dockerfile (Dev) (#659) * Dockerise app ready for migration * Add apt-get upgrade * Add && * Use the slim version of the base image * Fix Dockerfile * Fix Dockerfile * Try ubuntu:23.10, remove nodejs * Back to ubuntu 22.04 * Add user * Fix adding user rails * Fix user and group * Update Gemfile * Update Dockerfile * Switch to multi-stage build * Remove zlib1g from runtime * Move make jobs to right place * Switch to Alpine base, compile sqlite gem * Add comment about alpine and musl * Update comments * Use official ruby alpine image * Fix deprecation warning * Change branch to tag * Update test.rb * Update .ruby-version * Update Gemfile --------- Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> * Updated for cloud-watch (#688) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#666) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> * [Snyk] Security upgrade rails from 7.1.2 to 7.1.3 (#672) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> * Spotlight API and Registry Update integration merge into develop branch (#697) * Updated manifest and travis Updated manifest and travis to map to testing env * Update .travis.yml * Update user.rb * vault-temp-fix-to-cf_vault.rb * Remove vault fix * Update auth.rb * Update manage_organisations_controller_spec.rb * Update remove_organisations_additional_identifier_controller_spec.rb * Update update_organisations_controller_spec.rb * GMBP-213: Add Dockerfile (Staging/Test) (#674) * Updated for cloud-watch * Updated contact service for registry update * Some logging in contact service is down or not saved data * push to Cloud-watch logs Testing (#682) * Cloudwatch logs * fix logs Update to remove depandacy of ENV var. * Updated logging * removed RAILS_LOG_TO_STDOUT dependancy * Update aws_ssm.rb * Update aws_ssm.rb * Updated RAILS_LOG_TO_STDOUT * Update aws_ssm.rb * Create rollbar.rb * Revert "Update aws_ssm.rb" This reverts commit d48bcaf. * SF update * Removed contact api debug helpers. * Update contact_service.rb Stop pushing to Rollbar if 404 error * Update contact_service.rb * Update registry_update_controller.rb * Removed registry checker. * Update search_api.rb * Revert "Update search_api.rb" This reverts commit 9e5bdf4. * Updated Registry checker * test callback for spotlight * New spotlight api integration. * Removed registry update from two controllers Can be put back when ready. * Updated code for rubocop issues * Update user.rb Removed logger info --------- Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: Tom Berey <tomberey1@gmail.com> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> * Update spotlight/search.rb (#698) * Update spotlight/search.rb Adds a conditional check to the spotlight API search to ensure only active organisations are returned when searching. * Update US-DUN-404123456.json Add missing field to stubs, for tests to pass. Also matches the external data. * Update US-DUN-34578904.json * Update US-DUN-444444440.json * Update US-DUN-505123456.json * Update US-DUN-606123456.json * Update US-DUN-707123456.json * Update US-DUN-808123456.json * Update US-DUN-901123456.json * Update US-DUN-909123456.json * Update US-DUN-011122333.json * Update US-DUN-101123456.json * Update US-DUN-111111111.json * Update US-DUN-111123456.json * Update US-DUN-220123456.json * Update US-DUN-222123456.json * Update US-DUN-222223456.json * Update US-DUN-303123456.json * Update search_api_additional_identifiers.rb (#699) * Debug spotlight issues (#700) * Update search_api_additional_identifiers.rb * Update search_api_additional_identifiers.rb * Update search.rb (#701) * Update search.rb (#702) * Fixing spotlight parameter issue and remove logging (#703) * Update search_api_additional_identifiers.rb * Update search.rb * Update search.rb (#704) * Update search.rb * spotlight-add-extra-logging-for-debug (#705) spotlight-add-extra-logging-for-debug * Update search.rb (#706) remove extra logging. rename param to what it should be. * Update search.rb (#707) * Fix Spotlight Issues & Remove Debug Logging (#708) Fixes remaining Spotlight issues, by accounting for where the external API returns a 200, even though the DnB API itself returns a negative response of 400 Bad Request, with no record/data. Removes any added logging that was used for debugging the above issues. * Update spotlight/search.rb Adjust the conditional requirements for returning a negative 404 response, based on external API messaging. * Update companies_house/search.rb (#709) Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this). * PPG-1127-Search-for-addition-identifiers-when-DUNs-Spotlight (#718) * Bump rdoc from 6.6.2 to 6.6.3.1 (#696) Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1. - [Release notes](https://github.com/ruby/rdoc/releases) - [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc) - [Commits](ruby/rdoc@v6.6.2...v6.6.3.1) --- updated-dependencies: - dependency-name: rdoc dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#717) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-REXML-6861566 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * fix: Gemfile & Gemfile.lock to reduce vulnerabilities (#716) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274386 - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-6274387 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-6228056 - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274383 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274384 - https://snyk.io/vuln/SNYK-RUBY-RACK-6274385 Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack-cors from 2.0.1 to 2.0.2 (#694) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2. - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](cyu/rack-cors@v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: rack-cors dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Update application.rb (#673) Filter sensitive fields from logs Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * Bump rack from 2.2.8 to 3.0.9.1 (#693) Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 3.0.9.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@v2.2.8...v3.0.9.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * [Snyk] Security upgrade puma from 5.6.7 to 5.6.8 (#670) * fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-PUMA-6146928 * Update Gemfile.lock --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk> * PPG-1332-Fix-issues-around-additional-identifiers (#732) * PPG-1332--Fix-new-regression-issue-causing-internal-error (#734) * PPG-1332-Fix-issues-around-additional-identifiers * PPG-1332--Fix-new-regression-issue-causing-internal-error * Update organisations_controller.rb --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: mohammed Aziz <mo_zag@yahoo.co.uk> Co-authored-by: mo-zag <mo-zag@users.noreply.github.com> Co-authored-by: georges1996 <40758489+georges1996@users.noreply.github.com> Co-authored-by: Andrew Hemming <drewhemm@users.noreply.github.com> Co-authored-by: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk> Co-authored-by: cosborneCCS <57792536+cosborneCCS@users.noreply.github.com> Co-authored-by: ccs-wattsa <andrew.watts@crowncommercial.gov.uk> Co-authored-by: ccsnareshkumar <66829713+ccsnareshkumar@users.noreply.github.com> Co-authored-by: Iulia R Ionita <iulia.ionita@crowncommercial.gov.uk> Co-authored-by: ccsnareshk <90035996+ccsnareshk@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ccs-snyk <158492397+ccs-snyk@users.noreply.github.com> Co-authored-by: John Denford <63358032+johndenford@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps rack-cors from 2.0.1 to 2.0.2.
Changelog
Sourced from rack-cors's changelog.
Commits
8780639Update changelog7231de7Bump rack-cors to 2.0.2b30b86dFix rubocope823594Fix typo in README.md (#267)8f50607Escape $ in ressource paths compile (#270)555ac46Mocha 2.0+ / Minitest 5.19+ compatibility (#266)202b85dExclude test in gemb0e06a0Move Host matching note into troubleshooting507894eFix test (#262)You can trigger a rebase of this PR by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)You can disable automated security fix PRs for this repo from the Security Alerts page.