awes_cli 0.0.9 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 912c0b612f6528b10417d66d062b3646f0526552c95af03c0d084a1f6f814256
-  data.tar.gz: 1932373450158a805b021a178067e1ec36163d64bf0675f90929eb7dd7ba44f7
+  metadata.gz: 5b9a73dc5dbf7745e69146f02c3374ce6a957e43281ae0503c9ad80c53aa17ce
+  data.tar.gz: de4640754c3386a108a1d998932d58f79c7314c1d2d10d36d6c45e0e1f22460e
 SHA512:
-  metadata.gz: 48e7098342c9676b5b7e37f95622925835b4f076b823363433912eadc7312356efc4592275c8120f5794ca525d681e1ab3711b3819f970ee59c6fdf82bddb38c
-  data.tar.gz: 353e9d9422aab3511da8f2c0492ea1386edc2dfa5cc0de08b4a182cc4cf51cfa789d4a94a91bf497f21f24097a932187e2f320bf6e1b507ffee625b3bfe233a5
+  metadata.gz: a989510de0b482da03abda2787c0d0a3c4b9b9930bff1b3ed63af0849c205535398beba98789f9d8a43fff67e4af8fd9c28dbfd22b2a315395f1a21f1e842b59
+  data.tar.gz: 2125e83e81a46dc3edced849a9a79fab44c786113cdd6a50a66d022b7a90de86045d95cdb25c3aa8b3b6437cd2122bd98f89a75ad467dfc3f36d76735b924115

data/lib/deploy_config.rb

@@ -13,9 +13,7 @@ class DeployConfig
 
     take_approval_app_env(options)
 
-    gcr_url = "gcr.io/#{options[:project_id]}/#{options[:app_name]}"
-
-    deploy_config(gcr_url, options)
+    deploy_config(options)
   end
 
   private
@@ -36,6 +34,10 @@ class DeployConfig
           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
@@ -139,7 +141,7 @@ class DeployConfig
       image_url
     end
 
-    def deploy_config(gcr_url, options)
+    def deploy_config(options)
       shell_cmd(
         "gcloud container clusters get-credentials #{options[:cluster]} " \
         "--region #{options[:cluster_location]} " \
@@ -157,15 +159,15 @@ 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[env_name] = "'" + env_val + "'"
+        yaml_file.gsub!(/\$#{env_key}\s*$/, "'#{env_val}'")
       end
 
-      gcr_url = "gcr.io/#{options[:project_id]}/#{options[:app_name]}"
-
-      # opt_image_url = options[:image_tag] && "#{gcr_url}:#{options[:image_tag]}"
+      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 = opt_image_url || spec[:image] || "#{gcr_url}:current"
       image_url = "#{gcr_url}:current"
+      image_url = spec[:image] if 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)
         build_image(image_url, gcr_url, options)

metadata

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