awes_cli 0.0.1 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be520b19b3caa21d29f8208eab535c95e728180b7c74e77feb477263933587f4
-  data.tar.gz: 1233834f30464477ec72c618857d980bd68c2d750ce5c8cbd508a98db8876371
+  metadata.gz: df13512eaa1e69d2b5a6e0e053fa3ef1fb5a8d840ae0b3a2cf44cd734f899d7a
+  data.tar.gz: 929a008841be798c8fc952c913f34755322ac5ffc3490f921167c6946a645c19
 SHA512:
-  metadata.gz: 655d71c2e1f7563b8bd6f414f2e3ca73ee5a4c50713ab9009dc9a5709a30866682494cd1d2ddf6edd8bc8d8fa2e47d39cf2ae2c57c12bdf76ed45accd4671fa4
-  data.tar.gz: e4133b8c0233f5f89352e968daeaad5f31f837b1f0adeed939b83bd986e9d476dcf5e6f6ab8b52d6c56d4ad559754e44e656cad31dbdb21ae1203f15fc39d4b8
+  metadata.gz: dc58d40330cecb711cd4e9b11667c136d64679015089db3216fa1066c75847b2c3473dae5609e38044dfc9cc43f094beab7d3e51f866286c7fdd0c26f9199659
+  data.tar.gz: e7205d85c8a78a13945557b53f1b035781436c1f36f45cc27b91e66d1b5752fe619e30ee3d70b128f7376fb1f2bba6fd94a921e935c8e888563908f3345d11bb

data/lib/build_app_image.rb

@@ -19,7 +19,7 @@ class BuildAppImage
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: ather build [options]"
 
-        opts.on("--image-tag IMAGE_TAG", "Image tag to deploy [optional]") do |val|
+        opts.on("--image-tag IMAGE_TAG", "Addtional Image tag to build [optional]") do |val|
           options[:image_tag] = val
         end
 

data/lib/deploy_config.rb

@@ -119,7 +119,23 @@ class DeployConfig
     end
 
     def validate_image_tag_exists?(image_url)
-      shell_cmd("gcloud container images describe #{image_url}")
+      system("gcloud container images describe #{image_url}")
+    end
+
+    def build_image(image_url, gcr_url, options)
+      commit_image_tag = ENV['CI_COMMIT_SHORT_SHA'] || `git rev-parse --short HEAD`
+      time_image_tag=`TZ=IST-5:30 date +'%Y.%m.%d.%HH.%MM.%SS'`
+      commit_image_url = "#{gcr_url}:#{commit_image_tag}".strip
+      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")
+
+      shell_cmd("gcloud container images add-tag --quiet #{time_image_url} #{commit_image_url}")
+
+      shell_cmd("gcloud container images add-tag --quiet #{time_image_url} #{image_url}")
+
       image_url
     end
 
@@ -141,17 +157,21 @@ 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[env_name] = "'" + env_val + "'"
       end
 
       gcr_url = "gcr.io/#{options[:project_id]}/#{options[:app_name]}"
 
-      opt_image_url = options[:image_tag] && "#{gcr_url}:#{options[:image_tag]}"
+      # opt_image_url = options[:image_tag] && "#{gcr_url}:#{options[:image_tag]}"
 
-      image_url = opt_image_url || spec[:image] || "#{gcr_url}:current"
-      validate_image_tag_exists?(image_url)
+      # image_url = opt_image_url || spec[:image] || "#{gcr_url}:current"
+      image_url = spec[:image] || "#{gcr_url}:current"
+
+      if !validate_image_tag_exists?(image_url)
+        build_image(image_url, gcr_url, options)
+      end
 
-      yaml_file['$IMAGE_URL'] = image_url
+      yaml_file.gsub(/\$IMAGE_URL/, image_url)
 
       FileUtils.mkdir_p('./tmp')
 

metadata

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