cloudformation-tool 1.5.7 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54883f0b3b73d46c3c1713a195b9890e44d45b0f6518bc0af02a05723ae98639
-  data.tar.gz: de8e95b100a2416ce91466d23ca4b409bcce5ed0c49392c1035113be5d8a3384
+  metadata.gz: f7be18ff2c6036cdb06141cdd8228ac6ddf638817255dc382cb556d092daed68
+  data.tar.gz: e524b656930e02f090a10643a7b2861b31a6ac719bfec3c83c2185baaaac690b
 SHA512:
-  metadata.gz: 95940c9d47d1ae01da4f6f34bd7ed78f40a5b3888037f768dfdaf84febeab5755f56ac78aecd4ab20e3e4f2e6f2dffa01048509824d096cb9ff5618cccd22bcc
-  data.tar.gz: 919a01d74e3f9da20933c8b2efd3dc5ea3aac7d78a3ac7f9e540ead9a9e037a857e35b0d695f0c4cdaef0503b02e28c223758c27dd3918672b1153c912a52f17
+  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 REGION - 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.7'
+  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,21 +72,27 @@ 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
-    $__profile ||= find_profile(nil, ENV['AWS_PROFILE'] || ENV['AWS_DEFAULT_PROFILE'] || 'default')
+  def profile name = nil
+    $__profile ||= name || find_profile(nil, ENV['AWS_PROFILE'] || ENV['AWS_DEFAULT_PROFILE'] || 'default')
   end
   
   def awscreds
-    require 'aws-sdk-core'
-    $__aws_creds ||= Aws::SharedCredentials.new(profile_name: profile)
+    #$__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,
+#      credentials: awscreds,
+      profile: profile,
       region: region,
       http_read_timeout: 5
     }
@@ -116,11 +140,12 @@ module CloudFormationTool
     if bucket.nil?
       name = cf_bucket_name(region)
       log "Creating CF template bucket #{name}"
-      awss3.create_bucket({
+      awss3(region).create_bucket({
         acl: "private",
         bucket: name,
         object_ownership: 'BucketOwnerPreferred'
       }.merge(if region == 'us-east-1' then {} else { create_bucket_configuration: { location_constraint: region } } end))
+      awss3(region).delete_public_access_block({bucket: name})
       name
     else
       bucket[:name]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.9
 platform: ruby
 authors:
 - Oded Arbel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement