kitchen-cloudformation 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3ccb1075f10d85580ebe04b444a9eb6c19b38ff
-  data.tar.gz: 37820bbfae06fa69e88f76e9852cc49d49a68c0a
+  metadata.gz: b8b6413186cf620aa770f3edf0a0cd0e43423a69
+  data.tar.gz: a796500599de24d644660dcabfde361374e85335
 SHA512:
-  metadata.gz: 1aad3de220fdd5c8bcc7fa2405051f25351f4fb267408a2c879cadf15272f5724e19f39c2f141b85d2268008dffa07b65ece93d8ac37e4414e6edad48a62d507
-  data.tar.gz: ac67d565aa1ea283ad57c02c072c968db464bbbb26ca57fc42dddd75473cfd1d69837f59a6b8ff6f72b85283a98630b3cd6c73d9d13c0124c89f779b593a84f5
+  metadata.gz: 510c8df116dd61765534720551462e496e465ca097c07aacfd353c6524b202dc5db0bb919502166855dd6295d2fe31fe18f54195493bdbb09c964edf7efd8b58
+  data.tar.gz: 25581e9e976e8cd093da2ead699f8a7e038bea8ca5397d4b90a40caa94fdf8620fd786f051b67b6f40906d56726905651b70c82a45979682cc325ca85ae3a436

data/README.md

@@ -8,12 +8,12 @@ A Test Kitchen Driver for Amazon AWS Cloudformation.
 This driver uses the [aws sdk gem][aws_sdk_gem] to create and delete Amazon AWS Cloudformation stacks to orchestrate your cloud resources for your infrastructure testing, dev or production setup.
 
 It works best using AWS VPC where the servers have fixed IP addresses or in AWS Clasic using known Elastic IP Addresses.
-This allow the IP address of each of the servers to be specified as a hostname in the suite definition (see example below).
+This allow the IP address of each of the servers to be specified as a hostname in the converge step.
 
 So you can deploy and test say a Mongodb High Availability cluster by using cloud formation to create the servers
 and then converge each of the servers in the cluster and run tests.
 
-WARNING: This is a pre-release version. I'm sure the code does not handle all error conditions etc.
+This can be used with [kitchen-verifier-awspec](https://github.com/neillturner/kitchen-verifier-awspec) to do verification of AWS infrastructure.
 
 ## Requirements
 
@@ -25,19 +25,25 @@ will need access to an [AWS][aws_site] account.
 
 key | default value | Notes
 ----|---------------|--------
-region|ENV["AWS_REGION"] or "us-east-1"|Aws Region
+capabilities||Array of capabilities that must be specified before creating or updating certain stacks accepts CAPABILITY_IAM, CAPABILITY_NAMED_IAM
+disable_rollback||If the template gets an error don't rollback changes. true/false. default false.
+notification_arns| [] |The Simple Notification Service (SNS) topic ARNs to publish stack related events. Array of Strings.
+on_failure||Determines what action will be taken if stack creation fails. accepts DO_NOTHING, ROLLBACK, DELETE. You can specify either on_failure or disable_rollback, but not both.
+parameters|{}|Hash of parameters {key: value} to apply to the templates
+resource_types| [] |The template resource types that you have permissions to work with. Array of Strings.
+role_arn||The Amazon Resource Name (ARN) of an AWS Identity and Access Management (IAM) role that AWS CloudFormation assumes to create the stack.
 shared_credentials_profile| nil|Specify Credentials Using a Profile Name
-aws_access_key_id|nil|Deprecated see Authenticating with AWS
-aws_secret_access_key|nil|Deprecated see Authenticating with AWS
-aws_session_token|nil|Deprecated see Authenticating with AWS
 ssl_cert_file| ENV["SSL_CERT_FILE"]|SSL Certificate required on Windows platforms
 stack_name ||Name of the Cloud Formation Stack to create
+stack_policy_body||Structure containing the stack policy body.
+stack_policy_url||Location of a file containing the stack policy.
+tags|{}|Hash of tags for stack TagKey: TagValue
 template_file||File containing the Cloudformation template to run
 template_url||URL of the file containing the Cloudformation template to run
-parameters|{}|Hash of parameters {key: value} to apply to the templates
-disable_rollback|false|If the template gets an error don't rollback changes
 timeout_in_minutes|0|Timeout if the stack is not created in the time
 
+See http://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_CreateStack.html for parameter details.
+
 ## Authenticating with AWS
 
 There are 3 ways you can authenticate against AWS, and we will try them in the
@@ -61,7 +67,7 @@ This precedence order is taken from http://docs.aws.amazon.com/sdkforruby/api/in
 In summary it searches the following locations for credentials:
 
    ENV['AWS_ACCESS_KEY_ID'] and ENV['AWS_SECRET_ACCESS_KEY']
-   The shared credentials ini file at ~/.aws/credentials (more information)
+   The shared credentials ini file at ~/.aws/credentials
    From an instance profile when running on EC2
 
 and it searches the following locations for a region:
@@ -103,7 +109,7 @@ driver:
   stack_name: mystack
   template_file: /test/example.template
   parameters:
-    - base_package: wget
+    base_package: wget
 
 provisioner:
   name: chef_zero
@@ -120,8 +126,6 @@ suites:
       hostname: '10.53.191.70'
 ```
 
-## <a name="license"></a> License
-
 Apache 2.0 (see [LICENSE][license])
 
 
@@ -143,8 +147,4 @@ 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,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kitchen/driver/cloudformation_version.rb'

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

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');

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

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,13 +38,23 @@ module Kitchen
           if config[:template_file]
             s[:template_body] = File.open(config[:template_file], 'rb') { |file| file.read }
           end
-          s[:capabilities] = config[:capabilities] if !config[:capabilities].nil? && (config[:capabilities].is_a? Array)
+          s[:capabilities] = config[:capabilities] if !config[:capabilities].nil? && (config[:capabilities].is_a? Array) && !config[:capabilities].empty?
           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)
           end
+          s[:notification_arns] = config[:notification_arns] if !config[:notification_arns].nil? && (config[:notification_arns].is_a? Array) && !config[:notification_arns].empty?
+          s[:resource_types] = config[:resource_types] if !config[:resource_types].nil? && (config[:resource_types].is_a? Array) && !config[:resource_types].empty?
+          s[:role_arn] = config[:role_arn] unless config[:role_arn].nil?
+          s[:on_failure] = config[:on_failure] unless config[:on_failure].nil? # accepts DO_NOTHING, ROLLBACK, DELETE
+          s[:stack_policy_body] = config[:stack_policy_body] unless config[:stack_policy_body].nil?
+          s[:stack_policy_url] = config[:stack_policy_url] unless config[:stack_policy_url].nil?
+          s[:tags] = []
+          config[:tags].each do |k, v|
+            s[:tags].push(key: k.to_s, value: v.to_s)
+          end
           s
         end
       end

data/lib/kitchen/driver/cloudformation.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,24 +30,26 @@ module Kitchen
 
       plugin_version Kitchen::Driver::CLOUDFORMATION_VERSION
 
-      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 :stack_name, nil
       default_config :template_file, nil
       default_config :capabilities, nil
       default_config :parameters, {}
-      default_config :disable_rollback, false
+      default_config :disable_rollback, nil
       default_config :timeout_in_minutes, 0
       default_config :parameters, {}
 
       default_config :ssh_key, nil
       default_config :username, 'root'
       default_config :hostname, nil
-      # default_config :interface, nil
+      default_config :notification_arns, []
+      default_config :resource_types, []
+      default_config :role_arn, nil
+      default_config :on_failure, nil # accepts DO_NOTHING, ROLLBACK, DELETE
+      default_config :stack_policy_body, nil
+      default_config :stack_policy_url, nil
+      default_config :tags, {}
 
       required_config :ssh_key
       required_config :stack_name
@@ -118,11 +119,11 @@ module Kitchen
 
       def cf
         @cf ||= Aws::CfClient.new(
-          config[:region],
+          '',
           config[:shared_credentials_profile],
           config[:ssl_cert_file],
-          { access_key_id: config[:aws_access_key_id], secret_access_key: config[:aws_secret_access_key] },
-          config[:aws_session_token]
+          { access_key_id: nil, secret_access_key: nil },
+          nil
         )
       end
 

data/lib/kitchen/driver/cloudformation_version.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +14,6 @@
 module Kitchen
   module Driver
     # Version string for CloudFormation Test Kitchen driver
-    CLOUDFORMATION_VERSION = '1.0.3'.freeze
+    CLOUDFORMATION_VERSION = '1.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cloudformation
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen