From 5e775bb43dcf4e5a4a65a770e984d5fa32894d6c Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Fri, 12 Feb 2021 17:15:15 -0500 Subject: [PATCH] Reorg and docs for aws lambda and HTTP --- bom/application/pom.xml | 4 +- .../src/main/asciidoc/amazon-lambda-http.adoc | 73 +++++++++++-------- .../deployment/pom.xml | 8 +- .../deployment/AmazonLambdaHttpProcessor.java | 0 .../src/main/resources/http/sam.jvm.yaml | 0 .../src/main/resources/http/sam.native.yaml | 0 .../maven-archetype/pom.xml | 6 +- .../META-INF/maven/archetype-metadata.xml | 0 .../resources/archetype-resources/pom.xml | 0 .../src/main/java/GreetingFunction.java | 0 .../src/main/java/GreetingResource.java | 0 .../src/main/java/GreetingServlet.java | 0 .../src/main/java/GreetingVertx.java | 0 .../src/test/java/GreetingTest.java | 0 .../pom.xml | 5 +- .../runtime/pom.xml | 7 +- .../amazon/lambda/http/LambdaHttpHandler.java | 0 .../amazon/lambda/http/model/AlbContext.java | 0 .../model/ApiGatewayAuthorizerContext.java | 0 .../http/model/ApiGatewayRequestIdentity.java | 0 .../lambda/http/model/AwsProxyRequest.java | 0 .../http/model/AwsProxyRequestContext.java | 0 .../lambda/http/model/AwsProxyResponse.java | 0 .../http/model/CognitoAuthorizerClaims.java | 0 .../amazon/lambda/http/model/ErrorModel.java | 0 .../amazon/lambda/http/model/Headers.java | 0 .../lambda/http/model/MultiValuedTreeMap.java | 0 .../resources/META-INF/quarkus-extension.yaml | 2 +- extensions/pom.xml | 5 +- .../pom.xml | 8 +- .../it/amazon/lambda/v1/FunqyGreeting.java | 0 .../it/amazon/lambda/v1/GreetingResource.java | 0 .../it/amazon/lambda/v1/GreetingServlet.java | 0 .../it/amazon/lambda/v1/GreetingVertx.java | 0 .../src/main/resources/application.properties | 0 .../amazon/lambda/AmazonLambdaV1SimpleIT.java | 0 .../lambda/AmazonLambdaV1SimpleTestCase.java | 0 integration-tests/pom.xml | 2 +- 38 files changed, 66 insertions(+), 54 deletions(-) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/deployment/pom.xml (85%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/deployment/src/main/resources/http/sam.jvm.yaml (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/deployment/src/main/resources/http/sam.native.yaml (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/maven-archetype/pom.xml (91%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/maven-archetype/src/main/resources/archetype-resources/pom.xml (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingFunction.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingVertx.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/maven-archetype/src/main/resources/archetype-resources/src/test/java/GreetingTest.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/pom.xml (77%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/pom.xml (86%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AlbContext.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayAuthorizerContext.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayRequestIdentity.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequest.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequestContext.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyResponse.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/CognitoAuthorizerClaims.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ErrorModel.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/Headers.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/MultiValuedTreeMap.java (100%) rename extensions/{amazon-lambda-http-v1 => amazon-lambda-rest}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (82%) rename integration-tests/{amazon-lambda-http-v1 => amazon-lambda-rest}/pom.xml (95%) rename integration-tests/{amazon-lambda-http-v1 => amazon-lambda-rest}/src/main/java/io/quarkus/it/amazon/lambda/v1/FunqyGreeting.java (100%) rename integration-tests/{amazon-lambda-http-v1 => amazon-lambda-rest}/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java (100%) rename integration-tests/{amazon-lambda-http-v1 => amazon-lambda-rest}/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java (100%) rename integration-tests/{amazon-lambda-http-v1 => amazon-lambda-rest}/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingVertx.java (100%) rename integration-tests/{amazon-lambda-http-v1 => amazon-lambda-rest}/src/main/resources/application.properties (100%) rename integration-tests/{amazon-lambda-http-v1 => amazon-lambda-rest}/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleIT.java (100%) rename integration-tests/{amazon-lambda-http-v1 => amazon-lambda-rest}/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java (100%) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index c9e10a1343f68..87f9a9fbfc38c 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -1687,12 +1687,12 @@ io.quarkus - quarkus-amazon-lambda-http-v1 + quarkus-amazon-lambda-rest ${project.version} io.quarkus - quarkus-amazon-lambda-http-v1-deployment + quarkus-amazon-lambda-rest-deployment ${project.version} diff --git a/docs/src/main/asciidoc/amazon-lambda-http.adoc b/docs/src/main/asciidoc/amazon-lambda-http.adoc index 74e13001740d7..32c6818691957 100644 --- a/docs/src/main/asciidoc/amazon-lambda-http.adoc +++ b/docs/src/main/asciidoc/amazon-lambda-http.adoc @@ -3,18 +3,22 @@ This guide is maintained in the main Quarkus repository and pull requests should be submitted there: https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc //// -= Quarkus - Amazon Lambda with RESTEasy, Undertow, or Vert.x Web  += Quarkus - Amazon Lambda with RESTEasy, Undertow, or Vert.x Web :extension-status: preview include::./attributes.adoc[] -The `quarkus-amazon-lambda-http` extension allows you to write microservices with RESTEasy (JAX-RS), -Undertow (servlet), Vert.x Web, link:funqy-http[Funqy HTTP] or any other Quarkus HTTP API that runs on top of Vert.x Web -and deploy them to Amazon Lambda -using https://aws.amazon.com/api-gateway/[Amazon's API Gateway] and https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-sam.html[Amazon's SAM framework]. +With Quarkus you can deploy your favorite Java HTTP frameworks as Amazon Lambda's using either the https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api.html[AWS Gateway HTTP API] +or https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-rest-api.html[AWS Gateway REST API]. This means that you can deploy your microservices written with RESTEasy (JAX-RS), +Undertow (servlet), Vert.x Web, link:funqy-http[Funqy HTTP] or any other Quarkus HTTP framework as an AWS Lambda. You can deploy your Lambda as a pure Java jar, or you can compile your project to a native image and deploy that for a smaller -memory footprint and startup time. +memory footprint and startup time. Our integration also generates SAM deployment files that can be consumed by https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-sam.html[Amazon's SAM framework]. + +Quarkus has a different extension for each Gateway API. The HTTP Gateway API is implemented within the `quarkus-amazon-lambda-http` extension. +The REST Gateway API is implemented within the `quarkus-amazon-lambda-rest` extension. If you are confused on which Gateway product to use, +Amazon has a https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html[great guide] to help you navigate this decision. + include::./status-include.adoc[] @@ -42,7 +46,7 @@ for installing AWS SAM CLI. Create the Quarkus AWS Lambda maven project using our Maven Archetype. - +If you want to use the AWS Gateway HTTP API, generate your project with this script: [source,bash,subs=attributes+] ---- mvn archetype:generate \ @@ -51,8 +55,15 @@ mvn archetype:generate \ -DarchetypeVersion={quarkus-version} ---- -NOTE: This extension has recently been upgraded to use API Gateway V2. If you need to still use V1 of the API Gateway -use the `quarkus-amazon-lambda-http-v1` extension instead. +If you want to use the AWS Gateway REST API, generate your project with this script: +[source,bash,subs=attributes+] +---- +mvn archetype:generate \ + -DarchetypeGroupId=io.quarkus \ + -DarchetypeArtifactId=quarkus-amazon-lambda-rest-archetype \ + -DarchetypeVersion={quarkus-version} +---- + == Build and Deploy @@ -86,7 +97,7 @@ Lambda requires linux binaries. You can do this by passing this property to you == Extra Build Generated Files -After you run the build, there are a few extra files generated by the `quarkus-amazon-lambda` extension. These files +After you run the build, there are a few extra files generated by the quarkus lambda extension you are using. These files are in the the build directory: `target/` for maven, `build/` for gradle. * `function.zip` - lambda deployment file @@ -161,7 +172,8 @@ sam deploy -t target/sam.native.yaml -g == Examine the POM There is nothing special about the POM other than the inclusion of the `quarkus-amazon-lambda-http` extension -as a dependencies. The extension automatically generates everything you might need for your lambda deployment. +(if you are deploying an AWS Gateway HTTP API) or the `quarkus-amazon-lambda-rest` extension (if you are deploy an AWS Gateway REST API). +These extensions automatically generate everything you might need for your lambda deployment. Also, at least in the generated maven archetype `pom.xml`, the `quarkus-resteasy`, `quarkus-vertx-web`, and `quarkus-undertow` dependencies are all optional. Pick which http framework(s) you want to use (JAX-RS, Vertx Web, and/or Servlet) and @@ -169,23 +181,11 @@ remove the other dependencies to shrink your deployment. === Examine sam.yaml -The `sam.yaml` syntax is beyond the scope of this document. There's a couple of things to note though that are particular -to the `quarkus-amazon-lambda-http` extension. - -Amazon's API Gateway assumes that HTTP response bodies are text unless you explicitly tell it which media types are -binary through configuration. To make things easier, the Quarkus extension forces a binary (base 64) encoding of all -HTTP response messages and the `sam.yaml` file must configure the API Gateway to assume all media types are binary: - -[source, subs=attributes+] ----- - Globals: - Api: - EndpointConfiguration: REGIONAL - BinaryMediaTypes: - - "*/*" ----- +The `sam.yaml` syntax is beyond the scope of this document. There's a couple of things that must be highlighted just in case you are +going to craft your own custom `sam.yaml` deployment files. -Another thing to note is that for pure Java lambda deployments, do not change the Lambda handler name. +The first thing to note is that for pure Java lambda deployments require a specific handler class. +Do not change the Lambda handler name. [source, subs=attributes+] ---- @@ -194,10 +194,9 @@ Another thing to note is that for pure Java lambda deployments, do not change th Runtime: java11 ---- -This particular handler handles all the intricacies of integrating with the Quarkus runtime. So you must use that -handler. +This handler is a bridge between the lambda runtime and the Quarkus HTTP framework you are using (JAX-RS, Servlet, etc.) -Finally, there's an environment variable that must be set for native GraalVM deployments. If you look at `sam.native.yaml` +If you want to go native, there's an environment variable that must be set for native GraalVM deployments. If you look at `sam.native.yaml` you'll see this: [source, subs=attributes+] @@ -209,6 +208,20 @@ you'll see this: This environment variable resolves some incompatibilities between Quarkus and the Amazon Lambda Custom Runtime environment. +Finally, there is one specific thing for AWS Gateway REST API deployments. +That API assumes that HTTP response bodies are text unless you explicitly tell it which media types are +binary through configuration. To make things easier, the Quarkus extension forces a binary (base 64) encoding of all +HTTP response messages and the `sam.yaml` file must configure the API Gateway to assume all media types are binary: + +[source, subs=attributes+] +---- + Globals: + Api: + EndpointConfiguration: REGIONAL + BinaryMediaTypes: + - "*/*" +---- + == Tracing with AWS XRay and GraalVM If you are building native images, and want to use https://aws.amazon.com/xray[AWS X-Ray Tracing] with your lambda diff --git a/extensions/amazon-lambda-http-v1/deployment/pom.xml b/extensions/amazon-lambda-rest/deployment/pom.xml similarity index 85% rename from extensions/amazon-lambda-http-v1/deployment/pom.xml rename to extensions/amazon-lambda-rest/deployment/pom.xml index 95a0e260f337c..bb4da0e13edbc 100644 --- a/extensions/amazon-lambda-http-v1/deployment/pom.xml +++ b/extensions/amazon-lambda-rest/deployment/pom.xml @@ -6,13 +6,13 @@ io.quarkus - quarkus-amazon-lambda-http-v1-parent + quarkus-amazon-lambda-rest-parent 999-SNAPSHOT ../pom.xml - quarkus-amazon-lambda-http-v1-deployment - Quarkus - Amazon Lambda HTTP V1 - Deployment + quarkus-amazon-lambda-rest-deployment + Quarkus - Amazon Lambda AWS Gateway REST API - Deployment @@ -29,7 +29,7 @@ io.quarkus - quarkus-amazon-lambda-http-v1 + quarkus-amazon-lambda-rest diff --git a/extensions/amazon-lambda-http-v1/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java b/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java similarity index 100% rename from extensions/amazon-lambda-http-v1/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java rename to extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java diff --git a/extensions/amazon-lambda-http-v1/deployment/src/main/resources/http/sam.jvm.yaml b/extensions/amazon-lambda-rest/deployment/src/main/resources/http/sam.jvm.yaml similarity index 100% rename from extensions/amazon-lambda-http-v1/deployment/src/main/resources/http/sam.jvm.yaml rename to extensions/amazon-lambda-rest/deployment/src/main/resources/http/sam.jvm.yaml diff --git a/extensions/amazon-lambda-http-v1/deployment/src/main/resources/http/sam.native.yaml b/extensions/amazon-lambda-rest/deployment/src/main/resources/http/sam.native.yaml similarity index 100% rename from extensions/amazon-lambda-http-v1/deployment/src/main/resources/http/sam.native.yaml rename to extensions/amazon-lambda-rest/deployment/src/main/resources/http/sam.native.yaml diff --git a/extensions/amazon-lambda-http-v1/maven-archetype/pom.xml b/extensions/amazon-lambda-rest/maven-archetype/pom.xml similarity index 91% rename from extensions/amazon-lambda-http-v1/maven-archetype/pom.xml rename to extensions/amazon-lambda-rest/maven-archetype/pom.xml index 159bc24d9db37..326475ac1feed 100644 --- a/extensions/amazon-lambda-http-v1/maven-archetype/pom.xml +++ b/extensions/amazon-lambda-rest/maven-archetype/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - quarkus-amazon-lambda-http-v1-parent + quarkus-amazon-lambda-rest-parent io.quarkus 999-SNAPSHOT 4.0.0 - quarkus-amazon-lambda-http-v1-archetype - Quarkus - Amazon Lambda HTTP V1 - Archetype + quarkus-amazon-lambda-rest-archetype + Quarkus - Amazon Lambda AWS Gateway REST API - Archetype maven-archetype diff --git a/extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml similarity index 100% rename from extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml rename to extensions/amazon-lambda-rest/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml diff --git a/extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml similarity index 100% rename from extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/pom.xml rename to extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml diff --git a/extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingFunction.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingFunction.java similarity index 100% rename from extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingFunction.java rename to extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingFunction.java diff --git a/extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java similarity index 100% rename from extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java rename to extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java diff --git a/extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java similarity index 100% rename from extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java rename to extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java diff --git a/extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingVertx.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingVertx.java similarity index 100% rename from extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingVertx.java rename to extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingVertx.java diff --git a/extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/src/test/java/GreetingTest.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/test/java/GreetingTest.java similarity index 100% rename from extensions/amazon-lambda-http-v1/maven-archetype/src/main/resources/archetype-resources/src/test/java/GreetingTest.java rename to extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/test/java/GreetingTest.java diff --git a/extensions/amazon-lambda-http-v1/pom.xml b/extensions/amazon-lambda-rest/pom.xml similarity index 77% rename from extensions/amazon-lambda-http-v1/pom.xml rename to extensions/amazon-lambda-rest/pom.xml index 1ace8c34e50a4..34cb1cf262363 100644 --- a/extensions/amazon-lambda-http-v1/pom.xml +++ b/extensions/amazon-lambda-rest/pom.xml @@ -11,9 +11,8 @@ ../pom.xml - quarkus-amazon-lambda-http-v1-parent - Quarkus - Amazon Lambda HTTP V1 - + quarkus-amazon-lambda-rest-parent + Quarkus - Amazon Lambda AWS Gateway REST API pom diff --git a/extensions/amazon-lambda-http-v1/runtime/pom.xml b/extensions/amazon-lambda-rest/runtime/pom.xml similarity index 86% rename from extensions/amazon-lambda-http-v1/runtime/pom.xml rename to extensions/amazon-lambda-rest/runtime/pom.xml index 7986f741322e9..a6e0f2a074f04 100644 --- a/extensions/amazon-lambda-http-v1/runtime/pom.xml +++ b/extensions/amazon-lambda-rest/runtime/pom.xml @@ -6,14 +6,13 @@ io.quarkus - quarkus-amazon-lambda-http-v1-parent + quarkus-amazon-lambda-rest-parent 999-SNAPSHOT ../pom.xml - quarkus-amazon-lambda-http-v1 - Quarkus - Amazon Lambda HTTP V1- Runtime - Deprecated API Gateway V1 api: Allow applications written for any Quarkus HTTP API to run in AWS Lambda + quarkus-amazon-lambda-rest + Quarkus - Amazon Lambda AWS Gateway REST API- Runtime diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java similarity index 100% rename from extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AlbContext.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AlbContext.java similarity index 100% rename from extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AlbContext.java rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AlbContext.java diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayAuthorizerContext.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayAuthorizerContext.java similarity index 100% rename from extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayAuthorizerContext.java rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayAuthorizerContext.java diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayRequestIdentity.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayRequestIdentity.java similarity index 100% rename from extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayRequestIdentity.java rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayRequestIdentity.java diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequest.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequest.java similarity index 100% rename from extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequest.java rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequest.java diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequestContext.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequestContext.java similarity index 100% rename from extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequestContext.java rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequestContext.java diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyResponse.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyResponse.java similarity index 100% rename from extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyResponse.java rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyResponse.java diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/CognitoAuthorizerClaims.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/CognitoAuthorizerClaims.java similarity index 100% rename from extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/CognitoAuthorizerClaims.java rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/CognitoAuthorizerClaims.java diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ErrorModel.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ErrorModel.java similarity index 100% rename from extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ErrorModel.java rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ErrorModel.java diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/Headers.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/Headers.java similarity index 100% rename from extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/Headers.java rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/Headers.java diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/MultiValuedTreeMap.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/MultiValuedTreeMap.java similarity index 100% rename from extensions/amazon-lambda-http-v1/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/MultiValuedTreeMap.java rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/MultiValuedTreeMap.java diff --git a/extensions/amazon-lambda-http-v1/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml similarity index 82% rename from extensions/amazon-lambda-http-v1/runtime/src/main/resources/META-INF/quarkus-extension.yaml rename to extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml index d5557c9ce5281..01e578e12c75e 100644 --- a/extensions/amazon-lambda-http-v1/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -1,5 +1,5 @@ --- -name: "AWS Lambda HTTP V1 (deprecated)" +name: "AWS Lambda Gateway REST API" metadata: keywords: - "lambda" diff --git a/extensions/pom.xml b/extensions/pom.xml index e5bb63b91e578..98fda08015dd3 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -152,9 +152,10 @@ amazon-lambda amazon-lambda-xray + amazon-lambda-http - - amazon-lambda-http-v1 + + amazon-lambda-rest amazon-services amazon-alexa azure-functions-http diff --git a/integration-tests/amazon-lambda-http-v1/pom.xml b/integration-tests/amazon-lambda-rest/pom.xml similarity index 95% rename from integration-tests/amazon-lambda-http-v1/pom.xml rename to integration-tests/amazon-lambda-rest/pom.xml index 07a9df35e9eb7..cee1cbbf85a53 100644 --- a/integration-tests/amazon-lambda-http-v1/pom.xml +++ b/integration-tests/amazon-lambda-rest/pom.xml @@ -9,8 +9,8 @@ 4.0.0 - quarkus-integration-test-amazon-lambda-http-v1 - Quarkus - Integration Tests - Amazon Lambda HTTP V1 + quarkus-integration-test-amazon-lambda-rest + Quarkus - Integration Tests - Amazon Lambda AWS Gateway REST API Module that contains Amazon Lambda related tests for RESTEasy @@ -35,7 +35,7 @@ io.quarkus - quarkus-amazon-lambda-http-v1 + quarkus-amazon-lambda-rest @@ -53,7 +53,7 @@ io.quarkus - quarkus-amazon-lambda-http-v1-deployment + quarkus-amazon-lambda-rest-deployment ${project.version} pom test diff --git a/integration-tests/amazon-lambda-http-v1/src/main/java/io/quarkus/it/amazon/lambda/v1/FunqyGreeting.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/FunqyGreeting.java similarity index 100% rename from integration-tests/amazon-lambda-http-v1/src/main/java/io/quarkus/it/amazon/lambda/v1/FunqyGreeting.java rename to integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/FunqyGreeting.java diff --git a/integration-tests/amazon-lambda-http-v1/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java similarity index 100% rename from integration-tests/amazon-lambda-http-v1/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java rename to integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java diff --git a/integration-tests/amazon-lambda-http-v1/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java similarity index 100% rename from integration-tests/amazon-lambda-http-v1/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java rename to integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java diff --git a/integration-tests/amazon-lambda-http-v1/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingVertx.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingVertx.java similarity index 100% rename from integration-tests/amazon-lambda-http-v1/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingVertx.java rename to integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingVertx.java diff --git a/integration-tests/amazon-lambda-http-v1/src/main/resources/application.properties b/integration-tests/amazon-lambda-rest/src/main/resources/application.properties similarity index 100% rename from integration-tests/amazon-lambda-http-v1/src/main/resources/application.properties rename to integration-tests/amazon-lambda-rest/src/main/resources/application.properties diff --git a/integration-tests/amazon-lambda-http-v1/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleIT.java b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleIT.java similarity index 100% rename from integration-tests/amazon-lambda-http-v1/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleIT.java rename to integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleIT.java diff --git a/integration-tests/amazon-lambda-http-v1/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java similarity index 100% rename from integration-tests/amazon-lambda-http-v1/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java rename to integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 2039ea45d9774..8212ad1cdb5c9 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -94,7 +94,7 @@ amazon-lambda-s3event amazon-lambda-stream-handler amazon-lambda-http - amazon-lambda-http-v1 + amazon-lambda-rest amazon-lambda-http-resteasy container-image kubernetes