sfn-serverspec 0.1.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d3b72ce916426b2f61d0bd4320710a4d6da2641
-  data.tar.gz: 4925870d5dfa43ad2efa6ac166b44e2eb48289b4
+  metadata.gz: ccd4bbd9aa84c7c01f81362705ca87427f0f58c4
+  data.tar.gz: af2e752a8837ae830052777437c1629bf991bc83
 SHA512:
-  metadata.gz: 0dff77605a821496db4cef14cf91f5f6d044092fb13b95041b52c35b9ea7006458558366e86b9054df752671adc5cc90170cb8511d43372696f3c44626c10a4d
-  data.tar.gz: 6c0264e4022cb4afb548ac84693832bb0d6cd726f58a78396d690497ab0a05bb71b95c59b9f13e32344ad6c7ce3ea29d19a8061bdc7d051b867078af3da14e7f
+  metadata.gz: 5ef3581092910aeaf2bb8950eaf57decd5f1c3d198a0a2929aa53be89fe93c8daa1bb77d1cac29f8b442385a6eeef7be2621c33e3d6eca93e03f25c1d52c0c25
+  data.tar.gz: 3865714053ff9d2218468113107ced84bbb044e64a43b586743160b159e06a215b1e8d94d74451ccf8c7f9596b03f4f1597519a67ba1ce61b22fc2ff62bc4e2f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v1.0.0
+* Added support for validating compute resources in nested stacks (#5)
+* Added alias for `after_update` callback (#6)
+* Breaking: updated `sfn` dependency to >= 3.0, < 4.0 (#7)
+
 # v0.1.4
 * Relax sfn constraint to allow 2.0 versions
 

data/README.md

@@ -11,6 +11,7 @@ Callbacks are configured via the `.sfn` configuration file. First, the callback
 ```ruby
 Configuration.new do
   callbacks do
+    # requiring sfn-serverspec here is optional when using bundler
     require ['sfn-serverspec']
     default ['serverspec_validator']
   end
@@ -66,12 +67,16 @@ The following configuration options specified at the resource level will overrid
 
 ### On-demand validation
 
-Provided that you are using Bundler, this callback also adds a `serverspec` command to sfn, enabling on-demand validation of a running stack. You'll want to configure sfn-serverspec thusly:
+Provided that you are using Bundler, this callback also adds a `serverspec` command to sfn, enabling on-demand validation of a running stack. You'll want to add sfn-serverspec to your Gemfile thusly:
 
 ```ruby
-gem 'sfn-serverspec', :require => 'sfn-serverspec'
+group :sfn do
+  gem 'sfn-serverspec'
+end
 ```
 
+Note that placing sfn and its friends in the `:sfn` group ensures that they'll be automatically `require`-d by sfn at run time.
+
 The `serverspec` command requires both a stack name and a template to use as the source of Serverspec configuration. The template may be provided via command line flag or interactive file path prompt:
 
 ```

data/lib/sfn-serverspec/validator.rb

@@ -44,94 +44,105 @@ module Sfn
             config.fetch(:sfn_serverspec, :ssh_key_passphrase, nil)
           )
 
-          instances = expand_compute_resource(args.first[:api_stack], resource)
-
-          instances.each do |instance|
-            target_host = case ssh_proxy_command.nil?
-                          when true
-                            instance.addresses_public.first.address
-                          when false
-                            instance.addresses_private.first.address
-                          end
-
-            begin
-              rspec_config = RSpec.configuration
-              rspec_config.reset
-              rspec_config.reset_filters
-              RSpec.world.reset
-
-              rspec_formatter = RSpec::Core::Formatters::DocumentationFormatter.new(
-                rspec_config.output_stream
-              )
-
-              rspec_reporter = RSpec::Core::Reporter.new(rspec_config)
-
-              rspec_config.instance_variable_set(:@reporter, rspec_reporter)
-              rspec_loader = rspec_config.send(:formatter_loader)
-              rspec_notifications = rspec_loader.send(
-                :notifications_for,
-                RSpec::Core::Formatters::DocumentationFormatter
-              )
-              rspec_reporter.register_listener(
-                rspec_formatter,
-                *rspec_notifications
-              )
-
-              global_specs = [
-                config.fetch(:sfn_serverspec, :global_spec_patterns, [])
-              ].flatten.compact
-
-              resource_specs = [
-                resource_config.fetch(:spec_patterns, [])
-              ].flatten.compact
-
-              spec_patterns = global_specs + resource_specs
-
-              ui.debug "spec loading patterns: #{spec_patterns.inspect}"
-              ui.debug "using SSH proxy commmand #{ssh_proxy_command}" unless ssh_proxy_command.nil?
-              ui.info "Serverspec validating #{instance.id} (#{target_host})"
-
-              Specinfra.configuration.backend :ssh
-              Specinfra.configuration.request_pty true
-              Specinfra.configuration.host target_host
-
-              connection_options = {
-                user: resource_config.fetch(
-                  :ssh_user,
-                  config.fetch(:sfn_serverspec, :ssh_user, 'ec2-user')
-                ),
-                port: resource_config.fetch(
-                  :ssh_port,
-                  config.fetch(:sfn_serverspec, :ssh_port, 22)
+          target_stack = args.first[:api_stack]
+          nested_stacks = target_stack.nested_stacks
+
+          stacks = nested_stacks.empty? ? [target_stack] : nested_stacks
+
+          ui.debug "Expanded #{target_stack} to #{stacks.map(&:inspect).join(', ')}"
+
+          stacks.each do |s|
+            instances = expand_compute_resource(s, resource)
+
+            instances.each do |instance|
+              target_host = case ssh_proxy_command.nil?
+                            when true
+                              instance.addresses_public.first.address
+                            when false
+                              instance.addresses_private.first.address
+                            end
+
+              begin
+                rspec_config = RSpec.configuration
+                rspec_config.reset
+                rspec_config.reset_filters
+                RSpec.world.reset
+
+                rspec_formatter = RSpec::Core::Formatters::DocumentationFormatter.new(
+                  rspec_config.output_stream
                 )
-              }
 
-              unless ssh_proxy_command.nil?
-                connection_options[:proxy] = Net::SSH::Proxy::Command.new(ssh_proxy_command)
-                ui.debug "using ssh proxy command: #{ssh_proxy_command}"
-              end
+                rspec_reporter = RSpec::Core::Reporter.new(rspec_config)
 
-              unless ssh_key_paths.empty?
-                connection_options[:keys] = ssh_key_paths
-                ui.debug "using ssh key paths #{connection_options[:keys]} exclusively"
-              end
+                rspec_config.instance_variable_set(:@reporter, rspec_reporter)
+                rspec_loader = rspec_config.send(:formatter_loader)
+                rspec_notifications = rspec_loader.send(
+                  :notifications_for,
+                  RSpec::Core::Formatters::DocumentationFormatter
+                )
+                rspec_reporter.register_listener(
+                  rspec_formatter,
+                  *rspec_notifications
+                )
 
-              unless ssh_key_passphrase.nil?
-                connection_options[:passphrase] = ssh_key_passphrase
-              end
+                global_specs = [
+                  config.fetch(:sfn_serverspec, :global_spec_patterns, [])
+                ].flatten.compact
+
+                resource_specs = [
+                  resource_config.fetch(:spec_patterns, [])
+                ].flatten.compact
 
-              Specinfra.configuration.ssh_options connection_options
+                spec_patterns = global_specs + resource_specs
 
-              RSpec::Core::Runner.run(spec_patterns.map { |p| Dir.glob(p) })
+                ui.debug "spec loading patterns: #{spec_patterns.inspect}"
+                ui.debug "using SSH proxy commmand #{ssh_proxy_command}" unless ssh_proxy_command.nil?
+                ui.info "Serverspec validating #{instance.id} (#{target_host})"
 
-            rescue => e
-              ui.error "Something unexpected happened when running rspec: #{e.inspect}"
+                Specinfra.configuration.backend :ssh
+                Specinfra::Backend::Ssh.clear
+                Specinfra.configuration.request_pty true
+                Specinfra.configuration.host target_host
+
+                connection_options = {
+                  user: resource_config.fetch(
+                    :ssh_user,
+                    config.fetch(:sfn_serverspec, :ssh_user, 'ec2-user')
+                  ),
+                  port: resource_config.fetch(
+                    :ssh_port,
+                    config.fetch(:sfn_serverspec, :ssh_port, 22)
+                  )
+                }
+
+                unless ssh_proxy_command.nil?
+                  connection_options[:proxy] = Net::SSH::Proxy::Command.new(ssh_proxy_command)
+                  ui.debug "using ssh proxy command: #{ssh_proxy_command}"
+                end
+
+                unless ssh_key_paths.empty?
+                  connection_options[:keys] = ssh_key_paths
+                  ui.debug "using ssh key paths #{connection_options[:keys]} exclusively"
+                end
+
+                unless ssh_key_passphrase.nil?
+                  connection_options[:passphrase] = ssh_key_passphrase
+                end
+
+                Specinfra.configuration.ssh_options connection_options
+
+                RSpec::Core::Runner.run(spec_patterns.map { |p| Dir.glob(p) })
+
+              rescue => e
+                ui.error "Something unexpected happened when running rspec: #{e.inspect}"
+              end
             end
           end
         end
       end
 
       alias_method :after_serverspec, :after_create
+      alias_method :after_update, :after_create
 
       COMPUTE_RESOURCE_TYPES = ['AWS::EC2::Instance', 'AWS::AutoScaling::AutoScalingGroup']
 
@@ -149,6 +160,10 @@ module Sfn
         end
       end
 
+      def quiet
+        true unless config[:debug]
+      end
+
       private
 
       # look up stack resource by name, return array of expanded compute instances
@@ -161,6 +176,8 @@ module Sfn
           resource.logical_id == name
         end
 
+        return [] if compute_resource.nil?
+
         if compute_resource.within?(:compute, :servers)
           [compute_resource.expand]
         else

data/lib/sfn-serverspec/version.rb

@@ -1,5 +1,5 @@
 # SfnServerspec internal constants
 module SfnServerspec
   # Current version
-  VERSION = Gem::Version.new('0.1.4')
+  VERSION = Gem::Version.new('1.0.0')
 end

data/sfn-serverspec.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = 'Executes Serverspec assertions against stack compute resources'
   s.license = 'Apache-2.0'
   s.require_path = 'lib'
-  s.add_runtime_dependency 'sfn', '>= 1.0', '< 3.0'
+  s.add_runtime_dependency 'sfn', '>= 3.0', '< 4.0'
   s.add_runtime_dependency 'serverspec', '~> 2.24'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rubocop', '~> 0.35.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn-serverspec
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Heavy Water Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfn
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement