vagrant-aws 0.1.3 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.2.0 (April 16, 2013)
+
+* Add support for `vagrant ssh -c` [GH-42]
+* Ability to specify a timeout for waiting for instances to become ready. [GH-44]
+* Better error message if instance didn't become ready in time.
+* Connection can now be done using IAM profiles. [GH-41]
+
 # 0.1.3 (April 9, 2013)
 
 * The `AWS_ACCESS_KEY` and `AWS_SECRET_KEY` will be used if available

data/README.md

@@ -1,10 +1,10 @@
 # Vagrant AWS Provider
 
-This is a [Vagrant](http://www.vagrantup.com) 1.1+ plugin that adds an [AWS](http://aws.amazon.com)
+This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an [AWS](http://aws.amazon.com)
 provider to Vagrant, allowing Vagrant to control and provision machines in
 EC2 and VPC.
 
-**NOTE:** This plugin requires Vagrant 1.1+,
+**NOTE:** This plugin requires Vagrant 1.2+,
 
 ## Features
 
@@ -50,14 +50,15 @@ your information where necessary.
 Vagrant.configure("2") do |config|
   config.vm.box = "dummy"
 
-  config.vm.provider :aws do |aws|
+  config.vm.provider :aws do |aws, override|
     aws.access_key_id = "YOUR KEY"
     aws.secret_access_key = "YOUR SECRET KEY"
     aws.keypair_name = "KEYPAIR NAME"
-    aws.ssh_private_key_path = "PATH TO YOUR PRIVATE KEY"
 
     aws.ami = "ami-7747d01e"
-    aws.ssh_username = "ubuntu"
+
+    override.ssh.username = "ubuntu"
+    override.ssh.private_key_path = "PATH TO YOUR PRIVATE KEY"
   end
 end
 ```
@@ -94,6 +95,8 @@ This provider exposes quite a few provider-specific configuration options:
 * `ami` - The AMI id to boot, such as "ami-12345678"
 * `availability_zone` - The availability zone within the region to launch
   the instance. If nil, it will use the default set by Amazon.
+* `instance_ready_timeout` - The number of seconds to wait for the instance
+  to become "ready" in AWS. Defaults to 120 seconds.
 * `instance_type` - The type of instance, such as "m1.small". The default
   value of this if not specified is "m1.small".
 * `keypair_name` - The name of the keypair to use to bootstrap AMIs
@@ -102,14 +105,13 @@ This provider exposes quite a few provider-specific configuration options:
   within a [VPC](http://aws.amazon.com/vpc/)
 * `region` - The region to start the instance in, such as "us-east-1"
 * `secret_access_key` - The secret access key for accessing AWS
-* `ssh_private_key_path` - The path to the SSH private key. This overrides
-  `config.ssh.private_key_path`.
-* `ssh_username` - The SSH username, which overrides `config.ssh.username`.
 * `security_groups` - An array of security groups for the instance. If this
   instance will be launched in VPC, this must be a list of security group
   IDs.
 * `subnet_id` - The subnet to boot the instance into, for VPC.
 * `tags` - A hash of tags to set on the machine.
+* `use_iam_profile` - If true, will use [IAM profiles](http://docs.aws.amazon.com/IAM/latest/UserGuide/instance-profiles.html)
+  for credentials.
 
 These can be set like typical provider-specific configuration:
 

data/lib/vagrant-aws/action/connect_aws.rb

@@ -23,10 +23,14 @@ module VagrantPlugins
           # Build the fog config
           fog_config = {
             :provider              => :aws,
-            :aws_access_key_id     => region_config.access_key_id,
-            :aws_secret_access_key => region_config.secret_access_key,
             :region                => region
           }
+          if region_config.use_iam_profile
+            fog_config[:use_iam_profile] = True
+          else
+            fog_config[:aws_access_key_id] = region_config.access_key_id
+            fog_config[:aws_secret_access_key] = region_config.secret_access_key
+          end
 
           fog_config[:endpoint] = region_config.endpoint if region_config.endpoint
           fog_config[:version]  = region_config.version if region_config.version

data/lib/vagrant-aws/action/run_instance.rb

@@ -95,13 +95,24 @@ module VagrantPlugins
 
           # Wait for the instance to be ready first
           env[:metrics]["instance_ready_time"] = Util::Timer.time do
+            tries = region_config.instance_ready_timeout / 2
+
             env[:ui].info(I18n.t("vagrant_aws.waiting_for_ready"))
-            retryable(:on => Fog::Errors::TimeoutError, :tries => 30) do
-              # If we're interrupted don't worry about waiting
-              next if env[:interrupted]
+            begin
+              retryable(:on => Fog::Errors::TimeoutError, :tries => tries) do
+                # If we're interrupted don't worry about waiting
+                next if env[:interrupted]
+
+                # Wait for the server to be ready
+                server.wait_for(2) { ready? }
+              end
+            rescue Fog::Errors::TimeoutError
+              # Delete the instance
+              terminate(env)
 
-              # Wait for the server to be ready
-              server.wait_for(2) { ready? }
+              # Notify the user
+              raise Errors::InstanceReadyTimeout,
+                timeout: region_config.instance_ready_timeout
             end
           end
 

data/lib/vagrant-aws/action.rb

@@ -70,6 +70,20 @@ module VagrantPlugins
         end
       end
 
+      def self.action_ssh_run
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use SSHRun
+          end
+        end
+      end
+
       # This action is called to bring the box up from nothing.
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|

data/lib/vagrant-aws/config.rb

@@ -19,6 +19,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :availability_zone
 
+      # The timeout to wait for an instance to become ready.
+      #
+      # @return [Fixnum]
+      attr_accessor :instance_ready_timeout
+
       # The type of instance to launch, such as "m1.small"
       #
       # @return [String]
@@ -87,6 +92,12 @@ module VagrantPlugins
       # @return [Hash<String, String>]
       attr_accessor :tags
 
+      # Use IAM Instance Role for authentication to AWS instead of an
+      # explicit access_id and secret_access_key
+      #
+      # @return [Boolean]
+      attr_accessor :use_iam_profile
+
       # The user data string
       #
       # @return [String]
@@ -96,6 +107,7 @@ module VagrantPlugins
         @access_key_id      = UNSET_VALUE
         @ami                = UNSET_VALUE
         @availability_zone  = UNSET_VALUE
+        @instance_ready_timeout = UNSET_VALUE
         @instance_type      = UNSET_VALUE
         @keypair_name       = UNSET_VALUE
         @private_ip_address = UNSET_VALUE
@@ -110,6 +122,7 @@ module VagrantPlugins
         @subnet_id          = UNSET_VALUE
         @tags               = {}
         @user_data          = UNSET_VALUE
+        @use_iam_profile    = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -188,6 +201,9 @@ module VagrantPlugins
         # AMI must be nil, since we can't default that
         @ami = nil if @ami == UNSET_VALUE
 
+        # Set the default timeout for waiting for an instance to be ready
+        @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
+
         # Default instance type is an m1.small
         @instance_type = "m1.small" if @instance_type == UNSET_VALUE
 
@@ -217,6 +233,9 @@ module VagrantPlugins
         # Subnet is nil by default otherwise we'd launch into VPC.
         @subnet_id = nil if @subnet_id == UNSET_VALUE
 
+        # By default we don't use an IAM profile
+        @use_iam_profile = false if @use_iam_profile == UNSET_VALUE
+
         # User Data is nil by default
         @user_data = nil if @user_data == UNSET_VALUE
 
@@ -255,10 +274,13 @@ module VagrantPlugins
           # that region.
           config = get_region_config(@region)
 
-          errors << I18n.t("vagrant_aws.config.access_key_id_required") if \
-            config.access_key_id.nil?
-          errors << I18n.t("vagrant_aws.config.secret_access_key_required") if \
-            config.secret_access_key.nil?
+          if !config.use_iam_profile
+            errors << I18n.t("vagrant_aws.config.access_key_id_required") if \
+              config.access_key_id.nil?
+            errors << I18n.t("vagrant_aws.config.secret_access_key_required") if \
+              config.secret_access_key.nil?
+          end
+
           errors << I18n.t("vagrant_aws.config.ami_required") if config.ami.nil?
 
           if config.ssh_private_key_path && \

data/lib/vagrant-aws/errors.rb

@@ -11,6 +11,10 @@ module VagrantPlugins
         error_key(:fog_error)
       end
 
+      class InstanceReadyTimeout < VagrantAWSError
+        error_key(:instance_ready_timeout)
+      end
+
       class RsyncError < VagrantAWSError
         error_key(:rsync_error)
       end

data/lib/vagrant-aws/plugin.rb

@@ -6,8 +6,8 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < "1.1.0"
-  raise "The Vagrant AWS plugin is only compatible with Vagrant 1.1+"
+if Vagrant::VERSION < "1.2.0"
+  raise "The Vagrant AWS plugin is only compatible with Vagrant 1.2+"
 end
 
 module VagrantPlugins

data/lib/vagrant-aws/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module AWS
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/locales/en.yml

@@ -47,6 +47,11 @@ en:
         below:
 
         %{message}
+      instance_ready_timeout: |-
+        The instance never became "ready" in AWS. The timeout currently
+        set waiting for the instance to become ready is %{timeout} seconds.
+        Please verify that the machine properly boots. If you need more time
+        set the `instance_ready_timeout` configuration on the AWS provider.
       rsync_error: |-
         There was an error when attemping to rsync a share folder.
         Please inspect the error message below for more info.

data/spec/vagrant-aws/config_spec.rb

@@ -18,6 +18,7 @@ describe VagrantPlugins::AWS::Config do
     its("access_key_id")     { should be_nil }
     its("ami")               { should be_nil }
     its("availability_zone") { should be_nil }
+    its("instance_ready_timeout") { should == 120 }
     its("instance_type")     { should == "m1.small" }
     its("keypair_name")      { should be_nil }
     its("private_ip_address") { should be_nil }
@@ -29,6 +30,7 @@ describe VagrantPlugins::AWS::Config do
     its("subnet_id")         { should be_nil }
     its("tags")              { should == {} }
     its("user_data")         { should be_nil }
+    its("use_iam_profile")   { should be_false }
   end
 
   describe "overriding defaults" do
@@ -36,10 +38,11 @@ describe VagrantPlugins::AWS::Config do
     # simple boilerplate test, so I cut corners here. It just sets
     # each of these attributes to "foo" in isolation, and reads the value
     # and asserts the proper result comes back out.
-    [:access_key_id, :ami, :availability_zone, :instance_type,
-      :keypair_name,
+    [:access_key_id, :ami, :availability_zone, :instance_ready_timeout,
+      :instance_type, :keypair_name,
       :region, :secret_access_key, :security_groups,
-      :ssh_private_key_path, :ssh_username, :subnet_id, :tags].each do |attribute|
+      :ssh_private_key_path, :ssh_username, :subnet_id, :tags,
+      :use_iam_profile, :user_data].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3553654739612910885
+      hash: 1824347495740521097
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: