cloudformation-tool 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1664bf2e43c0a1f38055655a7cf3f03e3cc894994b3f2c4999fe3ba2f176552d
-  data.tar.gz: 4629049058e37f0646ca4c2366056b30f53ea0984abe9bdb23ebdebba72fbb26
+  metadata.gz: f7be18ff2c6036cdb06141cdd8228ac6ddf638817255dc382cb556d092daed68
+  data.tar.gz: e524b656930e02f090a10643a7b2861b31a6ac719bfec3c83c2185baaaac690b
 SHA512:
-  metadata.gz: 6ee389717fb40caa17dad26a53600005c59a1291e708a8512ace4745b9b053e66e38896be0097c3e00399ec834ed47e73f109ad2ed6ea52a030782276e73e231
-  data.tar.gz: 702635a6866f36e6abbb34bce3bf6192788c7fd1b1f4ce2950f19f25b9c8ca2a51f34c96be8abf3eb7357a71e7f496ee0608996cf221912e1090fdec1f11ee79
+  metadata.gz: 6b5fd5bffc734fe2336b8410431a11ba4f70e1271373266efbe8ad4044004f2ddd653568298e3c700ab084315e8c34504ac371b44879991cae3c8fb0a7295a82
+  data.tar.gz: 500a58da8d2663bf28580e471c20f20acdbb5573227d19412262890abfb97669251d478e1e3917c7423bd790db280fe3c30a8af0cd3d1701ce8ec14b75d69fd0

data/README.md

@@ -359,11 +359,23 @@ more details and specific options.
 
 ### Region Selection
 
-The AWS region to be used can be select by specifying top level option (i.e. before the command name) `-r <region>`, by providing the standard environment variable `AWS_DEFAULT_REGION` or it will default to `us-west-1`
+The CloudFormation tool must know what region the CloudFormation stack is being deployed into, so it
+can create and appropriately located S3 bucket for template intermediary files (such cloud-init templates).
+
+The AWS region will be chosen according to this order of precedence:
+- Using the top level command line option `--region`
+- Setting the environment variable `AWS_REGION` (to be compatible with the AWS CLI)
+- Setting a default region in the AWS CLI profile, then selecting that profile using the top level command
+  line option `--profile` (this can be done using `aws configure` or by editing the credentials file)
+- Setting the environment variable `AWS_DEFAULT_REGION`
+- If none of these are set, the default AWS region `us-east-1` is assumed
 
 ### Credentials Selection
 
-The tool will use the standard AWS credentials selection process, except when you want to use AWS CLI configured credential profiles, you may select to use a profile other than "default" by specifying the top level option (i.e. before the command name) `-p <profile>`, by providing the standard environment variable `AWS_DEFAULT_PROFILE` or by having a file called `.awsprofile` - whose content is the name of a valid AWS credentials profile - in a parent directory (at any level up to the root directory).
+The tool will use the standard AWS credentials selection process, except that you may want to use AWS CLI configured
+credential profile - you may select to use a profile other than "default" either by using the top level command line
+option `--profile`, by providing the standard environment variable `AWS_DEFAULT_PROFILE`, or by creating a file called
+`.awsprofile` - whose content is the name of a valid AWS credentials profile - in a parent directory (at any level up to the root directory).
 
 ## Library API
 

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '1.5.8'
+  VERSION = '1.5.9'
 end

data/lib/cloud_formation_tool.rb

@@ -1,5 +1,7 @@
 require 'logger'
 require 'autoloaded'
+require 'socket'
+require 'aws-sdk-core'
 
 def logger
   ($__logger ||= Logger.new(STDERR))
@@ -37,6 +39,22 @@ def error(message = nul, &block)
   end)
 end
 
+# Hack AWS SDK to let us find out the Profile's region that it resolved
+module Aws
+  class SharedConfig
+    def profile_region
+      c = (if @parsed_credentials and @parsed_credentials[@profile_name] then
+        @parsed_credentials[@profile_name]
+      elsif @parsed_config and @parsed_config[@profile_name] then
+        @parsed_config[@profile_name]
+      else
+        {}
+      end)
+      c['region'] || c['aws_region'] || c['sso_region'] || nil
+    end
+  end
+end
+
 module CloudFormationTool
   
   Autoloaded.module do |autoloaded|
@@ -54,7 +72,10 @@ module CloudFormationTool
   end
   
   def region
-    $__region ||= (ENV['AWS_DEFAULT_REGION'] || 'us-west-1')
+    $__region ||= ENV['AWS_REGION'] ||
+        Aws::SharedConfig.new(profile_name: profile, config_enabled: true).profile_region ||
+        ENV['AWS_DEFAULT_REGION'] ||
+        'us-east-1'
   end
   
   def profile name = nil
@@ -62,13 +83,13 @@ module CloudFormationTool
   end
   
   def awscreds
-    require 'aws-sdk-core'
     #$__aws_creds ||= Aws::SharedCredentials.new(profile_name: profile)
     config = Aws::SharedConfig.new(profile_name: profile, config_enabled: true)
     $__aws_creds ||= config.credentials
   end
   
   def aws_config
+    p region
     {
 #      credentials: awscreds,
       profile: profile,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Oded Arbel