From be13306c210c458dfd74f9a1aab8377534f8760f Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curii.com>
Date: Mon, 23 Oct 2023 17:22:46 -0400
Subject: [PATCH] 20846: Update associations syntax for ruby 3.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---
 services/api/app/models/authorized_key.rb    | 11 +++++------
 services/api/app/models/container.rb         | 18 ++++++++----------
 services/api/app/models/container_request.rb | 20 +++++++++-----------
 services/api/app/models/node.rb              |  9 ++++-----
 services/api/app/models/pipeline_instance.rb |  9 ++++-----
 5 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/services/api/app/models/authorized_key.rb b/services/api/app/models/authorized_key.rb
index cf4a1d55de..8aefa8db81 100644
--- a/services/api/app/models/authorized_key.rb
+++ b/services/api/app/models/authorized_key.rb
@@ -9,12 +9,11 @@ class AuthorizedKey < ArvadosModel
   before_create :permission_to_set_authorized_user_uuid
   before_update :permission_to_set_authorized_user_uuid
 
-  belongs_to :authorized_user, {
-               foreign_key: 'authorized_user_uuid',
-               class_name: 'User',
-               primary_key: 'uuid',
-               optional: true,
-             }
+  belongs_to :authorized_user,
+             foreign_key: 'authorized_user_uuid',
+             class_name: 'User',
+             primary_key: 'uuid',
+             optional: true
 
   validate :public_key_must_be_unique
 
diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index 97f8dfa279..ca43fde5a9 100644
--- 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
diff --git a/services/api/app/models/container_request.rb b/services/api/app/models/container_request.rb
index 374859f2c1..0a8e33d05f 100644
--- a/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@ -12,17 +12,15 @@ class ContainerRequest < ArvadosModel
   include CommonApiTemplate
   include WhitelistUpdate
 
-  belongs_to :container, {
-               foreign_key: 'container_uuid',
-               primary_key: 'uuid',
-               optional: true,
-             }
-  belongs_to :requesting_container, {
-               class_name: 'Container',
-               foreign_key: 'requesting_container_uuid',
-               primary_key: 'uuid',
-               optional: true,
-             }
+  belongs_to :container,
+             foreign_key: 'container_uuid',
+             primary_key: 'uuid',
+             optional: true
+  belongs_to :requesting_container,
+             class_name: 'Container',
+             foreign_key: 'requesting_container_uuid',
+             primary_key: 'uuid',
+             optional: true
 
   # Posgresql JSONB columns should NOT be declared as serialized, Rails 5
   # already know how to properly treat them.
diff --git a/services/api/app/models/node.rb b/services/api/app/models/node.rb
index 3f0e0b5616..f384ba582b 100644
--- a/services/api/app/models/node.rb
+++ b/services/api/app/models/node.rb
@@ -20,11 +20,10 @@ class Node < ArvadosModel
   # Only a controller can figure out whether or not the current API tokens
   # have access to the associated Job.  They're expected to set
   # job_readable=true if the Job UUID can be included in the API response.
-  belongs_to :job, {
-               foreign_key: 'job_uuid',
-               primary_key: 'uuid',
-               optional: true,
-             }
+  belongs_to :job,
+             foreign_key: 'job_uuid',
+             primary_key: 'uuid',
+             optional: true
   attr_accessor :job_readable
 
   UNUSED_NODE_IP = '127.40.4.0'
diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb
index 23a08051ca..0b0af8b87d 100644
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@ -9,11 +9,10 @@ class PipelineInstance < ArvadosModel
   serialize :components, Hash
   serialize :properties, Hash
   serialize :components_summary, Hash
-  belongs_to :pipeline_template, {
-               foreign_key: 'pipeline_template_uuid',
-               primary_key: 'uuid',
-               optional: true,
-             }
+  belongs_to :pipeline_template,
+             foreign_key: 'pipeline_template_uuid',
+             primary_key: 'uuid',
+             optional: true
 
   before_validation :bootstrap_components
   before_validation :update_state
-- 
2.39.5