vagrant-aws 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.1.3 (April 9, 2013)
+
+* The `AWS_ACCESS_KEY` and `AWS_SECRET_KEY` will be used if available
+  and no specific keys are set in the Vagrantfile. [GH-33]
+* Fix issues with SSH on VPCs, the correct IP is used. [GH-30]
+* Exclude the ".vagrant" directory from rsync.
+* Implement `:disabled` flag support for shared folders. [GH-29]
+* `aws.user_data` to specify user data on the instance. [GH-26]
+
 # 0.1.2 (March 22, 2013)
 
 * Choose the proper region when connecting to AWS. [GH-9]

data/README.md

@@ -72,6 +72,9 @@ Note that normally a lot of this boilerplate is encoded within the box
 file, but the box file used for the quick start, the "dummy" box, has
 no preconfigured defaults.
 
+If you have issues with SSH connecting, make sure that the instances
+are being launched with a security group that allows SSH access.
+
 ## Box Format
 
 Every provider in Vagrant must introduce a custom box format. This
@@ -91,7 +94,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_type` - The type of instance, such as "m1.small"
+* `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
    which support it.
 * `private_ip_address` - The private IP address to assign to an instance
@@ -134,7 +138,7 @@ Vagrant.configure("2") do |config|
     aws.secret_access_key = "bar"
     aws.region = "us-east-1"
 
-    # Simply region config
+    # Simple region config
     aws.region_config "us-east-1", :ami => "ami-12345678"
 
     # More comprehensive region config

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

@@ -35,7 +35,7 @@ module VagrantPlugins
 
           # Read the DNS info
           return {
-            :host => server.dns_name,
+            :host => server.dns_name || server.private_ip_address,
             :port => config.ssh_port,
             :private_key_path => config.ssh_private_key_path,
             :username => config.ssh_username

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

@@ -34,6 +34,7 @@ module VagrantPlugins
           security_groups    = region_config.security_groups
           subnet_id          = region_config.subnet_id
           tags               = region_config.tags
+          user_data          = region_config.user_data
 
           # If there is no keypair then warn the user
           if !keypair
@@ -66,7 +67,8 @@ module VagrantPlugins
               :ssh_port           => ssh_port,
               :private_ip_address => private_ip_address,
               :subnet_id          => subnet_id,
-              :tags               => tags
+              :tags               => tags,
+              :user_data          => user_data
             }
 
             if !security_groups.empty?

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

@@ -2,12 +2,16 @@ require "log4r"
 
 require "vagrant/util/subprocess"
 
+require "vagrant/util/scoped_hash_override"
+
 module VagrantPlugins
   module AWS
     module Action
       # This middleware uses `rsync` to sync the folders over to the
       # AWS instance.
       class SyncFolders
+        include Vagrant::Util::ScopedHashOverride
+
         def initialize(app, env)
           @app    = app
           @logger = Log4r::Logger.new("vagrant_aws::action::sync_folders")
@@ -19,6 +23,11 @@ module VagrantPlugins
           ssh_info = env[:machine].ssh_info
 
           env[:machine].config.vm.synced_folders.each do |id, data|
+            data = scoped_hash_override(data, :aws)
+
+            # Ignore disabled shared folders
+            next if data[:disabled]
+
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]
 
@@ -38,6 +47,7 @@ module VagrantPlugins
             # Rsync over to the guest path using the SSH info
             command = [
               "rsync", "--verbose", "--archive", "-z",
+              "--exclude", ".vagrant/",
               "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]

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

@@ -7,7 +7,7 @@ module VagrantPlugins
       class TerminateInstance
         def initialize(app, env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_aws::action::run_instance")
+          @logger = Log4r::Logger.new("vagrant_aws::action::terminate_instance")
         end
 
         def call(env)

data/lib/vagrant-aws/config.rb

@@ -87,6 +87,11 @@ module VagrantPlugins
       # @return [Hash<String, String>]
       attr_accessor :tags
 
+      # The user data string
+      #
+      # @return [String]
+      attr_accessor :user_data
+
       def initialize(region_specific=false)
         @access_key_id      = UNSET_VALUE
         @ami                = UNSET_VALUE
@@ -104,6 +109,7 @@ module VagrantPlugins
         @ssh_username       = UNSET_VALUE
         @subnet_id          = UNSET_VALUE
         @tags               = {}
+        @user_data          = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -174,9 +180,10 @@ module VagrantPlugins
       end
 
       def finalize!
-        # The access keys default to nil
-        @access_key_id     = nil if @access_key_id     == UNSET_VALUE
-        @secret_access_key = nil if @secret_access_key == UNSET_VALUE
+        # Try to get access keys from standard AWS environment variables; they
+        # will default to nil if the environment variables are not present.
+        @access_key_id     = ENV['AWS_ACCESS_KEY'] if @access_key_id     == UNSET_VALUE
+        @secret_access_key = ENV['AWS_SECRET_KEY'] if @secret_access_key == UNSET_VALUE
 
         # AMI must be nil, since we can't default that
         @ami = nil if @ami == UNSET_VALUE
@@ -210,6 +217,9 @@ module VagrantPlugins
         # Subnet is nil by default otherwise we'd launch into VPC.
         @subnet_id = nil if @subnet_id == UNSET_VALUE
 
+        # User Data is nil by default
+        @user_data = nil if @user_data == UNSET_VALUE
+
         # Compile our region specific configurations only within
         # NON-REGION-SPECIFIC configurations.
         if !@__region_specific

data/lib/vagrant-aws/version.rb

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

data/spec/vagrant-aws/config_spec.rb

@@ -3,6 +3,11 @@ require "vagrant-aws/config"
 describe VagrantPlugins::AWS::Config do
   let(:instance) { described_class.new }
 
+  # Ensure tests are not affected by AWS credential environment variables
+  before :each do
+    ENV.stub(:[] => nil)
+  end
+
   describe "defaults" do
     subject do
       instance.tap do |o|
@@ -23,6 +28,7 @@ describe VagrantPlugins::AWS::Config do
     its("ssh_username")      { should be_nil }
     its("subnet_id")         { should be_nil }
     its("tags")              { should == {} }
+    its("user_data")         { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -43,6 +49,35 @@ describe VagrantPlugins::AWS::Config do
     end
   end
 
+  describe "getting credentials from environment" do
+    context "without EC2 credential environment variables" do
+      subject do
+        instance.tap do |o|
+          o.finalize!
+        end
+      end
+
+      its("access_key_id")     { should be_nil }
+      its("secret_access_key") { should be_nil }
+    end
+
+    context "with EC2 credential environment variables" do
+      before :each do
+        ENV.stub(:[]).with("AWS_ACCESS_KEY").and_return("access_key")
+        ENV.stub(:[]).with("AWS_SECRET_KEY").and_return("secret_key")
+      end
+
+      subject do
+        instance.tap do |o|
+          o.finalize!
+        end
+      end
+
+      its("access_key_id")     { should == "access_key" }
+      its("secret_access_key") { should == "secret_key" }
+    end
+  end
+
   describe "region config" do
     let(:config_access_key_id)     { "foo" }
     let(:config_ami)               { "foo" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-09 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: 1300892683038952165
+      hash: 3553654739612910885
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: