ami_spec 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2a7a5034e02deb64f10fae91426c5771688bbae9c8e56764c6af2faa13ebe7c
-  data.tar.gz: b006c1eeeae2d04e63d077717fabf1aa0ebe29a8361f88c6958d92401866ff7f
+  metadata.gz: c83caf5c011d84b3e70d6a855cf6fff7a87d01e06910bab01aeea55530ebde1d
+  data.tar.gz: 6b40b0cff04fe050717d2c500a2c3a635c974f83c4a3335b65f1985b6db76f84
 SHA512:
-  metadata.gz: c9e66fea702fe7f9edf9aa8679ec2c386e1c46079c9371b5cbae2964b25b9d84eb60ed65a54b34e54d123ab27e7bc2756dd4c9ee2fefffdd751187802d74976a
-  data.tar.gz: 1aaf85899a5269204bc817680c83c386e1b8132727712c49145cfa52627b72ea7301c8be6d08b28ae143daab2aa67aa0a61ec07854fb6b4a896c230b5843ccde
+  metadata.gz: 31de74ea052fafb212ce9ae126950c8882de96492cc2e40cd4c3f11821c1af17922de74825e6e3aaca9214b64e235c32a417845edff757880baca75e4f08341a
+  data.tar.gz: 01f976c2c436f1ddc1dd997524e788eb90ddad9d8f4ebe5fd2954c1078cfbb907f3323761850801709d865b35b4aaa557345dcf438c6f64f59baa47d7dca0e63

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

@@ -16,8 +16,6 @@ module AmiSpec
       @user = options.fetch(:ssh_user)
       @key_file = options.fetch(:key_file)
       @buildkite = options.fetch(:buildkite)
-      @user_data_file = options.fetch(:user_data_file)
-      @iam_instance_profile_arn = options.fetch(:user_data_file)
     end
 
     def run

data/lib/ami_spec/server_spec_options.rb

@@ -11,7 +11,5 @@ module AmiSpec
     property :specs
     property :ssh_user
     property :buildkite
-    property :user_data_file
-    property :iam_instance_profile_arn
   end
 end

data/lib/ami_spec/version.rb

@@ -1,3 +1,3 @@
 module AmiSpec
-  VERSION = '1.8.0'
+  VERSION = '1.8.2'
 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.2
 platform: ruby
 authors:
 - Patrick Robinson
 - Martin Jagusch
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
@@ -25,20 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +85,14 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5'
 description: Acceptance testing your AMIs
@@ -134,7 +120,7 @@ files:
 homepage: https://github.com/envato/ami-spec
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +135,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.4.5
+signing_key: 
 specification_version: 4
 summary: Acceptance testing your AMIs
 test_files: []