aws-partitions 1.650.0 → 1.651.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09cca034072d90852cedeafcc2c7958a439c9cacd3771e2a7d360cac0b77320c'
-  data.tar.gz: 7dbb3a16af281fabd9fc0b6ce6873b742ab1ecabf3afdf735ad720c6daa83e37
+  metadata.gz: dcc02d873496276ad8043f41ae1658b2afdf0a332ce99b05ff48989894b510a2
+  data.tar.gz: 0ef2a04a36a4b808b96d0d76ad952c7af100ce3d3cfea5e86e7bc8384e55cb51
 SHA512:
-  metadata.gz: d68fb3f5ddeb4ee041b9b559b05e40ed940d45ba58ca4360b07f942878832a2148d51b403001969ccd25cc6c6a75f19bffe9c705af555ca8c70f5741027de406
-  data.tar.gz: 13eebca4549b229bcbb77e9e8679a8280ba10b1387335e2ea557fcb692b48b88cff608cd301ee1a3c5799cf3b210b30c446fa846e82b8bc970966daff8827b46
+  metadata.gz: 575a2c637da0bcb4ea6ed4759a206de6d60531ea0fbce46f7cecb4ce5a71ba7771532569856f26b4fd06b2538b169fab8bd450662edef5295dbd2cda5e997f96
+  data.tar.gz: 4d055f5cf07168316c2099c8506ff9476625128e11a7c37eb4152f48e8b673030aae283d5e593b9672d1cbddfe04f384534b75586c578186cddc77005ef608c0

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Unreleased Changes
 ------------------
 
+1.651.0 (2022-10-25)
+------------------
+
+* Feature - Updated the partitions source data the determines the AWS service regions and endpoints.
+
+* Feature - Add a metadata method to `Partition` to supplement endpoint generation in service gems.
+
 1.650.0 (2022-10-24)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.650.0
+1.651.0

data/lib/aws-partitions/partition.rb

@@ -10,12 +10,20 @@ module Aws
       def initialize(options = {})
         @name = options[:name]
         @regions = options[:regions]
+        @region_regex = options[:region_regex]
         @services = options[:services]
+        @metadata = options[:metadata]
       end
 
       # @return [String] The partition name, e.g. "aws", "aws-cn", "aws-us-gov".
       attr_reader :name
 
+      # @return [String] The regex representing the region format.
+      attr_reader :region_regex
+
+      # @return [Metadata] The metadata for the partition.
+      attr_reader :metadata
+
       # @param [String] region_name The name of the region, e.g. "us-east-1".
       # @return [Region]
       # @raise [ArgumentError] Raises `ArgumentError` for unknown region name.
@@ -70,6 +78,7 @@ module Aws
           Partition.new(
             name: partition['partition'],
             regions: build_regions(partition),
+            region_regex: partition['regionRegex'],
             services: build_services(partition)
           )
         end
@@ -79,8 +88,7 @@ module Aws
         # @param [Hash] partition
         # @return [Hash<String,Region>]
         def build_regions(partition)
-          partition['regions'].each_with_object({}) do
-            |(region_name, region), regions|
+          partition['regions'].each_with_object({}) do |(region_name, region), regions|
             next if region_name == "#{partition['partition']}-global"
 
             regions[region_name] = Region.build(

data/lib/aws-partitions/partition_list.rb

@@ -42,12 +42,62 @@ module Aws
         end
       end
 
+      # @param [Partition] partition
+      # @api private
+      def merge_metadata(partitions_metadata)
+        partitions_metadata['partitions'].each do |partition_metadata|
+          outputs = partition_metadata['outputs']
+
+          if existing = @partitions[partition_metadata['id']]
+            @partitions[partition_metadata['id']] = Partition.new(
+              name: existing.name,
+              regions: build_metadata_regions(
+                partition_metadata['id'],
+                partition_metadata['regions'],
+                existing),
+              region_regex: partition_metadata['regionRegex'],
+              services: existing.services.each_with_object({}) do |s, services|
+                services[s.name] = s
+              end,
+              metadata: outputs
+            )
+          else
+            @partitions[partition_metadata['id']] = Partition.new(
+              name: partition_metadata['id'],
+              regions: build_metadata_regions(
+                partition_metadata['id'], partition_metadata['regions']
+              ),
+              region_regex: partition_metadata['regionRegex'],
+              services: {},
+              metadata: outputs
+            )
+          end
+        end
+      end
+
       # Removed all partitions.
       # @api private
       def clear
         @partitions = {}
       end
 
+      private
+
+      def build_metadata_regions(partition_name, metadata_regions, existing = nil)
+        metadata_regions.each_with_object({}) do |(region_name, region), regions|
+          if existing && existing.region?(region_name)
+            regions[region_name] = existing.region(region_name)
+          else
+            regions[region_name] = Region.new(
+              name: region_name,
+              description: region['description'],
+              partition_name: partition_name,
+              services: Set.new
+            )
+          end
+        end
+      end
+
       class << self
 
         # @api private

data/lib/aws-partitions.rb

@@ -195,6 +195,12 @@ module Aws
         end
       end
 
+      # @param [Hash] partition metadata
+      # @api private For Internal use only
+      def merge_metadata(partition_metadata)
+        default_partition_list.merge_metadata(partition_metadata)
+      end
+
       # @api private For internal use only.
       def clear
         default_partition_list.clear
@@ -204,7 +210,11 @@ module Aws
       # @return [PartitionList]
       # @api private
       def default_partition_list
-        @default_partition_list ||= PartitionList.build(defaults)
+        @default_partition_list ||= begin
+          partitions = PartitionList.build(defaults)
+          partitions.merge_metadata(default_metadata)
+          partitions
+        end
       end
 
       # @return [Hash]
@@ -217,6 +227,16 @@ module Aws
         end
       end
 
+      # @return [Hash]
+      # @api private
+      def default_metadata
+        @default_metadata ||= begin
+          path = File.expand_path('../../partitions-metadata.json', __FILE__)
+          defaults = JSON.parse(File.read(path), freeze: true)
+          defaults.merge('partitions' => defaults['partitions'].dup)
+        end
+      end
+
       # @return [Hash<String,String>] Returns a map of service module names
       #   to their id as used in the endpoints.json document.
       # @api private For internal use only.

data/partitions-metadata.json

@@ -0,0 +1,101 @@
+{
+  "version": "1.1",
+  "partitions": [
+    {
+      "id": "aws",
+      "regionRegex": "^(us|eu|ap|sa|ca|me|af)-\\w+-\\d+$",
+      "regions": {
+        "af-south-1": {},
+        "af-east-1": {},
+        "ap-northeast-1": {},
+        "ap-northeast-2": {},
+        "ap-northeast-3": {},
+        "ap-south-1": {},
+        "ap-southeast-1": {},
+        "ap-southeast-2": {},
+        "ap-southeast-3": {},
+        "ca-central-1": {},
+        "eu-central-1": {},
+        "eu-north-1": {},
+        "eu-south-1": {},
+        "eu-west-1": {},
+        "eu-west-2": {},
+        "eu-west-3": {},
+        "me-south-1": {},
+        "sa-east-1": {},
+        "us-east-1": {},
+        "us-east-2": {},
+        "us-west-1": {},
+        "us-west-2": {},
+        "aws-global": {}
+      },
+      "outputs": {
+        "name": "aws",
+        "dnsSuffix": "amazonaws.com",
+        "dualStackDnsSuffix": "api.aws",
+        "supportsFIPS": true,
+        "supportsDualStack": true
+      }
+    },
+    {
+      "id": "aws-us-gov",
+      "regionRegex": "^us\\-gov\\-\\w+\\-\\d+$",
+      "regions": {
+        "us-gov-west-1": {},
+        "us-gov-east-1": {},
+        "aws-us-gov-global": {}
+      },
+      "outputs": {
+        "name": "aws-us-gov",
+        "dnsSuffix": "amazonaws.com",
+        "dualStackDnsSuffix": "api.aws",
+        "supportsFIPS": true,
+        "supportsDualStack": true
+      }
+    },
+    {
+      "id": "aws-cn",
+      "regionRegex": "^cn\\-\\w+\\-\\d+$",
+      "regions": {
+        "cn-north-1": {},
+        "cn-northwest-1": {},
+        "aws-cn-global": {}
+      },
+      "outputs": {
+        "name": "aws-cn",
+        "dnsSuffix": "amazonaws.com.cn",
+        "dualStackDnsSuffix": "api.amazonwebservices.com.cn",
+        "supportsFIPS": true,
+        "supportsDualStack": true
+      }
+    },
+    {
+      "id": "aws-iso",
+      "regionRegex": "^us\\-iso\\-\\w+\\-\\d+$",
+      "outputs": {
+        "name": "aws-iso",
+        "dnsSuffix": "c2s.ic.gov",
+        "supportsFIPS": true,
+        "supportsDualStack": false,
+        "dualStackDnsSuffix": "c2s.ic.gov"
+      },
+      "regions": {
+        "aws-iso-global": {}
+      }
+    },
+    {
+      "id": "aws-iso-b",
+      "regionRegex": "^us\\-isob\\-\\w+\\-\\d+$",
+      "outputs": {
+        "name": "aws-iso-b",
+        "dnsSuffix": "sc2s.sgov.gov",
+        "supportsFIPS": true,
+        "supportsDualStack": false,
+        "dualStackDnsSuffix": "sc2s.sgov.gov"
+      },
+      "regions": {
+        "aws-iso-b-global": {}
+      }
+    }
+  ]
+}

data/partitions.json

@@ -3496,6 +3496,7 @@
             "deprecated" : true,
             "hostname" : "data.iot-fips.us-west-2.amazonaws.com"
           },
+          "me-central-1" : { },
           "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : {
@@ -7246,6 +7247,7 @@
             "deprecated" : true,
             "hostname" : "iot-fips.us-west-2.amazonaws.com"
           },
+          "me-central-1" : { },
           "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : {
@@ -10529,6 +10531,7 @@
             "deprecated" : true,
             "hostname" : "ram-fips.us-west-2.amazonaws.com"
           },
+          "me-central-1" : { },
           "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : {
@@ -15058,6 +15061,12 @@
           "fips-us-west-2" : {
             "deprecated" : true
           },
+          "ui-ap-northeast-1" : { },
+          "ui-ap-southeast-2" : { },
+          "ui-eu-central-1" : { },
+          "ui-eu-west-2" : { },
+          "ui-us-east-1" : { },
+          "ui-us-west-2" : { },
           "us-east-1" : {
             "variants" : [ {
               "tags" : [ "fips" ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-partitions
 version: !ruby/object:Gem::Version
-  version: 1.650.0
+  version: 1.651.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies: []
 description: Provides interfaces to enumerate AWS partitions, regions, and services.
 email: 
@@ -25,6 +25,7 @@ files:
 - lib/aws-partitions/partition_list.rb
 - lib/aws-partitions/region.rb
 - lib/aws-partitions/service.rb
+- partitions-metadata.json
 - partitions.json
 homepage: https://github.com/aws/aws-sdk-ruby
 licenses: