Skip to content

Commit bf47c3f

Browse files
committed
Merge branch 'main' of github.com:sebsto/swift-aws-lambda-runtime into sebsto/readme
2 parents 4eca886 + 8131a83 commit bf47c3f

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

Plugins/AWSLambdaPackager/Plugin.swift

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,8 @@ struct AWSLambdaPackager: CommandPlugin {
220220
try FileManager.default.createDirectory(atPath: workingDirectory.path(), withIntermediateDirectories: true)
221221

222222
// rename artifact to "bootstrap"
223-
let relocatedArtifactPath = workingDirectory.appending(path: artifactPath.lastPathComponent)
224-
let symbolicLinkPath = workingDirectory.appending(path: "bootstrap")
223+
let relocatedArtifactPath = workingDirectory.appending(path: "bootstrap")
225224
try FileManager.default.copyItem(atPath: artifactPath.path(), toPath: relocatedArtifactPath.path())
226-
try FileManager.default.createSymbolicLink(
227-
atPath: symbolicLinkPath.path(),
228-
withDestinationPath: relocatedArtifactPath.lastPathComponent
229-
)
230225

231226
var arguments: [String] = []
232227
#if os(macOS) || os(Linux)
@@ -235,7 +230,6 @@ struct AWSLambdaPackager: CommandPlugin {
235230
"--symlinks",
236231
zipfilePath.lastPathComponent,
237232
relocatedArtifactPath.lastPathComponent,
238-
symbolicLinkPath.lastPathComponent,
239233
]
240234
#else
241235
throw Errors.unsupportedPlatform("can't or don't know how to create a zip file on this platform")

Plugins/AWSLambdaPackager/PluginUtils.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import Dispatch
16+
import Foundation
1617
import PackagePlugin
1718
import Synchronization
18-
import Foundation
1919

2020
@available(macOS 15.0, *)
2121
struct Utils {

Sources/AWSLambdaRuntimeCore/LambdaRuntime.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
import Foundation
1616
import Logging
17-
import NIOCore
1817
import NIOConcurrencyHelpers
18+
import NIOCore
1919

2020
// We need `@unchecked` Sendable here, as `NIOLockedValueBox` does not understand `sending` today.
2121
// We don't want to use `NIOLockedValueBox` here anyway. We would love to use Mutex here, but this
2222
// sadly crashes the compiler today.
2323
public final class LambdaRuntime<Handler>: @unchecked Sendable where Handler: StreamingLambdaHandler {
2424
// TODO: We want to change this to Mutex as soon as this doesn't crash the Swift compiler on Linux anymore
25-
let handlerMutex: NIOLockedValueBox<Optional<Handler>>
25+
let handlerMutex: NIOLockedValueBox<Handler?>
2626
let logger: Logger
2727
let eventLoop: EventLoop
2828

0 commit comments

Comments
 (0)