[ARVADOS] updated: 1.3.0-1256-g1a021e2c7

[Git user]

Summary of changes:
 apps/workbench/config/application.rb    |  2 -
 apps/workbench/config/arvados_config.rb |  2 +
 apps/workbench/config/load_config.rb    | 71 ---------------------------------
 apps/workbench/lib/config_validators.rb |  6 +++
 4 files changed, 8 insertions(+), 73 deletions(-)
 delete mode 100644 apps/workbench/config/load_config.rb

       via  1a021e2c70aafe29222a2970ec97347f4f55e340 (commit)
      from  3100cf66fee222eed832bd813cc0b7430bed0f93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1a021e2c70aafe29222a2970ec97347f4f55e340
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jul 8 13:34:39 2019 -0400

    14812: Delete legacy load_config.rb
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/config/application.rb b/apps/workbench/config/application.rb
index da33c2f97..514d57196 100644
--- a/apps/workbench/config/application.rb
+++ b/apps/workbench/config/application.rb
@@ -74,5 +74,3 @@ module ArvadosWorkbench
     config.assets.paths << Rails.root.join('node_modules')
   end
 end
-
-require File.expand_path('../load_config', __FILE__)
diff --git a/apps/workbench/config/arvados_config.rb b/apps/workbench/config/arvados_config.rb
index 5a6cdfffa..c0ecfde25 100644
--- a/apps/workbench/config/arvados_config.rb
+++ b/apps/workbench/config/arvados_config.rb
@@ -189,4 +189,6 @@ ArvadosWorkbench::Application.configure do
   ConfigLoader.copy_into_config $remaining_config, config
   secrets.secret_key_base = $arvados_config["Workbench"]["SecretKeyBase"]
   ConfigValidators.validate_wb2_url_config()
+  ConfigValidators.validate_download_config()
+
 end
diff --git a/apps/workbench/config/load_config.rb b/apps/workbench/config/load_config.rb
deleted file mode 100644
index 5f0d9caf9..000000000
--- a/apps/workbench/config/load_config.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-# This file must be loaded _after_ secret_token.rb if secret_token is
-# defined there instead of in config/application.yml.
-
-$application_config = {}
-
-%w(application.default application).each do |cfgfile|
-  path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
-  if File.exist? path
-    yaml = ERB.new(IO.read path).result(binding)
-    confs = YAML.load(yaml, deserialize_symbols: true)
-    $application_config.merge!(confs['common'] || {})
-    $application_config.merge!(confs[::Rails.env.to_s] || {})
-  end
-end
-
-ArvadosWorkbench::Application.configure do
-  nils = []
-  $application_config.each do |k, v|
-    # "foo.bar: baz" --> { config.foo.bar = baz }
-    cfg = config
-    ks = k.split '.'
-    k = ks.pop
-    ks.each do |kk|
-      cfg = cfg.send(kk)
-    end
-    if v.nil? and cfg.respond_to?(k) and !cfg.send(k).nil?
-      # Config is nil in *.yml, but has been set already in
-      # environments/*.rb (or has a Rails default). Don't overwrite
-      # the default/upstream config with nil.
-      #
-      # After config files have been migrated, this mechanism should
-      # be removed.
-      Rails.logger.warn <<EOS
-DEPRECATED: Inheriting config.#{ks.join '.'} from Rails config.
-            Please move this config into config/application.yml.
-EOS
-    elsif v.nil?
-      # Config variables are not allowed to be nil. Make a "naughty"
-      # list, and present it below.
-      nils << k
-    else
-      cfg.send "#{k}=", v
-    end
-  end
-  if !nils.empty? and not ::Rails.groups.include?('assets')
-    raise <<EOS
-#{::Rails.groups.include?('assets')}
-Refusing to start in #{::Rails.env.to_s} mode with missing configuration.
-
-The following configuration settings must be specified in
-config/application.yml:
-* #{nils.join "\n* "}
-
-EOS
-  end
-  # Refuse to start if keep-web isn't configured
-  if not (config.keep_web_url or config.keep_web_download_url) and not ::Rails.groups.include?('assets')
-    raise <<EOS
-Refusing to start in #{::Rails.env.to_s} mode with missing configuration.
-
-Keep-web service must be configured in config/application.yml:
-* keep_web_url
-* keep_web_download_url
-
-EOS
-  end
-end
diff --git a/apps/workbench/lib/config_validators.rb b/apps/workbench/lib/config_validators.rb
index 953b392e3..804e3e397 100644
--- a/apps/workbench/lib/config_validators.rb
+++ b/apps/workbench/lib/config_validators.rb
@@ -17,4 +17,10 @@ module ConfigValidators
     end
     return false
   end
+
+  def self.validate_download_config
+    if Rails.configuration.Services.WebDAV.ExternalURL == URI("") and Rails.configuration.Services.WebDAVDownload.ExternalURL == URI("")
+      raise "Keep-web service must be configured in Services.WebDAV and/or Services.WebDAVDownload"
+    end
+  end
 end

-----------------------------------------------------------------------


hooks/post-receive
--