Skip to content

Commit 67b234c

Browse files
committed
Change default credential to nil
1 parent 93abfc7 commit 67b234c

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

Sources/TencentSCFRuntimeCore/SCFContext.swift

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,17 @@ extension SCF {
106106
.init(stringLiteral: SCF.Env["SCF_FUNCTIONVERSION"] ?? "")
107107
}
108108

109-
public var credential: TencentCloud.Credential {
110-
.init(secretId: SCF.Env["TENCENTCLOUD_SECRETID"] ?? "",
111-
secretKey: SCF.Env["TENCENTCLOUD_SECRETKEY"] ?? "",
112-
sessionToken: SCF.Env["TENCENTCLOUD_SESSIONTOKEN"] ?? "")
109+
/// The role credential from SCF environment.
110+
public var credential: TencentCloud.Credential? {
111+
if let secretId = SCF.Env["TENCENTCLOUD_SECRETID"],
112+
let secretKey = SCF.Env["TENCENTCLOUD_SECRETKEY"]
113+
{
114+
return TencentCloud.Credential(secretId: secretId,
115+
secretKey: secretKey,
116+
sessionToken: SCF.Env["TENCENTCLOUD_SESSIONTOKEN"])
117+
} else {
118+
return nil
119+
}
113120
}
114121

115122
/// `Logger` to log with.

Tests/TencentSCFRuntimeCoreTests/SCFContextTest.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ class SCFContextTest: XCTestCase {
3434
XCTAssertEqual(context.name, "my-swift-function")
3535
XCTAssertEqual(context.namespace, "default")
3636
XCTAssertEqual(context.version, .latest)
37-
XCTAssertEqual(context.credential.secretId, "")
38-
XCTAssertEqual(context.credential.secretKey, "")
39-
XCTAssertEqual(context.credential.sessionToken, "")
37+
XCTAssertNil(context.credential)
4038
}
4139

4240
func testEnvUpdateWithDict() {
@@ -68,14 +66,15 @@ class SCFContextTest: XCTestCase {
6866
XCTAssertEqual(context.name, "another-swift-function")
6967
XCTAssertEqual(context.namespace, "custom")
7068
XCTAssertEqual(context.version, .version(2))
71-
XCTAssertEqual(context.credential.secretId, "SECRET_ID")
72-
XCTAssertEqual(context.credential.secretKey, "SECRET_KEY")
73-
XCTAssertEqual(context.credential.sessionToken, "SESSION_TOKEN")
69+
XCTAssertNotNil(context.credential)
70+
XCTAssertEqual(context.credential?.secretId, "SECRET_ID")
71+
XCTAssertEqual(context.credential?.secretKey, "SECRET_KEY")
72+
XCTAssertEqual(context.credential?.sessionToken, "SESSION_TOKEN")
7473

7574
SCF.Env.reset()
7675
}
7776

78-
func testEnvSet() {
77+
func testEnvSetDirectly() {
7978
let customEnvironment = [
8079
"TENCENTCLOUD_UIN": "100000000003",
8180
"TENCENTCLOUD_APPID": "1250000002",
@@ -106,9 +105,10 @@ class SCFContextTest: XCTestCase {
106105
XCTAssertEqual(context.name, "another-swift-function")
107106
XCTAssertEqual(context.namespace, "custom")
108107
XCTAssertEqual(context.version, .version(2))
109-
XCTAssertEqual(context.credential.secretId, "SECRET_ID")
110-
XCTAssertEqual(context.credential.secretKey, "SECRET_KEY")
111-
XCTAssertEqual(context.credential.sessionToken, "SESSION_TOKEN")
108+
XCTAssertNotNil(context.credential)
109+
XCTAssertEqual(context.credential?.secretId, "SECRET_ID")
110+
XCTAssertEqual(context.credential?.secretKey, "SECRET_KEY")
111+
XCTAssertEqual(context.credential?.sessionToken, "SESSION_TOKEN")
112112

113113
SCF.Env.reset()
114114
}

0 commit comments

Comments
 (0)