ami_spec 1.1.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4504c60fd0ce24f40be03e192159fcc9c8509cddbc2642cb0c8c50e351a7c7fa
-  data.tar.gz: 8fc38e659fb6436b8ad37467564445de49c92940991d3f8b820d1b2f6927355a
+  metadata.gz: 718f947b58e6bedd2093507f23b7bcc1c8deae4503dde3603c6768700729948a
+  data.tar.gz: b8c05a3702f5951932d372f6c3788a2ee71f9d0ead934a4bdfb52cae382bbe70
 SHA512:
-  metadata.gz: 1a86bbfccdfbbe323eea7cea45bc9450d41626d3a40ed456a41b4228ef4eb1b211e23268a024dbecd81ebb768a06f00ac19e99f31387ce14e6b32635c99886cf
-  data.tar.gz: 65effb5f2d0a7053c645c79b9ffa0c42ca93c4ee4183cdfbc7ab909263affb431d54ba0ea7f0dcb339bc5f3b81466ed765393d644886910b499e6a8df501c673
+  metadata.gz: a2ceb57cf5b2ea84f085a835e47e1533065338479c23bf3da88ff962d5c046c6109f2c0b93461ac4c1d5093a14bc7d522e4c154d1f34225ef3813ebd70f6ecda
+  data.tar.gz: ca6403909f96efb50c412ed722e6449b51ea147677f10d2e7729e31d02adc8ae82561eeaf2bbe054ab774bdf9086fe7b690254512f590c49d977920f99e2f371

data/README.md

@@ -1,5 +1,9 @@
 # AmiSpec
 
+[![License MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/envato/ami-spec/blob/master/LICENSE.txt)
+[![Gem Version](https://badge.fury.io/rb/ami_spec.svg)](https://badge.fury.io/rb/ami_spec)
+[![Build Status](https://github.com/envato/ami-spec/workflows/tests/badge.svg?branch=master)](https://github.com/envato/ami-spec/actions?query=branch%3Amaster+workflow%3Atests)
+
 Acceptance testing your AMIs.
 
 AmiSpec is a RubyGem used to launch an Amazon Machine Image (AMI) and run ServerSpecs against it. It wraps around the AWS API and ServerSpec to spin up, test and tear down instances.
@@ -29,33 +33,39 @@ Run `bundle install`
 ```cli
 $ bundle exec ami_spec --help
 Options:
-  -r, --role=<s>                        The role to test, this should map to a directory in the spec
-                                        folder
-  -a, --ami=<s>                         The ami ID to run tests against
-  -o, --role-ami-file=<s>               A file containing comma separated roles and amis. i.e.
-                                        web_server,ami-id.
-  -s, --specs=<s>                       The directory to find ServerSpecs
-  -u, --subnet-id=<s>                   The subnet to start the instance in
-  -k, --key-name=<s>                    The SSH key name to assign to instances
-  -e, --key-file=<s>                    The SSH private key file associated to the key_name
-  -h, --ssh-user=<s>                    The user to ssh to the instance as
-  -w, --aws-region=<s>                  The AWS region, defaults to AWS_DEFAULT_REGION environment
-                                        variable
-  -i, --aws-instance-type=<s>           The ec2 instance type, defaults to t2.micro (default:
-                                        t2.micro)
-  -c, --aws-security-groups=<s+>        Security groups to associate to the launched instances. May be
-                                        specified multiple times
-  -p, --aws-public-ip                   Launch instances with a public IP
-  -t, --ssh-retries=<i>                 The number of times we should try sshing to the ec2 instance
-                                        before giving up. Defaults to 30 (default: 30)
-  -g, --tags=<s>                        Additional tags to add to launched instances in the form of
-                                        comma separated key=value pairs. i.e. Name=AmiSpec (default: )
-  -d, --debug                           Don't terminate instances on exit
-  -f, --wait-for-rc                     Wait for oldschool SystemV scripts to run before conducting
-                                        tests. Currently only supports Ubuntu with upstart
-  -l, --user-data-file=<s>              File path for aws ec2 user data
-  -m, --iam-instance-profile-arn=<s>    IAM instance profile to use
-  --help                                Show this message
+  -r, --role=<s>                            The role to test, this should map to a directory in the spec
+                                            folder
+  -a, --ami=<s>                             The ami ID to run tests against
+  -o, --role-ami-file=<s>                   A file containing comma separated roles and amis. i.e.
+                                            web_server,ami-id.
+  -s, --specs=<s>                           The directory to find ServerSpecs
+  -u, --subnet-id=<s>                       The subnet to start the instance in. If not provided a subnet
+                                            will be chosen from the default VPC
+  -k, --key-name=<s>                        The SSH key name to assign to instances. If not provided a
+                                            temporary key pair will be generated in AWS
+  -e, --key-file=<s>                        The SSH private key file associated to the key_name
+  -h, --ssh-user=<s>                        The user to ssh to the instance as
+  -w, --aws-region=<s>                      The AWS region, defaults to AWS_DEFAULT_REGION environment
+                                            variable
+  -i, --aws-instance-type=<s>               The ec2 instance type, defaults to t2.micro (default:
+                                            t2.micro)
+  -c, --aws-security-groups=<s>             Security groups IDs to associate to the launched instances. May be
+                                            specified multiple times. If not provided a temporary security
+                                            group will be generated in AWS
+  -n, --allow-any-temporary-security-group  The temporary security group will allow SSH connections 
+                                            from any IP address (0.0.0.0/0), otherwise allow the subnet's block
+  -p, --aws-public-ip                       Launch instances with a public IP
+  -t, --ssh-retries=<i>                     The number of times we should try sshing to the ec2 instance
+                                            before giving up. Defaults to 30 (default: 30)
+  -g, --tags=<s>                            Additional tags to add to launched instances in the form of
+                                            comma separated key=value pairs. i.e. Name=AmiSpec (default: )
+  -d, --debug                               Don't terminate instances on exit
+  -b, --buildkite                           Output section separators for buildkite
+  -f, --wait-for-rc                         Wait for oldschool SystemV scripts to run before conducting
+                                            tests. Currently only supports Ubuntu with upstart
+  -l, --user-data-file=<s>                  File path for aws ec2 user data
+  -m, --iam-instance-profile-arn=<s>        IAM instance profile to use
+  --help                                    Show this message
 
 ```
 
@@ -65,6 +75,41 @@ When the instances becomes reachable it will run all Specs inside the role spec
 
 Alternative to the `--ami` and `--role` variables, a file of comma separated roles and AMIs (`ROLE,AMI\n`) can be supplied to `--role-ami-file`.
 
+## ServerSpec test layout
+
+AmiSpec expects the usual ServerSpec configuration layout as generated by "serverspec-init":
+
+    spec/
+    ├── webserver
+    │   └── webserver_spec.rb
+    └── spec_helper.rb
+
+The \*\_spec.rb files under the role (e.g. webserver) contain the ServerSpec
+tests that you want to run. The spec_helper.rb file can be very simple:
+
+    require 'serverspec'
+
+    set :backend, :ssh
+
+Note that the backend *needs* to be :ssh or ami_spec might run the tests on
+your local machine, not in EC2.
+
+## Example usage
+
+To test a custom AMI using a pre-created security group that allows SSH from anywhere:
+
+```cli
+ami_spec --role webserver\
+ --specs spec\
+ --aws-region us-east-1\
+ --ami ami-0123456789abcdef0\
+ --key-name default\
+ --key-file ~/.ssh/default.pem\
+ --ssh-user ubuntu\
+ --aws-public-ip\
+ --aws-security-groups sg-0123456789abcdef0
+```
+
 ## Known caveats
 
 ### RSpec conditions in examples

data/bin/ami_spec

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'trollop'
 require 'ami_spec'
 
 AmiSpec.invoke

data/lib/ami_spec.rb

@@ -1,10 +1,15 @@
 require 'ami_spec/aws_instance'
 require 'ami_spec/aws_instance_options'
+require 'ami_spec/aws_default_vpc'
+require 'ami_spec/aws_key_pair'
+require 'ami_spec/aws_security_group'
 require 'ami_spec/server_spec'
 require 'ami_spec/server_spec_options'
 require 'ami_spec/wait_for_ssh'
 require 'ami_spec/wait_for_rc'
-require 'trollop'
+require 'ami_spec/wait_for_cloud_init'
+require 'optimist'
+require 'logger'
 
 module AmiSpec
   class InstanceConnectionTimeout < StandardError; end
@@ -19,7 +24,7 @@ module AmiSpec
   # subnet_id::
   #   The subnet_id to start instances in.
   # key_name::
-  #   The SSH key name to assign to instances. This key name must exist on the executing host for passwordless login.
+  #   The SSH key name to assign to instances. If not provided a temporary key pair will be generated in AWS
   # key_file::
   #   The SSH key file to use to connect to the host.
   # aws_region::
@@ -27,7 +32,9 @@ module AmiSpec
   #   Defaults to AWS_DEFAULT_REGION
   # aws_security_group_ids::
   #   AWS Security groups to assign to the instances
-  #   Defaults to the default security group for the VPC
+  #   If not provided a temporary security group will be generated in AWS
+  # allow_any_temporary_security_group::
+  #   The temporary security group will allow SSH connections from any IP address (0.0.0.0/0)
   # aws_instance_type::
   #   AWS ec2 instance type
   # aws_public_ip::
@@ -45,6 +52,33 @@ module AmiSpec
   # == Returns:
   # Boolean - The result of all the server specs.
   def self.run(options)
+    logger = Logger.new(STDOUT, formatter: proc { |_sev, _time, _name, message| "#{message}\n" })
+
+    ec2 = Aws::EC2::Resource.new(options[:aws_region] ? {region: options[:aws_region]} : {})
+
+    if options[:subnet_id].nil?
+      default_vpc_subnet = AwsDefaultVpc.find_subnet(ec2: ec2)
+      raise 'No default VPC subnet found. Please specify a subnet id.' if default_vpc_subnet.nil?
+      options[:subnet_id] = default_vpc_subnet.id
+      logger.info("Using subnet #{options[:subnet_id]} from the default VPC")
+    end
+
+    unless options[:key_name]
+      key_pair = AwsKeyPair.create(ec2: ec2, logger: logger)
+      options[:key_name] = key_pair.key_name
+      options[:key_file] = key_pair.key_file
+    end
+
+    if options[:aws_security_groups].nil? || options[:aws_security_groups].empty?
+      temporary_security_group = AwsSecurityGroup.create(
+        ec2: ec2,
+        subnet_id: options[:subnet_id],
+        allow_any_ip: options[:allow_any_temporary_security_group],
+        logger: logger
+      )
+      options[:aws_security_groups] = [temporary_security_group.group_id]
+    end
+
     instances = []
     options[:amis].each_pair do |role, ami|
       aws_instance_options = AwsInstanceOptions.new(options.merge(role: role, ami: ami))
@@ -56,6 +90,7 @@ module AmiSpec
       ip_address = options[:aws_public_ip] ? instance.public_ip_address : instance.private_ip_address
       WaitForSSH.wait(ip_address, options[:ssh_user], options[:key_file], options[:ssh_retries])
       WaitForRC.wait(ip_address, options[:ssh_user], options[:key_file]) if options[:wait_for_rc]
+      WaitForCloudInit.wait(ip_address, options[:ssh_user], options[:key_file]) if options[:wait_for_cloud_init]
 
       server_spec_options = ServerSpecOptions.new(options.merge(instance: instance))
       results << ServerSpec.new(server_spec_options).run
@@ -64,10 +99,12 @@ module AmiSpec
     results.all?
   ensure
     stop_instances(instances, options[:debug])
+    key_pair.delete if key_pair
+    temporary_security_group.delete if temporary_security_group
   end
 
   def self.stop_instances(instances, debug)
-    instances.each do |instance|
+    instances && instances.each do |instance|
       begin
         if debug
           puts "EC2 instance ##{instance.instance_id} has not been stopped due to debug mode."
@@ -83,29 +120,45 @@ module AmiSpec
   private_class_method :stop_instances
 
   def self.invoke
-    options = Trollop::options do
-      opt :role, "The role to test, this should map to a directory in the spec folder", type: :string
-      opt :ami, "The ami ID to run tests against", type: :string
-      opt :role_ami_file, "A file containing comma separated roles and amis. i.e.\nweb_server,ami-id.",
-          type: :string
-      opt :specs, "The directory to find ServerSpecs", type: :string, required: true
-      opt :subnet_id, "The subnet to start the instance in", type: :string, required: true
-      opt :key_name, "The SSH key name to assign to instances", type: :string, required: true
-      opt :key_file, "The SSH private key file associated to the key_name", type: :string, required: true
-      opt :ssh_user, "The user to ssh to the instance as", type: :string, required: true
-      opt :aws_region, "The AWS region, defaults to AWS_DEFAULT_REGION environment variable", type: :string
-      opt :aws_instance_type, "The ec2 instance type, defaults to t2.micro", type: :string, default: 't2.micro'
-      opt :aws_security_groups, "Security groups to associate to the launched instances. May be specified multiple times",
-          type: :strings, default: nil
-      opt :aws_public_ip, "Launch instances with a public IP"
-      opt :ssh_retries, "The number of times we should try sshing to the ec2 instance before giving up. Defaults to 30",
-          type: :int, default: 30
-      opt :tags, "Additional tags to add to launched instances in the form of comma separated key=value pairs. i.e. Name=AmiSpec", type: :string, default: ""
-      opt :debug, "Don't terminate instances on exit"
-      opt :buildkite, "Output section separators for buildkite"
-      opt :wait_for_rc, "Wait for oldschool SystemV scripts to run before conducting tests. Currently only supports Ubuntu with upstart"
-      opt :user_data_file, "File path for aws ec2 user data", type: :string, default: nil
-      opt :iam_instance_profile_arn, "IAM instance profile to use", type: :string
+    options = Optimist::options do
+      opt :role,
+          'The role to test, this should map to a directory in the spec folder',
+          type: :string, short: :r
+      opt :ami, 'The ami ID to run tests against', type: :string, short: :a
+      opt :role_ami_file,
+          'A file containing comma separated roles and amis. i.e.
+web_server,ami-id.',
+          type: :string, short: :o
+      opt :specs, 'The directory to find ServerSpecs',
+          type: :string, required: true, short: :s
+      opt :subnet_id,
+          'The subnet to start the instance in. If not provided a subnet will be chosen from the default VPC',
+          type: :string, short: :u
+      opt :key_name, 'The SSH key name to assign to instances. If not provided a temporary key pair will be generated in AWS',
+          type: :string, short: :k
+      opt :key_file, 'The SSH private key file associated to the key_name', type: :string, short: :e
+      opt :ssh_user, 'The user to ssh to the instance as', type: :string, required: true, short: :h
+      opt :aws_region, 'The AWS region, defaults to AWS_DEFAULT_REGION environment variable',
+          type: :string, short: :w
+      opt :aws_instance_type, 'The ec2 instance type, defaults to t2.micro',
+          type: :string, default: 't2.micro', short: :i
+      opt :aws_security_groups,
+          'Security groups to associate to the launched instances. May be specified multiple times. If not provided a temporary security group will be generated in AWS',
+          type: :string, default: nil, multi: true, short: :c
+      opt :allow_any_temporary_security_group, 'The temporary security group will allow SSH connections from any IP address (0.0.0.0/0)',
+          short: :n
+      opt :aws_public_ip, 'Launch instances with a public IP', short: :p
+      opt :ssh_retries, 'The number of times we should try sshing to the ec2 instance before giving up. Defaults to 30',
+          type: :int, default: 30, short: :t
+      opt :tags, 'Additional tags to add to launched instances in the form of comma separated key=value pairs. i.e. Name=AmiSpec',
+          type: :string, default: '', short: :g
+      opt :debug, "Don't terminate instances on exit", short: :d
+      opt :buildkite, 'Output section separators for buildkite', short: :b
+      opt :wait_for_rc, 'Wait for oldschool SystemV scripts to run before conducting tests. Currently only supports Ubuntu with upstart',
+          short: :f
+      opt :wait_for_cloud_init, 'Wait for Cloud Init to complete before running tests'
+      opt :user_data_file, 'File path for aws ec2 user data', type: :string, default: nil, short: :l
+      opt :iam_instance_profile_arn, 'IAM instance profile to use', type: :string, short: :m
     end
 
     if options[:role] && options[:ami]
@@ -121,9 +174,7 @@ module AmiSpec
       fail "You must specify either role and ami or role_ami_file"
     end
 
-    unless File.exist? options[:key_file]
-      fail "Key file #{options[:key_file]} not found"
-    end
+    fail "Key file #{options[:key_file]} not found" if options[:key_name] && !File.exist?(options.fetch(:key_file))
 
     if options[:user_data_file] and !File.exist? options[:user_data_file]
       fail "User Data file #{options[:user_data_file]} not found"
@@ -131,6 +182,12 @@ module AmiSpec
 
     options[:tags] = parse_tags(options[:tags])
 
+    options[:amis].each_pair do |role, _|
+      unless Dir.exist?("#{options[:specs]}/#{role}")
+        fail "Role directory #{options[:specs]}/#{role} does not exist. If you'd like to skip the role '#{role}', create the directory but leave it empty (except for a .gitignore file)."
+      end
+    end
+
     exit run(options)
   end
 

data/lib/ami_spec/aws_default_vpc.rb

@@ -0,0 +1,10 @@
+require 'aws-sdk-ec2'
+
+module AmiSpec
+  class AwsDefaultVpc
+    def self.find_subnet(ec2: Aws::EC2::Resource.new)
+      default_vpc = ec2.vpcs(filters: [{name: 'isDefault', values: ['true']}]).first
+      default_vpc && default_vpc.subnets.first
+    end
+  end
+end

data/lib/ami_spec/aws_instance.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-ec2'
 require 'forwardable'
 require 'base64'
 
@@ -26,7 +26,7 @@ module AmiSpec
       @iam_instance_profile_arn = options.fetch(:iam_instance_profile_arn, nil)
     end
 
-    def_delegators :@instance, :instance_id, :tags, :terminate, :private_ip_address, :public_ip_address
+    def_delegators :@instance, :instance_id, :tags, :private_ip_address, :public_ip_address
 
     def start
       client = Aws::EC2::Client.new(client_options)
@@ -37,6 +37,11 @@ module AmiSpec
       tag_instance
     end
 
+    def terminate
+      @instance.terminate
+      @instance.wait_until_terminated
+    end
+
     private
 
     def client_options

data/lib/ami_spec/aws_key_pair.rb

@@ -0,0 +1,36 @@
+require 'aws-sdk-ec2'
+require 'logger'
+require 'securerandom'
+require 'tempfile'
+require 'pathname'
+
+module AmiSpec
+  class AwsKeyPair
+
+    def self.create(**args)
+      new(**args).tap(&:create)
+    end
+
+    def initialize(ec2: Aws::EC2::Resource.new, key_name_prefix: 'ami-spec-', logger: Logger.new(STDOUT))
+      @ec2 = ec2
+      @key_name = "#{key_name_prefix}#{SecureRandom.uuid}"
+      @logger = logger
+    end
+
+    attr_reader :key_name, :key_file
+
+    def create
+      @logger.info "Creating temporary AWS key pair: #{@key_name}"
+      @key_pair = @ec2.create_key_pair(key_name: @key_name)
+      @temp_file = Tempfile.new('key')
+      @temp_file.write(@key_pair.key_material)
+      @temp_file.close
+      @key_file = Pathname.new(@temp_file.path)
+    end
+
+    def delete
+      @logger.info "Deleting temporary AWS key pair: #{@key_name}"
+      @key_pair.delete
+    end
+  end
+end

data/lib/ami_spec/aws_security_group.rb

@@ -0,0 +1,72 @@
+require 'aws-sdk-ec2'
+require 'forwardable'
+require 'securerandom'
+
+module AmiSpec
+  class AwsSecurityGroup
+    extend Forwardable
+
+    def self.create(**args)
+      new(**args).tap(&:create)
+    end
+
+    def initialize(ec2: Aws::EC2::Resource.new,
+                   group_name_prefix: "ami-spec-",
+                   connection_port: 22,
+                   subnet_id:,
+                   allow_any_ip: false,
+                   logger: Logger.new(STDOUT))
+      @ec2 = ec2
+      @group_name = "#{group_name_prefix}#{SecureRandom.uuid}"
+      @connection_port = connection_port
+      @subnet_id = subnet_id
+      @allow_any_ip = allow_any_ip
+      @logger = logger
+    end
+
+    def_delegators :@security_group, :group_id
+    attr_reader :group_name
+
+    def create
+      @logger.info "Creating temporary AWS security group: #{@group_name}"
+      create_security_group
+      allow_ingress_via_connection_port
+    end
+
+    def delete
+      @logger.info "Deleting temporary AWS security group: #{@group_name}"
+      @security_group.delete
+    end
+
+    private
+
+    def create_security_group
+      @security_group = @ec2.create_security_group(
+        group_name: @group_name,
+        description: "A temporary security group for running AmiSpec",
+        vpc_id: subnet.vpc_id,
+      )
+    end
+
+    def allow_ingress_via_connection_port
+      @security_group.authorize_ingress(
+        ip_permissions: [
+          {
+            ip_protocol: "tcp",
+            from_port: @connection_port,
+            to_port: @connection_port,
+            ip_ranges: [{cidr_ip: cidr_block}],
+          },
+        ],
+      )
+    end
+
+    def cidr_block
+      @allow_any_ip ? "0.0.0.0/0" : subnet.cidr_block
+    end
+
+    def subnet
+      @subnet ||= @ec2.subnet(@subnet_id)
+    end
+  end
+end

data/lib/ami_spec/server_spec.rb

@@ -28,11 +28,15 @@ module AmiSpec
       end
 
       $LOAD_PATH.unshift(@spec) unless $LOAD_PATH.include?(@spec)
-      require File.join(@spec, 'spec_helper')
+      begin
+        require File.join(@spec, 'spec_helper')
+      rescue LoadError
+        puts 'Spec Helper does not exist. Skipping!'
+      end
 
       set :backend, :ssh
       set :host, @ip
-      set :ssh_options, :user => @user, :keys => [@key_file], :paranoid => false
+      set :ssh_options, :user => @user, :keys => [@key_file], :verify_host_key => :never
 
       RSpec.configuration.fail_fast = true if @debug
 

data/lib/ami_spec/version.rb

@@ -1,3 +1,3 @@
 module AmiSpec
-  VERSION = '1.1.0'
+  VERSION = '1.7.0'
 end

data/lib/ami_spec/wait_for_cloud_init.rb

@@ -0,0 +1,11 @@
+require 'net/ssh'
+
+module AmiSpec
+  class WaitForCloudInit
+    def self.wait(ip_address, user, key, port=22)
+      Net::SSH.start(ip_address, user, keys: [key], :verify_host_key => :never, port: port) do |ssh|
+        ssh.exec! '/usr/bin/cloud-init status --wait'
+      end
+    end
+  end
+end

data/lib/ami_spec/wait_for_rc.rb

@@ -3,7 +3,7 @@ require 'net/ssh'
 module AmiSpec
   class WaitForRC
     def self.wait(ip_address, user, key, port=22)
-      Net::SSH.start(ip_address, user, keys: [key], paranoid: false, port: port) do |ssh|
+      Net::SSH.start(ip_address, user, keys: [key], :verify_host_key => :never, port: port) do |ssh|
         distrib_stdout = ""
         # Determine the OS family
         ssh.exec!("source /etc/*release && echo -n $DISTRIB_ID && echo -n $ID") do |channel, stream, data|

data/lib/ami_spec/wait_for_ssh.rb

@@ -8,8 +8,8 @@ module AmiSpec
 
       while retries < max_retries
         begin
-          Net::SSH.start(ip_address, user, keys: [key], paranoid: false) { |ssh| ssh.exec 'echo boo!' }
-        rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Timeout::Error => error
+          Net::SSH.start(ip_address, user, keys: [key], :verify_host_key => :never) { |ssh| ssh.exec 'echo boo!' }
+        rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Timeout::Error, Net::SSH::Exception => error
           last_error = error
           sleep 1
         else

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: ami_spec
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Patrick Robinson
 - Martin Jagusch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -43,16 +43,16 @@ dependencies:
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: specinfra
   requirement: !ruby/object:Gem::Requirement
@@ -68,19 +68,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.45'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -99,16 +99,16 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5'
 description: Acceptance testing your AMIs
 email: []
 executables:
@@ -116,41 +116,25 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-version"
-- ".travis.yml"
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- ami_spec.gemspec
 - bin/ami_spec
 - lib/ami_spec.rb
+- lib/ami_spec/aws_default_vpc.rb
 - lib/ami_spec/aws_instance.rb
 - lib/ami_spec/aws_instance_options.rb
+- lib/ami_spec/aws_key_pair.rb
+- lib/ami_spec/aws_security_group.rb
 - lib/ami_spec/server_spec.rb
 - lib/ami_spec/server_spec_options.rb
 - lib/ami_spec/version.rb
+- lib/ami_spec/wait_for_cloud_init.rb
 - lib/ami_spec/wait_for_rc.rb
 - lib/ami_spec/wait_for_ssh.rb
-- spec/ami_spec_spec.rb
-- spec/aws_instance_spec.rb
-- spec/containers/Dockerfile.amazon_linux
-- spec/containers/Dockerfile.trusty
-- spec/containers/Dockerfile.xenial
-- spec/containers/README.md
-- spec/containers/ami-spec
-- spec/containers/ami-spec.pub
-- spec/containers/docker-compose.yml
-- spec/containers/rc.conf
-- spec/containers/sshd_config
-- spec/spec_helper.rb
-- spec/wait_for_rc_spec.rb
-- spec/wait_for_ssh_spec.rb
 homepage: https://github.com/envato/ami-spec
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,30 +142,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.4
+signing_key:
 specification_version: 4
 summary: Acceptance testing your AMIs
-test_files:
-- spec/ami_spec_spec.rb
-- spec/aws_instance_spec.rb
-- spec/containers/Dockerfile.amazon_linux
-- spec/containers/Dockerfile.trusty
-- spec/containers/Dockerfile.xenial
-- spec/containers/README.md
-- spec/containers/ami-spec
-- spec/containers/ami-spec.pub
-- spec/containers/docker-compose.yml
-- spec/containers/rc.conf
-- spec/containers/sshd_config
-- spec/spec_helper.rb
-- spec/wait_for_rc_spec.rb
-- spec/wait_for_ssh_spec.rb
+test_files: []

data/.gitignore

@@ -1,2 +0,0 @@
-Gemfile.lock
-*.gem

data/.ruby-version

@@ -1 +0,0 @@
-1.9.3-p551

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
- - 1.9.3
- - 2.1.8
- - 2.2.4
-script: bundle exec rake spec

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/Rakefile

@@ -1,8 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = "--tag ~integration"
-end
-
-task :default => :spec

data/ami_spec.gemspec

@@ -1,27 +0,0 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'ami_spec/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = 'ami_spec'
-  gem.version       = AmiSpec::VERSION
-  gem.authors       = ['Patrick Robinson', 'Martin Jagusch']
-  gem.email         = []
-  gem.description   = 'Acceptance testing your AMIs'
-  gem.summary       = gem.description
-  gem.homepage      = 'https://github.com/envato/ami-spec'
-
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ['lib']
-
-  gem.add_dependency 'aws-sdk', '~> 2'
-  gem.add_dependency 'rake'
-  gem.add_dependency 'serverspec'
-  gem.add_dependency 'specinfra', '>= 2.45'
-  gem.add_dependency 'trollop'
-  gem.add_dependency 'hashie'
-  gem.add_dependency 'net-ssh', '< 3.0'
-end

data/spec/ami_spec_spec.rb

@@ -1,74 +0,0 @@
-require 'spec_helper'
-
-describe AmiSpec do
-  let(:amis) { {'web_server' => 'ami-1234abcd', 'db_server' => 'ami-1234abcd'} }
-  let(:ec2_double) { instance_double(AmiSpec::AwsInstance) }
-  let(:state) { double(name: 'running') }
-  let(:test_result) { true }
-  let(:server_spec_double) { double(run: test_result) }
-  subject do
-    described_class.run(
-      amis: amis,
-      specs: '/tmp/foobar',
-      subnet_id: 'subnet-1234abcd',
-      key_name: 'key',
-      key_file: 'key.pem',
-      aws_public_ip: false,
-      aws_instance_type: 't2.micro',
-      ssh_user: 'ubuntu',
-      debug: false,
-      ssh_retries: 30,
-    )
-  end
-
-  describe '#invoke' do
-    it 'raises a system exit with no arguments' do
-      expect{ described_class.invoke }.to raise_error(SystemExit)
-    end
-  end
-
-  describe '#run' do
-    before do
-      allow(AmiSpec::WaitForSSH).to receive(:wait).and_return(true)
-      allow(AmiSpec::AwsInstance).to receive(:start).and_return(ec2_double)
-      allow(AmiSpec::ServerSpec).to receive(:new).and_return(server_spec_double)
-      allow(ec2_double).to receive(:terminate).and_return(true)
-      allow(ec2_double).to receive(:private_ip_address).and_return('127.0.0.1')
-      allow_any_instance_of(Object).to receive(:sleep)
-    end
-
-    context 'successful tests' do
-      it 'calls aws instance for each ami' do
-        expect(AmiSpec::AwsInstance).to receive(:start).with(hash_including(role: 'web_server'))
-        expect(AmiSpec::AwsInstance).to receive(:start).with(hash_including(role: 'db_server'))
-        subject
-      end
-
-      it 'returns true' do
-        expect(subject).to be_truthy
-      end
-    end
-
-    context 'failed tests' do
-      let(:test_result) { false }
-
-      it 'returns false' do
-        expect(subject).to be_falsey
-      end
-    end
-  end
-
-  describe '#parse_tags' do
-    it 'parses a single key/value pair' do
-      expect(described_class.parse_tags("Name=AmiSpec")).to eq( { "Name"=>"AmiSpec" } )
-    end
-
-    it 'parses multiple key/value pairs' do
-      expect(described_class.parse_tags("Name=AmiSpec,Owner=Me")).to eq( { "Name"=>"AmiSpec", "Owner"=>"Me" } )
-    end
-
-    it 'parses an empty string' do
-      expect(described_class.parse_tags("")).to eq({})
-    end
-  end
-end

data/spec/aws_instance_spec.rb

@@ -1,142 +0,0 @@
-require 'spec_helper'
-require 'base64'
-require 'tempfile'
-
-describe AmiSpec::AwsInstance do
-  let(:role) { 'web_server' }
-  let(:sec_group_id) { nil }
-  let(:region) { nil }
-  let(:client_double) { instance_double(Aws::EC2::Client) }
-  let(:new_ec2_double) { instance_double(Aws::EC2::Types::Instance) }
-  let(:ec2_double) { instance_double(Aws::EC2::Instance) }
-  let(:tags) { {} }
-  let(:iam_instance_profile_arn) { nil }
-  let(:user_data_file) { nil }
-
-  subject(:aws_instance) do
-    described_class.new(
-      role: role,
-      ami: 'ami',
-      subnet_id: 'subnet',
-      key_name: 'key',
-      aws_instance_type: 't2.micro',
-      aws_public_ip: false,
-      aws_security_groups: sec_group_id,
-      aws_region: region,
-      tags: tags,
-      user_data_file: user_data_file,
-      iam_instance_profile_arn: iam_instance_profile_arn
-    )
-  end
-
-  before do
-    allow(Aws::EC2::Client).to receive(:new).and_return(client_double)
-    allow(client_double).to receive(:run_instances).and_return(double(instances: [new_ec2_double]))
-    allow(ec2_double).to receive(:create_tags).and_return(double)
-    allow(Aws::EC2::Instance).to receive(:new).and_return(ec2_double)
-    allow(new_ec2_double).to receive(:instance_id)
-    allow(ec2_double).to receive(:instance_id)
-    allow(ec2_double).to receive(:wait_until_running)
-  end
-
-  describe '#start' do
-    subject(:start) { aws_instance.start }
-    context 'without optional values' do
-      it 'does not include the security group' do
-        expect(client_double).to receive(:run_instances).with(
-                                   hash_excluding(:network_interfaces=>array_including(hash_including(:groups)))
-                                 )
-        start
-      end
-
-      it 'does include the region' do
-        expect(Aws::EC2::Client).to receive(:new).with(
-                                      hash_excluding(:region => region)
-                                    )
-        start
-      end
-    end
-
-    context 'with security group' do
-      let(:sec_group_id) { ['1234'] }
-
-      it 'does include security groups' do
-        expect(client_double).to receive(:run_instances).with(
-                                   hash_including(:network_interfaces=>array_including(hash_including(:groups)))
-                                 )
-        start
-      end
-    end
-
-    context 'with region' do
-      let(:region) { 'us-east-1' }
-
-      it 'does include the region in the intial connection' do
-        expect(Aws::EC2::Client).to receive(:new).with(
-                                      hash_including(:region => region)
-                                    )
-        start
-      end
-
-      it 'does include the region in the subsequent connection' do
-        expect(Aws::EC2::Instance).to receive(:new).with(
-                                        anything,
-                                        hash_including(:region => region)
-                                      )
-        start
-      end
-    end
-
-    context 'with tags' do
-      let(:tags) { {"Name" => "AmiSpec"} }
-
-      it 'tags the instance' do
-        expect(ec2_double).to receive(:create_tags).with(
-                                 {tags: [{ key: 'AmiSpec', value: role}, { key: "Name", value: "AmiSpec"}]}
-                               )
-        start
-      end
-    end
-
-    context 'with user_data' do
-      let(:user_data_file) {
-        file = Tempfile.new('user_data.txt')
-        file.write("my file\ncontent")
-        file.close
-        file.path
-      }
-
-      it 'does include user_data' do
-        expect(client_double).to receive(:run_instances).with(
-            hash_including(:user_data =>  Base64.encode64("my file\ncontent"))
-        )
-        start
-      end
-    end
-
-    context 'with iam_instance_profile_arn' do
-      let(:iam_instance_profile_arn) { "my_arn" }
-
-      it 'does include iam_instance_profile_arn' do
-        expect(client_double).to receive(:run_instances).with(
-            hash_including(:iam_instance_profile =>  { arn: 'my_arn'})
-        )
-        start
-      end
-    end
-
-    it 'tags the instance with a role' do
-      expect(ec2_double).to receive(:create_tags).with(
-                                 hash_including(tags: [{ key: 'AmiSpec', value: role}])
-                               )
-      start
-    end
-
-    it 'delegates some methods to the instance variable' do
-      expect(ec2_double).to receive(:instance_id)
-      start
-      aws_instance.instance_id
-    end
-  end
-
-end

data/spec/containers/Dockerfile.amazon_linux

@@ -1,9 +0,0 @@
-FROM amazonlinux:1
-
-RUN yum install -y upstart openssh-server && yum clean all
-ADD rc.conf /etc/init/rc.conf
-
-COPY ami-spec.pub /root/.ssh/authorized_keys
-COPY sshd_config /etc/ssh/sshd_config
-
-CMD ["/bin/bash", "-c", "exec /sbin/init"]

data/spec/containers/Dockerfile.trusty

@@ -1,8 +0,0 @@
-FROM ubuntu-upstart:trusty
-
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get install -y openssh-server && apt-get clean
-
-COPY ami-spec.pub /root/.ssh/authorized_keys
-
-EXPOSE 22

data/spec/containers/Dockerfile.xenial

@@ -1,22 +0,0 @@
-FROM ubuntu:xenial
-
-RUN cd /lib/systemd/system/sysinit.target.wants/; ls | grep -v systemd-tmpfiles-setup | xargs rm -f $1 \
-rm -f /lib/systemd/system/multi-user.target.wants/*;\
-rm -f /etc/systemd/system/*.wants/*;\
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*;\
-rm -f /lib/systemd/system/anaconda.target.wants/*; \
-rm -f /lib/systemd/system/plymouth*; \
-rm -f /lib/systemd/system/systemd-update-utmp*;
-
-RUN apt-get update && apt-get install -y openssh-server dbus && apt-get clean
-
-RUN systemctl set-default multi-user.target
-
-COPY ami-spec.pub /root/.ssh/authorized_keys
-
-EXPOSE 22
-
-CMD ["/bin/bash", "-c", "exec /sbin/init --log-target=journal 3>&1"]

data/spec/containers/README.md

@@ -1,5 +0,0 @@
-## Integration test containers
-
-This directory is used to create containers that can be used to test the `WaitForRC` class. Because they require upstart/systemd to exist we have to install and start the init environment. We also setup SSH so that we can simple call the `wait` function and have it SSH to our container to execute.
-
-Refer to the [README](../../README.md#running-tests) for how to execute them.

data/spec/containers/ami-spec

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAwWn2++lylp8RcHzy7H9QpYli3nxLDh769DDbnb9cw2UDd9OH
-6JZKaT3xe3IbMr39SmkGlOygkBmeH43VxAkiVJv3awDPRU0UvDyUvCsbaYj1/cOS
-8Vxr7ENExoiKkengcg6k3mFj65ooJ1pf8RoXuj+0+YU0fgejuR/M4x6V8GKFCJhU
-wFmRs3mcoCx0EiJtTx40IW87uOQUruDX5HcgTUInRhyRxltNrXJaap1weMGpIA/o
-Bo8foOx1Os9o3YKQlkPF4iqk2AVJ4FZGbMay0cIq3075Jeig6bdlIhRpYA+w+SAI
-y/yT/K3U1ciQqKtPgahGEyihrh7Ks2F2FSLhdwIDAQABAoIBABWt/QNLrY54kgnb
-15buxmlntu9dW0Rf8J1ChLtv4cP9JKBf05IcloapbNH7flT3utaGYzh6NZ0xYeoD
-ifyJUZHOUbNqydDozPQ0ji9xXYc81OX28Beh1m8LM0BVucKVRpVCUvSiUgLsqqeO
-l8Z8uEAmN/DoH3QpAw8TI3Ip0YC6OHA2aRV9PXuDnR5OTdBPOBj33Fdtf0rUAk41
-UFe/BHFyACfTK05+bcQz9DvRV/H+SnBeOCqDie1eNDnEgza4NS2cnBUCogKsaCrY
-gV06pivS2aHsK5CuNB1lcZi1tVf3DnDwPvFWqLLG9PIHaevPDpDURECirCrpCWJT
-VSHm7KECgYEA4K5jSna4Jzo9FlHzF+yGEju5QwEJTjnhunNw1FpcgPAddFQ4hs3w
-0EhyPlZyf3vwhfdH4vBhTLjRTrOF2SIvSSPwrkWlAhaluVvpVRFd/ncYW4kAVwhQ
-15/ZBtvu8OQnKeeztsLlkEi4ik3cKjeXyeDQReb2Guvc6IM4fr6ZrlkCgYEA3F/S
-uJr04UgzX0cQuNLX7uXz6oeyJupwFkTuAhvLcHDsDHFkP1M9zfFzg5aEcQungz/l
-5s/vFJmfLBrzhSoYY1T9PDdLwEL/JKaxhKNEV9lExF4exMui6QPWdTMA8ndvB7r5
-Ur85X8scH1qJo99fsEmNmG5O72PGXmltOB0sNE8CgYEApeuCPYIweh+C7xGzkE5F
-r/9Uz4tbYN5TuMn5X4gfWcR4K+jqGXrJxDZLz4ctZMGVHIlBF/DmGa8+On1OccvR
-2ZRl73xU35bz6U9bn0uE+x7d6PLiQmNMt/8+WNdfu5rw5PxLdcK1nnhldxUKak7F
-k/qmM4jc44Kcj0QgG1EL0nkCgYAFbV61KSvKuIp7WDazNo4W1hbxubHLf46PHdd2
-udSCymUl0U0UuioVflLH9NcCKbVQaCxzSL+slDP1VByXNPgwyhEKgJoe/Adokaph
-h9vRBgrJgz/ivNkgP/XyIPVvAz36xMILJaZ2E3x30TT+kiu7HbSdAmpzPtPN027b
-KOzDxQKBgEv2OvEtpvpv9DgPHs9Mq4haTh2o8c8JW7kwHqbbZOZjZ/4daEh89FhH
-gjvJV5NjaNhFqBWTnNfjSr4o09WFDoQyVwEUrWNJXXZmsjOHqMDT/kwVoAsld1tO
-N+JW6/4M+EMYvF39yWzdQn/U3A1gZIfzAC6S3HUCi9BgKLBMKEN3
------END RSA PRIVATE KEY-----

data/spec/containers/ami-spec.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBafb76XKWnxFwfPLsf1CliWLefEsOHvr0MNudv1zDZQN304folkppPfF7chsyvf1KaQaU7KCQGZ4fjdXECSJUm/drAM9FTRS8PJS8KxtpiPX9w5LxXGvsQ0TGiIqR6eByDqTeYWPrmignWl/xGhe6P7T5hTR+B6O5H8zjHpXwYoUImFTAWZGzeZygLHQSIm1PHjQhbzu45BSu4NfkdyBNQidGHJHGW02tclpqnXB4wakgD+gGjx+g7HU6z2jdgpCWQ8XiKqTYBUngVkZsxrLRwirfTvkl6KDpt2UiFGlgD7D5IAjL/JP8rdTVyJCoq0+BqEYTKKGuHsqzYXYVIuF3

data/spec/containers/docker-compose.yml

@@ -1,28 +0,0 @@
-version: '3'
-services:
-  xenial:
-    build:
-      context: .
-      dockerfile: Dockerfile.xenial
-    ports:
-      - "1122:22"
-    # --security-opt seccomp=unconfined --tmpfs /run --tmpfs /run/lock -v /sys/fs/cgroup:/sys/fs/cgroup:ro
-    security_opt:
-      - seccomp:unconfined
-    tmpfs:
-      - /run
-      - /run/lock
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  trusty:
-    build:
-      context: .
-      dockerfile: Dockerfile.trusty
-    ports:
-      - "1123:22"
-  amazon_linux:
-    build:
-      context: .
-      dockerfile: Dockerfile.amazon_linux
-    ports:
-      - "1124:22"

data/spec/containers/rc.conf

@@ -1,17 +0,0 @@
-# rc - System V runlevel compatibility
-#
-# This task runs the old sysv-rc runlevel scripts.  It
-# is usually started by the telinit compatibility wrapper.
-#
-# Do not edit this file directly. If you want to change the behaviour,
-# please create a file rc.override and put your changes there.
-
-start on runlevel [0123456]
-
-stop on runlevel [!$RUNLEVEL]
-
-task
-
-export RUNLEVEL
-console output
-exec /etc/rc.d/rc $RUNLEVEL

data/spec/containers/sshd_config

@@ -1,17 +0,0 @@
-HostKey /etc/ssh/ssh_host_rsa_key
-HostKey /etc/ssh/ssh_host_ecdsa_key
-HostKey /etc/ssh/ssh_host_ed25519_key
-SyslogFacility AUTHPRIV
-AuthorizedKeysFile	.ssh/authorized_keys
-PasswordAuthentication no
-ChallengeResponseAuthentication no
-UsePAM yes
-X11Forwarding yes
-PrintLastLog yes
-UsePrivilegeSeparation sandbox
-AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
-AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
-AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE
-AcceptEnv XMODIFIERS
-Subsystem	sftp	/usr/libexec/openssh/sftp-server
-PermitRootLogin yes

data/spec/spec_helper.rb

@@ -1,2 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'ami_spec'

data/spec/wait_for_rc_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe AmiSpec::WaitForRC, integration: true do
-  let(:private_key_file) { File.expand_path(File.join('..', 'containers', 'ami-spec'), __FILE__) }
-  context 'xenial server' do
-    let(:ssh_port) { 1122 }
-    it 'executes without printing any errors' do
-      expect { described_class.wait("localhost", "root", private_key_file, ssh_port) }.to_not output.to_stdout
-    end
-  end
-
-  context 'trusty server' do
-    let(:ssh_port) { 1123 }
-    it 'executes without printing any errors' do
-      expect { described_class.wait("localhost", "root", private_key_file, ssh_port) }.to_not output.to_stdout
-    end
-  end
-
-  context 'amazon linux server' do
-    let(:ssh_port) { 1124 }
-    it 'executes without printing any errors' do
-      expect { described_class.wait("localhost", "root", private_key_file, ssh_port) }.to_not output.to_stdout
-    end
-  end
-end

data/spec/wait_for_ssh_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-describe AmiSpec::WaitForSSH do
-  describe '#wait' do
-    let(:retries) { 30 }
-    subject { described_class.wait('127.0.0.1', 'ubuntu', 'key.pem', 30) }
-
-    before do
-      allow_any_instance_of(Object).to receive(:sleep)
-    end
-
-    it 'returns after one attempt if ssh connection succeeds' do
-      expect(Net::SSH).to receive(:start)
-
-      subject
-    end
-
-    context 'ssh fails' do
-      before do
-        allow(Net::SSH).to receive(:start).and_raise(Errno::ECONNREFUSED, 'ssh failed')
-      end
-
-      it 'raises an exception' do
-        expect{subject}.to raise_error(AmiSpec::InstanceConnectionTimeout)
-      end
-
-      it 'returns the last error' do
-        expect(Net::SSH).to receive(:start).and_raise(Errno::ECONNREFUSED, 'some other error')
-        expect{subject}.to raise_error(AmiSpec::InstanceConnectionTimeout, /ssh failed/)
-      end
-
-      it 'tries the number of retries specified' do
-        expect(Net::SSH).to receive(:start).exactly(retries).times
-
-        expect{subject}.to raise_error(AmiSpec::InstanceConnectionTimeout)
-      end
-    end
-  end
-end