chef-provisioning-aws 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1484fb7faef2c0ce2abadef678b520d88219f7de
-  data.tar.gz: c7f948fc458daa4f0ba1ba2294f17bf9e368133b
+  metadata.gz: 3aed5292d699880d31eaffbff1b415985250bb92
+  data.tar.gz: c6f7e4c96e7b7c1a7a28a02c336666b0f03d1aa0
 SHA512:
-  metadata.gz: 397a01589702e2d9439a7209dbaaaf3548ca9d5cc7707fd2b2ed05a69dc5f0a9c43fc0524559e4c288e5d76e8180ff6696810fd0e22d9b3c44c80418110d3e9e
-  data.tar.gz: 090afbab837aadcf3c502cbc96ec633069cc6685aa67a1c56ae2fc93cc9ace1e8ca725c8735fd7304e9bb991bc887c9d5ab1aced3c869152df4f211ce65508de
+  metadata.gz: 368067e2bc0e09bd9de87fe78c65b0c7ecfa3d55e1506783d552a77ff220dea5666c271f7f68625613b85bb9f5faef27abad62b3e9a34314b9dbe7e0a4309274
+  data.tar.gz: e8f0f0fa76803d7b13ab449ae4a4a50a2e254183a384efc24ada0a417a9c6e6761e6eecf2b4d55792f5bae763e74fa8105d1000d28cedb58a30a731881915f2c

data/README.md

@@ -269,7 +269,7 @@ All resources (incuding base resources like `machine`) that are taggable support
 
 Some AWS objects (may EC2) view the `Name` tag as unique - it shows up in a `Name` column in the AWS console.  By default we specify the `Name` tag as the resource name.  This can be overridden by specifying `aws_tags {Name: 'some other name'}`.
 
-You can remove all the tags _except_ the `Name` tag by specifying `aws_tags {}`.
+You can remove all the tags _except_ the `Name` tag by specifying `aws_tags({})`.
 
 Tag keys and values can be specified as symbols or strings but will be converted to strings before sending to AWS.
 
@@ -309,7 +309,7 @@ end
 
 The `aws_tagger` method is used by the tests to assert that the object tags are correct.  These methods can be encapsulated in an module for DRY purposes, as the EC2 strategy shows.
 
-Finally, you should add 3 standard tests for taggable objects - 1) Tags can be created on a new object, 2) Tags can be updated on an existing object with tags and 3) Tags can be cleared by setting `aws_tags {}`.  Copy the tests from an existing spec file and modify them to support your resource.  TODO make a module that copies these tests for us.  Right now it is complicated by the fact that some resources have required attributes that others don't.
+Finally, you should add 3 standard tests for taggable objects - 1) Tags can be created on a new object, 2) Tags can be updated on an existing object with tags and 3) Tags can be cleared by setting `aws_tags({})`.  Copy the tests from an existing spec file and modify them to support your resource.  TODO make a module that copies these tests for us.  Right now it is complicated by the fact that some resources have required attributes that others don't.
 
 # Looking up AWS objects
 

data/Rakefile

@@ -1,31 +1,31 @@
-require 'bundler'
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler"
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 task :default => :spec
 
 desc "run all non-integration specs"
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
+  spec.pattern = "spec/**/*_spec.rb"
   # TODO add back integration tests whenever we have strategy for keys
-  spec.exclude_pattern = 'spec/integration/**/*_spec.rb'
+  spec.exclude_pattern = "spec/integration/**/*_spec.rb"
 end
 
 desc "run integration specs"
 RSpec::Core::RakeTask.new(:integration, [:pattern]) do |spec, args|
-  spec.pattern = args[:pattern] || 'spec/integration/**/*_spec.rb'
+  spec.pattern = args[:pattern] || "spec/integration/**/*_spec.rb"
   spec.rspec_opts = "-b"
 end
 
 desc "run :super_slow specs (machine/machine_image)"
 RSpec::Core::RakeTask.new(:super_slow, [:pattern]) do |spec, args|
-  spec.pattern = args[:pattern] || 'spec/integration/**/*_spec.rb'
+  spec.pattern = args[:pattern] || "spec/integration/**/*_spec.rb"
   spec.rspec_opts = "-b -t super_slow"
 end
 
 desc "run all specs, except :super_slow"
 RSpec::Core::RakeTask.new(:all) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
+  spec.pattern = "spec/**/*_spec.rb"
 end
 
 desc "run all specs, including :super_slow"
@@ -42,13 +42,22 @@ task :travis, [:sub_task] do |t, args|
     pattern = "load_balancer_spec.rb,aws_route_table_spec.rb,machine_spec.rb,aws_eip_address_spec.rb" # This is a comma seperated list
     pattern = pattern.split(",").map {|p| "spec/integration/**/*#{p}"}.join(",")
   else
-    pattern = 'spec/integration/**/*_spec.rb'
+    pattern = "spec/integration/**/*_spec.rb"
   end
   Rake::Task[sub_task].invoke(pattern)
 end
 
 desc "travis task for machine_image tests - these take so long to run that we only run the first test"
 RSpec::Core::RakeTask.new(:machine_image) do |spec|
-  spec.pattern = 'spec/integration/machine_image_spec.rb'
+  spec.pattern = "spec/integration/machine_image_spec.rb"
   spec.rspec_opts = "-b -t super_slow -e 'machine_image can create an image in the VPC'"
 end
+
+require "github_changelog_generator/task"
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.future_release = Chef::Provisioning::AWSDriver::VERSION
+  config.enhancement_labels = "enhancement,Enhancement,New Feature".split(",")
+  config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
+  config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog".split(",")
+end

data/chef-provisioning-aws.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'pry-stack_explorer'
+  s.add_development_dependency 'github_changelog_generator'
 
   s.bindir       = "bin"
   s.executables  = %w( )

data/lib/chef/provider/aws_rds_instance.rb

@@ -9,7 +9,7 @@ class Chef::Provider::AwsRdsInstance < Chef::Provisioning::AWSDriver::AWSProvide
   REQUIRED_OPTIONS = %i(db_instance_identifier allocated_storage engine
                         db_instance_class master_username master_user_password)
 
-  OTHER_OPTIONS = %i(engine_version multi_az iops publicly_accessible db_name port db_subnet_group_name)
+  OTHER_OPTIONS = %i(engine_version multi_az iops publicly_accessible db_name port db_subnet_group_name db_parameter_group_name)
 
   def update_aws_object(instance)
     Chef::Log.warn("aws_rds_instance does not support modifying a started instance")

data/lib/chef/provider/aws_rds_parameter_group.rb

@@ -0,0 +1,127 @@
+require 'chef/provisioning/aws_driver/aws_provider'
+require 'chef/provisioning/aws_driver/tagging_strategy/rds'
+
+# inspiration taken from providers/aws_rds_subnet_group.rb
+# but different enough that I'm not sure there is easy abstraction
+class Chef::Provider::AwsRdsParameterGroup < Chef::Provisioning::AWSDriver::AWSProvider
+  include Chef::Provisioning::AWSDriver::TaggingStrategy::RDSConvergeTags
+
+  provides :aws_rds_parameter_group
+
+  def create_aws_object
+    converge_create_message = "create RDS parameter group #{new_resource.name} in #{region}"
+    if update_parameters
+      converge_notes = [converge_create_message, "  set group parameters to #{desired_options[:parameters]}"]
+    else
+      converge_notes = converge_create_message
+    end
+
+    converge_by converge_notes do
+      driver.create_db_parameter_group(desired_create_options)
+
+      if update_parameters
+        driver.modify_db_parameter_group(desired_update_options)
+      end
+    end
+  end
+
+  def destroy_aws_object(_parameter_group)
+    converge_by "delete RDS parameter group #{new_resource.name} in #{region}" do
+      driver.delete_db_parameter_group(db_parameter_group_name: new_resource.name)
+    end
+  end
+
+  def update_aws_object(_parameter_group)
+    updates = required_updates
+    if ! updates.empty?
+      converge_by updates do
+        driver.modify_db_parameter_group(desired_update_options)
+      end
+    end
+  end
+
+  def desired_create_options
+    result = {}
+    full_options = desired_options
+    result[:db_parameter_group_name] = full_options[:db_parameter_group_name]
+    result[:db_parameter_group_family] = full_options[:db_parameter_group_family]
+    result[:description] = full_options[:description]
+    result
+  end
+
+  def desired_update_options
+    result = {}
+    full_options = desired_options
+    result[:db_parameter_group_name] = full_options[:db_parameter_group_name]
+    result[:parameters] = full_options[:parameters]
+    result
+  end
+
+  def desired_options
+    @desired_options ||= begin
+                           opts = {}
+                           opts[:db_parameter_group_name] = new_resource.name
+                           opts[:db_parameter_group_family] = new_resource.db_parameter_group_family
+                           opts[:description] = new_resource.description
+                           opts[:parameters] = new_resource.parameters
+                           AWSResource.lookup_options(opts, resource: new_resource)
+                         end
+  end
+
+  # Given an existing parameter group, return an array of update descriptions
+  # representing the updates that need to be made.
+  #
+  # Also returns Chef warnings for all the fields required for create that
+  # are not updateable, which is currently every field but parameters :(
+  #
+  # If no updates are needed, an empty array is returned.
+  def required_updates
+    # this is the only updateable field
+    ret = []
+    if update_parameters
+      ret << "  set group parameters to #{desired_options[:parameters]}"
+    end
+
+    if ! desired_options[:db_parameter_group_family].nil?
+      # modify_db_parameter_group doesn't support updating the db_parameter_group_family  according to
+      # http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/RDS/Client.html#modify_db_parameter_group-instance_method
+      # which is frustrating because it is required for create
+      Chef::Log.warn "Updating description for RDS parameter groups is not supported by RDS client."
+    end
+
+    if ! desired_options[:description].nil?
+      # modify_db_parameter_group doesn't support updating the description according to
+      # http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/RDS/Client.html#modify_db_parameter_group-instance_method
+      # which is frustrating because it is required for create
+      Chef::Log.warn "Updating description for RDS parameter groups is not supported by RDS client."
+    end
+
+    if ! (desired_options[:aws_tags].nil? || desired_options[:aws_tags].empty?)
+      # modify_db_parameter_group doesn't support the tags key according to
+      # http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/RDS/Client.html#modify_db_parameter_group-instance_method
+      Chef::Log.warn "Updating tags for RDS parameter groups is not supported by RDS client."
+    end
+
+    ret.unshift("update RDS parameter group #{new_resource.name} in #{region}") unless ret.empty?
+    ret
+  end
+
+  private
+
+  def update_parameters
+    # We cannot properly check for idempotence here due to errors in the RDS API's describe_db_parameters endpoint
+    # describe_db_parameters is supposed to return every field for every entry, but it does not return apply_method,
+    # which is a required field to modify_db_parameter_group.
+    #
+    # Therefore, we cannot have idempotence on users updating the value of apply_method, so we must either
+    # break in the case that the user specifies apply_method for a parameter and then later specified a different
+    # value for apply_method for that parameter later in a recipe, or not be itempotent.
+    #
+    # Breaking the user is never the right option, so we have elected to not be itempotent.
+    ! (desired_options[:parameters].nil? || desired_options[:parameters].empty?)
+  end
+  
+  def driver
+    new_resource.driver.rds.client
+  end
+end

data/lib/chef/provisioning/aws_driver.rb

@@ -22,6 +22,7 @@ require "chef/resource/aws_network_acl"
 require "chef/resource/aws_network_interface"
 require "chef/resource/aws_rds_instance"
 require "chef/resource/aws_rds_subnet_group"
+require "chef/resource/aws_rds_parameter_group"
 require "chef/resource/aws_route_table"
 require "chef/resource/aws_route53_hosted_zone"
 require "chef/resource/aws_s3_bucket"

data/lib/chef/provisioning/aws_driver/driver.rb

@@ -844,6 +844,13 @@ EOD
         bootstrap_options[:iam_instance_profile] = {name: bootstrap_options[:iam_instance_profile]}
       end
 
+      if machine_options[:is_windows]
+        Chef::Log.debug "Setting Default WinRM userdata for windows..."
+        bootstrap_options[:user_data] = Base64.encode64(user_data) if bootstrap_options[:user_data].nil?
+      else
+        Chef::Log.debug "Non-windows, not setting userdata"
+      end
+
       bootstrap_options = AWSResource.lookup_options(bootstrap_options, managed_entry_store: machine_spec.managed_entry_store, driver: self)
 
       # In the migration from V1 to V2 we still support associate_public_ip_address at the top level

data/lib/chef/provisioning/aws_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module AWSDriver
-  VERSION = '1.7.0'
+  VERSION = '1.8.0'
 end
 end
 end

data/lib/chef/resource/aws_network_acl.rb

@@ -30,16 +30,16 @@ class Chef::Resource::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSResource
   #
   # `cidr_block` will be a source if it is an inbound rule, or a destination if it is an outbound rule
   #
-  # If `inbound_rules` or `outbound_rules` is `nil`, respective current rules will not be changed.
+  # If `inbound_rules` or `outbound_rules` is unset, respective current rules will not be changed.
   # However, if either is set to `[]` all respective current rules will be removed.
   #
   attribute :inbound_rules,
             kind_of: [ Array, Hash ],
-            coerce: proc { |v| [v].flatten }
+            coerce: proc { |v| v && [v].flatten }
 
   attribute :outbound_rules,
             kind_of: [ Array, Hash ],
-            coerce: proc { |v| [v].flatten }
+            coerce: proc { |v| v && [v].flatten }
 
   attribute :network_acl_id,
             kind_of: String,

data/lib/chef/resource/aws_rds_instance.rb

@@ -22,6 +22,9 @@ class Chef::Resource::AwsRdsInstance < Chef::Provisioning::AWSDriver::AWSRDSReso
   # We cannot pass the resource or an AWS object because there is no AWS model
   # and that causes lookup_options to fail
   attribute :db_subnet_group_name, kind_of: String
+  # We cannot pass the resource or an AWS object because there is no AWS model
+  # and that causes lookup_options to fail
+  attribute :db_parameter_group_name, kind_of: String
 
   # RDS has a ton of options, allow users to set any of them via a
   # custom Hash

data/lib/chef/resource/aws_rds_parameter_group.rb

@@ -0,0 +1,37 @@
+require 'chef/provisioning/aws_driver/aws_rds_resource'
+require 'chef/provisioning/aws_driver/aws_taggable'
+
+class Chef::Resource::AwsRdsParameterGroup < Chef::Provisioning::AWSDriver::AWSRDSResource
+  include Chef::Provisioning::AWSDriver::AWSTaggable
+
+  # there is no class for a parameter group specifically
+  aws_sdk_type AWS::RDS
+
+  attribute :name, kind_of: String, name_attribute: true
+  attribute :db_parameter_group_family, kind_of: String, required: true
+  attribute :description, kind_of: String, required: true
+  attribute :parameters, kind_of: Array, default: []
+
+  def aws_object
+    object = driver.rds.client.describe_db_parameter_groups(db_parameter_group_name: name)[:db_parameter_groups].first
+
+    # use paginated API to get all options
+    initial_request = driver.rds.client.describe_db_parameters(db_parameter_group_name: name, max_records: 100)
+    marker = initial_request[:marker]
+    parameters = initial_request[:parameters]
+    while !marker.nil?
+      more_results = driver.rds.client.describe_db_parameters(db_parameter_group_name: name, max_records: 100, marker: marker)
+      parameters += more_results[:parameters]
+      marker = more_results[:marker]
+    end
+    object[:parameters] = parameters
+
+    object
+  rescue AWS::RDS::Errors::DBParameterGroupNotFound
+    nil
+  end
+
+  def rds_tagging_type
+    "pg"
+  end
+end

data/spec/acceptance/aws_ebs_volume/nodes/ettores-mbp.lan.json

@@ -0,0 +1,3 @@
+{
+  "name": "ettores-mbp.lan"
+}

data/spec/integration/aws_ebs_volume_spec.rb

@@ -120,7 +120,7 @@ describe Chef::Resource::AwsEbsVolume do
         it "deletes the tags" do
           expect_recipe {
             aws_ebs_volume "test_volume_a" do
-              aws_tags {}
+              aws_tags({})
             end
           }.to have_aws_ebs_volume_tags('test_volume_a',
                                         {

data/spec/integration/aws_elasticsearch_domain_spec.rb

@@ -99,7 +99,7 @@ describe Chef::Resource::AwsElasticsearchDomain do
         it "removes all aws_elasticsearch_domain tags" do
           expect_recipe {
             aws_elasticsearch_domain "test-#{time}-2" do
-              aws_tags {}
+              aws_tags({})
             end
           }.to have_aws_elasticsearch_domain_tags("test-#{time}-2", {}).and be_idempotent
         end

data/spec/integration/aws_network_acl_spec.rb

@@ -143,7 +143,7 @@ describe Chef::Resource::AwsNetworkAcl do
           expect_recipe {
             aws_network_acl 'test_network_acl' do
               vpc 'test_vpc'
-              aws_tags {}
+              aws_tags({})
             end
           }.to have_aws_network_acl_tags('test_network_acl',
             {

data/spec/integration/aws_network_interface_spec.rb

@@ -71,7 +71,7 @@ describe "AwsNetworkInterface" do
             expect_recipe {
               aws_network_interface 'test_network_interface' do
                 subnet 'test_public_subnet'
-                aws_tags {}
+                aws_tags({})
               end
             }.to have_aws_network_interface_tags('test_network_interface',
               {

data/spec/integration/aws_rds_instance_spec.rb

@@ -4,7 +4,7 @@ describe Chef::Resource::AwsRdsInstance do
   extend AWSSupport
 
   when_the_chef_12_server "exists", organization: 'foo', server_scope: :context do
-    with_aws "with a connection to AWS, a VPC, two subnets, and a db subnet group" do
+    with_aws "with a connection to AWS, a VPC, two subnets, a db subnet group, and a db parameter group" do
 
       azs = []
       driver.ec2.availability_zones.each do |az|
@@ -35,7 +35,13 @@ describe Chef::Resource::AwsRdsInstance do
         subnets ["test_subnet", test_subnet_2.aws_object.id]
       end
 
-      it "aws_rds_instance 'test-rds-instance' creates an rds instance that can parse the aws_rds_subnet_group" do
+      aws_rds_parameter_group "test-db-parameter-group" do
+        db_parameter_group_family "postgres9.4"
+        description "testing provisioning"
+        parameters [{:parameter_name => "max_connections", :parameter_value => "250", :apply_method => "pending-reboot"}]
+      end
+
+      it "aws_rds_instance 'test-rds-instance' creates an rds instance that can parse the aws_rds_subnet_group and aws_rds_parameter_group" do
         expect_recipe {
           aws_rds_instance "test-rds-instance" do
             engine "postgres"
@@ -46,6 +52,7 @@ describe Chef::Resource::AwsRdsInstance do
             multi_az false
             allocated_storage 5
             db_subnet_group_name "test-db-subnet-group"
+            db_parameter_group_name "test-db-parameter-group"
           end
         }.to create_an_aws_rds_instance('test-rds-instance',
                                         engine: 'postgres',
@@ -55,6 +62,7 @@ describe Chef::Resource::AwsRdsInstance do
                                        ).and be_idempotent
         r = driver.rds_resource.db_instance("test-rds-instance")
         expect(r.db_subnet_group.db_subnet_group_name).to eq("test-db-subnet-group")
+        expect(r.db_parameter_groups.first.db_parameter_group_name).to eq("test-db-parameter-group")
         expect(r.publicly_accessible).to eq(false)
       end
 
@@ -133,7 +141,7 @@ describe Chef::Resource::AwsRdsInstance do
         it "removes all aws_rds_instance tags" do
           expect_recipe {
             aws_rds_instance "test-rds-instance-tagging-#{tagging_id}" do
-              aws_tags {}
+              aws_tags({})
               allocated_storage 5
               db_instance_class "db.t1.micro"
               engine "postgres"

data/spec/integration/aws_rds_parameter_group_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+describe Chef::Resource::AwsRdsParameterGroup do
+  extend AWSSupport
+  when_the_chef_12_server "exists", organization: 'foo', server_scope: :context do
+
+    with_aws "no required pre-existing objects" do
+      it "creates an empty parameter group" do
+        expect_recipe {
+          aws_rds_parameter_group "test-db-parameter-group" do
+            db_parameter_group_family "postgres9.4"
+            description "testing provisioning"
+          end
+        }.to create_an_aws_rds_parameter_group("test-db-parameter-group",
+                                               :db_parameter_group_family => "postgres9.4",
+                                               :description => "testing provisioning"
+                                              )
+      end
+
+      it "creates a parameter group with tags" do
+        expect_recipe {
+          aws_rds_parameter_group "test-db-parameter-group-with-tags" do
+            db_parameter_group_family "postgres9.4"
+            description "testing provisioning"
+            aws_tags key1: 'value'
+          end
+        }.to create_an_aws_rds_parameter_group("test-db-parameter-group-with-tags")
+              .and have_aws_rds_parameter_group_tags("test-db-parameter-group-with-tags",
+                                                     {
+                                                       'key1' => 'value'
+                                                     }
+                                                    )
+      end
+
+      it "creates an new parameter group with parameters" do
+        results = nil
+        expect_recipe {
+          results = aws_rds_parameter_group "test-db-parameter-group-with-parameters" do
+            db_parameter_group_family "postgres9.4"
+            description "testing provisioning"
+            parameters [{:parameter_name => "max_connections", :parameter_value => "250", :apply_method => "pending-reboot"}]
+          end
+        }.to create_an_aws_rds_parameter_group("test-db-parameter-group-with-parameters",
+                                               :db_parameter_group_family => "postgres9.4",
+                                               :description => "testing provisioning",
+                                              )
+
+        expect(results.parameters).to eq([{:parameter_name => "max_connections", :parameter_value => "250", :apply_method => "pending-reboot"}])
+
+        results.aws_object[:parameters].each do |parameter|
+          expect(parameter[:parameter_value]).to eq("250") if parameter[:parameter_name] == "max_connections"
+        end
+      end
+
+      context "when the object is updated" do
+        let(:final_max_connection_value)   { "300" }
+        let(:final_application_name_value) { "second_name" }
+        let(:initial_parameters) { [
+                                     {:parameter_name => "application_name", :parameter_value => "first_name", :apply_method => "pending-reboot"}
+                                   ] }
+        let(:updated_parameters) { [
+                                     {:parameter_name => "application_name", :parameter_value => final_application_name_value, :apply_method => "pending-reboot"},
+                                     {:parameter_name => "max_connections", :parameter_value => final_max_connection_value, :apply_method => "pending-reboot"}
+                                   ] }
+        it "updates properly" do
+          results = nil
+          expect_recipe {
+            results = aws_rds_parameter_group "test-db-parameter-group-updated" do
+              db_parameter_group_family "postgres9.4"
+              description "testing provisioning"
+              parameters initial_parameters
+            end
+          }
+          expect(results.parameters).to eq(initial_parameters)
+
+          results_2 = nil
+          expect_recipe {
+            results_2 = aws_rds_parameter_group "test-db-parameter-group-updated" do
+              db_parameter_group_family "postgres9.4"
+              description "testing provisioning"
+              parameters updated_parameters
+            end
+          }
+          expect(results_2.parameters).to eq(updated_parameters)
+          results_2.aws_object[:parameters].each do |parameter|
+            expect(parameter[:parameter_value]).to eq(final_max_connection_value) if parameter[:parameter_name] == "max_connections"
+            expect(parameter[:parameter_value]).to eq(final_application_name_value) if parameter[:parameter_name] == "application_name"
+
+          end
+        end
+      end
+    end
+  end
+end

data/spec/integration/aws_rds_subnet_group_spec.rb

@@ -93,7 +93,7 @@ describe Chef::Resource::AwsRdsSubnetGroup do
             aws_rds_subnet_group "test-db-subnet-group" do
               description "some_description"
               subnets ["test_subnet", test_subnet_2.aws_object.id]
-              aws_tags {}
+              aws_tags({})
             end
           }.to have_aws_rds_subnet_group_tags("test-db-subnet-group", {}
           ).and be_idempotent

data/spec/integration/aws_route_table_spec.rb

@@ -153,7 +153,7 @@ describe Chef::Resource::AwsRouteTable do
           expect_recipe {
             aws_route_table 'test_route_table' do
               vpc 'test_vpc'
-              aws_tags {}
+              aws_tags({})
             end
           }.to have_aws_route_table_tags('test_route_table',
             {

data/spec/integration/aws_s3_bucket_spec.rb

@@ -51,12 +51,13 @@ describe Chef::Resource::AwsS3Bucket do
         end
 
         it "removes all aws_s3_bucket tags" do
+          pending
+
           expect_recipe {
             aws_s3_bucket bucket_name do
-              aws_tags {}
+              aws_tags({})
             end
-          }.to have_aws_s3_bucket_tags(bucket_name, {}
-          ).and be_idempotent
+          }.to have_aws_s3_bucket_tags(bucket_name, {}).and be_idempotent
         end
       end
 

data/spec/integration/aws_security_group_spec.rb

@@ -92,7 +92,7 @@ describe Chef::Resource::AwsSecurityGroup do
         it "removes all aws_security_group tags except Name" do
           expect_recipe {
             aws_security_group 'test_sg' do
-              aws_tags {}
+              aws_tags({})
             end
           }.to have_aws_security_group_tags('test_sg',
             {

data/spec/integration/aws_subnet_spec.rb

@@ -87,7 +87,7 @@ describe Chef::Resource::AwsSubnet do
         it "removes all aws_subnet tags except Name" do
           expect_recipe {
             aws_subnet 'test_subnet' do
-              aws_tags {}
+              aws_tags({})
             end
           }.to have_aws_subnet_tags('test_subnet',
             {

data/spec/integration/aws_vpc_spec.rb

@@ -152,7 +152,7 @@ describe Chef::Resource::AwsVpc do
         it "removes all aws_vpc tags except Name" do
           expect_recipe {
             aws_vpc 'test_vpc' do
-              aws_tags {}
+              aws_tags({})
             end
           }.to have_aws_vpc_tags('test_vpc',
             {

data/spec/integration/machine_image_spec.rb

@@ -119,7 +119,7 @@ describe Chef::Resource::MachineImage do
         it "removes all aws_image tags", :super_slow do
           expect_recipe {
             machine_image 'test_machine_image' do
-              aws_tags {}
+              aws_tags({})
             end
           }.to have_aws_image_tags('test_machine_image',
             {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-provisioning
@@ -196,6 +196,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provisioner for creating aws containers in Chef Provisioning.
 email: jewart@getchef.com
 executables: []
@@ -229,6 +243,7 @@ files:
 - lib/chef/provider/aws_network_acl.rb
 - lib/chef/provider/aws_network_interface.rb
 - lib/chef/provider/aws_rds_instance.rb
+- lib/chef/provider/aws_rds_parameter_group.rb
 - lib/chef/provider/aws_rds_subnet_group.rb
 - lib/chef/provider/aws_route_table.rb
 - lib/chef/provider/aws_s3_bucket.rb
@@ -279,6 +294,7 @@ files:
 - lib/chef/resource/aws_network_acl.rb
 - lib/chef/resource/aws_network_interface.rb
 - lib/chef/resource/aws_rds_instance.rb
+- lib/chef/resource/aws_rds_parameter_group.rb
 - lib/chef/resource/aws_rds_subnet_group.rb
 - lib/chef/resource/aws_route53_hosted_zone.rb
 - lib/chef/resource/aws_route53_record_set.rb
@@ -291,6 +307,7 @@ files:
 - lib/chef/resource/aws_subnet.rb
 - lib/chef/resource/aws_vpc.rb
 - lib/chef/resource/aws_vpc_peering_connection.rb
+- spec/acceptance/aws_ebs_volume/nodes/ettores-mbp.lan.json
 - spec/aws_support.rb
 - spec/aws_support/aws_resource_run_wrapper.rb
 - spec/aws_support/deep_matcher.rb
@@ -318,6 +335,7 @@ files:
 - spec/integration/aws_network_acl_spec.rb
 - spec/integration/aws_network_interface_spec.rb
 - spec/integration/aws_rds_instance_spec.rb
+- spec/integration/aws_rds_parameter_group_spec.rb
 - spec/integration/aws_rds_subnet_group_spec.rb
 - spec/integration/aws_route53_hosted_zone_spec.rb
 - spec/integration/aws_route_table_spec.rb
@@ -354,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Provisioner for creating aws containers in Chef Provisioning.