Rename COS.Object.key and add convenient access to the real key

Author: stevapple

Examples/LocalDebugging/MyCloudFunction/scripts/package.sh

@@ -31,7 +31,7 @@ set -eu
 executable=$1
 
 target=".build/scf/$executable"
-rm -rf "$target" "$target.zip"
+rm -rf "$target"
 mkdir -p "$target"
 
 cp ".build/release/$executable" "$target/"

Sources/TencentSCFEvents/COS/COS.swift

@@ -71,7 +71,11 @@ public enum COS {
 
     public struct Object: Equatable {
         public let url: URL
-        public let key: String
+        public let fullKey: String
+        public var key: String {
+            fullKey.split(separator: "/").dropFirst(2).joined(separator: "/")
+        }
+
         public let vid: String
         public let size: UInt64
 

Sources/TencentSCFEvents/COS/EventRecord+Codable.swift

@@ -33,7 +33,6 @@ extension COS.Event.Record: Codable {
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
-
         cos = try container.decode(COS.Entity.self, forKey: .cos)
 
         let eventContainer = try container.nestedContainer(keyedBy: EventCodingKeys.self, forKey: .event)

Sources/TencentSCFEvents/COS/Object+Codable.swift

@@ -39,7 +39,7 @@ extension COS.Object: Codable {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 
         url = try container.decode(URL.self, forKey: .url)
-        key = try container.decode(String.self, forKey: .key)
+        fullKey = try container.decode(String.self, forKey: .key)
         vid = try container.decode(String.self, forKey: .vid)
         size = try container.decode(UInt64.self, forKey: .size)
 
@@ -57,7 +57,7 @@ extension COS.Object: Codable {
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(url, forKey: .url)
-        try container.encode(key, forKey: .key)
+        try container.encode(fullKey, forKey: .key)
         try container.encode(vid, forKey: .vid)
         try container.encode(size, forKey: .size)
         try container.encode(customMeta.mapKeys { "x-cos-meta-" + $0 }, forKey: .meta)

Tests/TencentSCFEventsTests/COSTests.swift

@@ -54,7 +54,7 @@ class COSTests: XCTestCase {
                 "cosNotificationId": "unknown"
             },
             "event": {
-                "eventName": "cos:ObjectCreated:*",
+                "eventName": "cos:ObjectCreated:CompleteMultipartUpload",
                 "eventVersion": "1.0",
                 "eventTime": 1545205770,
                 "eventSource": "qcs::cos",
@@ -87,7 +87,8 @@ class COSTests: XCTestCase {
         XCTAssertEqual(record.cos.bucket.region, "cd")
         XCTAssertEqual(record.cos.bucket.name, "testpic")
         XCTAssertEqual(record.cos.bucket.appid, "1253970026")
-        XCTAssertEqual(record.cos.object.key, "/1253970026/testpic/testfile")
+        XCTAssertEqual(record.cos.object.fullKey, "/1253970026/testpic/testfile")
+        XCTAssertEqual(record.cos.object.key, "testfile")
         XCTAssertEqual(record.cos.object.size, 1029)
         XCTAssertEqual(record.cos.object.vid, "")
         XCTAssertEqual(record.cos.object.contentType, "")
@@ -97,7 +98,7 @@ class COSTests: XCTestCase {
         XCTAssertEqual(record.cos.object.expireTime?.description, "2012-04-05 21:47:37 +0000")
         XCTAssertEqual(record.cos.object.customMeta, ["mykey": "myvalue"])
 
-        XCTAssertEqual(record.eventName, "cos:ObjectCreated:*")
+        XCTAssertEqual(record.eventName, "cos:ObjectCreated:CompleteMultipartUpload")
         XCTAssertEqual(record.eventVersion, "1.0")
         XCTAssertEqual(record.eventSource, "qcs::cos")
         XCTAssertEqual(record.eventTime, Date(timeIntervalSince1970: 1_545_205_770))