openstax_aws 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7754f428f875d2a03d7e007352ab1c98107838904fd56ec7b0b7e188f62cf3fd
-  data.tar.gz: 862cfac082c78ac44a42190634cac16e2d05b2eaf5f9445950928d9883bd53b8
+  metadata.gz: d7ed7cb99a4131a436325e8766d03f6a62accbd62a700a6238a0a6278ae1e6e5
+  data.tar.gz: 46f26ea0c266cf1c1ca1b0cf7c5307848bf8be3c5097c7fe16472a1fe3115f81
 SHA512:
-  metadata.gz: dfb2f7012992c090625da1ba7906f475d43042456e8c241e54624123f12a28ac36effa58cab39de0beede13643f4513441da7e1154edfaa2f1783e97ea8927dc
-  data.tar.gz: 309ed6f57c82ea3d42a9860f44a7ad80bec3d524ae5deac7546ed870e4cb572b904cba75a76df9e4d80c0834e6393b1b85d41a53d5bb9bc4619da8fc20ea0b1d
+  metadata.gz: 1871bbb908ecbfb58eb782fae57f960cf1db1a066adf8003c14115756273656a51aa2c32e061bb8fcc6607fe06633fd6936b7d71da38c907d313aa9d5509ad8b
+  data.tar.gz: 82108d04dde247454dfeafe8450a2bfed4ffe40d8d00c45dea2693501ae9693e7e77be618605cf3f49cb647bdb6cdf0b78e1cac71b37f3fe0fbe94543a1ffac8

data/lib/openstax/aws/build_image_command_1.rb

@@ -7,6 +7,7 @@ module OpenStax
       def initialize(ami_name_base:, region:,
                      verbose: false, debug: false,
                      github_org:, repo:, branch: nil, sha: nil,
+                     deployment_sha: nil,
                      packer_absolute_file_path: , playbook_absolute_file_path:,
                      dry_run: true)
         if sha.nil?
@@ -18,6 +19,8 @@ module OpenStax
                 )
         end
 
+        deployment_sha ||= OpenStax::Aws::GitHelper.current_sha
+
         ami_name = "#{ami_name_base}@#{sha[0..6]} #{Time.now.utc.strftime("%y%m%d%H%MZ")}"
 
         @packer = OpenStax::Aws::PackerFactory.new_packer(
@@ -30,9 +33,11 @@ module OpenStax
         @packer.var("region", region)
         @packer.var("ami_name", ami_name)
         @packer.var("sha", sha)
+        @packer.var("deployment_sha", deployment_sha)
         @packer.var("playbook_file", playbook_absolute_file_path)
         @packer.var("ami_description", {
           sha: sha,
+          deployment_sha: deployment_sha,
           github_org: github_org,
           repo: repo
         }.to_json)

data/lib/openstax/aws/git_helper.rb

@@ -3,7 +3,6 @@ require 'open-uri'
 
 module OpenStax::Aws
   module GitHelper
-
     def self.sha_for_branch_name(org_slash_repo:, branch:)
       ::Git.ls_remote("https://github.com/#{org_slash_repo}")["branches"][branch][:sha]
     end
@@ -23,5 +22,9 @@ module OpenStax::Aws
         end
       end
     end
+
+    def self.current_sha
+      ::Git.revparse('HEAD')
+    end
   end
 end

data/lib/openstax/aws/image.rb

@@ -25,9 +25,12 @@ module OpenStax::Aws
       get_tag(key: "sha")
     end
 
-    def self.find_by_sha(sha:, region:)
+    def self.find_by_sha(sha:, region:, deployment_sha: nil)
+      filters = [{name: "tag:sha", values: [sha]}]
+      filters << {name: "tag:deployment_sha", values: [deployment_sha]} unless deployment_sha.nil?
+
       Aws::EC2::Client.new(region: region).describe_images({
-        owners: ['self'], filters: [{name: "tag:sha", values: [sha]}]
+        owners: ['self'], filters: filters
       }).images.map{|aws_image| new(aws_image: aws_image)}
     end
   end

data/lib/openstax/aws/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Aws
-    VERSION = "1.5.0"
+    VERSION = "1.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_aws
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling