vagrant-aws-mkubenka 0.7.2.pre.9 → 0.7.2.pre.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4629112cf6cd74a0d19c03ad1b91cf4c5183ceaf
-  data.tar.gz: de1512459a12c58c6d76c99253238cfb698f23b0
+  metadata.gz: 501f18e17e8ec70da2fbb1519c194488e2bd9869
+  data.tar.gz: a284c2af7a88fc1de2d6513294759202050d54f4
 SHA512:
-  metadata.gz: e3c03b54816422192a1c66b7820c863e011db1c42688ffaedeee9644715abce7f1518d2519cac6be080a403b4721a6884e95aa8e72680b78d791dddcfcf0fd77
-  data.tar.gz: a9d03e7c5c250d5de3bfec82b9ecd442d14b905ff9ec71130ddc75b03c7ecb098b63003d1f3c59f06264097bb5dcf43b063e0f900469719359d243fa737d451c
+  metadata.gz: b0c929872a6ea16d0ab38c00c43189fc51789317e9026a623aabf417fd8d8fd3d764a7f1f6b33a8fc78ccf74a0bcbed1421f78a70f4e2c2540d23a156eba1d10
+  data.tar.gz: 3b4e7f51abecdb1a066f559cade4bb5c9a1888439f665f0dc6127448080c15ce16ca9ff9c8f989c6a4773a1e754cd9437d415982e1bc18edab0216e29ef993a3

data/lib/vagrant-aws/config.rb

@@ -323,8 +323,8 @@ module VagrantPlugins
         if @access_key_id == UNSET_VALUE or @secret_access_key == UNSET_VALUE
           @aws_profile = 'default' if @aws_profile == UNSET_VALUE
           @aws_dir = ENV['HOME'].to_s + '/.aws/' if @aws_dir == UNSET_VALUE
-          @region, @access_key_id, @secret_access_key, @session_token = Credentials.new.get_aws_info(@aws_profile, @aws_dir)
-          @region = UNSET_VALUE if @region.nil?
+          @aws_region, @access_key_id, @secret_access_key, @session_token = Credentials.new.get_aws_info(@aws_profile, @aws_dir)
+          @region = @aws_region if @region == UNSET_VALUE and !@aws_region.nil?
         else
           @aws_profile = nil
           @aws_dir = nil

data/spec/vagrant-aws/config_spec.rb

@@ -219,6 +219,23 @@ aws_session_token= TOKuser3
       its("access_key_id")         { should == "AKIdefault" }
       its("secret_access_key")     { should == "PASSdefault" }
       its("session_token")         { should be_nil }
+      its("region")                { should == "eu-west-1" }
+    end
+
+    context "with default profile and overriding region" do
+      subject do
+        allow(File).to receive(:exist?).and_return(true)
+        allow(File).to receive(:read).with(filename_cfg).and_return(data_cfg)
+        allow(File).to receive(:read).with(filename_keys).and_return(data_keys)
+        instance.region = "eu-central-1"
+        instance.tap do |o|
+          o.finalize!
+        end
+      end
+      its("access_key_id")         { should == "AKIdefault" }
+      its("secret_access_key")     { should == "PASSdefault" }
+      its("session_token")         { should be_nil }
+      its("region")                { should == "eu-central-1" }
     end
 
     context "without any credential environment variables and chosing a profile" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws-mkubenka
 version: !ruby/object:Gem::Version
-  version: 0.7.2.pre.9
+  version: 0.7.2.pre.10
 platform: ruby
 authors:
 - Mitchell Hashimoto