ami_spec 1.7.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 718f947b58e6bedd2093507f23b7bcc1c8deae4503dde3603c6768700729948a
-  data.tar.gz: b8c05a3702f5951932d372f6c3788a2ee71f9d0ead934a4bdfb52cae382bbe70
+  metadata.gz: 52b2bb6051e9962f16d4743d539763034bdf6e5ae33154852bbd335fe0a1b26b
+  data.tar.gz: 3b8876510c793c28911dab088fa35f003a0f15862c869bda17092db38e266929
 SHA512:
-  metadata.gz: a2ceb57cf5b2ea84f085a835e47e1533065338479c23bf3da88ff962d5c046c6109f2c0b93461ac4c1d5093a14bc7d522e4c154d1f34225ef3813ebd70f6ecda
-  data.tar.gz: ca6403909f96efb50c412ed722e6449b51ea147677f10d2e7729e31d02adc8ae82561eeaf2bbe054ab774bdf9086fe7b690254512f590c49d977920f99e2f371
+  metadata.gz: '06228534001d96065a6bc5937533e4e00a250d821ce264259cc792d41165639d0142e04e4dfa0374cd934fc9b0786fa80c76deb577e96649519017a28a23a4c1'
+  data.tar.gz: 3aff902fd3205ce1704dbddb09eda7b5a02ce960cc253e944c04473e5101624d8459c31b3bb69400ac20565745647dfbb178f1c23b2f6fc2f259bc7fc50c02a8

data/README.md

@@ -54,7 +54,8 @@ Options:
                                             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
+  -p, --aws-public-ip                       Launch instances with a public IP and use that IP for SSH
+  -q, --associate-public-ip                 Launch instances with a public IP and use the Private IP for SSH
   -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

data/lib/ami_spec/aws_instance.rb

@@ -19,27 +19,34 @@ module AmiSpec
       @key_name = options.fetch(:key_name)
       @instance_type = options.fetch(:aws_instance_type)
       @public_ip = options.fetch(:aws_public_ip)
+      @associate_public_ip = options.fetch(:associate_public_ip)
       @region = options.fetch(:aws_region)
       @security_group_ids = options.fetch(:aws_security_groups)
       @tags = ec2ify_tags(options.fetch(:tags))
       @user_data_file = options.fetch(:user_data_file, nil)
       @iam_instance_profile_arn = options.fetch(:iam_instance_profile_arn, nil)
+      @logger = options.fetch(:logger)
     end
 
     def_delegators :@instance, :instance_id, :tags, :private_ip_address, :public_ip_address
 
     def start
+      @logger.info "Creating AWS EC2 instance for #{@ami}"
       client = Aws::EC2::Client.new(client_options)
       placeholder_instance = client.run_instances(instances_options).instances.first
 
       @instance = Aws::EC2::Instance.new(placeholder_instance.instance_id, client_options)
+      @logger.info "Waiting for AWS EC2 instance to start: #{@instance.id}"
       @instance.wait_until_running
       tag_instance
+      @logger.info "AWS EC2 instance started: #{@instance.id}"
     end
 
     def terminate
+      @logger.info "Terminating AWS EC2 instance: #{@instance.id}"
       @instance.terminate
       @instance.wait_until_terminated
+      @logger.info "AWS EC2 instance terminated: #{@instance.id}"
     end
 
     private
@@ -61,7 +68,7 @@ module AmiSpec
         key_name: @key_name,
         network_interfaces: [{
           device_index: 0,
-          associate_public_ip_address: @public_ip,
+          associate_public_ip_address: @public_ip || @associate_public_ip,
           subnet_id: @subnet_id,
         }]
       }

data/lib/ami_spec/aws_instance_options.rb

@@ -12,8 +12,10 @@ module AmiSpec
     property :aws_public_ip
     property :aws_region
     property :aws_security_groups
+    property :associate_public_ip
     property :tags
     property :user_data_file
     property :iam_instance_profile_arn
+    property :logger
   end
 end

data/lib/ami_spec/version.rb

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

data/lib/ami_spec.rb

@@ -38,7 +38,9 @@ module AmiSpec
   # aws_instance_type::
   #   AWS ec2 instance type
   # aws_public_ip::
-  #   Should the instances get a public IP address
+  #   Should the instances get a public IP address and use that IP for SSH
+  # associate_public_ip::
+  #   Launch instances with a public IP but don't use that IP for SSH
   # ssh_user::
   #   The username to SSH to the AMI with.
   # ssh_retries::
@@ -81,17 +83,25 @@ module AmiSpec
 
     instances = []
     options[:amis].each_pair do |role, ami|
-      aws_instance_options = AwsInstanceOptions.new(options.merge(role: role, ami: ami))
+      aws_instance_options = AwsInstanceOptions.new(options.merge(role: role, ami: ami, logger: logger))
       instances << AwsInstance.start(aws_instance_options)
     end
 
     results = []
     instances.each do |instance|
       ip_address = options[:aws_public_ip] ? instance.public_ip_address : instance.private_ip_address
+      logger.info("Waiting for SSH…")
       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]
+      if options[:wait_for_rc]
+        logger.info("Waiting for RC…")
+        WaitForRC.wait(ip_address, options[:ssh_user], options[:key_file])
+      end
+      if options[:wait_for_cloud_init]
+        logger.info("Waiting for cloud init…")
+        WaitForCloudInit.wait(ip_address, options[:ssh_user], options[:key_file])
+      end
 
+      logger.info("Running serverspec…")
       server_spec_options = ServerSpecOptions.new(options.merge(instance: instance))
       results << ServerSpec.new(server_spec_options).run
      end
@@ -147,7 +157,8 @@ web_server,ami-id.',
           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 :aws_public_ip, 'Launch instances with a public IP and use that IP for SSH', short: :p
+      opt :associate_public_ip, "Launch instances with a public IP but don't use that IP for SSH", short: :q
       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',

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ami_spec
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Patrick Robinson
 - Martin Jagusch
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
@@ -134,7 +134,7 @@ files:
 homepage: https://github.com/envato/ami-spec
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Acceptance testing your AMIs
 test_files: []