Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update configs to match PSD-managed RabbitMQ #4403

Merged
merged 3 commits into from
Oct 22, 2024
Merged

Update configs to match PSD-managed RabbitMQ #4403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89fa82c
Update configs to match PSD-managed RabbitMQ (pass-1)
dasunpubudumal Oct 8, 2024
bbae51c
Merge remote-tracking branch 'origin/develop' into update-configs-to-…
dasunpubudumal Oct 17, 2024
4d787f7
Merge remote-tracking branch 'origin/develop' into update-configs-to-…
dasunpubudumal Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/jobs/export_pool_xp_to_traction_job.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def send_message(message, subject, version)

begin
channel = conn.create_channel
exchange = channel.headers(configatron.amqp.isg.exchange, passive: true)
exchange = channel.headers(configatron.amqp.broker.exchange, passive: true)
headers = { subject: subject, version: version, encoder_type: 'binary' }
exchange.publish(message, headers: headers, persistent: true)
ensure
Expand All @@ -107,7 +107,7 @@ def send_message(message, subject, version)
end

def connection_params
rabbit_config = configatron.amqp.isg
rabbit_config = configatron.amqp.broker

connection_params = {
host: rabbit_config.host,
Expand All @@ -123,7 +123,7 @@ def add_tls_params(connection_params)
connection_params[:tls] = true

begin
connection_params[:tls_ca_certificates] = [configatron.amqp.isg.ca_certificate!]
connection_params[:tls_ca_certificates] = [configatron.amqp.broker.ca_certificate!]
rescue Configatron::UndefinedKeyError
# Should not be the case in production!
connection_params[:verify_peer] = false
Expand Down
26 changes: 13 additions & 13 deletions config/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@

configatron.taxon_lookup_url = 'http://eutils.ncbi.nlm.nih.gov/entrez/eutils/'

configatron.amqp.isg.host = 'localhost'
configatron.amqp.isg.tls = false
configatron.amqp.isg.vhost = 'tol'
configatron.amqp.isg.username = 'admin'
configatron.amqp.isg.password = 'development'
configatron.amqp.isg.exchange = 'sequencescape'
configatron.amqp.broker.host = 'localhost'
configatron.amqp.broker.tls = false
configatron.amqp.broker.vhost = 'tol'
configatron.amqp.broker.username = 'admin'
configatron.amqp.broker.password = 'development'
configatron.amqp.broker.exchange = 'sequencescape'

configatron.amqp.schemas.registry_url = 'https://redpanda.uat.psd.sanger.ac.uk/subjects/'
configatron.amqp.schemas.subjects = {
Expand Down Expand Up @@ -135,13 +135,13 @@

configatron.taxon_lookup_url = 'http://eutils.ncbi.nlm.nih.gov/entrez/eutils/'

configatron.amqp.isg.host = 'localhost'
configatron.amqp.isg.tls = true
configatron.amqp.isg.ca_certificate = 'test-ca-cert'
configatron.amqp.isg.vhost = 'test-vhost'
configatron.amqp.isg.username = 'test-user'
configatron.amqp.isg.password = 'test-pass'
configatron.amqp.isg.exchange = 'test-exchange'
configatron.amqp.broker.host = 'localhost'
configatron.amqp.broker.tls = true
configatron.amqp.broker.ca_certificate = 'test-ca-cert'
configatron.amqp.broker.vhost = 'test-vhost'
configatron.amqp.broker.username = 'test-user'
configatron.amqp.broker.password = 'test-pass'
configatron.amqp.broker.exchange = 'test-exchange'

configatron.amqp.schemas.registry_url = 'http://test-redpanda/subjects/'
configatron.amqp.schemas.subjects = { export_pool_xp_to_traction: { subject: 'test-subject-name', version: 10 } }
Expand Down
10 changes: 5 additions & 5 deletions spec/jobs/export_pool_xp_to_traction_job_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,12 @@
export_job.send_message(encoded_message, schema_subject, schema_version)

expect(Bunny).to have_received(:new).with(
host: configatron.amqp.isg.host,
username: configatron.amqp.isg.username,
password: configatron.amqp.isg.password,
vhost: configatron.amqp.isg.vhost,
host: configatron.amqp.broker.host,
username: configatron.amqp.broker.username,
password: configatron.amqp.broker.password,
vhost: configatron.amqp.broker.vhost,
tls: true,
tls_ca_certificates: [configatron.amqp.isg.ca_certificate]
tls_ca_certificates: [configatron.amqp.broker.ca_certificate]
)
end

Expand Down
Loading