20978: Merge branch 'main' into 20978-instance-types

[arvados.git] / services / api / app / models / container.rb

diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index 97f8dfa279f23214e446361470721034f757e391..ee338b81ffedad646854cd4b55998937551ffa59 100644 (file)
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -51,17 +51,15 @@ class Container < ArvadosModel
   after_save :update_cr_logs
   after_save :handle_completed
 
-  has_many :container_requests, {
-             class_name: 'ContainerRequest',
-             foreign_key: 'container_uuid',
+  has_many :container_requests,
+           class_name: 'ContainerRequest',
+           foreign_key: 'container_uuid',
+           primary_key: 'uuid'
+  belongs_to :auth,
+             class_name: 'ApiClientAuthorization',
+             foreign_key: 'auth_uuid',
              primary_key: 'uuid',
-           }
-  belongs_to :auth, {
-               class_name: 'ApiClientAuthorization',
-               foreign_key: 'auth_uuid',
-               primary_key: 'uuid',
-               optional: true,
-             }
+             optional: true
 
   api_accessible :user, extend: :common do |t|
     t.add :command
@@ -321,7 +319,7 @@ class Container < ArvadosModel
         resolved_runtime_constraints.delete('cuda')
       ].uniq
     end
-    reusable_runtime_constraints = hash_product(runtime_constraint_variations)
+    reusable_runtime_constraints = hash_product(**runtime_constraint_variations)
                                      .map { |v| resolved_runtime_constraints.merge(v) }
 
     candidates = candidates.where_serialized(:runtime_constraints, reusable_runtime_constraints, md5: true, multivalue: true)