stemcell 0.13.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 440002a8d4c58fd1329664656e61589e6d174e7330acfa73af957e8d2e690d7c
-  data.tar.gz: 88a3fe213bfc823772d72296a130b37fca10032c8519597277d377e1abdfd798
+  metadata.gz: 16a5cbb7dcb7e4495352b0749f424e36c389a5eccfddbd40c5b41100431fb6c1
+  data.tar.gz: 1c6565c633be486655ada6443337fed2646a0fcff58108079a39fecded3fdb37
 SHA512:
-  metadata.gz: 80f1c8e2e9f3fee310ff779dfcb9b1b4e7118ed27da2045441747b0783060fb9dc39022a6c23740167f76c9d4655999015a6858d68cdc2c906c73bfb2af99d4e
-  data.tar.gz: 07ba99d048effdccd90f9a1185449e13e9829cb047d2c16c027c91834accd2610b053b460bc0f5eba8983ca49312a3238d817d9d5946cd81bd57ff4ce021f4b3
+  metadata.gz: 9769d64cb8c025d299b2d4dbc61881e6488a4fc7fcb7a9b165328ecfaa72528a411de8bda6e96fcf75a07029aa6e0d41e2a66f59f2f45d7b58d94390fde8422d
+  data.tar.gz: b70659ae2ba80a91dc1094dd479c1aefee7650aa0fa418315adcf2496fdadf9dd7bfca0de152098e5479c3629b0c0d3de1845905f974ebb251d0528993199fe4

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-# 0.13.1
+# 0.15.0
+- Upgrade Chef to 18 and Nokogiri to 1.16 for compatibility with newer Ruby versions
+
+# 0.14.0
+- Adds support for specifying a custom bootstrap template file
+
+# 0.13.2
 - Support for specifying --min-count and --max-count
 
 # 0.13.1

data/Gemfile

@@ -9,4 +9,4 @@ group :test do
   gem 'rake', '~> 10.3.2'
 end
 
-gem 'nokogiri', '~> 1.8.2'
+gem 'nokogiri', '~> 1.16.0'

data/lib/stemcell/launcher.rb

@@ -83,6 +83,7 @@ module Stemcell
       @aws_secret_key = opts['aws_secret_key']
       @aws_session_token = opts['aws_session_token']
       @max_attempts = opts['max_attempts'] || 3
+      @bootstrap_template_path = opts['bootstrap_template_path']
       configure_aws_creds_and_region
     end
 
@@ -257,7 +258,7 @@ module Stemcell
 
     # this is made public for ec2admin usage
     def render_template(opts={})
-      template_file_path = File.expand_path(TEMPLATE_PATH, __FILE__)
+      template_file_path = @bootstrap_template_path || File.expand_path(TEMPLATE_PATH, __FILE__)
       template_file = File.read(template_file_path)
       erb_template = ERB.new(template_file)
       last_bootstrap_line = LAST_BOOTSTRAP_LINE

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.13.2"
+  VERSION = "0.15.0"
 end

data/spec/lib/stemcell/launcher_spec.rb

@@ -23,6 +23,51 @@ describe Stemcell::Launcher do
   end
   let(:instance_ids) { instances.map(&:id) }
 
+  describe '#render_template' do
+
+    context 'when bootstrap_template_path is not provided' do
+      let(:subject) do
+        launcher.render_template()
+      end
+
+      before do
+        allow(File).to receive(:expand_path).and_return('/path/to/default/bootstrap.sh.erb')
+        allow(File).to receive(:read).and_return('default template content')
+      end
+
+      it 'launches the default template' do
+        expect(File).to receive(:expand_path)
+        expect(File).to receive(:read).with('/path/to/default/bootstrap.sh.erb')
+
+        expect(subject).not_to be_empty
+      end
+    end
+
+    context 'when bootstrap_template_path is provided' do
+      let(:subject) do
+        launcher.render_template()
+      end
+
+      let(:launcher) do
+        opts = {'region' => 'region', 'vpc_id' => 'vpc-1', 'bootstrap_template_path' => '/path/to/file.sh.erb'}
+        launcher = Stemcell::Launcher.new(opts)
+
+        launcher
+      end
+
+      before do
+        allow(File).to receive(:read).and_return('custom template content')
+      end
+
+      it 'launches the override template' do
+        expect(File).not_to receive(:expand_path)
+        expect(File).to receive(:read).with('/path/to/file.sh.erb')
+
+        expect(subject).not_to be_empty
+      end
+    end
+  end
+
   describe '#launch' do
     let(:ec2) do
       ec2 = Aws::EC2::Client.new

data/spec/lib/stemcell/metadata_source/chef_repository_spec.rb

@@ -116,7 +116,7 @@ describe Stemcell::MetadataSource::ChefRepository do
         let(:role) { 'unit-simple-none' }
         let(:cookbook_attributes) { ['unknown::attr'] }
         it "raises an error" do
-          expect { result_metadata }.to raise_error(Chef::Exceptions::CookbookNotFound)
+          expect { result_metadata }.to raise_error(Chef::Exceptions::CookbookNotFoundInRepo)
         end
       end
 

data/stemcell.gemspec

@@ -18,25 +18,22 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # pins several aws sdk transitive dependencies to maintain compatibility with Ruby < 2.3
+  s.add_runtime_dependency 'aws-sdk-core',    '~> 3.130.2'
   s.add_runtime_dependency 'aws-eventstream', '~> 1.1.1'
   s.add_runtime_dependency 'aws-sdk-ec2',     '~> 1'
   s.add_runtime_dependency 'aws-sigv4',       '~> 1.2.4'
-  s.add_runtime_dependency 'net-ssh',         '~> 2.9'
+  s.add_runtime_dependency 'net-ssh',         '~> 7.1'
   if RUBY_VERSION >= '2.0'
     s.add_runtime_dependency 'chef',     '>= 11.4.0'
   else
-    s.add_runtime_dependency 'chef',     ['>= 11.4.0', '< 12.0.0']
+    s.add_runtime_dependency 'chef',     ['>= 11.4.0', '< 19.0.0']
   end
 
-  # this is a transitive dependency, but the latest vesion has a late ruby
-  # version dependency. lets explicitly include it here. if this becomes
-  # no-longer a dependency of chef via chef-zero, then remove it
-  s.add_runtime_dependency 'rack', '< 2.0.0'
-  s.add_runtime_dependency 'nokogiri', '~> 1.8.2'
+  s.add_runtime_dependency 'nokogiri', '~> 1.16.0'
   s.add_runtime_dependency 'ffi-yajl', '< 2.3.1'
 
   s.add_runtime_dependency 'trollop',    '~> 2.1'
   s.add_runtime_dependency 'aws-creds',  '~> 0.2.3'
   s.add_runtime_dependency 'colored',    '~> 1.2'
-  s.add_runtime_dependency 'json',       '~> 1.8.2'
+  s.add_runtime_dependency 'json',       '>= 1.8.2'
 end

metadata

@@ -1,18 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Martin Rhoads
 - Igor Serebryany
 - Nelson Gauthier
 - Patrick Viet
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.130.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.130.2
 - !ruby/object:Gem::Dependency
   name: aws-eventstream
   requirement: !ruby/object:Gem::Requirement
@@ -61,14 +75,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -83,34 +97,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 11.4.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
@@ -171,14 +171,14 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
 description: A tool for launching and bootstrapping EC2 instances
@@ -252,7 +252,7 @@ homepage: https://github.com/airbnb/stemcell
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -267,8 +267,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: no summary
 test_files: