ami_spec 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2a7a5034e02deb64f10fae91426c5771688bbae9c8e56764c6af2faa13ebe7c
-  data.tar.gz: b006c1eeeae2d04e63d077717fabf1aa0ebe29a8361f88c6958d92401866ff7f
+  metadata.gz: 52b2bb6051e9962f16d4743d539763034bdf6e5ae33154852bbd335fe0a1b26b
+  data.tar.gz: 3b8876510c793c28911dab088fa35f003a0f15862c869bda17092db38e266929
 SHA512:
-  metadata.gz: c9e66fea702fe7f9edf9aa8679ec2c386e1c46079c9371b5cbae2964b25b9d84eb60ed65a54b34e54d123ab27e7bc2756dd4c9ee2fefffdd751187802d74976a
-  data.tar.gz: 1aaf85899a5269204bc817680c83c386e1b8132727712c49145cfa52627b72ea7301c8be6d08b28ae143daab2aa67aa0a61ec07854fb6b4a896c230b5843ccde
+  metadata.gz: '06228534001d96065a6bc5937533e4e00a250d821ce264259cc792d41165639d0142e04e4dfa0374cd934fc9b0786fa80c76deb577e96649519017a28a23a4c1'
+  data.tar.gz: 3aff902fd3205ce1704dbddb09eda7b5a02ce960cc253e944c04473e5101624d8459c31b3bb69400ac20565745647dfbb178f1c23b2f6fc2f259bc7fc50c02a8

data/lib/ami_spec/aws_instance.rb

@@ -25,22 +25,28 @@ module AmiSpec
       @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

data/lib/ami_spec/aws_instance_options.rb

@@ -16,5 +16,6 @@ module AmiSpec
     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.8.0'
+  VERSION = '1.8.1'
 end

data/lib/ami_spec.rb

@@ -83,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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ami_spec
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Patrick Robinson
 - Martin Jagusch
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 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: []