ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove vault_credential_path before constructing SQS client 

refs AE-53
fixes CANVAS-KC4N, CANVAS-KC4M

Change-Id: I525fd2d505fa950b271ae5a398aab51e5bcf9f83
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/318248
Reviewed-by: Isaac Moore <isaac.moore@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
This commit is contained in:
Aaron Ogata 2023-05-16 05:45:06 -07:00
parent 29817df954
commit 07d659d53b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/notification_failure_processor.rb
View File

@ -100,8 +100,8 @@ class NotificationFailureProcessor
return @notification_failure_queue if defined?(@notification_failure_queue)
conf = Canvas::AWS.validate_v2_config(config, "notification_failures.yml").dup
conf[:credentials] ||= Canvas::AwsCredentialProvider.new("notification_failures_creds", conf["vault_credential_path"])
conf.except!(*POLL_PARAMS)
conf[:credentials] ||= Canvas::AwsCredentialProvider.new("notification_failures_creds", conf[:vault_credential_path])
conf.except!(*POLL_PARAMS, :vault_credential_path)
conf.delete(:iteration_high_water)
conf.delete(:initial_timeout) # old, no longer supported poll param
queue_name = conf.delete(:notification_failure_queue_name)

2
lib/services/notification_service.rb
View File

@ -50,7 +50,7 @@ module Services
@notification_sqs ||= begin
conf = Canvas::AWS.validate_v2_config(config, "notification_service")
conf["credentials"] ||= Canvas::AwsCredentialProvider.new("notification_service_creds", conf["vault_credential_path"])
sqs = Aws::SQS::Client.new(conf.except(*QUEUE_NAME_KEYS.values))
sqs = Aws::SQS::Client.new(conf.except(*QUEUE_NAME_KEYS.values, "vault_credential_path"))
@queue_urls = {}
QUEUE_NAME_KEYS.each do |key, queue_name_key|
queue_name = conf[queue_name_key]