Merge branch '15652-crunch-run-memory-use'

[arvados.git] / services / api / lib / enable_jobs_api.rb

diff --git a/services/api/lib/enable_jobs_api.rb b/services/api/lib/enable_jobs_api.rb
index d99edd8018881cbc4406360fe7f460ef6e19490c..1a96a81ad66708f8e45c032737a821d3a5d12ebc 100644 (file)
--- a/services/api/lib/enable_jobs_api.rb
+++ b/services/api/lib/enable_jobs_api.rb
@@ -2,38 +2,49 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-Disable_jobs_api_method_list = ["jobs.create",
-                                               "pipeline_instances.create",
-                                               "pipeline_templates.create",
-                                               "jobs.get",
-                                               "pipeline_instances.get",
-                                               "pipeline_templates.get",
-                                               "jobs.list",
-                                               "pipeline_instances.list",
-                                               "pipeline_templates.list",
-                                               "jobs.index",
-                                               "pipeline_instances.index",
-                                               "pipeline_templates.index",
-                                               "jobs.update",
-                                               "pipeline_instances.update",
-                                               "pipeline_templates.update",
-                                               "jobs.queue",
-                                               "jobs.queue_size",
-                                               "job_tasks.create",
-                                               "job_tasks.get",
-                                               "job_tasks.list",
-                                               "job_tasks.index",
-                                               "job_tasks.update",
-                                               "jobs.show",
-                                               "pipeline_instances.show",
-                                               "pipeline_templates.show",
-                                               "jobs.show",
-                                               "job_tasks.show"]
+Disable_update_jobs_api_method_list = {"jobs.create"=>{},
+                                "pipeline_instances.create"=>{},
+                                "pipeline_templates.create"=>{},
+                                "jobs.update"=>{},
+                                "pipeline_instances.update"=>{},
+                                "pipeline_templates.update"=>{},
+                                "job_tasks.create"=>{},
+                                "job_tasks.update"=>{}}
+
+Disable_jobs_api_method_list = {"jobs.create"=>{},
+                                "pipeline_instances.create"=>{},
+                                "pipeline_templates.create"=>{},
+                                "jobs.get"=>{},
+                                "pipeline_instances.get"=>{},
+                                "pipeline_templates.get"=>{},
+                                "jobs.list"=>{},
+                                "pipeline_instances.list"=>{},
+                                "pipeline_templates.list"=>{},
+                                "jobs.index"=>{},
+                                "pipeline_instances.index"=>{},
+                                "pipeline_templates.index"=>{},
+                                "jobs.update"=>{},
+                                "pipeline_instances.update"=>{},
+                                "pipeline_templates.update"=>{},
+                                "jobs.queue"=>{},
+                                "jobs.queue_size"=>{},
+                                "job_tasks.create"=>{},
+                                "job_tasks.get"=>{},
+                                "job_tasks.list"=>{},
+                                "job_tasks.index"=>{},
+                                "job_tasks.update"=>{},
+                                "jobs.show"=>{},
+                                "pipeline_instances.show"=>{},
+                                "pipeline_templates.show"=>{},
+                                "job_tasks.show"=>{}}
 
 def check_enable_legacy_jobs_api
-  if Rails.configuration.enable_legacy_jobs_api == false ||
-     (Rails.configuration.enable_legacy_jobs_api == "auto" &&
-      ActiveRecord::Base.connection.exec_query("select count(*) from jobs").first["count"] == "0")
-    Rails.configuration.disable_api_methods = Disable_jobs_api_method_list
+  # Create/update is permanently disabled (legacy functionality has been removed)
+  Rails.configuration.API.DisabledAPIs.merge! Disable_update_jobs_api_method_list
+
+  if Rails.configuration.Containers.JobsAPI.Enable == "false" ||
+     (Rails.configuration.Containers.JobsAPI.Enable == "auto" &&
+      Job.count == 0)
+    Rails.configuration.API.DisabledAPIs.merge! Disable_jobs_api_method_list
   end
 end