kitchen-cloudformation 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82766a03521b8ae66cbd55c8595a99a6e6987251
-  data.tar.gz: 469a2c828e14cf0e2d594b9a9f952640fff54878
+  metadata.gz: 94bea117ffbcbabd80f54b512bd221a0529781a0
+  data.tar.gz: af087f7fbc4f8bc816eb0d3f82394013b0d562e1
 SHA512:
-  metadata.gz: 7e03b00da1ade35c0a48a8f20bc837684aba43551549ca24433e13e2530abb5ee5445b47bee1a03d7989fc7b7f041e38ca54b69c3a780b2dd081b5c757f2adbb
-  data.tar.gz: 2dfb3564d3325a4aaff8ce535ebcf17c7b7617ed446ca95f8175ec61e2a7767e47186c74077870d8e6a8eb88fa09b183f12e97dca4fdd4837a260a813ced0c90
+  metadata.gz: f4ef72422a0c8266ec5e12c2b20746777e59916ff47d6249b67150e1f3975ebcb9c5e155c6a1b2a3ed0c1d83155704c35fc245498b0da2c9f1ea1a5a0b5ede38
+  data.tar.gz: b3c478beab03e5a4de1f44252f704ad15240c5ada1d9f387ba4c0c8f2359e00223806a1f83d839d0e6994875dcf77ed0d3d0380071eda4089dfc91df4ea15c50

data/README.md

@@ -69,7 +69,6 @@ and it searches the following locations for a region:
    ENV['AWS_REGION']
 ```
 
-
 The first method attempted that works will be used.  IE, if you want to auth
 using the instance profile, you must not set any of the access key configs
 or environment variables, and you must not specify a `~/.aws/credentials`
@@ -88,7 +87,7 @@ as per https://github.com/aws/aws-sdk-core-ruby/issues/93 .
 To overcome this problem set the parameter `ssl_cert_file` or the environment variable `SSL_CERT_FILE`
 to a a SSL CA bundle.
 
-A file ca-bundle.crt is supplied inside this gem for this purpose so you can set it to something like: 
+A file ca-bundle.crt is supplied inside this gem for this purpose so you can set it to something like:
 `<RubyHome>/lib/ruby/gems/2.1.0/gems/kitchen-cloudformation-0.0.1/ca-bundle.crt`
 
 
@@ -144,3 +143,8 @@ Apache 2.0 (see [LICENSE][license])
 
 -implement all the options of cloud formation.
 
+-We also need plugins for: 
+ OpenStack Heat
+ Azure Resource Manager
+ Google Cloud Deployment Manager
+but i'm not aware of any ruby sdks for these yet.

data/kitchen-cloudformation.gemspec

@@ -1,26 +1,24 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "kitchen/driver/cloudformation_version.rb"
+require 'kitchen/driver/cloudformation_version.rb'
 
 Gem::Specification.new do |gem|
-  gem.name          = "kitchen-cloudformation"
+  gem.name          = 'kitchen-cloudformation'
   gem.version       = Kitchen::Driver::CLOUDFORMATION_VERSION
-  gem.license       = "Apache 2.0"
-  gem.authors       = ["Neill Turner"]
-  gem.email         = ["neillwturner@gmail.com"]
-  gem.description   = "A Test Kitchen Driver for Amazon AWS CloudFormation"
+  gem.license       = 'Apache 2.0'
+  gem.authors       = ['Neill Turner']
+  gem.email         = ['neillwturner@gmail.com']
+  gem.description   = 'A Test Kitchen Driver for Amazon AWS CloudFormation'
   gem.summary       = gem.description
-  gem.homepage      = "https://github.com/neillturner/kitchen-cloudformation"
-  candidates = Dir.glob('{lib}/**/*') + ['README.md', 'CHANGELOG.md', 'LICENSE' , 'ca-bundle.crt', 'kitchen-cloudformation.gemspec']
+  gem.homepage      = 'https://github.com/neillturner/kitchen-cloudformation'
+  candidates = Dir.glob('{lib}/**/*') + ['README.md', 'CHANGELOG.md', 'LICENSE', 'ca-bundle.crt', 'kitchen-cloudformation.gemspec']
   gem.files         = candidates.sort
   gem.executables   = []
-  gem.require_paths = ["lib"]
-
-  gem.add_dependency "test-kitchen", "~> 1.4"
-  gem.add_dependency "excon"
-  gem.add_dependency "multi_json"
-  gem.add_dependency "aws-sdk-v1", "~> 1.59.0"
-  gem.add_dependency "aws-sdk", "~> 2"
-
+  gem.require_paths = ['lib']
+  gem.add_dependency 'test-kitchen', '~> 1.4'
+  gem.add_dependency 'excon'
+  gem.add_dependency 'multi_json'
+  gem.add_dependency 'aws-sdk-v1', '~> 1.59.0'
+  gem.add_dependency 'aws-sdk', '~> 2'
 end

data/lib/kitchen/driver/{cloud_formation.rb → CloudFormation.rb}

@@ -12,33 +12,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "benchmark"
-require "json"
-require "aws"
-require "kitchen"
-require_relative "cloudformation_version"
-require_relative "aws/cf_client"
-require_relative "aws/stack_generator"
-#require "aws-sdk-core/waiters/errors"
+require 'benchmark'
+require 'json'
+require 'aws'
+require 'kitchen'
+require_relative 'cloudformation_version'
+require_relative 'aws/cf_client'
+require_relative 'aws/stack_generator'
+# require 'aws-sdk-core/waiters/errors'
 
 module Kitchen
-
   module Driver
-
+    #
     # Amazon CloudFormation driver for Test Kitchen.
     #
-    class CloudFormation < Kitchen::Driver::Base # rubocop:disable Metrics/ClassLength
-
+    class CloudFormation < Kitchen::Driver::Base
       kitchen_driver_api_version 2
 
       plugin_version Kitchen::Driver::CLOUDFORMATION_VERSION
 
-      default_config :region,             ENV["AWS_REGION"] || "us-east-1"
-      default_config :shared_credentials_profile, nil      
+      default_config :region,             ENV['AWS_REGION'] || 'us-east-1'
+      default_config :shared_credentials_profile, nil
       default_config :aws_access_key_id,  nil
       default_config :aws_secret_access_key, nil
       default_config :aws_session_token,  nil
-      default_config :ssl_cert_file,      ENV["SSL_CERT_FILE"]
+      default_config :ssl_cert_file,      ENV['SSL_CERT_FILE']
       default_config :stack_name,         nil
       default_config :template_file,      nil
       default_config :parameters,         {}
@@ -49,7 +47,7 @@ module Kitchen
       default_config :ssh_key,              nil
       default_config :username,            'root'
       default_config :hostname,             nil
-      #default_config :interface,           nil
+      # default_config :interface,           nil
 
       required_config :ssh_key
       required_config :stack_name
@@ -67,14 +65,14 @@ module Kitchen
         END
         begin
           stack = create_stack
-        rescue Exception => e
-          error("CloudFormation #{e.message}.")
+        rescue # Exception => e
+          error("CloudFormation #{$ERROR_INFO}.") # e.message
           return
         end
         state[:stack_name] = stack.stack_name
         state[:hostname] = config[:hostname]
         info("Stack <#{state[:stack_name]}> requested.")
-        #tag_stack(stack)
+        # tag_stack(stack)
 
         s = cf.get_stack(state[:stack_name])
         while s.stack_status == 'CREATE_IN_PROGRESS'
@@ -107,7 +105,7 @@ module Kitchen
               sleep(30)
               stack = cf.get_stack(state[:stack_name])
             end
-          rescue Exception => e
+          rescue # Exception => e
             info("CloudFormation stack <#{state[:stack_name]}> deleted.")
             state.delete(:stack_name)
             return
@@ -122,8 +120,7 @@ module Kitchen
           config[:region],
           config[:shared_credentials_profile],
           config[:ssl_cert_file],
-          config[:aws_access_key_id],
-          config[:aws_secret_access_key],
+          { access_key_id: config[:aws_access_key_id], secret_access_key: config[:aws_secret_access_key] },
           config[:aws_session_token]
         )
       end
@@ -138,27 +135,18 @@ module Kitchen
       # can get rid of this when we get rid of these deprecated configs!
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def copy_deprecated_configs(state)
-        if config[:ssh_timeout]
-          state[:connection_timeout] = config[:ssh_timeout]
-        end
-        if config[:ssh_retries]
-          state[:connection_retries] = config[:ssh_retries]
-        end
-        if config[:username]
-          state[:username] = config[:username]
-        #elsif instance.transport[:username] == instance.transport.class.defaults[:username]
-        #  # If the transport has the default username, copy it from amis.json
-        #  # This duplicated old behavior but I hate amis.json
-        #  ami_username = amis["usernames"][instance.platform.name]
-        #  state[:username] = ami_username if ami_username
-        end
-        if config[:ssh_key]
-          state[:ssh_key] = config[:ssh_key]
-        end
+        state[:connection_timeout] = config[:ssh_timeout] if config[:ssh_timeout]
+        state[:connection_retries] = config[:ssh_retries] if config[:ssh_retries]
+        state[:username] = config[:username] if config[:username]
+        # elsif instance.transport[:username] == instance.transport.class.defaults[:username]
+        # If the transport has the default username, copy it from amis.json
+        # This duplicated old behavior but I hate amis.json
+        # ami_username = amis["usernames"][instance.platform.name]
+        # state[:username] = ami_username if ami_username
+        # end
+        state[:ssh_key] = config[:ssh_key] if config[:ssh_key]
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-      # Fog AWS helper for creating the stack
       def create_stack
         stack_data = stack_generator.cf_stack_data
         info("Creating CloudFormation Stack #{stack_data[:stack_name]}")
@@ -179,7 +167,6 @@ module Kitchen
           info("#{r[:timestamp]} #{r[:resource_type]} #{r[:logical_resource_id]} #{r[:resource_status]} #{r[:resource_status_reason]}")
         end
       end
-
     end
   end
 end

data/lib/kitchen/driver/aws/cf_client.rb

@@ -1,76 +1,73 @@
 # -*- encoding: utf-8 -*-
 #
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an 'AS IS' BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "aws-sdk"
-require "aws-sdk-core/credentials"
-require "aws-sdk-core/shared_credentials"
-require "aws-sdk-core/instance_profile_credentials"
+require 'aws-sdk'
+require 'aws-sdk-core/credentials'
+require 'aws-sdk-core/shared_credentials'
+require 'aws-sdk-core/instance_profile_credentials'
 
 module Kitchen
-
   module Driver
-
     class Aws
-
+      #
       # A class for creating and managing the Cloud Formation client connection
       #
       class CfClient
-
         def initialize(
           region,
           profile_name = nil,
           ssl_cert_file = nil,
-          access_key_id = nil,
-          secret_access_key = nil,
+          aws_key = {},
           session_token = nil
         )
+          access_key_id = aws_key[:access_key_id]
+          secret_access_key = aws_key[:secret_access_key]
           creds = self.class.get_credentials(
             profile_name, access_key_id, secret_access_key, session_token
           )
-          
+
           ::AWS.config(
-            :region => region,
-            :credentials => creds,
-            :ssl_ca_bundle => ssl_cert_file            
+            region: region,
+            credentials: creds,
+            ssl_ca_bundle: ssl_cert_file
           )
         end
 
         # Try and get the credentials from an ordered list of locations
         # http://docs.aws.amazon.com/sdkforruby/api/index.html#Configuration
-        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def self.get_credentials(profile_name, access_key_id, secret_access_key, session_token)
-          shared_creds = ::Aws::SharedCredentials.new(:profile_name => profile_name)
+          shared_creds = ::Aws::SharedCredentials.new(profile_name: profile_name)
           if access_key_id && secret_access_key
             ::Aws::Credentials.new(access_key_id, secret_access_key, session_token)
           # TODO: these are deprecated, remove them in the next major version
-          elsif ENV["AWS_ACCESS_KEY"] && ENV["AWS_SECRET_KEY"]
+          elsif ENV['AWS_ACCESS_KEY'] && ENV['AWS_SECRET_KEY']
             ::Aws::Credentials.new(
-              ENV["AWS_ACCESS_KEY"],
-              ENV["AWS_SECRET_KEY"],
-              ENV["AWS_TOKEN"]
+              ENV['AWS_ACCESS_KEY'],
+              ENV['AWS_SECRET_KEY'],
+              ENV['AWS_TOKEN']
             )
-          elsif ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"]
+          elsif ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY']
             ::Aws::Credentials.new(
-              ENV["AWS_ACCESS_KEY_ID"],
-              ENV["AWS_SECRET_ACCESS_KEY"],
-              ENV["AWS_SESSION_TOKEN"]
+              ENV['AWS_ACCESS_KEY_ID'],
+              ENV['AWS_SECRET_ACCESS_KEY'],
+              ENV['AWS_SESSION_TOKEN']
             )
           elsif shared_creds.loadable?
             shared_creds
           else
-            ::Aws::InstanceProfileCredentials.new(:retries => 1)
+            ::Aws::InstanceProfileCredentials.new(retries: 1)
           end
         end
 
@@ -83,7 +80,7 @@ module Kitchen
         end
 
         def get_stack_events(stack_name)
-          client.describe_stack_events({:stack_name => stack_name})
+          client.describe_stack_events(stack_name: stack_name)
         end
 
         def delete_stack(stack_name)
@@ -92,17 +89,13 @@ module Kitchen
         end
 
         def client
-          @client ||= ::Aws::CloudFormation::Client.new 
+          @client ||= ::Aws::CloudFormation::Client.new
         end
 
         def resource
           @resource ||= ::Aws::CloudFormation::Resource.new
         end
-
       end
-
     end
-
   end
-
 end

data/lib/kitchen/driver/aws/stack_generator.rb

@@ -13,18 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/logging"
+require 'kitchen/logging'
 
 module Kitchen
-
   module Driver
-
     class Aws
-
+      #
       # A class for encapsulating the stack payload logic
       #
       class StackGenerator
-
         include Logging
 
         attr_reader :config, :cf
@@ -36,25 +33,21 @@ module Kitchen
 
         # Transform the provided config into the hash to send to AWS.  Some fields
         # can be passed in null, others need to be ommitted if they are null
-        def cf_stack_data # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-          s ={:stack_name => config[:stack_name]}
+        def cf_stack_data
+          s = { stack_name: config[:stack_name] }
           s[:template_url] = config[:template_url] if config[:template_file]
           if config[:template_file]
             s[:template_body] = File.open(config[:template_file], 'rb') { |file| file.read }
           end
-          s[:timeout_in_minutes] = config[:timeout_in_minutes] if config[:timeout_in_minutes] != nil and config[:timeout_in_minutes]>0
-          s[:disable_rollback] = config[:disable_rollback] if config[:disable_rollback] != nil and config[:disable_rollback] == true or config[:disable_rollback] == false
+          s[:timeout_in_minutes] = config[:timeout_in_minutes] if !config[:timeout_in_minutes].nil? && config[:timeout_in_minutes] > 0
+          s[:disable_rollback] = config[:disable_rollback]     if !config[:disable_rollback].nil? && config[:disable_rollback] == true || config[:disable_rollback] == false
           s[:parameters] = []
-          config[:parameters].each do |k,v|
-            s[:parameters].push({:parameter_key => k.to_s, :parameter_value => v.to_s})
+          config[:parameters].each do |k, v|
+            s[:parameters].push(parameter_key: k.to_s, parameter_value: v.to_s)
           end
           s
         end
-
       end
-
     end
-
   end
-
 end

data/lib/kitchen/driver/cloudformation_version.rb

@@ -13,10 +13,8 @@
 # limitations under the License.
 
 module Kitchen
-
   module Driver
-
     # Version string for CloudFormation Test Kitchen driver
-    CLOUDFORMATION_VERSION = "0.0.1"
+    CLOUDFORMATION_VERSION = '0.0.2'
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cloudformation
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.59.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.59.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
 description: A Test Kitchen Driver for Amazon AWS CloudFormation
@@ -92,9 +92,9 @@ files:
 - README.md
 - ca-bundle.crt
 - kitchen-cloudformation.gemspec
+- lib/kitchen/driver/CloudFormation.rb
 - lib/kitchen/driver/aws/cf_client.rb
 - lib/kitchen/driver/aws/stack_generator.rb
-- lib/kitchen/driver/cloud_formation.rb
 - lib/kitchen/driver/cloudformation_version.rb
 homepage: https://github.com/neillturner/kitchen-cloudformation
 licenses:
@@ -106,17 +106,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon AWS CloudFormation