Updated to latest endpoints.json

aws · Apr 26, 2016 · 4b4eb55 · 4b4eb55
1 parent 9ec5145
commit 4b4eb55
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/aws-sdk-core/endpoints.json b/aws-sdk-core/endpoints.json
@@ -192,6 +192,13 @@
             "ap-northeast-1": {}
           }
         },
+        "cognito-idp": {
+          "endpoints": {
+            "us-east-1": {},
+            "eu-west-1": {},
+            "ap-northeast-1": {}
+          }
+        },
         "cognito-sync": {
           "endpoints": {
             "us-east-1": {},
@@ -519,8 +526,13 @@
             "aws-global": {
               "hostname": "importexport.amazonaws.com",
               "signatureVersions": [
-                "v2"
-              ]
+                "v2",
+                "v4"
+              ],
+              "credentialScope": {
+                "service": "IngestionService",
+                "region": "us-east-1"
+              }
             }
           }
         },
@@ -542,6 +554,7 @@
             "us-east-1": {},
             "us-west-2": {},
             "ap-northeast-1": {},
+            "ap-southeast-1": {},
             "eu-west-1": {},
             "eu-central-1": {}
           }

diff --git a/aws-sdk-core/lib/aws-sdk-core/partitions/partition.rb b/aws-sdk-core/lib/aws-sdk-core/partitions/partition.rb
@@ -69,7 +69,9 @@ def build(partition)
         # @return [Hash<String,Region>]
         def build_regions(partition)
           partition['regions'].inject({}) do |regions, (region_name, region)|
-            regions[region_name] = Region.build(region_name, region, partition)
+            unless region_name == "#{partition['partition']}-global"
+              regions[region_name] = Region.build(region_name, region, partition)
+            end
             regions
           end
         end

diff --git a/aws-sdk-core/lib/aws-sdk-core/partitions/service.rb b/aws-sdk-core/lib/aws-sdk-core/partitions/service.rb
@@ -68,15 +68,13 @@ def regions(service, partition)
         def partition_region(service)
           if service['partitionEndpoint']
             endpoint = service['endpoints'][service['partitionEndpoint']]
-            region = if endpoint['credentialScope']
+            if endpoint['credentialScope']
               endpoint['credentialScope']['region']
             elsif service['defaults'] && service['defaults']['credentialScope']
               service['defaults']['credentialScope']['region']
+            else
+              service['partitionEndpoint']
             end
-            unless region
-              raise "missing partition endpoint region for #{service.inspect}"
-            end
-            region
           end
         end