stemcell 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e65ab6388e741e11ab2f46af451098bd7fe70cb847f3ea8f1b9b9d229c860c2c
-  data.tar.gz: 568f4aecc9c7518ed156355035b39843b04d006bec7876438d707e097e071d30
+  metadata.gz: 941a58d82b39ad807a558b7d569ffee7f28ad7477f5dbc1cb61c11e8daab9ff4
+  data.tar.gz: 3736e5f1586336821de1d74b249dd64b65b68042de443600cae166a61d054e82
 SHA512:
-  metadata.gz: 53d4581e807c8c1373189437a5e0afb42e0dc00c62b3b2b18797a31ae72d483ac066af02c455cfc3fc9a98dcc5452f433bfef618b8f8e56643f5748cff22ce12
-  data.tar.gz: 431fe9ee22ac0f42ff40227f1ce39e74a88af53af1fb4dc571cace78d167e346d125a2615d35799060853767801412a8c8d4ba35603d269ebc1b5232ec4bbda5
+  metadata.gz: ce9ebf93cd89e275e7bcf01cce447936b99686aad8a0fc82ca5ee3982009b508f5ffa7faa0e3b65cb2c310d06fc991a8268262652bd4b083bc53e924e1eded36
+  data.tar.gz: a976b2c11ffb37d4703cf8d5424e3110a01653b6dde3ddcfb6c6879845cbbab6580c5c1c5cca6029ca43fadfe50fe4e64f740fbe4ccadfa38f406c10e58f77ec

data/.travis.yml

@@ -5,5 +5,6 @@ rvm:
   - 2.1.2
   - 2.2.4
   - 2.3.1
+  - 2.6.8
 before_install:
   - gem install bundler -v 1.16.3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 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
+- Support for specifying --cpu-options
+
 # 0.13.0
 - Migrate to AWS SDK to v3
 - Drop support for ClassicLink

data/lib/stemcell/command_line.rb

@@ -132,6 +132,7 @@ module Stemcell
       # comma-separated list when presented as defaults.
       pd['security_groups'] &&= pd['security_groups'].join(',')
       pd['tags'] &&= pd['tags'].to_a.map { |p| p.join('=') }.join(',')
+      pd['cpu_options'] &&= pd['cpu_options'].to_a.map { |p| p.join('=') }.join(',')
       pd['chef_cookbook_attributes'] &&= pd['chef_cookbook_attributes'].join(',')
     end
 

data/lib/stemcell/launcher.rb

@@ -31,6 +31,7 @@ module Stemcell
       'chef_environment',
       'chef_data_bag_secret',
       'chef_data_bag_secret_path',
+      'cpu_options',
       'git_branch',
       'git_key',
       'git_origin',
@@ -46,6 +47,8 @@ module Stemcell
       'dedicated_tenancy',
       'associate_public_ip_address',
       'count',
+      'min_count',
+      'max_count',
       'security_groups',
       'security_group_ids',
       'tags',
@@ -80,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
 
@@ -101,16 +105,19 @@ module Stemcell
       tags['Name'] = opts['chef_role'] if opts['chef_environment'] == 'production'
       tags.merge!(opts['tags']) if opts['tags']
 
+      #  Min/max number of instances to launch
+      min_count = opts['min_count'] || opts['count']
+      max_count = opts['max_count'] || opts['count']
+
       # generate launch options
       launch_options = {
         :image_id => opts['image_id'],
         :instance_type => opts['instance_type'],
         :key_name => opts['key_name'],
-        :min_count => opts['count'],
-        :max_count => opts['count'],
+        :min_count => min_count,
+        :max_count => max_count,
       }
 
-
       # Associate Public IP can only bet set on network_interfaces, and if present
       # security groups and subnet should be set on the interface. VPC-only.
       # Primary network interface
@@ -178,6 +185,11 @@ module Stemcell
         launch_options[:block_device_mappings] = opts['block_device_mappings']
       end
 
+      # specify cpu options (optional)
+      if opts['cpu_options']
+        launch_options[:cpu_options] = opts['cpu_options']
+      end
+
       # specify ephemeral block device mappings (optional)
       if opts['ephemeral_devices']
         launch_options[:block_device_mappings] ||= []
@@ -246,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/option_parser.rb

@@ -187,6 +187,12 @@ module Stemcell
         :type  => String,
         :env   => 'CHEF_DATA_BAG_SECRET_PATH'
       },
+      {
+        :name => 'cpu_options',
+        :desc => "comma-separated list of cpu option key=value pairs",
+        :type => String,
+        :env => 'CPU_OPTIONS'
+      },
       {
         :name => 'chef_role',
         :desc => "chef role of instance to be launched",
@@ -253,6 +259,18 @@ module Stemcell
         :type  => Integer,
         :env   => 'COUNT'
       },
+      {
+        :name  => 'min_count',
+        :desc  => "minimum number of instances to launch",
+        :type  => Integer,
+        :env   => 'MIN_COUNT'
+      },
+      {
+        :name  => 'max_count',
+        :desc  => "maximum number of instances to launch",
+        :type  => Integer,
+        :env   => 'MAX_COUNT'
+      },
       {
         :name  => 'tail',
         :desc  => "interactively tail the initial converge",
@@ -345,6 +363,16 @@ module Stemcell
         options['tags'] = tags
       end
 
+      # convert cpu_options from comma separated string to ruby hash
+      if options['cpu_options']
+        cpu_options = {}
+        options['cpu_options'].split(',').each do |cpu_opt|
+          key, value = cpu_opt.split('=')
+          cpu_options[key] = value
+        end
+        options['cpu_options'] = cpu_options
+      end
+
       # parse block_device_mappings to convert it from the standard CLI format
       # to the EC2 Ruby API format.
       # All of this is a bit hard to find so here are some docs links to

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.13.0"
+  VERSION = "0.14.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
@@ -71,7 +116,8 @@ describe Stemcell::Launcher do
         'count'                   => 2,
         'security_groups'         => ['sg_name1', 'sg_name2'],
         'user'                    => 'some_user',
-        'wait'                    => true
+        'wait'                    => true,
+        'cpu_options'             => 'core_count=1,threads_per_core=1'
       }
     }
 
@@ -107,11 +153,25 @@ describe Stemcell::Launcher do
                 { :key => "stemcell",   :value => Stemcell::VERSION },
               ]},
           ],
-          :user_data          => Base64.encode64('template')
+          :user_data          => Base64.encode64('template'),
+          :cpu_options        => 'core_count=1,threads_per_core=1'
         )).and_return(instances)
       launched_instances = launcher.send(:launch, launch_options)
       expect(launched_instances.map(&:public_ip_address)).to all(be_truthy)
     end
+
+    it 'launches with min/max count' do
+      expect(launcher).to receive(:do_launch).with(a_hash_including(
+        :min_count => 3,
+        :max_count => 6,
+      )).and_return(instances)
+      options = launch_options.merge(
+        'min_count' => 3,
+        'max_count' => 6,
+      )
+      launched_instances = launcher.send(:launch,
+        launch_options.merge('min_count' => 3, 'max_count' => 6))
+    end
   end
 
   describe '#kill' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Martin Rhoads
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-eventstream
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: no summary