openstax_aws 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a062d5bb4d0c5c73fd23b6ed4c1d1b36e18d24143e6a74c7a51e4e3c552048d
-  data.tar.gz: a7fcc57860108b12434d66f5e5ccc90e27494bf892a67a1f961aba942398ab8e
+  metadata.gz: eb329933135fb800a09d8883d181b3a44fa0ff97f58d79757c0710d35f30594c
+  data.tar.gz: ecf61c1aba906cfb3b7a848c42bffac57193864c138eaa84c8592c697be589c4
 SHA512:
-  metadata.gz: 3be0e6e5c49c30f40e98575d0957fad14e025c6297f7276bcc71b8f42f427b0b349ff47b1c60ca3089a1901be4f9643afe68275aa468bb04e2a1412f426d5b37
-  data.tar.gz: a369f3fb8b8a8f39165358cc24352b0a1b21c6af2fa1baf4bd4fc816877cf3ae8d2fa3e4bff67e49e7930ceb7e42e61942f31ee78c3e00bc92605fa3cb30dee8
+  metadata.gz: 903288c5e8e78ab5c94e660bbd8657ed9357002fb82a2cdc22f398284d3800daad6c478d669d4072e3c8f74d665aa0ed2fe27687c02e154e582b80fec4ffd97c
+  data.tar.gz: 75dae33c89bb17c0ebf211450551003158a85ee1228c877f17cad075f596fe5e82bb5562029ed2d746a4f9ea9cba9613d9e9f9cfbcd7e1ba466bc92178a6825a

data/.github/workflows/tests.yml

@@ -0,0 +1,33 @@
+name: Tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: '0 0 * * 0' # weekly
+
+jobs:
+  tests:
+    timeout-minutes: 10
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-pr-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-pr-
+      - name: Test
+        run: |
+          gem install bundler --force --no-document --version 2.1.4
+          bundle config path vendor/bundle
+          bundle config jobs 2
+          bundle install
+          bundle exec rake

data/CHANGELOG.md

@@ -6,16 +6,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.1.0] - 2020-10-20
-
-Fixed Packer debug mode by reading and printing each character from Packer instead of each line.
+## [1.2.0] - 2021-01-12
 
-Restricted AMI search to images owned by the same account to prevent a potential security flaw.
+- Added additional method to MskCluster resource, to return sorted list of bootstrap brokers
+- Replaced Travis with GH Actions
+- All secret types now default to SecureString, not just the RSA keys
+- Added CloudFormation ERB templates (cfn files that end in .yml.erb)
+- Gracefully handle interrupts while running Packer and return Packer's exit status from the call
 
-Gitignored Gemfile.lock.
+## [1.1.0] - 2020-10-20
 
-Removed development dependency on bundler 1.
+- Fixed Packer debug mode by reading and printing each character from Packer instead of each line.
+- Restricted AMI search to images owned by the same account to prevent a potential security flaw.
+- Gitignored Gemfile.lock.
+- Removed development dependency on bundler 1.
 
 ## [1.0.0] - 2020-10-03
 
-First official version.
+- First official version.

data/README.md

@@ -1,6 +1,6 @@
 # aws-ruby
 
-[![Build Status](https://travis-ci.org/openstax/aws-ruby.svg?branch=master)](https://travis-ci.org/openstax/aws-ruby)
+[![Tests](https://github.com/openstax/aws-ruby/workflows/Tests/badge.svg)](https://github.com/openstax/aws-ruby/actions?query=workflow:Tests)
 
 The `openstax_aws` gem helps you deploy your applications to AWS using CloudFormation.  It provides a layer on top of
 the AWS SDKs to help coordinate common deployment steps and configurations.

data/lib/openstax/aws/msk_cluster.rb

@@ -14,6 +14,10 @@ module OpenStax::Aws
       client.get_bootstrap_brokers(cluster_arn: cluster_arn).bootstrap_broker_string
     end
 
+    def sorted_bootstrap_broker_string
+      bootstrap_broker_string.split(',').sort.join(',')
+    end
+
   end
 end
 

data/lib/openstax/aws/packer_1_2_5.rb

@@ -55,7 +55,7 @@ module OpenStax::Aws
           stdout_err.sync = true
 
           while char = stdout_err.getc do
-            print char
+            STDERR.print char
           end
         end
       end

data/lib/openstax/aws/packer_1_4_1.rb

@@ -53,24 +53,43 @@ module OpenStax::Aws
         ami = ""
 
         Open3.popen2e(command) do |stdin, stdout_err, wait_thr|
-          stdout_err.sync = true
+          begin
+            previous_interrupt_handler = Signal.trap 'INT' do
+              # Interrupt Packer
+              Process.kill 'INT', wait_thr.pid
 
-          line = ''
+              # Restore previous interrupt handler so we don't interrupt Packer again
+              Signal.trap 'INT', previous_interrupt_handler
 
-          while char = stdout_err.getc do
-            line << char
-            print char
+              # Disable other code that restores previous interrupt
+              previous_interrupt_handler = nil
+            end
 
-            next unless char == "\n"
-
-            matchami = line.match(/AMI: (ami-[0-9\-a-z]*)/i)
-            ami = matchami.captures[0] if matchami
+            stdout_err.sync = true
 
             line = ''
+
+            while char = stdout_err.getc do
+              line << char
+              STDERR.print char
+
+              next unless char == "\n"
+
+              matchami = line.match(/AMI: (ami-[0-9\-a-z]*)/i)
+              ami = matchami.captures[0] if matchami
+
+              line = ''
+            end
+          ensure
+            # Restore previous interrupt unless we did so already
+            Signal.trap 'INT', previous_interrupt_handler unless previous_interrupt_handler.nil?
           end
-        end
 
-        puts ami
+          puts ami
+
+          # Return Packer's exit status wrapped in a Process::Status object
+          wait_thr.value
+        end
       end
     end
 

data/lib/openstax/aws/secrets.rb

@@ -146,7 +146,7 @@ module OpenStax::Aws
 
     def process_individual_spec_value(spec_value, substitutions)
       generated = false
-      type = "String"
+      type = "SecureString"
 
       value = case spec_value
       when /^random\(hex,(\d+)\)$/
@@ -158,7 +158,6 @@ module OpenStax::Aws
         num_characters = $1.to_i
         SecureRandom.urlsafe_base64(num_characters)[0..num_characters-1]
       when /^rsa\((\d+)\)$/
-        type = "SecureString"
         generated = true
         key_length = $1.to_i
         OpenSSL::PKey::RSA.new(key_length).to_s

data/lib/openstax/aws/stack_factory.rb

@@ -52,9 +52,13 @@ module OpenStax::Aws
         path = File.join(base_directory, "#{@id}.yml")
 
         if !File.file?(path)
-          path = File.join(base_directory, "#{@id}.json")
+          path = File.join(base_directory, "#{@id}.yml.erb")
+
           if !File.file?(path)
-            raise "Couldn't infer an existing template file for stack #{@id}"
+            path = File.join(base_directory, "#{@id}.json")
+            if !File.file?(path)
+              raise "Couldn't infer an existing template file for stack #{@id}"
+            end
           end
         end
       end

data/lib/openstax/aws/template.rb

@@ -26,8 +26,20 @@ module OpenStax::Aws
       File.basename(absolute_file_path)
     end
 
+    def extname
+      File.extname(absolute_file_path)
+    end
+
+    def erb?
+      extname == '.erb'
+    end
+
     def body
-      @body ||= File.read(absolute_file_path)
+      return @body unless @body.nil?
+
+      @body = File.read(absolute_file_path)
+      @body = ERB.new(@body).tap { |erb| erb.filename = absolute_file_path }.result if erb?
+      @body
     end
 
     def hash

data/lib/openstax/aws/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Aws
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_aws
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
@@ -273,8 +273,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -342,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: openstax IaC

data/.travis.yml

@@ -1,12 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.6
-cache: bundler
-bundler_args: --retry=6
-script:
-  - bundle exec rake
-notifications:
-  email: false
-before_install:
-  - gem install bundler