Move location assignment to config class

shakacode · Nov 17, 2023 · 3895bf5 · 3895bf5
1 parent 257b551
commit 3895bf5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/lib/command/apply_template.rb b/lib/command/apply_template.rb
@@ -127,7 +127,7 @@ def confirm_workload(template)
     def apply_template(filename)
       data = File.read(filename)
                  .gsub("APP_GVC", config.app)
-                 .gsub("APP_LOCATION", config.options[:location] || config[:default_location])
+                 .gsub("APP_LOCATION", config.location)
                  .gsub("APP_ORG", config.org)
                  .gsub("APP_IMAGE", latest_image)
 

diff --git a/lib/command/ps.rb b/lib/command/ps.rb
@@ -26,7 +26,7 @@ class Ps < Base
     def call
       cp.fetch_gvc!
 
-      location = config.options["location"] || config[:default_location]
+      location = config.location
 
       workloads = [config.options[:workload]] if config.options[:workload]
       workloads ||= config[:app_workloads] + config[:additional_workloads]

diff --git a/lib/command/run.rb b/lib/command/run.rb
@@ -57,7 +57,7 @@ class Run < Base
     attr_reader :location, :workload, :one_off, :container
 
     def call # rubocop:disable Metrics/MethodLength
-      @location = config.options["location"] || config[:default_location]
+      @location = config.location
       @workload = config.options["workload"] || config[:one_off_workload]
       @one_off = "#{workload}-run-#{rand(1000..9999)}"
 

diff --git a/lib/command/run_detached.rb b/lib/command/run_detached.rb
@@ -48,7 +48,7 @@ class RunDetached < Base # rubocop:disable Metrics/ClassLength
     attr_reader :location, :workload, :one_off, :container
 
     def call # rubocop:disable Metrics/MethodLength
-      @location = config.options["location"] || config[:default_location]
+      @location = config.location
       @workload = config.options["workload"] || config[:one_off_workload]
       @one_off = "#{workload}-runner-#{rand(1000..9999)}"
 

diff --git a/lib/core/config.rb b/lib/core/config.rb
@@ -2,7 +2,7 @@
 
 class Config # rubocop:disable Metrics/ClassLength
   attr_reader :config, :current,
-              :org, :org_comes_from_env, :app, :apps, :app_dir,
+              :org, :org_comes_from_env, :app, :apps, :app_dir, :location,
               # command line options
               :args, :options
 
@@ -18,6 +18,8 @@ def initialize(args, options)
     load_app_config
     load_apps
 
+    @location = options[:location] || config.dig(:apps, app.to_sym, :default_location)
+
     Shell.verbose_mode(options[:verbose])
   end