cfndsl 1.8.0 → 1.9.5

data/lib/cfndsl/globals.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'version'
+require 'json'
 require 'fileutils'
 
 # Global variables to adjust CfnDsl behavior
@@ -10,8 +11,15 @@ module CfnDsl
 
   module_function
 
-  AWS_SPECIFICATION_URL = 'https://d201a2mn26r7lk.cloudfront.net/%<version>s/gzip/CloudFormationResourceSpecification.json'
   LOCAL_SPEC_FILE = File.expand_path('aws/resource_specification.json', __dir__)
+  REGION_SPEC_URLS_FILE = File.expand_path('aws/region_spec_urls.json', __dir__)
+
+  SPEC_PATH_SUFFIX = '%<version>s/gzip/CloudFormationResourceSpecification.json'
+  DEFAULT_SPEC_REGION = 'us-east-1'
+
+  def region_spec_urls
+    @region_spec_urls ||= JSON.parse(File.read(REGION_SPEC_URLS_FILE)).tap { |h| h.delete('_source') }.freeze
+  end
 
   def disable_deep_merge
     @disable_deep_merge = true
@@ -42,15 +50,35 @@ module CfnDsl
     File.join(ENV['HOME'], '.cfndsl/resource_specification.json')
   end
 
-  def update_specification_file(file: user_specification_file, version: nil)
+  # Build the full specification URL for a given region and version
+  #
+  # @param region [String] AWS region code
+  # @param version [String] specification version or 'latest'
+  # @return [String] full URL to the CloudFormation resource specification
+  def spec_url_for_region(region, version:)
+    base_url = region_spec_urls.fetch(region) do
+      raise Error, "Unsupported region '#{region}'. Use CfnDsl.supported_spec_regions for a list of supported regions."
+    end
+    "#{base_url}/#{format(SPEC_PATH_SUFFIX, version: version)}"
+  end
+
+  # List all supported regions for spec downloads
+  #
+  # @return [Array<String>] sorted list of supported region codes
+  def supported_spec_regions
+    region_spec_urls.keys.sort
+  end
+
+  def update_specification_file(file: user_specification_file, version: nil, region: nil)
     require 'open-uri'
     version ||= 'latest'
+    region ||= DEFAULT_SPEC_REGION
     FileUtils.mkdir_p File.dirname(file)
-    url = format(AWS_SPECIFICATION_URL, version: version)
+    url = spec_url_for_region(region, version: version)
     content = URI.parse(url).open.read
     version = JSON.parse(content)['ResourceSpecificationVersion'] if version == 'latest'
     File.open(file, 'w') { |f| f.puts content }
-    { file: file, version: version, url: url }
+    { file: file, version: version, url: url, region: region }
   rescue StandardError
     raise "Failed updating specification file #{file} from #{url}"
   end

data/lib/cfndsl/rake_task.rb

@@ -79,14 +79,14 @@ module CfnDsl
     #    then any existing file is considered sufficient, and 'latest' is the version used for downloading
     #
     # @todo Add capability to provide a user spec/patches dir
-    def specification(file:, name: nil, version: nil)
+    def specification(file:, name: nil, version: nil, region: nil)
       if name
         desc 'Update Resource Specification' unless ::Rake.application.last_description
         task name, [:cfn_spec_version] => file
       end
 
       @spec_task = file(file, :cfn_spec_version) do |t, args|
-        update_specification(t.name, args.with_defaults(cfn_spec_version: version)[:cfn_spec_version])
+        update_specification(t.name, args.with_defaults(cfn_spec_version: version)[:cfn_spec_version], region: region)
       end
       @spec_task.define_singleton_method(:needed?) { true } # We always need to check
       self
@@ -163,13 +163,13 @@ module CfnDsl
       tasks.unshift(load_spec)
     end
 
-    def update_specification(file, minimum_version)
-      if CfnDsl::Specification.update_required?(version: minimum_version, file: file)
+    def update_specification(file, minimum_version, region: nil)
+      if region || CfnDsl::Specification.update_required?(version: minimum_version, file: file)
 
         safe_update_embedded_spec if file == CfnDsl::LOCAL_SPEC_FILE
 
-        result = CfnDsl.update_specification_file(file: file, version: minimum_version)
-        puts "Specification #{result[:file]} updated to version #{result[:version]}"
+        result = CfnDsl.update_specification_file(file: file, version: minimum_version, region: region)
+        puts "Specification #{result[:file]} updated to version #{result[:version]} (#{result[:region]})"
         @updated_version = result[:version]
       elsif minimum_version
         verbose&.puts "Specification #{file} is already >= #{minimum_version}"

data/lib/cfndsl/runner.rb

@@ -64,6 +64,10 @@ module CfnDsl
           options[:update_spec] = true
         end
 
+        opts.on('-r', '--region REGION', 'AWS region for specification download (use with -u)') do |region|
+          options[:region] = region
+        end
+
         opts.on('-g', '--generate RESOURCE_TYPE,RESOURCE_LOGICAL_NAME', 'Add resource type and logical name') do |r|
           options[:lego] = true
           options[:resources] = []
@@ -92,8 +96,8 @@ module CfnDsl
 
       if options[:update_spec]
         warn 'Updating specification file'
-        result = CfnDsl.update_specification_file(version: options[:spec_version])
-        warn "Specification #{result[:version]} successfully written to #{result[:file]}"
+        result = CfnDsl.update_specification_file(version: options[:spec_version], region: options[:region])
+        warn "Specification #{result[:version]} (#{result[:region]}) successfully written to #{result[:file]}"
       end
 
       if options[:assetversion]

data/lib/cfndsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CfnDsl
-  VERSION = '1.8.0'
+  VERSION = '1.9.5'
 end

data/lib/deep_merge/core.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # rubocop:disable Metrics/AbcSize, Metrics/BlockNesting, Metrics/CyclomaticComplexity, Metrics/MethodLength
-# rubocop:disable Metrics/ModuleLength, Metrics/PerceivedComplexity, Style/IfInsideElse, Style/Semicolon
+# rubocop:disable Metrics/ModuleLength, Metrics/PerceivedComplexity, Style/Semicolon
 #
 # Totally borrowed from https://github.com/danielsdeleo/deep_merge
 module DeepMerge
@@ -246,4 +246,4 @@ module DeepMerge
   end
 end
 # rubocop:enable Metrics/AbcSize, Metrics/BlockNesting, Metrics/CyclomaticComplexity, Metrics/MethodLength
-# rubocop:enable Metrics/ModuleLength, Metrics/PerceivedComplexity, Style/IfInsideElse, Style/Semicolon
+# rubocop:enable Metrics/ModuleLength, Metrics/PerceivedComplexity, Style/Semicolon

data/spec/cli_spec.rb

@@ -17,6 +17,7 @@ describe 'cfndsl', type: :aruba do
           -s, --specification-file FILE    Location of Cloudformation Resource Specification file
           -u [VERSION],                    Update the Resource Specification file to latest, or specific version
               --update-specification
+          -r, --region REGION              AWS region for specification download (use with -u)
           -g RESOURCE_TYPE,RESOURCE_LOGICAL_NAME,
               --generate                   Add resource type and logical name
           -a, --assetversion               Print out the specification version
@@ -45,7 +46,7 @@ describe 'cfndsl', type: :aruba do
       run_command "cfndsl -u #{WORKING_SPEC_VERSION}"
       expect(last_command_started).to have_output_on_stderr(<<-OUTPUT.gsub(/^ {8}/, '').chomp)
         Updating specification file
-        Specification #{WORKING_SPEC_VERSION} successfully written to #{ENV['HOME']}/.cfndsl/resource_specification.json
+        Specification #{WORKING_SPEC_VERSION} (us-east-1) successfully written to #{ENV['HOME']}/.cfndsl/resource_specification.json
       OUTPUT
       expect(last_command_started).to have_exit_status(0)
     end
@@ -56,7 +57,19 @@ describe 'cfndsl', type: :aruba do
       run_command 'cfndsl -u'
 
       expected = %r{Updating specification file
-Specification ([0-9]+\.){2}[0-9]+ successfully written to #{ENV['HOME']}/.cfndsl/resource_specification.json}
+Specification ([0-9]+\.){2}[0-9]+ \(us-east-1\) successfully written to #{ENV['HOME']}/.cfndsl/resource_specification.json}
+
+      expect(last_command_started).to have_output_on_stderr(expected)
+      expect(last_command_started).to have_exit_status(0)
+    end
+  end
+
+  context 'cfndsl -u --region us-east-2' do
+    it 'updates the specification file from the specified region' do
+      run_command 'cfndsl -u --region us-east-2'
+
+      expected = %r{Updating specification file
+Specification ([0-9]+\.){2}[0-9]+ \(us-east-2\) successfully written to #{ENV['HOME']}/.cfndsl/resource_specification.json}
 
       expect(last_command_started).to have_output_on_stderr(expected)
       expect(last_command_started).to have_exit_status(0)

data/spec/region_spec_availability_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'net/http'
+require 'uri'
+
+describe 'Region specification availability', :network do
+  results = {}
+
+  before(:all) do
+    threads = CfnDsl.region_spec_urls.map do |region, base_url|
+      Thread.new do
+        url = URI.parse("#{base_url}/latest/gzip/CloudFormationResourceSpecification.json")
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = (url.scheme == 'https')
+        http.open_timeout = 5
+        http.read_timeout = 5
+
+        begin
+          response = http.request_head(url.path)
+          results[region] = { code: response.code.to_i, url: url.to_s }
+        rescue Net::OpenTimeout, Net::ReadTimeout
+          results[region] = { code: nil, url: url.to_s, timeout: true }
+        end
+      end
+    end
+    threads.each(&:join)
+  end
+
+  CfnDsl.region_spec_urls.each_key do |region|
+    it "#{region} has a reachable latest specification" do
+      result = results[region]
+      skip "Timed out connecting to #{region} (#{result[:url]}) — likely a network route issue" if result[:timeout]
+      expect(result[:code]).to eq(200), "Expected 200 for #{region} (#{result[:url]}), got #{result[:code]}"
+    end
+  end
+end

data/spec/region_spec_urls_spec.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe CfnDsl do
+  describe '.spec_url_for_region' do
+    it 'builds the correct URL for a CloudFront-backed region' do
+      url = CfnDsl.spec_url_for_region('eu-west-1', version: '255.0.0')
+      expect(url).to eq('https://d3teyb21fexa9r.cloudfront.net/255.0.0/gzip/CloudFormationResourceSpecification.json')
+    end
+
+    it 'builds the correct URL for an S3-backed region' do
+      url = CfnDsl.spec_url_for_region('af-south-1', version: 'latest')
+      expect(url).to eq('https://cfn-resource-specifications-af-south-1-prod.s3.af-south-1.amazonaws.com/latest/gzip/CloudFormationResourceSpecification.json')
+    end
+
+    it 'builds the correct URL for the default region (us-east-1)' do
+      url = CfnDsl.spec_url_for_region('us-east-1', version: '7.1.0')
+      expect(url).to eq('https://d1uauaxba7bl26.cloudfront.net/7.1.0/gzip/CloudFormationResourceSpecification.json')
+    end
+
+    it 'raises CfnDsl::Error for an unsupported region' do
+      expect { CfnDsl.spec_url_for_region('mars-west-1', version: 'latest') }
+        .to raise_error(CfnDsl::Error, /Unsupported region 'mars-west-1'/)
+    end
+  end
+
+  describe '.supported_spec_regions' do
+    it 'returns a sorted array of 35 region codes' do
+      regions = CfnDsl.supported_spec_regions
+      expect(regions).to be_an(Array)
+      expect(regions).to eq(regions.sort)
+      expect(regions.size).to eq(35)
+    end
+
+    it 'includes well-known regions' do
+      regions = CfnDsl.supported_spec_regions
+      expect(regions).to include('us-east-1', 'us-west-2', 'eu-west-1', 'ap-southeast-2')
+    end
+  end
+
+  describe '.update_specification_file' do
+    let(:tmpdir) { Dir.mktmpdir }
+    let(:tmpfile) { File.join(tmpdir, 'spec.json') }
+    let(:spec_content) { '{"ResourceSpecificationVersion":"255.0.0","ResourceTypes":{},"PropertyTypes":{}}' }
+
+    before do
+      mock_io = double('io', read: spec_content)
+      mock_uri = double('uri', open: mock_io)
+      allow(URI).to receive(:parse).and_return(mock_uri)
+    end
+
+    after { FileUtils.rm_rf(tmpdir) }
+
+    context 'with explicit region' do
+      it 'uses the region-specific URL' do
+        result = CfnDsl.update_specification_file(file: tmpfile, version: '255.0.0', region: 'eu-west-1')
+        expect(result[:url]).to eq('https://d3teyb21fexa9r.cloudfront.net/255.0.0/gzip/CloudFormationResourceSpecification.json')
+        expect(result[:region]).to eq('eu-west-1')
+      end
+
+      it 'writes the spec content to the file' do
+        CfnDsl.update_specification_file(file: tmpfile, version: '255.0.0', region: 'eu-west-1')
+        expect(File.exist?(tmpfile)).to be true
+        parsed = JSON.parse(File.read(tmpfile))
+        expect(parsed['ResourceSpecificationVersion']).to eq('255.0.0')
+      end
+
+      it 'resolves version from content when version is latest' do
+        result = CfnDsl.update_specification_file(file: tmpfile, version: 'latest', region: 'us-east-1')
+        expect(result[:version]).to eq('255.0.0')
+      end
+    end
+
+    context 'without region (defaults to us-east-1)' do
+      it 'uses the us-east-1 URL' do
+        result = CfnDsl.update_specification_file(file: tmpfile, version: '255.0.0')
+        expect(result[:url]).to eq('https://d1uauaxba7bl26.cloudfront.net/255.0.0/gzip/CloudFormationResourceSpecification.json')
+        expect(result[:region]).to eq('us-east-1')
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.5
 platform: ruby
 authors:
 - Steven Jack
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/spec.yml"
+- ".github/workflows/spec_latest.yml"
 - ".github/workflows/spec_publish.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -86,6 +87,7 @@ files:
 - lib/cfndsl/aws/patches/700_SAM_Serverless_Function_InlineCode_patch.json
 - lib/cfndsl/aws/patches/900_SageMakerTags_patch.json
 - lib/cfndsl/aws/patches/901_SageMakerTags_patch.json
+- lib/cfndsl/aws/region_spec_urls.json
 - lib/cfndsl/aws/resource_specification.json
 - lib/cfndsl/aws/types.rb
 - lib/cfndsl/aws/types.yaml
@@ -168,6 +170,8 @@ files:
 - spec/names_spec.rb
 - spec/output_spec.rb
 - spec/plurals_spec.rb
+- spec/region_spec_availability_spec.rb
+- spec/region_spec_urls_spec.rb
 - spec/resource_name_spec.rb
 - spec/resources_spec.rb
 - spec/rule_spec.rb
@@ -228,6 +232,8 @@ test_files:
 - spec/names_spec.rb
 - spec/output_spec.rb
 - spec/plurals_spec.rb
+- spec/region_spec_availability_spec.rb
+- spec/region_spec_urls_spec.rb
 - spec/resource_name_spec.rb
 - spec/resources_spec.rb
 - spec/rule_spec.rb