From 7795b61f4425ca7f87b47ea0021b895162e47160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Stormacq?= Date: Fri, 17 Oct 2025 16:46:20 +0200 Subject: [PATCH 1/2] change links to /swift-server to /awslabs --- Examples/quoteapi/Package.swift | 6 +++--- Examples/quoteapi/README.md | 2 +- Examples/quoteapi/template.yml | 2 +- Package.swift | 4 ++-- README.md | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Examples/quoteapi/Package.swift b/Examples/quoteapi/Package.swift index 9e1b0c8..423f491 100644 --- a/Examples/quoteapi/Package.swift +++ b/Examples/quoteapi/Package.swift @@ -14,9 +14,9 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-openapi-generator.git", from: "1.4.0"), .package(url: "https://github.com/apple/swift-openapi-runtime.git", from: "1.8.2"), - .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.3"), - .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.2.0"), - // .package(url: "https://github.com/swift-server/swift-openapi-lambda.git", from: "0.3.0"), + .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.0.0"), + .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.2.0"), + // .package(url: "https://github.com/awslabs/swift-openapi-lambda.git", from: "2.0.0"), .package(name: "swift-openapi-lambda", path: "../.."), .package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.8.0"), ], diff --git a/Examples/quoteapi/README.md b/Examples/quoteapi/README.md index 53dc3c9..dda6691 100644 --- a/Examples/quoteapi/README.md +++ b/Examples/quoteapi/README.md @@ -89,7 +89,7 @@ This is an example application for demonstration purposes. When deploying such i - Ensure that AWS Lambda function is configured for function-level concurrent execution limit ([concurrency documentation](https://docs.aws.amazon.com/lambda/latest/dg/lambda-concurrency.html), [configuration guide](https://docs.aws.amazon.com/lambda/latest/dg/configuration-concurrency.html)) - Check encryption settings for Lambda environment variables ([documentation](https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars-encryption.html)) - Ensure that AWS Lambda function is configured for a Dead Letter Queue (DLQ) ([documentation](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async-retain-records.html#invocation-dlq)) -- Ensure that AWS Lambda function is configured inside a VPC when it needs to access private resources ([documentation](https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html), [code example](https://github.com/swift-server/swift-aws-lambda-runtime/tree/main/Examples/ServiceLifecycle%2BPostgres)) +- Ensure that AWS Lambda function is configured inside a VPC when it needs to access private resources ([documentation](https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html), [code example](https://github.com/awslabs/swift-aws-lambda-runtime/tree/main/Examples/ServiceLifecycle%2BPostgres)) **Note:** The `openapi.yaml` file in this example is not suited for production. In real-world scenarios, you must: 1. Ensure that the global security field has rules defined diff --git a/Examples/quoteapi/template.yml b/Examples/quoteapi/template.yml index 9e5650b..1c9c4a9 100644 --- a/Examples/quoteapi/template.yml +++ b/Examples/quoteapi/template.yml @@ -16,7 +16,7 @@ Description: SAM Template for QuoteService # See: https://docs.aws.amazon.com/lambda/latest/dg/invocation-async-retain-records.html#invocation-dlq # - Ensure that AWS Lambda function is configured inside a VPC when it needs to access private resources # See: https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html -# Code Example: https://github.com/swift-server/swift-aws-lambda-runtime/tree/main/Examples/ServiceLifecycle%2BPostgres +# Code Example: https://github.com/awslabs/swift-aws-lambda-runtime/tree/main/Examples/ServiceLifecycle%2BPostgres Globals: Function: diff --git a/Package.swift b/Package.swift index e77fe98..aaa5259 100644 --- a/Package.swift +++ b/Package.swift @@ -9,8 +9,8 @@ let package = Package( products: [.library(name: "OpenAPILambda", targets: ["OpenAPILambda"])], dependencies: [ .package(url: "https://github.com/apple/swift-openapi-runtime.git", from: "1.8.2"), - .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.3"), - .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.2.0"), + .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.0.0"), + .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.2.0"), ], targets: [ .target( diff --git a/README.md b/README.md index 2f062a1..bf073cb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build & Test on GitHub](https://github.com/swift-server/swift-openapi-lambda/actions/workflows/pull_request.yml/badge.svg)](https://github.com/swift-server/swift-openapi-lambda/actions/workflows//pull_request.yml) +[![Build & Test on GitHub](https://github.com/awslabs/swift-openapi-lambda/actions/workflows/pull_request.yml/badge.svg)](https://github.com/awslabs/swift-openapi-lambda/actions/workflows//pull_request.yml) ![language](https://img.shields.io/badge/swift-6.0-blue) ![language](https://img.shields.io/badge/swift-6.1-blue) @@ -39,9 +39,9 @@ dependencies: [ .package(url: "https://github.com/apple/swift-openapi-runtime.git", from: "1.8.2"), // add these three dependencies - .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.3"), - .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.2.0"), - .package(url: "https://github.com/swift-server/swift-openapi-lambda.git", from: "2.0.0"), + .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.0.0"), + .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.2.0"), + .package(url: "https://github.com/awslabs/swift-openapi-lambda.git", from: "2.0.0"), ], targets: [ .executableTarget( @@ -237,6 +237,6 @@ struct QuoteServiceImpl: APIProtocol, OpenAPILambdaHttpApi { ## References - [Swift OpenAPI Generator](https://swiftpackageindex.com/apple/swift-openapi-generator/documentation) - Complete documentation and tutorials -- [Swift AWS Lambda Runtime](https://swiftpackageindex.com/swift-server/swift-aws-lambda-runtime) - Swift runtime for AWS Lambda +- [Swift AWS Lambda Runtime](https://swiftpackageindex.com/awslabs/swift-aws-lambda-runtime) - Swift runtime for AWS Lambda - [AWS SAM](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-sam.html) - Serverless Application Model documentation - [API Gateway Lambda Authorizers](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-use-lambda-authorizer.html) - Lambda authorization documentation \ No newline at end of file From a8345a5429a3774a736966659cb2fc19c33e8296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Stormacq?= Date: Tue, 21 Oct 2025 20:27:49 +0200 Subject: [PATCH 2/2] change license headers --- .license_header_template | 4 ++-- .mailmap | 1 + CONTRIBUTORS.txt | 11 +++++++---- .../Sources/LambdaAuthorizer/main.swift | 18 ++---------------- .../QuoteAPI/AuthenticateUserMiddleware.swift | 4 ++-- .../Sources/QuoteAPI/QuoteService.swift | 4 ++-- Sources/Exports.swift | 4 ++-- Sources/HttpApi/APIGatewayV2+HTTPRequest.swift | 4 ++-- Sources/HttpApi/OpenAPILambdaHttpApi.swift | 4 ++-- Sources/Middleware/LoggingMiddleware.swift | 4 ++-- Sources/OpenAPILambdaHandler.swift | 4 ++-- Sources/OpenAPILambdaService.swift | 4 ++-- Sources/OpenAPILambdaTransport.swift | 11 ++++++----- .../OpenAPILambdaRouter+SimplifiedAPI.swift | 4 ++-- Sources/Router/OpenAPILambdaRouter.swift | 4 ++-- Sources/Router/OpenAPILambdaRouterNode.swift | 4 ++-- Sources/Router/OpenAPILambdaRouterTrie.swift | 4 ++-- .../Router/RouterGraphTest.swift | 4 ++-- .../Router/RouterNodeTest.swift | 4 ++-- scripts/check_format.sh | 4 ++-- scripts/check_license.sh | 9 +++++---- scripts/generate-contributors-list.sh | 7 ++++--- 22 files changed, 57 insertions(+), 64 deletions(-) create mode 100644 .mailmap diff --git a/.license_header_template b/.license_header_template index 4c55a26..c2d0b7a 100644 --- a/.license_header_template +++ b/.license_header_template @@ -2,8 +2,8 @@ @@ @@ This source file is part of the Swift OpenAPI Lambda open source project @@ -@@ Copyright (c) YEARS Amazon.com, Inc. or its affiliates -@@ and the Swift OpenAPI Lambda project authors +@@ Copyright Swift OpenAPI Lambda project authors +@@ Copyright (c) YEARS Amazon.com, Inc. or its affiliates. @@ Licensed under Apache License v2.0 @@ @@ See LICENSE.txt for license information diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..907e33e --- /dev/null +++ b/.mailmap @@ -0,0 +1 @@ +Sébastien Stormacq \ No newline at end of file diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 3a77c36..f68d8a2 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,5 +1,5 @@ For the purpose of tracking copyright, this is the list of individuals and -organizations who have contributed source code to Hummingbird OpenAPI Transport. +organizations who have contributed source code to Swift OpenAPI Lambda. For employees of an organization/company where the copyright of work done by employees of that company is held by the company itself, only the company @@ -7,13 +7,16 @@ needs to be listed here. ## COPYRIGHT HOLDERS +- Amazon.com, Inc. (all contributors with '@amazon.com') - Apple Inc. (all contributors with '@apple.com') -- Amazon.com, Inc. or its affiliates (all contributors with @amazon.com) ### Contributors -- Sébastien Stormacq (stormacq@amazon.com) +- Emlyn Murphy +- Franz Busch +- Sébastien Stormacq +- Victor Hugo Barros **Updating this list** -Please do not edit this file manually. It is generated using `./scripts/generate-contributors-list.sh`. If a name is misspelled or appearing multiple times: add an entry in `./.mailmap` \ No newline at end of file +Please do not edit this file manually. It is generated using `bash ./scripts/generate-contributors-list.sh`. If a name is misspelled or appearing multiple times: add an entry in `./.mailmap` diff --git a/Examples/quoteapi/Sources/LambdaAuthorizer/main.swift b/Examples/quoteapi/Sources/LambdaAuthorizer/main.swift index 5658529..e6560c7 100644 --- a/Examples/quoteapi/Sources/LambdaAuthorizer/main.swift +++ b/Examples/quoteapi/Sources/LambdaAuthorizer/main.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information @@ -13,20 +13,6 @@ // //===----------------------------------------------------------------------===// -//===----------------------------------------------------------------------===// -// -// This source file is part of the SwiftAWSLambdaRuntime open source project -// -// Copyright (c) 2024 Apple Inc. and the SwiftAWSLambdaRuntime project authors -// Licensed under Apache License v2.0 -// -// See LICENSE.txt for license information -// See CONTRIBUTORS.txt for the list of SwiftAWSLambdaRuntime project authors -// -// SPDX-License-Identifier: Apache-2.0 -// -//===----------------------------------------------------------------------===// - import AWSLambdaEvents import AWSLambdaRuntime diff --git a/Examples/quoteapi/Sources/QuoteAPI/AuthenticateUserMiddleware.swift b/Examples/quoteapi/Sources/QuoteAPI/AuthenticateUserMiddleware.swift index f93ba7c..e1ba1f0 100644 --- a/Examples/quoteapi/Sources/QuoteAPI/AuthenticateUserMiddleware.swift +++ b/Examples/quoteapi/Sources/QuoteAPI/AuthenticateUserMiddleware.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Examples/quoteapi/Sources/QuoteAPI/QuoteService.swift b/Examples/quoteapi/Sources/QuoteAPI/QuoteService.swift index 2070cf5..779f3ff 100644 --- a/Examples/quoteapi/Sources/QuoteAPI/QuoteService.swift +++ b/Examples/quoteapi/Sources/QuoteAPI/QuoteService.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Sources/Exports.swift b/Sources/Exports.swift index ceb8f66..d214ab5 100644 --- a/Sources/Exports.swift +++ b/Sources/Exports.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2025 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Sources/HttpApi/APIGatewayV2+HTTPRequest.swift b/Sources/HttpApi/APIGatewayV2+HTTPRequest.swift index 0227a68..3231e0e 100644 --- a/Sources/HttpApi/APIGatewayV2+HTTPRequest.swift +++ b/Sources/HttpApi/APIGatewayV2+HTTPRequest.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Sources/HttpApi/OpenAPILambdaHttpApi.swift b/Sources/HttpApi/OpenAPILambdaHttpApi.swift index 226fda3..0ec3e4a 100644 --- a/Sources/HttpApi/OpenAPILambdaHttpApi.swift +++ b/Sources/HttpApi/OpenAPILambdaHttpApi.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Sources/Middleware/LoggingMiddleware.swift b/Sources/Middleware/LoggingMiddleware.swift index 39aa81a..028b42d 100644 --- a/Sources/Middleware/LoggingMiddleware.swift +++ b/Sources/Middleware/LoggingMiddleware.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Sources/OpenAPILambdaHandler.swift b/Sources/OpenAPILambdaHandler.swift index b325a42..6b54cdf 100644 --- a/Sources/OpenAPILambdaHandler.swift +++ b/Sources/OpenAPILambdaHandler.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Sources/OpenAPILambdaService.swift b/Sources/OpenAPILambdaService.swift index 3b6b044..98a66c4 100644 --- a/Sources/OpenAPILambdaService.swift +++ b/Sources/OpenAPILambdaService.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Sources/OpenAPILambdaTransport.swift b/Sources/OpenAPILambdaTransport.swift index c3ec064..94cf990 100644 --- a/Sources/OpenAPILambdaTransport.swift +++ b/Sources/OpenAPILambdaTransport.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information @@ -30,9 +30,10 @@ public typealias OpenAPILambdaResponse = (HTTPResponse, String?) public typealias OpenAPILambdaRequestParameters = [String: Substring] /// an OpenAPI handler -public typealias OpenAPIHandler = @Sendable (HTTPRequest, HTTPBody?, ServerRequestMetadata) async throws -> ( - HTTPResponse, HTTPBody? -) +public typealias OpenAPIHandler = + @Sendable (HTTPRequest, HTTPBody?, ServerRequestMetadata) async throws -> ( + HTTPResponse, HTTPBody? + ) /// Lambda Transport for OpenAPI generator public struct OpenAPILambdaTransport: ServerTransport, Sendable { diff --git a/Sources/Router/OpenAPILambdaRouter+SimplifiedAPI.swift b/Sources/Router/OpenAPILambdaRouter+SimplifiedAPI.swift index a53922f..27b732a 100644 --- a/Sources/Router/OpenAPILambdaRouter+SimplifiedAPI.swift +++ b/Sources/Router/OpenAPILambdaRouter+SimplifiedAPI.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Sources/Router/OpenAPILambdaRouter.swift b/Sources/Router/OpenAPILambdaRouter.swift index cf4929d..9052f46 100644 --- a/Sources/Router/OpenAPILambdaRouter.swift +++ b/Sources/Router/OpenAPILambdaRouter.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Sources/Router/OpenAPILambdaRouterNode.swift b/Sources/Router/OpenAPILambdaRouterNode.swift index b109425..c885b68 100644 --- a/Sources/Router/OpenAPILambdaRouterNode.swift +++ b/Sources/Router/OpenAPILambdaRouterNode.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Sources/Router/OpenAPILambdaRouterTrie.swift b/Sources/Router/OpenAPILambdaRouterTrie.swift index cba2d15..72d15b2 100644 --- a/Sources/Router/OpenAPILambdaRouterTrie.swift +++ b/Sources/Router/OpenAPILambdaRouterTrie.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Tests/OpenAPILambdaTests/Router/RouterGraphTest.swift b/Tests/OpenAPILambdaTests/Router/RouterGraphTest.swift index c26fe9e..e850a0b 100644 --- a/Tests/OpenAPILambdaTests/Router/RouterGraphTest.swift +++ b/Tests/OpenAPILambdaTests/Router/RouterGraphTest.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/Tests/OpenAPILambdaTests/Router/RouterNodeTest.swift b/Tests/OpenAPILambdaTests/Router/RouterNodeTest.swift index 23ff5c4..92f0557 100644 --- a/Tests/OpenAPILambdaTests/Router/RouterNodeTest.swift +++ b/Tests/OpenAPILambdaTests/Router/RouterNodeTest.swift @@ -2,8 +2,8 @@ // // This source file is part of the Swift OpenAPI Lambda open source project // -// Copyright (c) 2023 Amazon.com, Inc. or its affiliates -// and the Swift OpenAPI Lambda project authors +// Copyright Swift OpenAPI Lambda project authors +// Copyright (c) 2023 Amazon.com, Inc. or its affiliates. // Licensed under Apache License v2.0 // // See LICENSE.txt for license information diff --git a/scripts/check_format.sh b/scripts/check_format.sh index 3ae555d..4e2dddc 100755 --- a/scripts/check_format.sh +++ b/scripts/check_format.sh @@ -3,8 +3,8 @@ ## ## This source file is part of the Swift OpenAPI Lambda open source project ## -## Copyright (c) 2023 Amazon.com, Inc. or its affiliates -## and the Swift OpenAPI Lambda project authors +## Copyright Swift OpenAPI Lambda project authors +## Copyright (c) 2023 Amazon.com, Inc. or its affiliates. ## Licensed under Apache License v2.0 ## ## See LICENSE.txt for license information diff --git a/scripts/check_license.sh b/scripts/check_license.sh index 240c7d5..b98364d 100755 --- a/scripts/check_license.sh +++ b/scripts/check_license.sh @@ -3,8 +3,8 @@ ## ## This source file is part of the Swift OpenAPI Lambda open source project ## -## Copyright (c) 2023 Amazon.com, Inc. or its affiliates -## and the Swift OpenAPI Lambda project authors +## Copyright Swift OpenAPI Lambda project authors +## Copyright (c) 2023 Amazon.com, Inc. or its affiliates. ## Licensed under Apache License v2.0 ## ## See LICENSE.txt for license information @@ -37,6 +37,7 @@ fatal() { error "$@"; exit 1; } test -n "${PROJECT_NAME:-}" || fatal "PROJECT_NAME unset" if [ -f .license_header_template ]; then + log "Using custom license header template" # allow projects to override the license header template expected_file_header_template=$(cat .license_header_template) else @@ -44,8 +45,8 @@ else @@ @@ This source file is part of the ${PROJECT_NAME} open source project @@ -@@ Copyright (c) YEARS Apple Inc. and the ${PROJECT_NAME} project authors -@@ Licensed under Apache License v2.0 +@@ Copyright Swift OpenAPI Lambda project authors +@@ Copyright (c) YEARS Amazon.com, Inc. or its affiliates. @@ @@ See LICENSE.txt for license information @@ See CONTRIBUTORS.txt for the list of ${PROJECT_NAME} project authors diff --git a/scripts/generate-contributors-list.sh b/scripts/generate-contributors-list.sh index 724b5c3..a5cbd24 100755 --- a/scripts/generate-contributors-list.sh +++ b/scripts/generate-contributors-list.sh @@ -3,8 +3,8 @@ ## ## This source file is part of the Swift OpenAPI Lambda open source project ## -## Copyright (c) 2023 Amazon.com, Inc. or its affiliates -## and the Swift OpenAPI Lambda project authors +## Copyright Swift OpenAPI Lambda project authors +## Copyright (c) 2023 Amazon.com, Inc. or its affiliates. ## Licensed under Apache License v2.0 ## ## See LICENSE.txt for license information @@ -48,7 +48,7 @@ contributors=$( cd "$here"/.. && git shortlog -es | cut -f2 | sed 's/^/- /' ) cat > "$here/../CONTRIBUTORS.txt" <<- EOF For the purpose of tracking copyright, this is the list of individuals and - organizations who have contributed source code to SwiftOpenAPIGenerator. + organizations who have contributed source code to Swift OpenAPI Lambda. For employees of an organization/company where the copyright of work done by employees of that company is held by the company itself, only the company @@ -56,6 +56,7 @@ cat > "$here/../CONTRIBUTORS.txt" <<- EOF ## COPYRIGHT HOLDERS + - Amazon.com, Inc. (all contributors with '@amazon.com') - Apple Inc. (all contributors with '@apple.com') ### Contributors