Changes to support new AP02 region (#73)

* Add support for CDP_ENDPOINT env for intergration test. Update inline documentation for new ap02 endpoints

Author: tung-vu-td

TreasureData.xcodeproj/xcshareddata/xcschemes/TreasureData.xcscheme

@@ -27,18 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "NO">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6B73809D192A09160097D56E"
-               BuildableName = "TreasureDataTests.xctest"
-               BlueprintName = "TreasureDataTests"
-               ReferencedContainer = "container:TreasureData.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -54,6 +42,11 @@
             value = "$(API_MASTER_KEY)"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "CDP_ENDPOINT"
+            value = "$(CDP_ENDPOINT)"
+            isEnabled = "YES">
+         </EnvironmentVariable>
          <EnvironmentVariable
             key = "API_ENDPOINT"
             value = "$(API_ENDPOINT)"
@@ -75,8 +68,18 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6B73809D192A09160097D56E"
+               BuildableName = "TreasureDataTests.xctest"
+               BlueprintName = "TreasureDataTests"
+               ReferencedContainer = "container:TreasureData.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -97,8 +100,6 @@
             ReferencedContainer = "container:TreasureData.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

TreasureData/TreasureData.h

@@ -70,14 +70,19 @@ typedef void (^ErrorHandler)(NSString* _Nonnull errorCode, NSString* _Nullable e
  *    AWS East  https://cdp.in.treasuredata.com
  *    AWS Tokyo https://cdp-tokyo.in.treasuredata.com
  *    AWS EU    https://cdp-eu01.in.treasuredata.com
- *    IDCF      https://cdp-idcf.in.treasuredata.com
+ *    AWS Asia Pacific (Seoul)  https://cdp-ap02.in.treasuredata.com
  */
 @property(nonatomic, strong) NSString * _Nullable cdpEndpoint;
 
 #pragma mark - Initialization
 
 /**
  * Assign the target API endpoint, default is "https://in.treasuredata.com".
+ * Possible values:
+ *    AWS East  https://in.treasuredata.com
+ *    AWS Tokyo https://tokyo.in.treasuredata.com
+ *    AWS EU    https://eu01.in.treasuredata.com
+ *    AWS Asia Pacific (Seoul)  https://ap02.in.treasuredata.com
  * This have to be call before `initializeWithApiKey(apiKey:)`, otherwise it won't have effect.
  * @param apiEndpoint for the in effect endpoint (`+[TreasureData initializeApiEndpoint:]`).
  */

TreasureDataTests/IntegrationTests.swift

@@ -14,6 +14,7 @@ class IntegrationTests: XCTestCase {
     static var api: TDAPI!
     static var apiKey: String!
     static var collectorEndpoint: String!
+    static var cdpEndpoint: String!
 
     static let TargetDatabase = "ios_it"
     static var sessionPrefix = uuid()
@@ -33,6 +34,9 @@ class IntegrationTests: XCTestCase {
         guard let collectorEndpoint = ProcessInfo.processInfo.environment["COLLECTOR_ENDPOINT"] else {
             fatalError("Missing env COLLECTOR_ENDPOINT")
         }
+        guard let cdpEndpoint = ProcessInfo.processInfo.environment["CDP_ENDPOINT"] else {
+            fatalError("Missing env CDP_ENDPOINT")
+        }
         // Syntax: AUDIENCE_TOKENS=token1,token2
         guard let audienceTokensString = ProcessInfo.processInfo.environment["AUDIENCE_TOKENS"] else {
             fatalError("Missing env AUDIENCE_TOKENS")
@@ -44,6 +48,7 @@ class IntegrationTests: XCTestCase {
 
         IntegrationTests.apiKey = apiKey
         IntegrationTests.collectorEndpoint = collectorEndpoint
+        IntegrationTests.cdpEndpoint = cdpEndpoint
         IntegrationTests.audienceTokens = audienceTokensString.split(separator: ",").map { String($0) }
         let keyValueStrings = userSegmentKeysString.split(separator: ",").map { String($0) }
         keyValueStrings.forEach { keyValueString in
@@ -65,6 +70,7 @@ class IntegrationTests: XCTestCase {
         TreasureData.initializeApiEndpoint(IntegrationTests.collectorEndpoint)
         sdkClient = TreasureData(apiKey: IntegrationTests.apiKey)
         sdkClient.defaultDatabase = IntegrationTests.TargetDatabase
+        sdkClient.cdpEndpoint = IntegrationTests.cdpEndpoint
         tempTables = []
     }
 

scripts/ci_test

@@ -17,6 +17,7 @@ xcodebuild \
     API_MASTER_KEY="$API_MASTER_KEY" \
     API_ENDPOINT="$API_ENDPOINT" \
     COLLECTOR_ENDPOINT="$COLLECTOR_ENDPOINT" \
+    CDP_ENDPOINT="$CDP_ENDPOINT" \
     AUDIENCE_TOKENS="$AUDIENCE_TOKENS" \
     USER_SEGMENT_KEYS="$USER_SEGMENT_KEYS" \
     test \