Fixed the compiler warnings.

hiramtibbit · Dec 3, 2015 · 5ce586e · 5ce586e
1 parent 702dcd7
commit 5ce586e
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 3 deletions.
diff --git a/AWSCore/AWSCore.h b/AWSCore/AWSCore.h
@@ -24,9 +24,11 @@
 #import "AWSCategory.h"
 #import "AWSLogging.h"
 #import "AWSClientContext.h"
+#import "AWSSynchronizedMutableDictionary.h"
 
 #import "AWSSTS.h"
 #import "AWSCognitoIdentity.h"
 
 #import "AWSBolts.h"
 #import "AWSGZIP.h"
+#import "AWSFMDB.h"
diff --git a/AWSCore/FMDB/AWSFMDatabase.m b/AWSCore/FMDB/AWSFMDatabase.m
@@ -498,7 +498,7 @@ - (int)lastErrorCode {
 - (NSError*)errorWithMessage:(NSString*)message {
     NSDictionary* errorMessage = [NSDictionary dictionaryWithObject:message forKey:NSLocalizedDescriptionKey];
 
-    return [NSError errorWithDomain:@"FMDatabase" code:sqlite3_errcode(_db) userInfo:errorMessage];    
+    return [NSError errorWithDomain:@"AWSFMDatabase" code:sqlite3_errcode(_db) userInfo:errorMessage];    
 }
 
 - (NSError*)lastError {

diff --git a/AWSCore/FMDB/AWSFMResultSet.m b/AWSCore/FMDB/AWSFMResultSet.m
@@ -182,7 +182,7 @@ - (BOOL)nextWithError:(NSError **)outErr {
                 // If 'next' or 'nextWithError' is called after the result set is closed,
                 // we need to return the appropriate error.
                 NSDictionary* errorMessage = [NSDictionary dictionaryWithObject:@"parentDB does not exist" forKey:NSLocalizedDescriptionKey];
-                *outErr = [NSError errorWithDomain:@"FMDatabase" code:SQLITE_MISUSE userInfo:errorMessage];
+                *outErr = [NSError errorWithDomain:@"AWSFMDatabase" code:SQLITE_MISUSE userInfo:errorMessage];
             }
 
         }

diff --git a/AWSCore/Service/AWSService.m b/AWSCore/Service/AWSService.m
@@ -445,6 +445,8 @@ - (NSURL *)URLWithRegion:(AWSRegionType)regionType
     } else if (serviceType == AWSServiceSTS) {
         if (regionType == AWSRegionCNNorth1) {
             URL = [NSURL URLWithString:@"https://sts.cn-north-1.amazonaws.com"];
+        } else if (regionType == AWSRegionUSGovWest1) {
+            URL = [NSURL URLWithString:@"https://sts.us-gov-west-1.amazonaws.com"];
         } else {
             URL = [NSURL URLWithString:@"https://sts.amazonaws.com"];
         }

diff --git a/AWSCoreTests/AWSServiceTests.m b/AWSCoreTests/AWSServiceTests.m
@@ -246,7 +246,7 @@ - (void)testEndpoint {
     XCTAssertEqualObjects(endpoint.hostName, @"sqs.us-east-1.amazonaws.com");
     XCTAssertFalse(endpoint.useUnsafeURL);
 
-    // Special cases
+    // ===== Special cases =====
     endpoint = [[AWSEndpoint alloc] initWithRegion:AWSRegionUSEast1
                                            service:AWSServiceSTS
                                       useUnsafeURL:NO];
@@ -269,6 +269,17 @@ - (void)testEndpoint {
     XCTAssertEqualObjects(endpoint.hostName, @"sts.cn-north-1.amazonaws.com.cn");
     XCTAssertFalse(endpoint.useUnsafeURL);
 
+    endpoint = [[AWSEndpoint alloc] initWithRegion:AWSRegionUSGovWest1
+                                           service:AWSServiceSTS
+                                      useUnsafeURL:NO];
+    XCTAssertEqual(endpoint.regionType, AWSRegionUSGovWest1);
+    XCTAssertEqualObjects(endpoint.regionName, @"us-gov-west-1");
+    XCTAssertEqual(endpoint.serviceType, AWSServiceSTS);
+    XCTAssertEqualObjects(endpoint.serviceName, @"sts");
+    XCTAssertEqualObjects(endpoint.URL, [NSURL URLWithString:@"https://sts.us-gov-west-1.amazonaws.com"]);
+    XCTAssertEqualObjects(endpoint.hostName, @"sts.us-gov-west-1.amazonaws.com");
+    XCTAssertFalse(endpoint.useUnsafeURL);
+
     endpoint = [[AWSEndpoint alloc] initWithRegion:AWSRegionUSEast1
                                            service:AWSServiceSimpleDB
                                       useUnsafeURL:NO];
@@ -324,6 +335,17 @@ - (void)testEndpoint {
     XCTAssertEqualObjects(endpoint.hostName, @"s3-us-west-2.amazonaws.com");
     XCTAssertTrue(endpoint.useUnsafeURL);
 
+    endpoint = [[AWSEndpoint alloc] initWithRegion:AWSRegionUSGovWest1
+                                           service:AWSServiceS3
+                                      useUnsafeURL:NO];
+    XCTAssertEqual(endpoint.regionType, AWSRegionUSGovWest1);
+    XCTAssertEqualObjects(endpoint.regionName, @"us-gov-west-1");
+    XCTAssertEqual(endpoint.serviceType, AWSServiceS3);
+    XCTAssertEqualObjects(endpoint.serviceName, @"s3");
+    XCTAssertEqualObjects(endpoint.URL, [NSURL URLWithString:@"https://s3-us-gov-west-1.amazonaws.com"]);
+    XCTAssertEqualObjects(endpoint.hostName, @"s3-us-gov-west-1.amazonaws.com");
+    XCTAssertFalse(endpoint.useUnsafeURL);
+
     __block BOOL didThrowException = NO;
     @try {
         endpoint = [[AWSEndpoint alloc] initWithRegion:AWSRegionUnknown

diff --git a/AWSSimpleDB/AWSSimpleDBService.h b/AWSSimpleDB/AWSSimpleDBService.h
@@ -297,7 +297,10 @@ NS_ASSUME_NONNULL_BEGIN
  @see AWSSimpleDBSelectRequest
  @see AWSSimpleDBSelectResult
  */
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnullability"
 - (AWSTask *)select:(AWSSimpleDBSelectRequest *)request;
+#pragma clang diagnostic pop
 
 @end