Revert region changes and add region "us-iso-west-1"

soto-project · Nov 8, 2021 · b0435ba · b0435ba
1 parent 73a85b1
commit b0435ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Sources/SotoCodeGenerator/AwsService.swift b/Sources/SotoCodeGenerator/AwsService.swift
@@ -123,7 +123,7 @@ struct AwsService {
             context["partitionEndpoints"] = self.getPartitionEndpoints()
                 .map { (partition: $0.key, endpoint: $0.value.endpoint, region: $0.value.region) }
                 .sorted { $0.partition < $1.partition }
-                .map { ".\($0.partition.toSwiftRegionEnumCase()): (endpoint: \"\($0.endpoint)\", region: .\($0.region.toSwiftRegionEnumCase()))" }
+                .map { ".\($0.partition.toSwiftRegionEnumCase()): (endpoint: \"\($0.endpoint)\", region: .\($0.region.rawValue.toSwiftRegionEnumCase()))" }
         }
 
         context["operations"] = operations.operations
@@ -550,8 +550,8 @@ struct AwsService {
     }
 
     // return dictionary of partition endpoints keyed by endpoint name
-    func getPartitionEndpoints() -> [String: (endpoint: String, region: String)] {
-        var partitionEndpoints: [String: (endpoint: String, region: String)] = [:]
+    func getPartitionEndpoints() -> [String: (endpoint: String, region: Region)] {
+        var partitionEndpoints: [String: (endpoint: String, region: Region)] = [:]
         endpoints.partitions.forEach {
             if let partitionEndpoint = $0.services[self.serviceEndpointPrefix]?.partitionEndpoint {
                 guard let service = $0.services[self.serviceEndpointPrefix],

diff --git a/Sources/SotoCodeGenerator/Endpoints.swift b/Sources/SotoCodeGenerator/Endpoints.swift
@@ -42,6 +42,7 @@ enum Region: String, Decodable {
     case usgovwest1 = "us-gov-west-1"
     case usisoeast1 = "us-iso-east-1"
     case usisobeast1 = "us-isob-east-1"
+    case usisowest1 = "us-iso-west-1"
 }
 
 enum SignatureVersion: String, Decodable {
@@ -53,7 +54,7 @@ enum SignatureVersion: String, Decodable {
 
 struct Endpoints: Decodable {
     struct CredentialScope: Decodable {
-        var region: String?
+        var region: Region?
         var service: String?
     }