kitchen-ec2 1.3.2 → 1.4.0

data/lib/kitchen/driver/aws/standard_platform/centos.rb

@@ -18,7 +18,7 @@ module Kitchen
           def image_search
             search = {
               "owner-alias" => "aws-marketplace",
-              "name" => ["CentOS Linux #{version}*", "CentOS-#{version}*-GA-*"]
+              "name" => ["CentOS Linux #{version}*", "CentOS-#{version}*-GA-*"],
             }
             search["architecture"] = architecture if architecture
             search
@@ -30,7 +30,7 @@ module Kitchen
             # ...
             images.group_by { |image| self.class.from_image(driver, image).version }.
               sort_by { |k, _v| (k && k.include?(".") ? k.to_f : "#{k}.999".to_f) }.
-              reverse.map { |_k, v| v }.flatten(1)
+              reverse.flat_map { |_k, v| v }
           end
 
           def self.from_image(driver, image)

data/lib/kitchen/driver/aws/standard_platform/debian.rb

@@ -9,9 +9,10 @@ module Kitchen
           StandardPlatform.platforms["debian"] = self
 
           DEBIAN_CODENAMES = {
+            "9" => "stretch",
             "8" => "jessie",
             "7" => "wheezy",
-            "6" => "squeeze"
+            "6" => "squeeze",
           }
 
           def username
@@ -25,7 +26,7 @@ module Kitchen
           def image_search
             search = {
               "owner-id" => "379101102735",
-              "name" => "debian-#{codename}-*"
+              "name" => "debian-#{codename}-*",
             }
             search["architecture"] = architecture if architecture
             search

data/lib/kitchen/driver/aws/standard_platform/fedora.rb

@@ -15,7 +15,7 @@ module Kitchen
           def image_search
             search = {
               "owner-id" => "125523088429",
-              "name" => version ? "Fedora-Cloud-Base-#{version}-*" : "Fedora-Cloud-Base-*"
+              "name" => version ? "Fedora-Cloud-Base-#{version}-*" : "Fedora-Cloud-Base-*",
             }
             search["architecture"] = architecture if architecture
             search

data/lib/kitchen/driver/aws/standard_platform/freebsd.rb

@@ -18,7 +18,7 @@ module Kitchen
           def image_search
             search = {
               "owner-id" => "118940168514",
-              "name" => ["FreeBSD #{version}*-RELEASE*", "FreeBSD/EC2 #{version}*-RELEASE*"]
+              "name" => ["FreeBSD #{version}*-RELEASE*", "FreeBSD/EC2 #{version}*-RELEASE*"],
             }
             search["architecture"] = architecture if architecture
             search

data/lib/kitchen/driver/aws/standard_platform/rhel.rb

@@ -21,7 +21,7 @@ module Kitchen
           def image_search
             search = {
               "owner-id" => "309956199498",
-              "name" => "RHEL-#{version}*"
+              "name" => "RHEL-#{version}*",
             }
             search["architecture"] = architecture if architecture
             search

data/lib/kitchen/driver/aws/standard_platform/ubuntu.rb

@@ -15,7 +15,7 @@ module Kitchen
           def image_search
             search = {
               "owner-id" => "099720109477",
-              "name" => "ubuntu/images/*/ubuntu-*-#{version}*"
+              "name" => "ubuntu/images/*/ubuntu-*-#{version}*",
             }
             search["architecture"] = architecture if architecture
             search

data/lib/kitchen/driver/aws/standard_platform/windows.rb

@@ -35,7 +35,7 @@ module Kitchen
           def image_search
             search = {
               "owner-alias" => "amazon",
-              "name" => windows_name_filter
+              "name" => windows_name_filter,
             }
             search["architecture"] = architecture if architecture
             search
@@ -47,7 +47,7 @@ module Kitchen
             # ...
             images.group_by { |image| self.class.from_image(driver, image).windows_version_parts }.
               sort_by { |version, _platform_images| version }.
-              reverse.map { |_version, platform_images| platform_images }.flatten(1)
+              reverse.flat_map { |_version, platform_images| platform_images }
           end
 
           def self.from_image(driver, image)
@@ -101,7 +101,7 @@ module Kitchen
 
               # Turn service_pack into an integer. rtm = 0, spN = N.
               if service_pack
-                service_pack = (service_pack.downcase == "rtm") ? 0 : service_pack[2..-1].to_i
+                service_pack = (service_pack.casecmp("rtm") == 0) ? 0 : service_pack[2..-1].to_i
               end
             end
 

data/lib/kitchen/driver/ec2.rb

@@ -23,6 +23,7 @@ require_relative "ec2_version"
 require_relative "aws/client"
 require_relative "aws/instance_generator"
 require_relative "aws/standard_platform"
+require_relative "aws/standard_platform/amazon"
 require_relative "aws/standard_platform/centos"
 require_relative "aws/standard_platform/debian"
 require_relative "aws/standard_platform/rhel"
@@ -48,15 +49,15 @@ module Kitchen
 
       plugin_version Kitchen::Driver::EC2_VERSION
 
-      default_config :region,             ENV["AWS_REGION"] || "us-east-1"
+      default_config :region, ENV["AWS_REGION"] || "us-east-1"
       default_config :shared_credentials_profile, nil
-      default_config :availability_zone,  nil
+      default_config :availability_zone, nil
       default_config :instance_type do |driver|
         driver.default_instance_type
       end
       default_config :ebs_optimized,      false
       default_config :security_group_ids, nil
-      default_config :tags,                "created-by" => "test-kitchen"
+      default_config :tags, "created-by" => "test-kitchen"
       default_config :user_data do |driver|
         if driver.windows_os?
           driver.default_windows_user_data
@@ -83,7 +84,7 @@ module Kitchen
       default_config :retry_limit,         3
       default_config :tenancy,             "default"
       default_config :instance_initiated_shutdown_behavior, nil
-      default_config :ssl_verify_peer,     true
+      default_config :ssl_verify_peer, true
 
       def initialize(*args, &block)
         super
@@ -206,10 +207,18 @@ module Kitchen
           info("Attempting to tag the instance, #{r} retries")
           tag_server(server)
 
+          # Get information about the AMI (image) used to create the image.
+          image_data = ec2.client.describe_images({ :image_ids => [server.image_id] })[0][0]
+
           state[:server_id] = server.id
           info("EC2 instance <#{state[:server_id]}> created.")
-          wait_until_volumes_ready(server, state)
-          tag_volumes(server)
+
+          # instance-store backed images do not have attached volumes, so only
+          # wait for the volumes to be ready if the instance EBS-backed.
+          if image_data.root_device_type == "ebs"
+            wait_until_volumes_ready(server, state)
+            tag_volumes(server)
+          end
           wait_until_ready(server, state)
         end
 
@@ -221,7 +230,7 @@ module Kitchen
           fetch_windows_admin_password(server, state)
         end
 
-        info("EC2 instance <#{state[:server_id]}> ready.")
+        info("EC2 instance <#{state[:server_id]}> ready (hostname: #{state[:hostname]}).")
         instance.transport.connection(state).wait_until_ready
         create_ec2_json(state)
         debug("ec2:create '#{state[:hostname]}'")
@@ -372,7 +381,7 @@ module Kitchen
         request_data = {
           :spot_price => config[:spot_price].to_s,
           :launch_specification => instance_generator.ec2_instance_data,
-          :valid_until => Time.now + request_duration
+          :valid_until => Time.now + request_duration,
         }
         if config[:block_duration_minutes]
           request_data[:block_duration_minutes] = config[:block_duration_minutes]
@@ -491,7 +500,7 @@ module Kitchen
           "dns" => "public_dns_name",
           "public" => "public_ip_address",
           "private" => "private_ip_address",
-          "private_dns" => "private_dns_name"
+          "private_dns" => "private_dns_name",
         }
 
       #
@@ -557,26 +566,33 @@ module Kitchen
 
         if actual_platform.version =~ /2016/
           logfile_name = 'C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Log\\kitchen-ec2.log'
+          disk_init = 'C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeDisks.ps1'
         else
           logfile_name = 'C:\\Program Files\\Amazon\\Ec2ConfigService\\Logs\\kitchen-ec2.log'
+          disk_init = ""
         end
         # Returning the fully constructed PowerShell script to user_data
         Kitchen::Util.outdent!(<<-EOH)
         <powershell>
-        $logfile=#{logfile_name}
+        $logfile="#{logfile_name}"
+        # EC2Launch doesn't init extra disks by default
+        #{disk_init}
         # Allow script execution
         Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force
         #PS Remoting and & winrm.cmd basic config
-        Enable-PSRemoting -Force -SkipNetworkProfileCheck
+        $enableArgs=@{Force=$true}
+        $command=Get-Command Enable-PSRemoting
+        if($command.Parameters.Keys -contains "skipnetworkprofilecheck"){
+            $enableArgs.skipnetworkprofilecheck=$true
+        }
+        Enable-PSRemoting @enableArgs
         & winrm.cmd set winrm/config '@{MaxTimeoutms="1800000"}' >> $logfile
         & winrm.cmd set winrm/config/winrs '@{MaxMemoryPerShellMB="1024"}' >> $logfile
         & winrm.cmd set winrm/config/winrs '@{MaxShellsPerUser="50"}' >> $logfile
-        #Server settings - support username/password login
-        & winrm.cmd set winrm/config/service/auth '@{Basic="true"}' >> $logfile
-        & winrm.cmd set winrm/config/service '@{AllowUnencrypted="true"}' >> $logfile
         & winrm.cmd set winrm/config/winrs '@{MaxMemoryPerShellMB="1024"}' >> $logfile
         #Firewall Config
         & netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any  >> $logfile
+        Set-ItemProperty -Name LocalAccountTokenFilterPolicy -Path HKLM:\\software\\Microsoft\\Windows\\CurrentVersion\\Policies\\system -Value 1
         #{custom_admin_script}
         </powershell>
         EOH

data/lib/kitchen/driver/ec2_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "1.3.2"
+    EC2_VERSION = "1.4.0"
   end
 end

data/spec/kitchen/driver/ec2/client_spec.rb

@@ -164,7 +164,7 @@ describe Kitchen::Driver::Aws::Client do
     end
 
     context "when provided all optional parameters" do
-      let(:client) {
+      let(:client) do
         Kitchen::Driver::Aws::Client.new(
           "us-west-1",
           "profile_name",
@@ -175,7 +175,7 @@ describe Kitchen::Driver::Aws::Client do
           999,
           false
         )
-      }
+      end
       let(:creds) { double("creds") }
       it "Sets the AWS config" do
         expect(Kitchen::Driver::Aws::Client).to receive(:get_credentials).and_return(creds)
@@ -202,7 +202,7 @@ describe Kitchen::Driver::Aws::Client do
       "AWS_ACCESS_KEY_ID" => key_id,
       "AWS_SECRET_ACCESS_KEY" => secret
     ) do
-      block.call
+      yield
     end
   end
 end

data/spec/kitchen/driver/ec2/image_selection_spec.rb

@@ -59,247 +59,282 @@ describe "Default images for various platforms" do
   end
 
   PLATFORM_SEARCHES = {
+    "amazon" => [
+      { :name => "owner-id", :values => %w{137112412989} },
+      { :name => "name", :values => %w{amzn-ami-*} },
+    ],
+    "amazon-x86_64" => [
+      { :name => "owner-id", :values => %w{137112412989} },
+      { :name => "name", :values => %w{amzn-ami-*} },
+      { :name => "architecture", :values => ["x86_64"] },
+    ],
+    "amazon-2016" => [
+      { :name => "owner-id", :values => %w{137112412989} },
+      { :name => "name", :values => %w{amzn-ami-*-2016*} },
+    ],
+    "amazon-2017" => [
+      { :name => "owner-id", :values => %w{137112412989} },
+      { :name => "name", :values => %w{amzn-ami-*-2017*} },
+    ],
+    "amazon-2016.09" => [
+      { :name => "owner-id", :values => %w{137112412989} },
+      { :name => "name", :values => %w{amzn-ami-*-2016.09*} },
+    ],
+    "amazon-2017.03" => [
+      { :name => "owner-id", :values => %w{137112412989} },
+      { :name => "name", :values => %w{amzn-ami-*-2017.03*} },
+    ],
+    "amazon-2017.03-x86_64" => [
+      { :name => "owner-id", :values => %w{137112412989} },
+      { :name => "name", :values => %w{amzn-ami-*-2017.03*} },
+      { :name => "architecture", :values => ["x86_64"] },
+    ],
+
     "centos" => [
-      { :name => "owner-alias", :values => %w[aws-marketplace] },
-      { :name => "name", :values => ["CentOS Linux *", "CentOS-*-GA-*"] }
+      { :name => "owner-alias", :values => %w{aws-marketplace} },
+      { :name => "name", :values => ["CentOS Linux *", "CentOS-*-GA-*"] },
     ],
     "centos-7" => [
-      { :name => "owner-alias", :values => %w[aws-marketplace] },
-      { :name => "name", :values => ["CentOS Linux 7*", "CentOS-7*-GA-*"] }
+      { :name => "owner-alias", :values => %w{aws-marketplace} },
+      { :name => "name", :values => ["CentOS Linux 7*", "CentOS-7*-GA-*"] },
     ],
     "centos-6" => [
-      { :name => "owner-alias", :values => %w[aws-marketplace] },
-      { :name => "name", :values => ["CentOS Linux 6*", "CentOS-6*-GA-*"] }
+      { :name => "owner-alias", :values => %w{aws-marketplace} },
+      { :name => "name", :values => ["CentOS Linux 6*", "CentOS-6*-GA-*"] },
     ],
     "centos-6.3" => [
-      { :name => "owner-alias", :values => %w[aws-marketplace] },
-      { :name => "name", :values => ["CentOS Linux 6.3*", "CentOS-6.3*-GA-*"] }
+      { :name => "owner-alias", :values => %w{aws-marketplace} },
+      { :name => "name", :values => ["CentOS Linux 6.3*", "CentOS-6.3*-GA-*"] },
     ],
     "centos-x86_64" => [
-      { :name => "owner-alias", :values => %w[aws-marketplace] },
+      { :name => "owner-alias", :values => %w{aws-marketplace} },
       { :name => "name", :values => ["CentOS Linux *", "CentOS-*-GA-*"] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "architecture", :values => %w{x86_64} },
     ],
     "centos-6.3-x86_64" => [
-      { :name => "owner-alias", :values => %w[aws-marketplace] },
+      { :name => "owner-alias", :values => %w{aws-marketplace} },
       { :name => "name", :values => ["CentOS Linux 6.3*", "CentOS-6.3*-GA-*"] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "architecture", :values => %w{x86_64} },
     ],
     "centos-7-x86_64" => [
-      { :name => "owner-alias", :values => %w[aws-marketplace] },
+      { :name => "owner-alias", :values => %w{aws-marketplace} },
       { :name => "name", :values => ["CentOS Linux 7*", "CentOS-7*-GA-*"] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "architecture", :values => %w{x86_64} },
     ],
 
     "debian" => [
-      { :name => "owner-id", :values => %w[379101102735] },
-      { :name => "name", :values => %w[debian-jessie-*] }
+      { :name => "owner-id", :values => %w{379101102735} },
+      { :name => "name", :values => %w{debian-stretch-*} },
+    ],
+    "debian-9" => [
+      { :name => "owner-id", :values => %w{379101102735} },
+      { :name => "name", :values => %w{debian-stretch-*} },
     ],
     "debian-8" => [
-      { :name => "owner-id", :values => %w[379101102735] },
-      { :name => "name", :values => %w[debian-jessie-*] }
+      { :name => "owner-id", :values => %w{379101102735} },
+      { :name => "name", :values => %w{debian-jessie-*} },
     ],
     "debian-7" => [
-      { :name => "owner-id", :values => %w[379101102735] },
-      { :name => "name", :values => %w[debian-wheezy-*] }
+      { :name => "owner-id", :values => %w{379101102735} },
+      { :name => "name", :values => %w{debian-wheezy-*} },
     ],
     "debian-6" => [
-      { :name => "owner-id", :values => %w[379101102735] },
-      { :name => "name", :values => %w[debian-squeeze-*] }
+      { :name => "owner-id", :values => %w{379101102735} },
+      { :name => "name", :values => %w{debian-squeeze-*} },
     ],
     "debian-x86_64" => [
-      { :name => "owner-id", :values => %w[379101102735] },
-      { :name => "name", :values => %w[debian-jessie-*] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "owner-id", :values => %w{379101102735} },
+      { :name => "name", :values => %w{debian-stretch-*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
     "debian-6-x86_64" => [
-      { :name => "owner-id", :values => %w[379101102735] },
-      { :name => "name", :values => %w[debian-squeeze-*] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "owner-id", :values => %w{379101102735} },
+      { :name => "name", :values => %w{debian-squeeze-*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
 
     "rhel" => [
-      { :name => "owner-id", :values => %w[309956199498] },
-      { :name => "name", :values => %w[RHEL-*] }
+      { :name => "owner-id", :values => %w{309956199498} },
+      { :name => "name", :values => %w{RHEL-*} },
     ],
     "rhel-6" => [
-      { :name => "owner-id", :values => %w[309956199498] },
-      { :name => "name", :values => %w[RHEL-6*] }
+      { :name => "owner-id", :values => %w{309956199498} },
+      { :name => "name", :values => %w{RHEL-6*} },
     ],
     "rhel-7.1" => [
-      { :name => "owner-id", :values => %w[309956199498] },
-      { :name => "name", :values => %w[RHEL-7.1*] }
+      { :name => "owner-id", :values => %w{309956199498} },
+      { :name => "name", :values => %w{RHEL-7.1*} },
     ],
     "rhel-x86_64" => [
-      { :name => "owner-id", :values => %w[309956199498] },
-      { :name => "name", :values => %w[RHEL-*] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "owner-id", :values => %w{309956199498} },
+      { :name => "name", :values => %w{RHEL-*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
     "rhel-6-x86_64" => [
-      { :name => "owner-id", :values => %w[309956199498] },
-      { :name => "name", :values => %w[RHEL-6*] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "owner-id", :values => %w{309956199498} },
+      { :name => "name", :values => %w{RHEL-6*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
     "el" => [
-      { :name => "owner-id", :values => %w[309956199498] },
-      { :name => "name", :values => %w[RHEL-*] }
+      { :name => "owner-id", :values => %w{309956199498} },
+      { :name => "name", :values => %w{RHEL-*} },
     ],
     "el-6-x86_64" => [
-      { :name => "owner-id", :values => %w[309956199498] },
-      { :name => "name", :values => %w[RHEL-6*] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "owner-id", :values => %w{309956199498} },
+      { :name => "name", :values => %w{RHEL-6*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
 
     "fedora" => [
-      { :name => "owner-id", :values => %w[125523088429] },
-      { :name => "name", :values => %w[Fedora-Cloud-Base-*] }
+      { :name => "owner-id", :values => %w{125523088429} },
+      { :name => "name", :values => %w{Fedora-Cloud-Base-*} },
     ],
     "fedora-22" => [
-      { :name => "owner-id", :values => %w[125523088429] },
-      { :name => "name", :values => %w[Fedora-Cloud-Base-22-*] }
+      { :name => "owner-id", :values => %w{125523088429} },
+      { :name => "name", :values => %w{Fedora-Cloud-Base-22-*} },
     ],
     "fedora-x86_64" => [
-      { :name => "owner-id", :values => %w[125523088429] },
-      { :name => "name", :values => %w[Fedora-Cloud-Base-*] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "owner-id", :values => %w{125523088429} },
+      { :name => "name", :values => %w{Fedora-Cloud-Base-*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
     "fedora-22-x86_64" => [
-      { :name => "owner-id", :values => %w[125523088429] },
-      { :name => "name", :values => %w[Fedora-Cloud-Base-22-*] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "owner-id", :values => %w{125523088429} },
+      { :name => "name", :values => %w{Fedora-Cloud-Base-22-*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
 
     "freebsd" => [
-      { :name => "owner-id", :values => %w[118940168514] },
-      { :name => "name", :values => ["FreeBSD *-RELEASE*", "FreeBSD/EC2 *-RELEASE*"] }
+      { :name => "owner-id", :values => %w{118940168514} },
+      { :name => "name", :values => ["FreeBSD *-RELEASE*", "FreeBSD/EC2 *-RELEASE*"] },
     ],
     "freebsd-10" => [
-      { :name => "owner-id", :values => %w[118940168514] },
-      { :name => "name", :values => ["FreeBSD 10*-RELEASE*", "FreeBSD/EC2 10*-RELEASE*"] }
+      { :name => "owner-id", :values => %w{118940168514} },
+      { :name => "name", :values => ["FreeBSD 10*-RELEASE*", "FreeBSD/EC2 10*-RELEASE*"] },
     ],
     "freebsd-10.1" => [
-      { :name => "owner-id", :values => %w[118940168514] },
-      { :name => "name", :values => ["FreeBSD 10.1*-RELEASE*", "FreeBSD/EC2 10.1*-RELEASE*"] }
+      { :name => "owner-id", :values => %w{118940168514} },
+      { :name => "name", :values => ["FreeBSD 10.1*-RELEASE*", "FreeBSD/EC2 10.1*-RELEASE*"] },
     ],
     "freebsd-x86_64" => [
-      { :name => "owner-id", :values => %w[118940168514] },
+      { :name => "owner-id", :values => %w{118940168514} },
       { :name => "name", :values => ["FreeBSD *-RELEASE*", "FreeBSD/EC2 *-RELEASE*"] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "architecture", :values => %w{x86_64} },
     ],
     "freebsd-10-x86_64" => [
-      { :name => "owner-id", :values => %w[118940168514] },
+      { :name => "owner-id", :values => %w{118940168514} },
       { :name => "name", :values => ["FreeBSD 10*-RELEASE*", "FreeBSD/EC2 10*-RELEASE*"] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "architecture", :values => %w{x86_64} },
     ],
 
     "ubuntu" => [
-      { :name => "owner-id", :values => %w[099720109477] },
-      { :name => "name", :values => %w[ubuntu/images/*/ubuntu-*-*] }
+      { :name => "owner-id", :values => %w{099720109477} },
+      { :name => "name", :values => %w{ubuntu/images/*/ubuntu-*-*} },
     ],
     "ubuntu-14" => [
-      { :name => "owner-id", :values => %w[099720109477] },
-      { :name => "name", :values => %w[ubuntu/images/*/ubuntu-*-14*] }
+      { :name => "owner-id", :values => %w{099720109477} },
+      { :name => "name", :values => %w{ubuntu/images/*/ubuntu-*-14*} },
     ],
     "ubuntu-12.04" => [
-      { :name => "owner-id", :values => %w[099720109477] },
-      { :name => "name", :values => %w[ubuntu/images/*/ubuntu-*-12.04*] }
+      { :name => "owner-id", :values => %w{099720109477} },
+      { :name => "name", :values => %w{ubuntu/images/*/ubuntu-*-12.04*} },
     ],
     "ubuntu-x86_64" => [
-      { :name => "owner-id", :values => %w[099720109477] },
-      { :name => "name", :values => %w[ubuntu/images/*/ubuntu-*-*] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "owner-id", :values => %w{099720109477} },
+      { :name => "name", :values => %w{ubuntu/images/*/ubuntu-*-*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
     "ubuntu-14-x86_64" => [
-      { :name => "owner-id", :values => %w[099720109477] },
-      { :name => "name", :values => %w[ubuntu/images/*/ubuntu-*-14*] },
-      { :name => "architecture", :values => %w[x86_64] }
+      { :name => "owner-id", :values => %w{099720109477} },
+      { :name => "name", :values => %w{ubuntu/images/*/ubuntu-*-14*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
 
     "windows" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
         Windows_Server-*-RTM-English-*-Base-*
         Windows_Server-*-SP*-English-*-Base-*
         Windows_Server-*-R*_RTM-English-*-Base-*
         Windows_Server-*-R*_SP*-English-*-Base-*
-        Windows_Server-*-English-Full-Base-*] }
+        Windows_Server-*-English-Full-Base-*} },
     ],
     "windows-2008" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
         Windows_Server-2008-RTM-English-*-Base-*
-        Windows_Server-2008-SP*-English-*-Base-*] }
+        Windows_Server-2008-SP*-English-*-Base-*} },
     ],
     "windows-2012" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
         Windows_Server-2012-RTM-English-*-Base-*
-        Windows_Server-2012-SP*-English-*-Base-*] }
+        Windows_Server-2012-SP*-English-*-Base-*} },
     ],
     "windows-2012r2" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
         Windows_Server-2012-R2_RTM-English-*-Base-*
-        Windows_Server-2012-R2_SP*-English-*-Base-*] }
+        Windows_Server-2012-R2_SP*-English-*-Base-*} },
     ],
     "windows-2012sp1" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
-        Windows_Server-2012-SP1-English-*-Base-*] }
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
+        Windows_Server-2012-SP1-English-*-Base-*} },
     ],
     "windows-2012rtm" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
-        Windows_Server-2012-RTM-English-*-Base-*] }
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
+        Windows_Server-2012-RTM-English-*-Base-*} },
     ],
     "windows-2012r2sp1" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
-        Windows_Server-2012-R2_SP1-English-*-Base-*] }
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
+        Windows_Server-2012-R2_SP1-English-*-Base-*} },
     ],
     "windows-2012r2rtm" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
-        Windows_Server-2012-R2_RTM-English-*-Base-*] }
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
+        Windows_Server-2012-R2_RTM-English-*-Base-*} },
     ],
     "windows-x86_64" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
         Windows_Server-*-RTM-English-*-Base-*
         Windows_Server-*-SP*-English-*-Base-*
         Windows_Server-*-R*_RTM-English-*-Base-*
         Windows_Server-*-R*_SP*-English-*-Base-*
-        Windows_Server-*-English-Full-Base-*] },
-      { :name => "architecture", :values => %w[x86_64] }
+        Windows_Server-*-English-Full-Base-*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
     "windows-2012r2-x86_64" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
         Windows_Server-2012-R2_RTM-English-*-Base-*
-        Windows_Server-2012-R2_SP*-English-*-Base-*] },
-      { :name => "architecture", :values => %w[x86_64] }
+        Windows_Server-2012-R2_SP*-English-*-Base-*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
     "windows-server" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
         Windows_Server-*-RTM-English-*-Base-*
         Windows_Server-*-SP*-English-*-Base-*
         Windows_Server-*-R*_RTM-English-*-Base-*
         Windows_Server-*-R*_SP*-English-*-Base-*
-        Windows_Server-*-English-Full-Base-*] }
+        Windows_Server-*-English-Full-Base-*} },
     ],
     "windows-server-2012r2-x86_64" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
         Windows_Server-2012-R2_RTM-English-*-Base-*
-        Windows_Server-2012-R2_SP*-English-*-Base-*] },
-      { :name => "architecture", :values => %w[x86_64] }
+        Windows_Server-2012-R2_SP*-English-*-Base-*} },
+      { :name => "architecture", :values => %w{x86_64} },
     ],
     "windows-2016" => [
-      { :name => "owner-alias", :values => %w[amazon] },
-      { :name => "name", :values => %w[
-        Windows_Server-2016-English-Full-Base-*] }
-    ]
+      { :name => "owner-alias", :values => %w{amazon} },
+      { :name => "name", :values => %w{
+        Windows_Server-2016-English-Full-Base-*} },
+    ],
   }
 
   describe "Platform defaults" do
@@ -329,7 +364,7 @@ describe "Default images for various platforms" do
       it "searches for an image id without using the standard filters" do
         expect(driver.ec2.resource).
           to receive(:images).
-          with(:filters => [{ :name => "name", :values => %w[SuperImage] }]).
+          with(:filters => [{ :name => "name", :values => %w{SuperImage} }]).
           and_return([image])
         expect(driver.ec2.resource).
           to receive(:image).with(image.id).and_return(image)
@@ -345,7 +380,7 @@ describe "Default images for various platforms" do
       it "does not search for (or find) an image, and informs the user they need to set image_id" do
         expect(driver.ec2.resource).
           to receive(:images).
-          with(:filters => [{ :name => "name", :values => %w[SuperImage] }]).
+          with(:filters => [{ :name => "name", :values => %w{SuperImage} }]).
           and_return([image])
         expect(driver.ec2.resource).
           to receive(:image).with(image.id).and_return(image)