Skip to content

Commit a0537ec

Browse files
committed
Switch to standalone TencentCloudCore
1 parent e1a266a commit a0537ec

File tree

8 files changed

+19
-313
lines changed

8 files changed

+19
-313
lines changed

Package.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ let package = Package(
2121
.package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.17.0")),
2222
.package(url: "https://github.com/apple/swift-log.git", .upToNextMajor(from: "1.0.0")),
2323
.package(url: "https://github.com/swift-server/swift-backtrace.git", .upToNextMajor(from: "1.1.0")),
24+
.package(url: "https://github.com/stevapple/tencent-cloud-core.git", from: "0.0.1")
2425
],
2526
targets: [
26-
.target(name: "TencentCloudCore", dependencies: []),
27-
.testTarget(name: "TencentCloudCoreTests", dependencies: ["TencentCloudCore"]),
2827
.target(name: "TencentSCFRuntime", dependencies: [
2928
.byName(name: "TencentSCFRuntimeCore"),
3029
.product(name: "NIO", package: "swift-nio"),
@@ -35,7 +34,7 @@ let package = Package(
3534
.byName(name: "TencentSCFRuntime"),
3635
]),
3736
.target(name: "TencentSCFRuntimeCore", dependencies: [
38-
.byName(name: "TencentCloudCore"),
37+
.product(name: "TencentCloudCore", package: "tencent-cloud-core"),
3938
.product(name: "Logging", package: "swift-log"),
4039
.product(name: "Backtrace", package: "swift-backtrace"),
4140
.product(name: "NIOHTTP1", package: "swift-nio"),
@@ -45,7 +44,7 @@ let package = Package(
4544
.product(name: "NIOTestUtils", package: "swift-nio"),
4645
.product(name: "NIOFoundationCompat", package: "swift-nio"),
4746
]),
48-
.target(name: "TencentSCFEvents", dependencies: ["TencentCloudCore"]),
47+
.target(name: "TencentSCFEvents", dependencies: []),
4948
.testTarget(name: "TencentSCFEventsTests", dependencies: ["TencentSCFEvents"]),
5049
// testing helper
5150
.target(name: "TencentSCFTesting", dependencies: [

Sources/TencentCloudCore/Credential.swift

Lines changed: 0 additions & 37 deletions
This file was deleted.

Sources/TencentCloudCore/Region.swift

Lines changed: 0 additions & 120 deletions
This file was deleted.

Sources/TencentCloudCore/Zone.swift

Lines changed: 0 additions & 71 deletions
This file was deleted.

Sources/TencentSCFRuntimeCore/SCFContext.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ extension SCF {
8787
}
8888

8989
/// The Tencent Cloud region that the cloud function is in.
90-
public var region: TencentCloud.Region {
91-
TencentCloud.Region(rawValue: SCF.Env["TENCENTCLOUD_REGION"] ?? "")!
90+
public var region: TencentCloud.Region? {
91+
TencentCloud.Region(rawValue: SCF.Env["TENCENTCLOUD_REGION"] ?? "")
9292
}
9393

9494
/// The name of the cloud function.

Tests/TencentCloudCoreTests/RegionTests.swift

Lines changed: 0 additions & 40 deletions
This file was deleted.

Tests/TencentCloudCoreTests/ZoneTests.swift

Lines changed: 0 additions & 39 deletions
This file was deleted.

Tests/TencentSCFRuntimeCoreTests/SCFContextTest.swift

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,20 @@ class SCFContextTest: XCTestCase {
112112

113113
SCF.Env.reset()
114114
}
115+
116+
func testInvalidRegion() {
117+
SCF.Env["TENCENTCLOUD_REGION"] = "ap-ShangHai"
118+
119+
let context = SCF.Context(requestID: UUID().uuidString.lowercased(),
120+
memoryLimit: 128,
121+
timeLimit: .seconds(3),
122+
logger: Logger(label: "test"),
123+
eventLoop: MultiThreadedEventLoopGroup(numberOfThreads: 1).next(),
124+
allocator: ByteBufferAllocator())
125+
XCTAssertNil(context.region)
126+
127+
SCF.Env.reset()
128+
}
115129
}
116130

117131
#if os(Linux)

0 commit comments

Comments
 (0)