Skip to content

Commit

Permalink
Merge pull request #1291 from alphagov/dependabot/bundler/govuk_app_c…
Browse files Browse the repository at this point in the history 
…onfig-9.12.0

Bump govuk_app_config from 9.11.2 to 9.12.0
  • Loading branch information
@yndajas
yndajas authored Jun 25, 2024
2 parents 28c7986 + 35b7ce7 commit 10f18c6
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 50 deletions.
97 changes: 51 additions & 46 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,24 @@ GEM
warden-oauth2 (~> 0.0.1)
globalid (1.2.1)
activesupport (>= 6.1)
google-protobuf (3.25.3)
google-protobuf (3.25.3-aarch64-linux)
google-protobuf (3.25.3-arm64-darwin)
google-protobuf (3.25.3-x86_64-linux)
googleapis-common-protos-types (1.14.0)
google-protobuf (~> 3.18)
govuk_app_config (9.11.2)
google-protobuf (4.27.1)
bigdecimal
rake (>= 13)
google-protobuf (4.27.1-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.1-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.1-x86_64-linux)
bigdecimal
rake (>= 13)
googleapis-common-protos-types (1.15.0)
google-protobuf (>= 3.18, < 5.a)
govuk_app_config (9.12.0)
logstasher (~> 2.1)
opentelemetry-exporter-otlp (>= 0.25, < 0.27)
opentelemetry-instrumentation-all (>= 0.39.1, < 0.61.0)
opentelemetry-exporter-otlp (>= 0.25, < 0.29)
opentelemetry-instrumentation-all (>= 0.39.1, < 0.62.0)
opentelemetry-sdk (~> 1.2)
plek (>= 4, < 6)
prometheus_exporter (~> 2.0)
Expand Down Expand Up @@ -260,18 +268,22 @@ GEM
opentelemetry-api (1.2.5)
opentelemetry-common (0.21.0)
opentelemetry-api (~> 1.0)
opentelemetry-exporter-otlp (0.26.3)
google-protobuf (~> 3.14)
opentelemetry-exporter-otlp (0.28.0)
google-protobuf (>= 3.18)
googleapis-common-protos-types (~> 1.3)
opentelemetry-api (~> 1.1)
opentelemetry-common (~> 0.20)
opentelemetry-sdk (~> 1.2)
opentelemetry-semantic_conventions
opentelemetry-helpers-mysql (0.1.0)
opentelemetry-helpers-mysql (0.1.1)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.20)
opentelemetry-helpers-sql-obfuscation (0.1.0)
opentelemetry-common (~> 0.20)
opentelemetry-common (~> 0.21)
opentelemetry-helpers-sql-obfuscation (0.1.1)
opentelemetry-common (~> 0.21)
opentelemetry-instrumentation-action_mailer (0.1.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-active_support (~> 0.1)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-action_pack (0.9.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
Expand All @@ -289,11 +301,12 @@ GEM
opentelemetry-instrumentation-active_record (0.7.2)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-active_support (0.5.1)
opentelemetry-instrumentation-active_support (0.5.3)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-all (0.60.0)
opentelemetry-instrumentation-all (0.61.0)
opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
opentelemetry-instrumentation-aws_lambda (~> 0.1.0)
opentelemetry-instrumentation-aws_sdk (~> 0.5.0)
opentelemetry-instrumentation-bunny (~> 0.21.0)
opentelemetry-instrumentation-concurrent_ruby (~> 0.21.1)
Expand Down Expand Up @@ -326,36 +339,36 @@ GEM
opentelemetry-instrumentation-sidekiq (~> 0.25.0)
opentelemetry-instrumentation-sinatra (~> 0.23.1)
opentelemetry-instrumentation-trilogy (~> 0.59.0)
opentelemetry-instrumentation-aws_lambda (0.1.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-aws_sdk (0.5.2)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-base (0.22.3)
opentelemetry-instrumentation-base (0.22.4)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21)
opentelemetry-registry (~> 0.1)
opentelemetry-instrumentation-bunny (0.21.3)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-concurrent_ruby (0.21.3)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-dalli (0.25.2)
opentelemetry-instrumentation-dalli (0.25.3)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-delayed_job (0.22.2)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-ethon (0.21.5)
opentelemetry-instrumentation-ethon (0.21.7)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-excon (0.22.2)
opentelemetry-instrumentation-excon (0.22.3)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-faraday (0.24.3)
opentelemetry-instrumentation-faraday (0.24.5)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-grape (0.1.8)
opentelemetry-api (~> 1.0)
Expand All @@ -370,13 +383,11 @@ GEM
opentelemetry-instrumentation-http (0.23.3)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-http_client (0.22.5)
opentelemetry-instrumentation-http_client (0.22.6)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-koala (0.20.4)
opentelemetry-instrumentation-koala (0.20.5)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-lmdb (0.22.2)
opentelemetry-api (~> 1.0)
Expand All @@ -389,9 +400,8 @@ GEM
opentelemetry-helpers-mysql
opentelemetry-helpers-sql-obfuscation
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-net_http (0.22.5)
opentelemetry-instrumentation-net_http (0.22.6)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-pg (0.27.3)
opentelemetry-api (~> 1.0)
Expand All @@ -403,12 +413,12 @@ GEM
opentelemetry-instrumentation-racecar (0.3.2)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-rack (0.24.4)
opentelemetry-instrumentation-rack (0.24.5)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-rails (0.30.1)
opentelemetry-instrumentation-rails (0.30.2)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-action_mailer (~> 0.1.0)
opentelemetry-instrumentation-action_pack (~> 0.9.0)
opentelemetry-instrumentation-action_view (~> 0.7.0)
opentelemetry-instrumentation-active_job (~> 0.7.0)
Expand All @@ -418,31 +428,26 @@ GEM
opentelemetry-instrumentation-rake (0.2.2)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-rdkafka (0.4.5)
opentelemetry-instrumentation-rdkafka (0.4.6)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-redis (0.25.5)
opentelemetry-instrumentation-redis (0.25.6)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-resque (0.5.2)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-restclient (0.22.5)
opentelemetry-instrumentation-restclient (0.22.6)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-ruby_kafka (0.21.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-sidekiq (0.25.4)
opentelemetry-instrumentation-sidekiq (0.25.5)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-sinatra (0.23.4)
opentelemetry-instrumentation-sinatra (0.23.5)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-rack (~> 0.21)
opentelemetry-instrumentation-trilogy (0.59.3)
Expand Down Expand Up @@ -488,7 +493,7 @@ GEM
parslet (2.0.0)
pg (1.5.6)
plek (5.2.0)
prometheus_exporter (2.1.0)
prometheus_exporter (2.1.1)
webrick
pry (0.14.1)
coderay (~> 1.1)
Expand Down
8 changes: 4 additions & 4 deletions spec/lib/tasks/data_hygiene/content_item_deduplicator_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
create(:content_item, content_id: content_item.content_id, locale: "en")

expect(Rails.logger).to receive(:info).with("These duplicates were destroyed...")
expect(Rails.logger).to receive(:info).with("#{content_item.content_id},cy,2020-02-27 00:00:00 UTC,#{content_item.base_path}")
expect(Rails.logger).to receive(:info).with("#{content_item.content_id},cy,2020-02-27 00:00:00 +0000,#{content_item.base_path}")
expect(Rails.logger).to receive(:info).twice.with("-----------------------------------------------------------------")
expect(Rails.logger).to receive(:info).with("These records were preserved...")
expect(Rails.logger).to receive(:info).with("#{content_item.content_id},cy,2020-02-27 00:00:00 UTC,#{content_item2.base_path}")
expect(Rails.logger).to receive(:info).with("#{content_item.content_id},cy,2020-02-27 00:00:00 +0000,#{content_item2.base_path}")
expect(Rails.logger).to receive(:info).with("2 duplicates found.")
expect(Rails.logger).to receive(:info).with("1 records were removed.")
expect(Rails.logger).to receive(:info).with("1 records were preserved.")
Expand All @@ -33,10 +33,10 @@
create(:content_item, content_id: content_item.content_id, locale: "fr")

expect(Rails.logger).to receive(:info).with("These duplicates would be destroyed...")
expect(Rails.logger).to receive(:info).with("#{content_item.content_id},en,2020-02-27 00:00:00 UTC,#{content_item.base_path}")
expect(Rails.logger).to receive(:info).with("#{content_item.content_id},en,2020-02-27 00:00:00 +0000,#{content_item.base_path}")
expect(Rails.logger).to receive(:info).twice.with("-----------------------------------------------------------------")
expect(Rails.logger).to receive(:info).with("These records would be preserved...")
expect(Rails.logger).to receive(:info).with("#{content_item.content_id},en,2020-02-27 00:00:00 UTC,#{content_item2.base_path}")
expect(Rails.logger).to receive(:info).with("#{content_item.content_id},en,2020-02-27 00:00:00 +0000,#{content_item2.base_path}")
expect(Rails.logger).to receive(:info).with("2 duplicates found.")
expect(Rails.logger).to receive(:info).with("1 records would be removed.")
expect(Rails.logger).to receive(:info).with("1 records would be preserved.")
Expand Down

0 comments on commit 10f18c6

Please sign in to comment.