aws-partitions 1.524.0 → 1.528.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e71104e45e1f4f69dce4ba593adac06359ab84e6e718f446b74cb0183922754
-  data.tar.gz: 1015eda450bda5eecc7c99ecfc5800fc1358c6aaecd5d2ebf9de65d8398760bc
+  metadata.gz: 4772a4a96820cc044cbc58b62265508f180d477e62a7c35336d41e3a4c7dd533
+  data.tar.gz: 795571f3e83f8e36bfd7d8e9f900c964055219d38255fefecae109f36077054e
 SHA512:
-  metadata.gz: 43d063ee4f8df3b61af518cd60cc21b3a10f0321ba8871a6607705c0eb83d6f98c4ee563d51a6c48dc38596636c4f3b2caf062c0a43f6ed8144d2c76ac9d2fee
-  data.tar.gz: 89ed40d52d56aac72ad993d6996be96ce68954945343e84496a7faf5abb24dc4da9b66bdb97a7aa0410b29a860a7eb941b9802d5ae45beed0bcf02361c0e1acc
+  metadata.gz: 9addf3d86bcaed197c715f0f7652b08af207625a1a8975791e8f0e4fe968cef1d39a5d4f27c57b2afc6bd9c54d5efbefbdcab0a91280b8e9168a070352b7ff1e
+  data.tar.gz: edb3b1bd311d1777a9c09ee48efca446d12e265c3c892bbb7b530e1f255c1f4bb470881c4672470977ca8acb44aa1810a15271174446b889c5648383ddc7a7be

data/CHANGELOG.md

@@ -1,6 +1,28 @@
 Unreleased Changes
 ------------------
 
+1.528.0 (2021-11-11)
+------------------
+
+* Feature - Updated the partitions source data the determines the AWS service regions and endpoints.
+
+1.527.0 (2021-11-10)
+------------------
+
+* Feature - Added support for enumerating regions for `Aws::ResilienceHub`.
+
+1.526.0 (2021-11-09)
+------------------
+
+* Feature - Updated the partitions source data the determines the AWS service regions and endpoints.
+
+1.525.0 (2021-11-04)
+------------------
+
+* Feature - Added support for enumerating regions for `Aws::ChimeSDKMeetings`.
+
+* Feature - Support modeled dualstack and fips endpoints in `Aws::Partitions::EndpointProvider`.
+
 1.524.0 (2021-11-03)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.524.0
+1.528.0

data/lib/aws-partitions/endpoint_provider.rb

@@ -37,15 +37,19 @@ module Aws
       #   "monitoring" for cloudwatch.
       # @param [String] sts_regional_endpoints [STS only] Whether to use
       #   `legacy` (global endpoint for legacy regions) or `regional` mode for
-      #    using regional endpoint for supported regions except 'aws-global'
+      #   using regional endpoint for supported regions except 'aws-global'
+      # @param [Hash] variants Endpoint variants such as 'fips' or 'dualstack'
+      # @option variants [Boolean] :dualstack When true, resolve a dualstack
+      #   endpoint.
+      # @option variants [Boolean] :fips When true, resolve a FIPS endpoint.
       # @api private Use the static class methods instead.
-      def resolve(region, service, sts_regional_endpoints)
-        'https://' + endpoint_for(region, service, sts_regional_endpoints)
+      def resolve(region, service, sts_regional_endpoints, variants)
+        'https://' + endpoint_for(region, service, build_is_global_fn(sts_regional_endpoints), variants)
       end
 
       # @api private Use the static class methods instead.
       def signing_region(region, service, sts_regional_endpoints)
-        credential_scope(region, service, sts_regional_endpoints)
+        credential_scope(region, service, build_is_global_fn(sts_regional_endpoints))
           .fetch('region', region)
       end
 
@@ -54,47 +58,87 @@ module Aws
         # don't default to the service name
         # signers should prefer the api metadata's signingName
         # if no service is set in the credentialScope
-        credential_scope(region, service, 'regional')
+        credential_scope(region, service, build_is_global_fn('regional'))
           .fetch('service', nil)
       end
 
+      # @param [String] region The region used to fetch the partition.
+      # @param [String] service Used only if dualstack is true. Used to find a
+      #   DNS suffix for a specific service.
+      # @param [Hash] variants Endpoint variants such as 'fips' or 'dualstack'
+      # @option variants [Boolean] :dualstack When true, resolve a dualstack
+      #   endpoint.
+      # @option variants [Boolean] :fips When true, resolve a FIPS endpoint.
       # @api private Use the static class methods instead.
-      def credential_scope(region, service, sts_regional_endpoints)
-        partition = get_partition(region)
-        service_cfg = partition.fetch('services', {})
-                               .fetch(service, {})
-        endpoints = service_cfg.fetch('endpoints', {})
+      def dns_suffix_for(region, service, variants)
+        if configured_variants?(variants)
+          resolve_variant(region, service, variants)['dnsSuffix']
+        else
+          get_partition(region)['dnsSuffix']
+        end
+      end
+
+      private
 
-        # Check for sts legacy behavior
-        sts_legacy = service == 'sts' &&
-          sts_regional_endpoints == 'legacy' &&
-          STS_LEGACY_REGIONS.include?(region)
+      def configured_variants?(variants)
+        variants.values.any?
+      end
 
-        is_global = !endpoints.key?(region) &&
-          service_cfg['isRegionalized'] == false
+      def fetch_variant(cfg, tags)
+        variants = cfg.fetch('variants', [])
+        variants.find { |v| tags == Set.new(v['tags']) } || {}
+      end
 
-        # Check for global endpoint.
-        if sts_legacy || is_global
+      def resolve_variant(region, service, config_variants)
+        tags = Set.new(config_variants.select { |_k,v| v == true }.map { |k,_v| k.to_s })
+        is_global_fn = build_is_global_fn # ignore legacy STS config for variants
+
+        partition_cfg = get_partition(region)
+        service_cfg = partition_cfg.fetch('services', {})
+                                   .fetch(service, {})
+
+        endpoints_cfg = service_cfg.fetch('endpoints', {})
+
+        if is_global_fn.call(service, region, endpoints_cfg, service_cfg)
           region = service_cfg.fetch('partitionEndpoint', region)
         end
 
-        default_credential_scope = service_cfg
-                                     .fetch('defaults', {})
-                                     .fetch('credentialScope', {})
+        region_cfg = endpoints_cfg.fetch(region, {})
+        warn_deprecation(service, region) if region_cfg['deprecated']
 
-        endpoints
-          .fetch(region, {})
-          .fetch('credentialScope', default_credential_scope)
+        partition_defaults = fetch_variant(partition_cfg.fetch('defaults', {}), tags)
+        service_defaults = fetch_variant(service_cfg.fetch('defaults', {}), tags)
+        endpoint_cfg = fetch_variant(region_cfg, tags)
+
+        # merge upwards, preferring values from endpoint > service > partition
+        partition_defaults.merge(service_defaults.merge(endpoint_cfg))
       end
 
-      # @api private Use the static class methods instead.
-      def dns_suffix_for(region)
-        get_partition(region)['dnsSuffix']
+      def validate_variant!(config_variants, resolved_variant)
+        unless resolved_variant['hostname'] && resolved_variant['dnsSuffix']
+          enabled_variants = config_variants.select { |_k, v| v}.map { |k, _v| k.to_s }.join(', ')
+            raise ArgumentError,
+                "#{enabled_variants} not supported for this region and partition."
+        end
       end
 
-      private
+      def endpoint_for(region, service, is_global_fn, variants)
+        if configured_variants?(variants)
+          endpoint_with_variants_for(region, service, variants)
+        else
+          endpoint_no_variants_for(region, service, is_global_fn)
+        end
+      end
+
+      def endpoint_with_variants_for(region, service, variants)
+        variant = resolve_variant(region, service, variants)
+        validate_variant!(variants, variant)
+        variant['hostname'].sub('{region}', region)
+                           .sub('{service}', service)
+                           .sub('{dnsSuffix}', variant['dnsSuffix'])
+      end
 
-      def endpoint_for(region, service, sts_regional_endpoints)
+      def endpoint_no_variants_for(region, service, is_global_fn)
         partition = get_partition(region)
         service_cfg = partition.fetch('services', {}).fetch(service, {})
 
@@ -105,30 +149,66 @@ module Aws
 
         endpoints = service_cfg.fetch('endpoints', {})
 
-        # Check for sts legacy behavior
-        sts_legacy = service == 'sts' &&
-                     sts_regional_endpoints == 'legacy' &&
-                     STS_LEGACY_REGIONS.include?(region)
-
-        is_global = !endpoints.key?(region) &&
-                    service_cfg['isRegionalized'] == false
-
         # Check for global endpoint.
-        if sts_legacy || is_global
+        if is_global_fn.call(service, region, endpoints, service_cfg)
           region = service_cfg.fetch('partitionEndpoint', region)
         end
 
         # Check for service/region level endpoint.
-        endpoint = endpoints
+        region_cfg = endpoints
                    .fetch(region, {})
+        endpoint = region_cfg
                    .fetch('hostname', default_endpoint)
 
+        warn_deprecation(service, region) if region_cfg['deprecated']
+
         # Replace placeholders from the endpoints
         endpoint.sub('{region}', region)
                 .sub('{service}', service)
                 .sub('{dnsSuffix}', partition['dnsSuffix'])
       end
 
+      def warn_deprecation(service, region)
+        warn("The endpoint for service: #{service}, region: #{region}"\
+             ' is deprecated.')
+      end
+
+      # returns a callable that takes a region
+      # and returns true if the service is global
+      def build_is_global_fn(sts_regional_endpoints='regional')
+        lambda do |service, region, endpoints, service_cfg|
+          # Check for sts legacy behavior
+          sts_legacy = service == 'sts' &&
+            sts_regional_endpoints == 'legacy' &&
+            STS_LEGACY_REGIONS.include?(region)
+
+          is_global = !endpoints.key?(region) &&
+            service_cfg['isRegionalized'] == false
+
+          sts_legacy || is_global
+        end
+      end
+
+      def credential_scope(region, service, is_global_fn)
+        partition = get_partition(region)
+        service_cfg = partition.fetch('services', {})
+                               .fetch(service, {})
+        endpoints = service_cfg.fetch('endpoints', {})
+
+        # Check for global endpoint.
+        if is_global_fn.call(service, region, endpoints, service_cfg)
+          region = service_cfg.fetch('partitionEndpoint', region)
+        end
+
+        default_credential_scope = service_cfg
+                                     .fetch('defaults', {})
+                                     .fetch('credentialScope', {})
+
+        endpoints
+          .fetch(region, {})
+          .fetch('credentialScope', default_credential_scope)
+      end
+
       def get_partition(region_or_partition)
         partition_containing_region(region_or_partition) ||
           partition_matching_region(region_or_partition) ||
@@ -144,7 +224,7 @@ module Aws
 
       def partition_matching_region(region)
         @rules['partitions'].find do |p|
-          region.match(p['regionRegex']) ||
+          p['regionRegex'] && region.match(p['regionRegex']) ||
             p['services'].values.find do |svc|
               svc['endpoints'].key?(region) if svc.key?('endpoints')
             end
@@ -161,8 +241,8 @@ module Aws
       end
 
       class << self
-        def resolve(region, service, sts_regional_endpoints = 'regional')
-          default_provider.resolve(region, service, sts_regional_endpoints)
+        def resolve(region, service, sts_endpoint = 'regional', variants = {})
+          default_provider.resolve(region, service, sts_endpoint, variants)
         end
 
         def signing_region(region, service, sts_regional_endpoints = 'regional')
@@ -173,8 +253,8 @@ module Aws
           default_provider.signing_service(region, service)
         end
 
-        def dns_suffix_for(region)
-          default_provider.dns_suffix_for(region)
+        def dns_suffix_for(region, service = nil, variants = {})
+          default_provider.dns_suffix_for(region, service, variants)
         end
 
         private

data/lib/aws-partitions/service.rb

@@ -16,6 +16,8 @@ module Aws
         @name = options[:name]
         @partition_name = options[:partition_name]
         @regions = options[:regions]
+        @fips_regions = options[:fips_regions]
+        @dualstack_regions = options[:dualstack_regions]
         @regionalized = options[:regionalized]
         @partition_region = options[:partition_region]
       end
@@ -31,6 +33,14 @@ module Aws
       #   Regions are scoped to the partition.
       attr_reader :regions
 
+      # @return [Set<String>] The FIPS compatible regions this service is
+      #   available in. Regions are scoped to the partition.
+      attr_reader :fips_regions
+
+      # @return [Set<String>] The Dualstack compatible regions this service is
+      #   available in. Regions are scoped to the partition.
+      attr_reader :dualstack_regions
+
       # @return [String,nil] The global patition endpoint for this service.
       #   May be `nil`.
       attr_reader :partition_region
@@ -54,6 +64,8 @@ module Aws
             name: service_name,
             partition_name: partition['partition'],
             regions: regions(service, partition),
+            fips_regions: variant_regions('fips', service, partition),
+            dualstack_regions: variant_regions('dualstack', service, partition),
             regionalized: service['isRegionalized'] != false,
             partition_region: partition_region(service)
           )
@@ -67,6 +79,21 @@ module Aws
           names - ["#{partition['partition']}-global"]
         end
 
+        def variant_regions(variant_name, service, partition)
+          svc_endpoints = service.fetch('endpoints', {})
+          names = Set.new
+          svc_endpoints.each do |key, value|
+            variants = value.fetch('variants', [])
+            variants.each do |variant|
+              tags = variant.fetch('tags', [])
+              if tags.include?(variant_name) && partition['regions'].key?(key)
+                names << key
+              end
+            end
+          end
+          names - ["#{partition['partition']}-global"]
+        end
+
         def partition_region(service)
           service['partitionEndpoint']
         end

data/lib/aws-partitions.rb

@@ -257,6 +257,7 @@ module Aws
             'Budgets' => 'budgets',
             'Chime' => 'chime',
             'ChimeSDKIdentity' => 'identity-chime',
+            'ChimeSDKMeetings' => 'meetings-chime',
             'ChimeSDKMessaging' => 'messaging-chime',
             'Cloud9' => 'cloud9',
             'CloudControlApi' => 'cloudcontrolapi',
@@ -445,6 +446,7 @@ module Aws
             'Redshift' => 'redshift',
             'RedshiftDataAPIService' => 'redshift-data',
             'Rekognition' => 'rekognition',
+            'ResilienceHub' => 'resiliencehub',
             'ResourceGroups' => 'resource-groups',
             'ResourceGroupsTaggingAPI' => 'tagging',
             'RoboMaker' => 'robomaker',

data/partitions.json

@@ -2431,6 +2431,106 @@
           }
         }
       },
+      "compute-optimizer" : {
+        "endpoints" : {
+          "ap-northeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-1"
+            },
+            "hostname" : "compute-optimizer.ap-northeast-1.amazonaws.com"
+          },
+          "ap-northeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-2"
+            },
+            "hostname" : "compute-optimizer.ap-northeast-2.amazonaws.com"
+          },
+          "ap-south-1" : {
+            "credentialScope" : {
+              "region" : "ap-south-1"
+            },
+            "hostname" : "compute-optimizer.ap-south-1.amazonaws.com"
+          },
+          "ap-southeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-1"
+            },
+            "hostname" : "compute-optimizer.ap-southeast-1.amazonaws.com"
+          },
+          "ap-southeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-2"
+            },
+            "hostname" : "compute-optimizer.ap-southeast-2.amazonaws.com"
+          },
+          "ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "compute-optimizer.ca-central-1.amazonaws.com"
+          },
+          "eu-central-1" : {
+            "credentialScope" : {
+              "region" : "eu-central-1"
+            },
+            "hostname" : "compute-optimizer.eu-central-1.amazonaws.com"
+          },
+          "eu-north-1" : {
+            "credentialScope" : {
+              "region" : "eu-north-1"
+            },
+            "hostname" : "compute-optimizer.eu-north-1.amazonaws.com"
+          },
+          "eu-west-1" : {
+            "credentialScope" : {
+              "region" : "eu-west-1"
+            },
+            "hostname" : "compute-optimizer.eu-west-1.amazonaws.com"
+          },
+          "eu-west-2" : {
+            "credentialScope" : {
+              "region" : "eu-west-2"
+            },
+            "hostname" : "compute-optimizer.eu-west-2.amazonaws.com"
+          },
+          "eu-west-3" : {
+            "credentialScope" : {
+              "region" : "eu-west-3"
+            },
+            "hostname" : "compute-optimizer.eu-west-3.amazonaws.com"
+          },
+          "sa-east-1" : {
+            "credentialScope" : {
+              "region" : "sa-east-1"
+            },
+            "hostname" : "compute-optimizer.sa-east-1.amazonaws.com"
+          },
+          "us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "compute-optimizer.us-east-1.amazonaws.com"
+          },
+          "us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "compute-optimizer.us-east-2.amazonaws.com"
+          },
+          "us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "compute-optimizer.us-west-1.amazonaws.com"
+          },
+          "us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "compute-optimizer.us-west-2.amazonaws.com"
+          }
+        }
+      },
       "config" : {
         "endpoints" : {
           "af-south-1" : { },
@@ -5159,6 +5259,7 @@
           "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
+          "ap-northeast-3" : { },
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
@@ -9327,7 +9428,16 @@
       "s3-control" : {
         "defaults" : {
           "protocols" : [ "https" ],
-          "signatureVersions" : [ "s3v4" ]
+          "signatureVersions" : [ "s3v4" ],
+          "variants" : [ {
+            "dnsSuffix" : "amazonaws.com",
+            "hostname" : "{service}-fips.dualstack.{region}.{dnsSuffix}",
+            "tags" : [ "dualstack", "fips" ]
+          }, {
+            "dnsSuffix" : "amazonaws.com",
+            "hostname" : "{service}.dualstack.{region}.{dnsSuffix}",
+            "tags" : [ "dualstack" ]
+          } ]
         },
         "endpoints" : {
           "ap-northeast-1" : {
@@ -10740,13 +10850,20 @@
       "ssm-incidents" : {
         "endpoints" : {
           "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-central-1" : { },
           "eu-north-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
@@ -11261,12 +11378,24 @@
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
-          "ca-central-1" : { },
+          "ca-central-1" : {
+            "variants" : [ {
+              "hostname" : "fips.transcribe.ca-central-1.amazonaws.com",
+              "tags" : [ "fips" ]
+            } ]
+          },
           "eu-central-1" : { },
           "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "deprecated" : true,
+            "hostname" : "fips.transcribe.ca-central-1.amazonaws.com"
+          },
           "fips-us-east-1" : {
             "credentialScope" : {
               "region" : "us-east-1"
@@ -12348,6 +12477,22 @@
           "cn-north-1" : { }
         }
       },
+      "compute-optimizer" : {
+        "endpoints" : {
+          "cn-north-1" : {
+            "credentialScope" : {
+              "region" : "cn-north-1"
+            },
+            "hostname" : "compute-optimizer.cn-north-1.amazonaws.com.cn"
+          },
+          "cn-northwest-1" : {
+            "credentialScope" : {
+              "region" : "cn-northwest-1"
+            },
+            "hostname" : "compute-optimizer.cn-northwest-1.amazonaws.com.cn"
+          }
+        }
+      },
       "config" : {
         "endpoints" : {
           "cn-north-1" : { },
@@ -12845,7 +12990,12 @@
       "s3-control" : {
         "defaults" : {
           "protocols" : [ "https" ],
-          "signatureVersions" : [ "s3v4" ]
+          "signatureVersions" : [ "s3v4" ],
+          "variants" : [ {
+            "dnsSuffix" : "amazonaws.com.cn",
+            "hostname" : "{service}.dualstack.{region}.{dnsSuffix}",
+            "tags" : [ "dualstack" ]
+          } ]
         },
         "endpoints" : {
           "cn-north-1" : {
@@ -14698,6 +14848,12 @@
         "partitionEndpoint" : "aws-us-gov-global"
       },
       "identitystore" : {
+        "defaults" : {
+          "variants" : [ {
+            "hostname" : "identitystore.{region}.{dnsSuffix}",
+            "tags" : [ "fips" ]
+          } ]
+        },
         "endpoints" : {
           "fips-us-gov-west-1" : {
             "credentialScope" : {
@@ -15306,6 +15462,12 @@
         }
       },
       "rds" : {
+        "defaults" : {
+          "variants" : [ {
+            "hostname" : "rds.{region}.{dnsSuffix}",
+            "tags" : [ "fips" ]
+          } ]
+        },
         "endpoints" : {
           "rds.us-gov-east-1" : {
             "credentialScope" : {
@@ -15491,6 +15653,12 @@
         }
       },
       "runtime.sagemaker" : {
+        "defaults" : {
+          "variants" : [ {
+            "hostname" : "runtime.sagemaker.{region}.{dnsSuffix}",
+            "tags" : [ "fips" ]
+          } ]
+        },
         "endpoints" : {
           "us-gov-west-1" : {
             "variants" : [ {
@@ -15562,7 +15730,16 @@
       "s3-control" : {
         "defaults" : {
           "protocols" : [ "https" ],
-          "signatureVersions" : [ "s3v4" ]
+          "signatureVersions" : [ "s3v4" ],
+          "variants" : [ {
+            "dnsSuffix" : "amazonaws.com",
+            "hostname" : "{service}-fips.dualstack.{region}.{dnsSuffix}",
+            "tags" : [ "dualstack", "fips" ]
+          }, {
+            "dnsSuffix" : "amazonaws.com",
+            "hostname" : "{service}.dualstack.{region}.{dnsSuffix}",
+            "tags" : [ "dualstack" ]
+          } ]
         },
         "endpoints" : {
           "us-gov-east-1" : {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-partitions
 version: !ruby/object:Gem::Version
-  version: 1.524.0
+  version: 1.528.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies: []
 description: Provides interfaces to enumerate AWS partitions, regions, and services.
 email: