awes_cli 0.0.11 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 762baa6d19ad8f2222a0587e9f6fa6480616fdeedefe3c31233757a3bd6cf04d
-  data.tar.gz: 910d6e3701b492d13be6dfd002aa98df457a3eda0b7eb13a055dd8ccdfc77f0e
+  metadata.gz: cedee555e6aa2d7cb069dc15ae693bef45387058f5d3c004f5d9e1485fdcd70b
+  data.tar.gz: f08103b5a6e4218b4d94ec14450b1540cd96b67f243858bf3fd715dc0e009686
 SHA512:
-  metadata.gz: 9bae0f381c1de58cc2a55ac96a4773347a9a530e05a39346622d94f60542584012c6a182745d207a4230700bde70afda9e97cce8f6c35cc5b42eff195a49d448
-  data.tar.gz: 9bcfbaeacee77563d74ceda83699032fd0ef05867c238857dba38f3f3480f300e12aec87009f736fedfac1af76b11752f6bccea2339d8860b4b71697cee42926
+  metadata.gz: 9efc5058b6a755dd32ecd53f330c28e8cc82d1544cc930327b5d59739f41d39cd0cbe6c93454d1de3e6e9a679ccf686ad2127141fbb28850b1104cd030424ee0
+  data.tar.gz: 102425e126ce0ac3409c79fe2204fe8c8558b2254f020a62beff0b38ef83d530fcbcde9c4b9c810ec304a3342f48698bcb06f0aed8db8bbdc3ff1d601bb3ed44

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

@@ -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,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[:app_name]}"
+      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] && 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.11
+  version: 0.0.15
 platform: ruby
 authors:
 - Umar Siddiqui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies: []
 description: Ather cli tool
 email: umar.siddiqui@atherenergy.com