awes_cli 0.0.13 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b9a73dc5dbf7745e69146f02c3374ce6a957e43281ae0503c9ad80c53aa17ce
-  data.tar.gz: de4640754c3386a108a1d998932d58f79c7314c1d2d10d36d6c45e0e1f22460e
+  metadata.gz: ae356ef2d3af8d4b50abe527873238f1f1f9d605e9c30360593574caf3fb32d7
+  data.tar.gz: 83a3518d0a80ecc9c0630c182a9f27fe9ff91484872dab852ac5e9d40d2c5845
 SHA512:
-  metadata.gz: a989510de0b482da03abda2787c0d0a3c4b9b9930bff1b3ed63af0849c205535398beba98789f9d8a43fff67e4af8fd9c28dbfd22b2a315395f1a21f1e842b59
-  data.tar.gz: 2125e83e81a46dc3edced849a9a79fab44c786113cdd6a50a66d022b7a90de86045d95cdb25c3aa8b3b6437cd2122bd98f89a75ad467dfc3f36d76735b924115
+  metadata.gz: 340b7a3aff0a95b635178a0c2c556227649e471bbd76b7535a01a89570f6788e7cfb83c72f6ad0f011f76a857d23d5c4e82ddc8897089bc5f2368f0390bc164d
+  data.tar.gz: 829d803fafe6b122941b97067a78ff5703ecfb3b2508a7f0e14d0a9d0cd6e0c0ab5c2b7773a4ac2e1d329fafc608d0b638e557a2d9c883a59b9320c3469c1dc2

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

@@ -166,7 +166,7 @@ class DeployConfig
       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].empty? && 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.13
+  version: 0.0.17
 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