Merge develop into staging #735
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
The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917
…ec6d850211be03f51116438888 [Snyk] Security upgrade rubocop-rails from 2.21.0 to 2.21.1
The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917
The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338
The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917
Fix for the travis issue caused by drop of support for postgres appt package.
…gres-apt-package Update .travis.yml
The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917
The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917
…1da300e6be75c8cfbf319d6ff8 [Snyk] Security upgrade rspec-rails from 6.0.3 to 6.0.4
…9d3a76a5a87e16d638e80aaab6 [Snyk] Security upgrade rails from 7.0.8 to 7.1.0
The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917
…63b02282e7435a901b3276cee3 [Snyk] Security upgrade rails from 7.0.8 to 7.1.0
…70d43c0434ee306fee3f44f7bd [Snyk] Security upgrade i18n-tasks from 1.0.12 to 1.0.13
…f9a8f5891f78f67a78b248a230 [Snyk] Security upgrade factory_bot_rails from 6.2.0 to 6.3.0
…32e5399be5a6a04820fc49aeb2 [Snyk] Fix for 1 vulnerabilities
Removed from controller registry update
…-implementation Registry update implementation
* 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>
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>
* 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>
…ch (#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 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 * Update search_api_additional_identifiers.rb
* Update search_api_additional_identifiers.rb * Update search.rb
spotlight-add-extra-logging-for-debug
remove extra logging. rename param to what it should be.
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.
Adjust the conditional requirements for returning a negative 404 response, based on external API messaging.
Remove additional Identifier checking for DUNs, after the Primary Companies House Identifier has been found, (since Spotlight does not yet support this).
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>
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>
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>
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>
Filter sensitive fields from logs Co-authored-by: Tom <thomas.berey@crowncommercial.gov.uk>
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>
* 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 * PPG-1332--Fix-new-regression-issue-causing-internal-error * Update organisations_controller.rb
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.
Updates the testing environment.