awes_cli 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e45de21aa2807bd1e0d36671b120836b878a3fc3637b87020b65c3a24ef25213
-  data.tar.gz: 5a7952c65198f19e96412253c8a03e75cde414aedfdaa455227f2740c72645de
+  metadata.gz: 11b0868a3e61a6958996552fbaefaa668910307bf3c9467ee33aec2149597f0f
+  data.tar.gz: 2091c68dba8d1d3f73d73097b0280e6d6f5d1ff70d6ccb025355f7a8f78a22eb
 SHA512:
-  metadata.gz: 16b4b1c840286cd11ca5c658f28a3388a811de313f40b98c640360116ecd46f07209aa45954cd9aac1e2ede841dba4e6e3d9ec286473c9235804d9ee0ff3636b
-  data.tar.gz: 9927493efbc0938dff1d43c1dc3f994f6ab24077406f0cdd6ede2c6b9436035494f53c15c468149cff0fcb1edb3650bd9d23f56d8826fa65a30eaa678c672527
+  metadata.gz: c11381bc920e749aca8e4116bc1a8b55cd7274f199a3150ae34848f9ee953689f537f159f230230b1b7680c133a9791a095ff004089e5052e81b90abb93296bc
+  data.tar.gz: 45253514a729909c54ee2e48f0b549be76023ef0eb0a1a5eedb71d5f54561b6e19a4fc6d591f2192db88e66ac68a3700854419b6eea45ba1e190941d323f5f27

data/lib/build_app_image.rb

@@ -15,10 +15,15 @@ class BuildAppImage
       options = {}
 
       require_options_keys = [:project_id, :image_repo]
+      optional_options_keys = [:cluster_location, :img_worker_pool]
 
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: ather build [options]"
 
+        opts.on("--img-worker-pool IMG_WORKER_POOL", "Img worker pool to build [optional]") do |val|
+          options[:img_worker_pool] = val
+        end
+        
         opts.on("--image-tag IMAGE_TAG", "Addtional Image tag to build [optional]") do |val|
           options[:image_tag] = val
         end
@@ -31,6 +36,10 @@ class BuildAppImage
           options[:image_repo] = val
         end
 
+        opts.on("--cluster-location CLUSTER_LOCATION", "App name [required or set env var CLUSTER_LOCATION]") do |val|
+          options[:cluster_location] = val
+        end
+
         opts.on("-h", "--help", "Prints this help") do
           puts opts
           exit
@@ -48,6 +57,13 @@ class BuildAppImage
         end
       end
 
+      optional_options_keys.each do |key|
+        options[key] ||= ENV[key.to_s.upcase]
+        if options[key].nil?
+          options.delete(key)
+        end
+      end
+
       options
     end
 
@@ -68,8 +84,9 @@ class BuildAppImage
       time_image_url = "#{gcr_url}:#{time_image_tag}".strip
 
       project_id = options[:project_id]
-
-      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} || true")
+      worker_pool = options.key?(:img_worker_pool) && !options[:img_worker_pool].empty? ? "--worker-pool projects/#{project_id}/locations/#{options[:cluster_location]}/workerPools/#{options[:img_worker_pool]}" : ""
+      
+      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} #{worker_pool} || true")
 
       shell_cmd("gcloud container images add-tag --quiet #{time_image_url} #{commit_image_url}")
 

data/lib/deploy_app.rb

@@ -24,6 +24,7 @@ class DeployApp
       options = {}
 
       require_options_keys = [:project_id, :app_name, :namespace, :cluster, :cluster_location]
+      optional_options_keys = [:img_worker_pool]
 
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: ather deploy app [options]"
@@ -32,6 +33,10 @@ class DeployApp
           options[:approve] = flag
         end
 
+        opts.on("--img-worker-pool IMG_WORKER_POOL", "Img worker pool to build [optional]") do |val|
+          options[:img_worker_pool] = val
+        end
+
         opts.on("--image-tag IMAGE_TAG", "Image tag to deploy [optional]") do |val|
           options[:image_tag] = val
         end
@@ -77,6 +82,13 @@ class DeployApp
         end
       end
 
+      optional_options_keys.each do |key|
+        options[key] ||= ENV[key.to_s.upcase]
+        if options[key].nil?
+          options.delete(key)
+        end
+      end
+
       options
     end
 
@@ -116,8 +128,9 @@ class DeployApp
       time_image_url = "#{gcr_url}:#{time_image_tag}".strip
 
       project_id = options[:project_id]
-
-      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} || true")
+      worker_pool = options.key?(:img_worker_pool) && !options[:img_worker_pool].empty? ? "--worker-pool projects/#{project_id}/locations/#{options[:cluster_location]}/workerPools/#{options[:img_worker_pool]}" : ""
+      
+      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} #{worker_pool} || true")
 
       shell_cmd("gcloud container images add-tag --quiet #{time_image_url} #{commit_image_url}")
 

data/lib/deploy_config.rb

@@ -24,6 +24,7 @@ class DeployConfig
       options = {}
 
       require_options_keys = [:project_id, :app_name, :namespace, :cluster, :cluster_location, :kuztomize_env]
+      optional_options_keys = [:cluster_location, :img_worker_pool]
 
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: ather deploy config [options]"
@@ -32,6 +33,10 @@ class DeployConfig
           options[:approve] = flag
         end
 
+        opts.on("--img-worker-pool IMG_WORKER_POOL", "Img worker pool to build [optional]") do |val|
+          options[:img_worker_pool] = val
+        end
+
         opts.on("--image-tag IMAGE_TAG", "Image tag to deploy [optional]") do |val|
           options[:image_tag] = val
         end
@@ -81,6 +86,13 @@ class DeployConfig
         end
       end
 
+      optional_options_keys.each do |key|
+        options[key] ||= ENV[key.to_s.upcase]
+        if options[key].nil?
+          options.delete(key)
+        end
+      end
+
       options
     end
 
@@ -133,8 +145,9 @@ class DeployConfig
       time_image_url = "#{gcr_url}:#{time_image_tag}".strip
 
       project_id = options[:project_id]
-
-      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} || true")
+      worker_pool = options.key?(:img_worker_pool) && !options[:img_worker_pool].empty? ? "--worker-pool projects/#{project_id}/locations/#{options[:cluster_location]}/workerPools/#{options[:img_worker_pool]}" : ""
+      
+      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} #{worker_pool} || true")
 
       shell_cmd("gcloud container images add-tag --quiet #{time_image_url} #{commit_image_url}")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awes_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Umar Siddiqui
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies: []
 description: Ather cli tool
 email: umar.siddiqui@atherenergy.com
@@ -26,7 +26,7 @@ homepage: https://rubygems.org/gems/awes_cli
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -41,8 +41,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Ather cli tool
 test_files: []