awes_cli 0.0.12 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45e8bc63d693bc56a8caec4132ef4247015a8dab5d5700de58ac5bfdcf2f6469
-  data.tar.gz: f59ff2761788a4cae909c66f90c260d6043ea34aea9d9c84d0f6397a9efe5ac4
+  metadata.gz: 976175671147866776438637c2ee06daff8e55aeb7627905d209426a384dc8fd
+  data.tar.gz: 6924c13fc2614d6a0c7742c6c9e2cc3503bac0a78ae2e1248d77b3b06a61f35c
 SHA512:
-  metadata.gz: a14dc4135709022157dab1a44e474fc6fe3d0f71c683e7c039dbdcdd433df045fbddcaa6a46b597c1547b3e686c2d21ffbfdc66b7a79a40359addcf50e2af50d
-  data.tar.gz: d8eec4b98797c893c10703c77138c0f4f3fd6dd8f846821ba5d96eb68d5835d80e123a7e2ae14ac045e32fadf8a1b1a469e909099844669b640bbc3c53a2f977
+  metadata.gz: 9787637eb5cb323ffc6283803d0548413715b7aa3af315a5f27bb46793a689ce36d9d29bf8e9a9f04afed1d98846f0291c55db25ed99d83662b766b63c44fd48
+  data.tar.gz: 8dec561e51b237892c635271a667d3819c31c1fe2a44c7bc26b4b0542a39c91a0c0ba0157dfb2c32396d5d2aa11daf88ddffb4f708a1363cb531ae69f41bef70

data/lib/build_app_image.rb

@@ -5,7 +5,7 @@ class BuildAppImage
   def main
     options = get_options
 
-    gcr_url = "gcr.io/#{options[:project_id]}/#{options[:app_name]}"
+    gcr_url = "gcr.io/#{options[:project_id]}/#{options[:image_repo]}"
 
     image_url = build_image(gcr_url, options)
   end
@@ -14,7 +14,7 @@ class BuildAppImage
     def get_options
       options = {}
 
-      require_options_keys = [:project_id, :app_name]
+      require_options_keys = [:project_id, :image_repo]
 
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: ather build [options]"
@@ -27,8 +27,8 @@ class BuildAppImage
           options[:project_id] = val
         end
 
-        opts.on("--app-name APP_NAME", "K8s app name [required or set env var APP_NAME]") do |val|
-          options[:app_name] = val
+        opts.on("--image-repo IMAGE_REPO", "Image repo to deploy [required or set env var IMAGE_REPO]") do |val|
+          options[:image_repo] = val
         end
 
         opts.on("-h", "--help", "Prints this help") do
@@ -76,7 +76,6 @@ class BuildAppImage
       opt_image_url = options[:image_tag] && "#{gcr_url}:#{options[:image_tag]}"
 
       opt_image_url && shell_cmd("gcloud container images add-tag --quiet #{time_image_url} #{opt_image_url}")
-
-      opt_image_url
+      shell_cmd("echo \"IMAGE_TAG=#{commit_image_tag}\" >> build.env")
     end
 end

data/lib/deploy_app.rb

@@ -6,7 +6,7 @@ class DeployApp
     options = get_options
     take_approval(options)
 
-    gcr_url = "gcr.io/#{options[:project_id]}/#{options[:app_name]}"
+    gcr_url = "gcr.io/#{options[:project_id]}/#{options[:image_repo] || options[:app_name]}"
 
     if(!options[:image_tag].nil?)
       image_url = validate_image_tag_exists?(gcr_url, options[:image_tag])
@@ -34,6 +34,10 @@ class DeployApp
           options[:image_tag] = val
         end
 
+        opts.on("--image-repo IMAGE_REPO", "Image repo to deploy [optional] default to K8s app name") do |val|
+          options[:image_repo] = val
+        end
+
         opts.on("--project-id PROJECT_ID", "GCP project id [required or set env var PROJECT_ID]") do |val|
           options[:project_id] = val
         end

data/lib/deploy_config.rb

@@ -159,14 +159,14 @@ class DeployConfig
         env_key = env_name[1..-1]
         env_val = override_envs[env_key] || ENV[env_key] || k8s_deployment_envs[env_key]
         next if env_val.nil?
-        yaml_file.gsub!(env_name, "'#{env_val}'")
+        yaml_file.gsub!(/\$#{env_key}\s*$/, "'#{env_val}'")
       end
 
       gcr_url = "gcr.io/#{options[:project_id]}/#{options[:image_repo] || options[:app_name]}"
       opt_image_url = options[:image_tag] && "#{gcr_url}:#{options[:image_tag]}"
 
       image_url = "#{gcr_url}:current"
-      image_url = spec[:image] if validate_image_tag_exists?(spec[:image])
+      image_url = spec[:image] if spec[:image] && validate_image_tag_exists?(spec[:image])
       image_url = opt_image_url if validate_image_tag_exists?(opt_image_url)
 
       if !validate_image_tag_exists?(image_url)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awes_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.16
 platform: ruby
 authors:
 - Umar Siddiqui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies: []
 description: Ather cli tool
 email: umar.siddiqui@atherenergy.com