openstax_aws 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bb7df27bc9eb147fc4dccf7969fbcfaab379a615adcb2e6a255bc1951f72ca
-  data.tar.gz: dfa73e4d1aa3b1973678aa4fbcff0588e6990ec59a74b1ffad4758820b08600c
+  metadata.gz: 75f65f32cd2e572d1e83f624977186c7aee220c6d51924333fa08af2255543ad
+  data.tar.gz: bf3969a29e8fb4ff94b54bbd9685581cdff28f9c160f3ebe0fa26b92f4875575
 SHA512:
-  metadata.gz: 27c7c692f885a25aed594990cd52478754a53a87b3f5c473e8815777070c809b8cead54937c9dfbb6f9f0d629c3169916e17b747ca92db1e3a9b300d6e3db0dd
-  data.tar.gz: 40a6e67cd196f2870d9f8c54873641719c7c799ddf7778665c730558de93eef2758ca940a667110a07aa189f755787940596e7865eeb778ec6b83ec4be109cc2
+  metadata.gz: 76287d75f76a51cbeb635e6013f5e896174537fcba6352f5febba64c562c3cb857f82aa2a03f71af9583c5db3e8527bf0298e4e2759db9ac658b7a13c0fa6c14
+  data.tar.gz: f86924695c16ce1b3729e9a405e36603761477aa4c7af798ea50bd5faeffcaf18d3caca056db5f8d72127c8bf9c7edfd464d46a7e109f8597d1437ecffb2788f

data/.github/workflows/tests.yml

@@ -4,9 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - main
-  schedule:
-    - cron: '0 0 * * 0' # weekly
+      - master
 
 jobs:
   tests:
@@ -17,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 2.6
       - uses: actions/cache@v2
         with:
           path: vendor/bundle
@@ -30,4 +28,4 @@ jobs:
           bundle config path vendor/bundle
           bundle config jobs 2
           bundle install
-          bundle exec rake
+          bundle exec rspec

data/lib/openstax/aws/deployment_base.rb

@@ -260,6 +260,32 @@ module OpenStax::Aws
       nil # can be overridden by the DSL
     end
 
+    def failed_statuses_table
+      rows = []
+
+      stacks.each do |stack|
+        stack.status(reload: false).failed_events_since_last_user_event.each do |event|
+          rows.push([stack.name, event.status_text, event.status_reason])
+        end if stack.status.failed?
+      end
+
+      column_widths = [
+        2 + rows.reduce(0) { |result, rowdata| [result, rowdata[0].length].max },
+        2 + rows.reduce(0) { |result, rowdata| [result, rowdata[1].length].max },
+        0
+      ]
+
+      output = []
+
+      output.push(["Stack", "Status", "Reason"].each_with_index.map { |header, index| header.ljust(column_widths[index]) }.join(''))
+
+      rows.each { |rowdata|
+        output.push(rowdata.each_with_index.map { |value, index| value.ljust(column_widths[index]) }.join(''))
+      }
+
+      output.join("\n")
+    end
+
     protected
 
     def parameter_default(parameter_name)
@@ -360,13 +386,24 @@ module OpenStax::Aws
       get_image_tag(image_id: image_id, key: "sha")
     end
 
-    protected
-
     def secrets_namespace(id: 'default')
       raise "Override this method in your deployment class and provide a namespace " \
             "for secrets data in the AWS Parameter Store.  The key there will be this namespace " \
             "prefixed by the environment name and suffixed with the secret name."
     end
 
+    def log_and_exit_if_failed_status
+      begin
+        yield
+      rescue
+        if status.failed?
+          logger.fatal("The following errors have occurred: \n#{failed_statuses_table}")
+          exit(1)
+        else
+          raise
+        end
+      end
+    end
+
   end
 end

data/lib/openstax/aws/distribution.rb

@@ -34,7 +34,8 @@ module OpenStax::Aws
       begin
         Aws::CloudFront::Waiters::InvalidationCompleted.new(
           client: client,
-          before_attempt: ->(*) { wait_message.say_it }
+          before_attempt: ->(*) { wait_message.say_it },
+          max_attempts: 60
         ).wait(
           distribution_id: id,
           id: invalidation_id

data/lib/openstax/aws/git_helper.rb

@@ -11,7 +11,7 @@ module OpenStax::Aws
     def self.file_content_at_sha(org_slash_repo:, sha:, path:, github_token: nil )
       if github_token.blank?
         location = "https://raw.githubusercontent.com/#{org_slash_repo}/#{sha}/#{path}"
-        file = open(location)
+        file = URI.open(location)
         file.read
       else
         uri = URI("https://raw.githubusercontent.com/#{org_slash_repo}/#{sha}/#{path}")

data/lib/openstax/aws/packer_1_4_1.rb

@@ -41,54 +41,80 @@ module OpenStax::Aws
       cmd = "PACKER_LOG=1 #{cmd}" if @verbose
       cmd = "#{cmd} --debug" if @debug
 
-      cmd = "#{cmd} #{@absolute_file_path}"
+      cmd
     end
 
     def run
       @logger.info("**** DRY RUN ****") if @dry_run
-      @logger.info("Running: #{command}")
+      @logger.info("Running: #{command} #{@absolute_file_path}")
 
       if !@dry_run
         @logger.info("Printing stderr for desired verbosity")
-        ami = ""
 
-        Open3.popen2e(command) do |stdin, stdout_err, wait_thr|
-          begin
-            previous_interrupt_handler = Signal.trap 'INT' do
-              # Interrupt Packer
-              Process.kill 'INT', wait_thr.pid
+        tmpdir = nil
 
-              # Restore previous interrupt handler so we don't interrupt Packer again
-              Signal.trap 'INT', previous_interrupt_handler
+        begin
+          config_path = @absolute_file_path
 
-              # Disable other code that restores previous interrupt
-              previous_interrupt_handler = nil
+          # Can't handle modifying HCL2 templates yet
+          if config_path.ends_with?('.json')
+            config = JSON.parse(File.read(config_path))
+            config['post-processors'] ||= []
+            manifest_config = (config['post-processors']).find do |processor|
+              processor['type'] == 'manifest'
             end
 
-            stdout_err.sync = true
+            # Configure a manifest post-processor if not already configured
+            if manifest_config.nil?
+              tmpdir = Dir.mktmpdir
 
-            line = ''
+              manifest_config = { 'type' => 'manifest', 'output' => "#{tmpdir}/manifest.json" }
 
-            while char = stdout_err.getc do
-              line << char
-              STDERR.print char
+              config['post-processors'] << manifest_config
 
-              next unless char == "\n"
+              config_path = "#{tmpdir}/packer.json"
 
-              matchami = line.match(/AMI: (ami-[0-9\-a-z]*)/i)
-              ami = matchami.captures[0] if matchami
-
-              line = ''
+              File.write(config_path, JSON.dump(config))
             end
-          ensure
-            # Restore previous interrupt unless we did so already
-            Signal.trap 'INT', previous_interrupt_handler unless previous_interrupt_handler.nil?
           end
 
-          puts ami
+          Open3.popen2e("#{command} #{config_path}") do |stdin, stdout_err, wait_thr|
+            begin
+              previous_interrupt_handler = Signal.trap 'INT' do
+                # Interrupt Packer
+                Process.kill 'INT', wait_thr.pid
+
+                # Restore previous interrupt handler so we don't interrupt Packer again
+                Signal.trap 'INT', previous_interrupt_handler
+
+                # Disable other code that restores previous interrupt
+                previous_interrupt_handler = nil
+              end
+
+              stdout_err.sync = true
+
+              # Send all packer output to STDERR
+              while char = stdout_err.getc do
+                STDERR.print char
+              end
+            ensure
+              # Restore previous interrupt unless we did so already
+              Signal.trap 'INT', previous_interrupt_handler unless previous_interrupt_handler.nil?
+            end
+
+            # Read the AMI ID from the manifest file and output it to STDOUT
+            unless manifest_config.nil?
+              manifest = File.read(manifest_config['output']) rescue nil
 
-          # Return Packer's exit status wrapped in a Process::Status object
-          wait_thr.value
+              puts JSON.parse(manifest)['builds'].last['artifact_id'].split(':', 2).last \
+                unless manifest.nil?
+            end
+
+            # Return Packer's exit status wrapped in a Process::Status object
+            wait_thr.value
+          end
+        ensure
+          FileUtils.remove_entry(tmpdir) unless tmpdir.nil?
         end
       end
     end

data/lib/openstax/aws/sam_stack.rb

@@ -32,9 +32,12 @@ module OpenStax::Aws
             dry_run: dry_run)
     end
 
-    def build
+    def build(debug: false, env_vars: {})
       # SAM doesn't have an API or SDK - we have to make calls to its CLI
+      env_vars_prefix = env_vars.map { |variable, value| "#{variable}=#{value}" }.join(' ')
       command = "sam build -t #{absolute_template_path} -b #{build_directory}"
+      command += ' --debug' if debug
+      command = "#{env_vars_prefix} #{command}" if env_vars_prefix.present?
       System.call(command, logger: logger, dry_run: dry_run)
     end
 
@@ -50,7 +53,8 @@ module OpenStax::Aws
                 " --capabilities CAPABILITY_IAM" \
                 " --s3-bucket #{bucket_name}" \
                 " --s3-prefix #{name}" \
-                " --stack-name #{name}"
+                " --stack-name #{name}" \
+                " --region #{region}"
 
       if params.any?
         command += " --parameter-overrides #{self.class.format_hash_as_cli_stack_parameters(params)}"

data/lib/openstax/aws/template.rb

@@ -100,7 +100,7 @@ module OpenStax::Aws
     end
 
     def is_sam?
-      body.match(/Transform: AWS::Serverless/).present?
+      body.match(/Transform: .?AWS::Serverless/).present?
     end
 
   protected

data/lib/openstax/aws/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Aws
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_aws
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - JP Slavinsky
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
@@ -327,7 +327,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -342,8 +342,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: openstax IaC
 test_files: []