stemcell 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cbad56d6df2f65f6070e91f831c40a34c392ded
-  data.tar.gz: 0e69adf8fbf5f347a6883cee8a3b37290e7b639e
+  metadata.gz: a75498d7efc84297470587517941d2c008fb5e3c
+  data.tar.gz: 78e9281f72c7cd72c03da98aa0041bb1969ac7b9
 SHA512:
-  metadata.gz: cea1f891e2b9af4ef8566c694f9c0cd07b85cb77343f4ff68031a2e2c7efd42a145c92f0fe804bfdbedab901629c445f2f67dea37ef86dd53a366f22822ccf2b
-  data.tar.gz: 7772115e0831bf234abe3a6fb0b8621d10e1babf01e10851bf87f94448d96543a14463fb2509087703b68c005dea3b7d35afae9232921c27877d094c81366c83
+  metadata.gz: b0b8832be4df37d3599639f88bd093e1924e3ceada6bb0daec655276935fd3b63dd2d42e1df40404c5b867cc64bdacb50174231e85edef80d531c2cd5ee88dae
+  data.tar.gz: c4df4499b664495dc4d94b0ad9188562aa030b0025783f1040fae4a3a21db5908f5dbb660e0286dd11c0bf31f14ca70b419c3b3a7e10a5037eea0e37ce2abb51

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.11.0
+- allow user to specify `contexts` to override certain attributes
+
+# 0.10.1
+- check for nil classic link
+
+# 0.10.0
+- allow launching termination-protected instances
+- enable classic link
+
 # 0.9.1
 - Don't require aws keys for Stemcell::Launcher to allow for launching via iam role
 

data/lib/stemcell/metadata_launcher.rb

@@ -35,12 +35,14 @@ module Stemcell
     end
 
     def determine_options(role, environment, override_options)
+      contexts = override_options.delete('contexts').split(',') rescue []
       # Initially assume that empty roles are not allowed
       allow_empty = false
       begin
         return source.expand_role(
           role,
           environment,
+          contexts,
           override_options,
           :allow_empty_roles => allow_empty)
       rescue EmptyRoleError

data/lib/stemcell/metadata_source.rb

@@ -43,7 +43,7 @@ module Stemcell
       DEFAULT_OPTIONS.merge(config.default_options)
     end
 
-    def expand_role(role, environment, override_options={}, options={})
+    def expand_role(role, environment, contexts=[], override_options={}, options={})
       raise ArgumentError, "Missing chef role" unless role
       raise ArgumentError, "Missing chef environment" unless environment
       allow_empty_roles = options.fetch(:allow_empty_roles, false)
@@ -55,6 +55,16 @@ module Stemcell
 
       raise EmptyRoleError if !allow_empty_roles && role_empty
 
+      # Step 1.5: Override context specific values
+      if !role_empty
+        context_overrides = role_options['context_overrides'] || {}
+        contexts.each do |context|
+          overriding_hash = context_overrides[context]
+          role_options.merge!(overriding_hash) if overriding_hash
+        end
+        role_options.delete('context_overrides')
+      end
+
       # Step 2: Determine the backing store from available options.
 
       # This is determined distinctly from the merge sequence below because

data/lib/stemcell/option_parser.rb

@@ -260,6 +260,12 @@ module Stemcell
         :type  => nil,
         :env   => 'NON_INTERACTIVE',
         :short => :f
+      },
+      {
+        :name  => 'contexts',
+        :desc  => "comma-separated list of contexts to override certain values",
+        :type  => String,
+        :env   => "CONTEXTS",
       }
     ]
 

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

data/spec/lib/stemcell/metadata_source_spec.rb

@@ -64,6 +64,7 @@ describe Stemcell::MetadataSource do
     let(:backing_options)    { Hash.new }
     let(:availability_zones) { Hash.new }
     let(:role_metadata)      { Hash.new }
+    let(:override_contexts)  { Array.new }
     let(:override_options)   { Hash.new }
     let(:expand_options)     { Hash.new }
 
@@ -81,6 +82,7 @@ describe Stemcell::MetadataSource do
       metadata_source.expand_role(
         role,
         environment,
+        override_contexts,
         override_options,
         expand_options)
     end
@@ -209,6 +211,22 @@ describe Stemcell::MetadataSource do
           end
         end
 
+        context "when context overrides" do
+          before do
+            override_contexts << 'another_account'
+            role_metadata.merge!({'security_groups' => 'default_group'})
+            role_metadata.merge!({'context_overrides' => {'another_account' => {'security_groups' => 'another_group'}}})
+          end
+
+          it 'returns the overrode security groups' do
+            expect(expansion['security_groups']).to eql 'another_group'
+          end
+
+          it 'delete "context_overrides" key from Chef options' do
+            expect(expansion).not_to have_key('context_overrides')
+          end
+        end
+
       end
 
     end
@@ -247,4 +265,4 @@ describe Stemcell::MetadataSource do
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Martin Rhoads
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: no summary