Add tests and documentation to the package_tags system

README.md

@@ -134,6 +134,7 @@ This provider exposes quite a few provider-specific configuration options:
 * `subnet_id` - The subnet to boot the instance into, for VPC.
 * `associate_public_ip` - If true, will associate a public IP address to an instance in a VPC.
 * `tags` - A hash of tags to set on the machine.
+* `package_tags` - A hash of tags to set on the ami generated during the package operation.
 * `use_iam_profile` - If true, will use [IAM profiles](http://docs.aws.amazon.com/IAM/latest/UserGuide/instance-profiles.html)
   for credentials.
 * `block_device_mapping` - Amazon EC2 Block Device Mapping Property

spec/vagrant-aws/config_spec.rb

@@ -31,6 +31,7 @@
     its("iam_instance_profile_arn") { should be_nil }
     its("iam_instance_profile_name") { should be_nil }
     its("tags")              { should == {} }
+    its("package_tags")      { should == {} }
     its("user_data")         { should be_nil }
     its("use_iam_profile")   { should be_false }
     its("block_device_mapping")  {should == [] }
@@ -50,8 +51,8 @@
     [:access_key_id, :ami, :availability_zone, :instance_ready_timeout,
       :instance_package_timeout, :instance_type, :keypair_name, :ssh_host_attribute,
       :ebs_optimized, :region, :secret_access_key, :session_token, :monitoring,
-      :associate_public_ip, :subnet_id, :tags, :elastic_ip, :terminate_on_shutdown,
-      :iam_instance_profile_arn, :iam_instance_profile_name,
+      :associate_public_ip, :subnet_id, :tags, :package_tags :elastic_ip,
+      :terminate_on_shutdown, :iam_instance_profile_arn, :iam_instance_profile_name,
       :use_iam_profile, :user_data, :block_device_mapping].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
@@ -209,6 +210,8 @@ def set_test_values(instance)
       it "should merge the tags and block_device_mappings" do
         first.tags["one"] = "one"
         second.tags["two"] = "two"
+        first.package_tags["three"] = "three"
+        second.package_tags["four"] = "four"
         first.block_device_mapping = [{:one => "one"}]
         second.block_device_mapping = [{:two => "two"}]
 
@@ -217,6 +220,10 @@ def set_test_values(instance)
           "one" => "one",
           "two" => "two"
         }
+        third.package_tags.should == {
+          "three" => "three",
+          "four" => "four"
+        }
         third.block_device_mapping.index({:one => "one"}).should_not be_nil
         third.block_device_mapping.index({:two => "two"}).should_not be_nil
       end