ami_spec 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87eebf7f488963ef90dec3e34678f6c75bd36eaf896467edaeb1651271ad8d8a
-  data.tar.gz: 6425586e1732b2e78cb4099047f1ba6e5e99d08deb0dbd5aa4031daa24beb597
+  metadata.gz: 5c700a6f5448ab25c9b1247276aa03da13a25e8b6ee11c99627c0001b980bb7d
+  data.tar.gz: 162c0f91f251d700daecf145b80dc713d5f7770d6f718fd96276461c61497ab3
 SHA512:
-  metadata.gz: 93dd91143f960c39da8cfdf24522a9daf271d4aaf3a69db345d4621e40c9a10ca43158abe19a0e2268cca9bbc699267fe9c54b954275d5e7bccb404eb2e487f7
-  data.tar.gz: 7e1a7762ed90bfd5266ab9a869fe1a78af16e065fe8d5c8ac0663376195e9029d7b23c8d8d7ab818cba7fdf5d2ee821eab723b8b176459880685851e4a055ebe
+  metadata.gz: f202c83cce3214a851739e6eaa2564b8a8c85f3b865732196d11381a789a4e5ee15b44b381b1d0dddd41109614c0b1a1ba2aff58e9bfaacdb0f97a28be164c73
+  data.tar.gz: db260f6ed177d0f6574d4e53a4d445c340806c5c81c95d1f5ba3173673fe698c7be11a0a4a68c0075698d31f7ea4d0807262574284b45f44f1200861807a9f6b

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://travis-ci.org/envato/ami-spec.svg?branch=master)](https://travis-ci.org/envato/ami-spec)
+
 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.
@@ -35,7 +39,8 @@ Options:
   -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
+  -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

data/lib/ami_spec.rb

@@ -1,5 +1,6 @@
 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'
@@ -54,6 +55,13 @@ module AmiSpec
 
     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
@@ -94,7 +102,7 @@ module AmiSpec
   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."
@@ -116,7 +124,7 @@ module AmiSpec
       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 :subnet_id, "The subnet to start the instance in. If not provided a subnet will be chosen from the default VPC", type: :string
       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
       opt :key_file, "The SSH private key file associated to the key_name", type: :string

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/version.rb

@@ -1,3 +1,3 @@
 module AmiSpec
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ami_spec
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Patrick Robinson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
@@ -120,6 +120,7 @@ files:
 - README.md
 - 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