From ecaaf4cba747c8c2a765b7841a29046038d45cf7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 02:52:25 +0000 Subject: [PATCH 1/2] Bump dfe-analytics from v1.15.1 to v1.15.3 Bumps [dfe-analytics](https://github.com/DFE-Digital/dfe-analytics) from v1.15.1 to v1.15.3. - [Changelog](https://github.com/DFE-Digital/dfe-analytics/blob/main/CHANGELOG.md) - [Commits](https://github.com/DFE-Digital/dfe-analytics/compare/7618b23697e91ab1ababee5234faaa260f6c873e...322a89542ae675e2e27b404ef9b3689966cb75c3) --- updated-dependencies: - dependency-name: dfe-analytics dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 336ea47f422..e406fab3b3b 100644 --- a/Gemfile +++ b/Gemfile @@ -149,7 +149,7 @@ gem 'colorize' gem 'rack-mini-profiler', require: ['prepend_net_http_patch'] # BigQuery -gem 'dfe-analytics', github: 'DFE-Digital/dfe-analytics', tag: 'v1.15.1' +gem 'dfe-analytics', github: 'DFE-Digital/dfe-analytics', tag: 'v1.15.3' # Azure Blob Storage gem 'azure-blob' diff --git a/Gemfile.lock b/Gemfile.lock index 99ff18977c8..55944cb8312 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/DFE-Digital/dfe-analytics.git - revision: 7618b23697e91ab1ababee5234faaa260f6c873e - tag: v1.15.1 + revision: 322a89542ae675e2e27b404ef9b3689966cb75c3 + tag: v1.15.3 specs: - dfe-analytics (1.15.1) + dfe-analytics (1.15.3) google-cloud-bigquery (~> 1.38) httparty (~> 0.21) multi_xml (~> 0.6.0) @@ -300,7 +300,7 @@ GEM csv (>= 3.0.0) globalid (1.2.1) activesupport (>= 6.1) - google-apis-bigquery_v2 (0.81.0) + google-apis-bigquery_v2 (0.82.0) google-apis-core (>= 0.15.0, < 2.a) google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) @@ -324,9 +324,11 @@ GEM google-cloud-env (2.2.1) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) - googleauth (1.11.2) + google-logging-utils (0.1.0) + googleauth (1.12.0) faraday (>= 1.0, < 3.a) - google-cloud-env (~> 2.1) + google-cloud-env (~> 2.2) + google-logging-utils (~> 0.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) From 993562e0270254661793116c943ca07043670661 Mon Sep 17 00:00:00 2001 From: David Young Date: Tue, 17 Dec 2024 11:29:10 +0000 Subject: [PATCH 2/2] Add X-REAL-IP header to request_double signature With the updated dfe-analytics gem, it now uses a specific header with the IP to track remote IPs. We need to mirror the signature in our test doubles. See: https://github.com/DFE-Digital/publish-teacher-training/pull/4745/commits/b2d15996e9739bc8c19ad470ee76cfaa4f9a3fb5 Co-authored-by: Daniel Dye --- spec/services/adviser/tracking_spec.rb | 2 +- spec/services/provider_interface/tracking_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/services/adviser/tracking_spec.rb b/spec/services/adviser/tracking_spec.rb index c54c8730adb..f0d36713501 100644 --- a/spec/services/adviser/tracking_spec.rb +++ b/spec/services/adviser/tracking_spec.rb @@ -10,7 +10,7 @@ original_fullpath: '/path', query_string: nil, referer: nil, - remote_ip: '1.2.3.4') + headers: { 'X-REAL-IP' => '1.2.3.4' }) end subject(:tracker) { described_class.new(current_user_double, request_double) } diff --git a/spec/services/provider_interface/tracking_spec.rb b/spec/services/provider_interface/tracking_spec.rb index ead26d05017..1e37f86bbf8 100644 --- a/spec/services/provider_interface/tracking_spec.rb +++ b/spec/services/provider_interface/tracking_spec.rb @@ -10,7 +10,7 @@ original_fullpath: '/path', query_string: nil, referer: nil, - remote_ip: '1.2.3.4') + headers: { 'X-REAL-IP' => '1.2.3.4' }) end subject(:tracker) { described_class.new(current_user_double, request_double) }