govuk_message_queue_consumer 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ff831021fdec8b26b02d2a1b9c36d5b35499a617e6c43995bb1dea97710d62e
-  data.tar.gz: 68fb8c56450889fd41def5ce02fd520a6e5d4ead28f738688ebb26a351769e05
+  metadata.gz: cc0734bab51ff11acbfbb49e0e750f1dc572597dc022ba914ca3bf3fe1d056a8
+  data.tar.gz: 737af6b51e95e3e9295c66a03485c9f98ba9aaf34c907829c217c88d7d1d54ac
 SHA512:
-  metadata.gz: ccd4008cf70e0a1edb4ff3e1712233518bed5321c7ed5531853a8336d596ecf06ba645a1b65b4071a0fcf7b77885f0c6ed4200f26eb2c8284e7f4d14834d18cb
-  data.tar.gz: 0dc0f62ca439285e225f0cf3b0261158ffc3444339c765937077759e4565134618488826b8547b255bdbc92d41a04c392154ff50b9919ede2a8405f1f26c9862
+  metadata.gz: bf52f103daa4c105e0d8efb84b597ae3fa6e7354b391457b1d984bcf53132b70dc03ca4aca0b02bf63c7dc51d1f8c42f399880b4e433800db0307171f6b02822
+  data.tar.gz: 9527d48f2fe4bd59b068a666359c2d949cc2f7bcee0b5f4e745d9fd10fe8eea25fb6504ab151dbd7e3ab251f21c71a74084e09f5bd817e4cef3704f65a5971a8

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 4.1.0
+
+- Support configuration via
+  [`RABBITMQ_URL`](https://github.com/ruby-amqp/bunny/blob/066496d8/docs/guides/connecting.md#the-rabbitmq_url-environment-variable)
+  instead of `RABBITMQ_HOSTS`, `RABBITMQ_VHOST`, `RABBITMQ_USER` and
+  `RABBITMQ_PASSWORD`, which are deprecated and will be removed in a later
+  version.
+- Update [bunny](https://github.com/ruby-amqp/bunny/) from 2.11 to 2.17, which
+  is the last version that supports Ruby 2.7. See [Bunny
+  changelog](https://github.com/ruby-amqp/bunny/blob/main/ChangeLog.md#changes-between-bunny-216x-and-2170-sep-11th-2020).
+
 # 4.0.0
 
 - Breaking: remove batch consumer ([#73](https://github.com/alphagov/govuk_message_queue_consumer/pull/73))

data/README.md

@@ -57,15 +57,15 @@ end
 
 More options are [documented here](http://www.rubydoc.info/gems/govuk_message_queue_consumer/GovukMessageQueueConsumer/Consumer#initialize-instance_method).
 
-The consumer expects a number of environment variables to be present. On GOV.UK,
-these should be set up in puppet.
+The consumer expects the [`RABBITMQ_URL` environment
+variable](https://github.com/ruby-amqp/bunny/blob/066496d/docs/guides/connecting.md#paas-environments)
+to be set to an AMQP connection string, for example:
 
-```
-RABBITMQ_HOSTS=rabbitmq1.example.com,rabbitmq2.example.com
-RABBITMQ_VHOST=/
-RABBITMQ_USER=a_user
-RABBITMQ_PASSWORD=a_super_secret
-```
+`RABBITMQ_URL=amqp://mrbean:hunter2@rabbitmq.example.com:5672`
+
+The GOV.UK-specific environment variables `RABBITMQ_HOSTS`, `RABBITMQ_VHOST`,
+`RABBITMQ_USER` and `RABBITMQ_PASSWORD` are deprecated. Support for these will
+be removed in a future version of govuk_message_queue_consumer.
 
 Define a class that will process the messages:
 

data/lib/govuk_message_queue_consumer/consumer.rb

@@ -11,7 +11,12 @@ module GovukMessageQueueConsumer
     NUMBER_OF_MESSAGES_TO_PREFETCH = 1
 
     def self.default_connection_from_env
-      Bunny.new(GovukMessageQueueConsumer::RabbitMQConfig.from_environment(ENV))
+      # https://github.com/ruby-amqp/bunny/blob/066496d/docs/guides/connecting.md#paas-environments
+      if !ENV["RABBITMQ_URL"].to_s.empty?
+        Bunny.new
+      else
+        Bunny.new(RabbitMQConfig.from_environment(ENV))
+      end
     end
 
     # Create a new consumer

data/lib/govuk_message_queue_consumer/rabbitmq_config.rb

@@ -9,7 +9,6 @@ module GovukMessageQueueConsumer
         vhost: fetch(env, "RABBITMQ_VHOST"),
         user: fetch(env, "RABBITMQ_USER"),
         pass: fetch(env, "RABBITMQ_PASSWORD"),
-        recover_from_connection_close: true,
       }
     end
 
@@ -22,7 +21,9 @@ module GovukMessageQueueConsumer
         The environment variable #{variable_name} is not set. If you are in test
         mode, make sure you set the correct vars in your helpers. If you get this
         error in development, make sure you run rails or rake with `govuk_setenv`
-        and puppet is up to date.
+        and puppet is up to date. RABBITMQ_HOSTS, RABBITMQ_VHOST,
+        RABBITMQ_USER and RABBITMQ_PASSWORD are deprecated. Please switch to
+        RABBITMQ_URL.
       ERR
     end
   end

data/lib/govuk_message_queue_consumer/version.rb

@@ -1,3 +1,3 @@
 module GovukMessageQueueConsumer
-  VERSION = "4.0.0".freeze
+  VERSION = "4.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_message_queue_consumer
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.17'
 - !ruby/object:Gem::Dependency
   name: bunny-mock
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.9.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: AMQP message queue consumption with GOV.UK conventions