You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/06/18 07:54:08 UTC
[camel-quarkus] 01/03: Added AWS2-KMS native extesion
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch aws2-kms
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 24e488ce7c885983212cdc1586b6272020c85bde
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jun 18 09:38:09 2020 +0200
Added AWS2-KMS native extesion
---
docs/modules/ROOT/pages/extensions/aws2-kms.adoc | 2 +-
.../pages/list-of-camel-quarkus-extensions.adoc | 2 +-
.../aws2/kms/deployment/Aws2KmsProcessor.java | 47 -------------
extensions-jvm/aws2-kms/integration-test/pom.xml | 81 ----------------------
.../component/aws2/kms/it/Aws2KmsResource.java | 51 --------------
.../quarkus/component/aws2/kms/it/Aws2KmsTest.java | 34 ---------
extensions-jvm/pom.xml | 1 -
.../aws2-kms/deployment/pom.xml | 12 ++++
.../aws2/kms/deployment/Aws2KmsProcessor.java | 65 +++++++++++++++++
{extensions-jvm => extensions}/aws2-kms/pom.xml | 1 -
.../aws2-kms/runtime/pom.xml | 12 ++++
.../main/resources/META-INF/quarkus-extension.yaml | 0
extensions/pom.xml | 1 +
poms/bom/pom.xml | 6 ++
14 files changed, 98 insertions(+), 217 deletions(-)
diff --git a/docs/modules/ROOT/pages/extensions/aws2-kms.adoc b/docs/modules/ROOT/pages/extensions/aws2-kms.adoc
index 8027e68..05ce38c 100644
--- a/docs/modules/ROOT/pages/extensions/aws2-kms.adoc
+++ b/docs/modules/ROOT/pages/extensions/aws2-kms.adoc
@@ -5,7 +5,7 @@
= AWS 2 KMS
[.badges]
-[.badge-key]##Since Camel Quarkus##[.badge-version]##1.0.0-M6## [.badge-key]##JVM##[.badge-supported]##supported## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##Since Camel Quarkus##[.badge-version]##1.0.0-M6## [.badge-key]##JVM##[.badge-supported]##supported## [.badge-key]##Native##[.badge-supported]##supported##
Manage keys stored in AWS KMS instances using AWS SDK version 2.x.
diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
index 1fcbb91..dc78138 100644
--- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
+++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
@@ -48,7 +48,7 @@ Number of Camel components: 149 in 114 JAR artifacts (0 deprecated)
| xref:extensions/aws2-iam.adoc[AWS 2 IAM] | camel-quarkus-aws2-iam | Native + Stable | 1.0.0-M6 | Manage AWS IAM instances using AWS SDK version 2.x.
-| xref:extensions/aws2-kms.adoc[AWS 2 KMS] | camel-quarkus-aws2-kms | JVM + Preview | 1.0.0-M6 | Manage keys stored in AWS KMS instances using AWS SDK version 2.x.
+| xref:extensions/aws2-kms.adoc[AWS 2 KMS] | camel-quarkus-aws2-kms | Native + Stable | 1.0.0-M6 | Manage keys stored in AWS KMS instances using AWS SDK version 2.x.
| xref:extensions/aws2-mq.adoc[AWS 2 MQ] | camel-quarkus-aws2-mq | JVM + Preview | 1.0.0-M6 | Manage AWS MQ instances using AWS SDK version 2.x.
diff --git a/extensions-jvm/aws2-kms/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kms/deployment/Aws2KmsProcessor.java b/extensions-jvm/aws2-kms/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kms/deployment/Aws2KmsProcessor.java
deleted file mode 100644
index dadbea6..0000000
--- a/extensions-jvm/aws2-kms/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kms/deployment/Aws2KmsProcessor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.component.aws2.kms.deployment;
-
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.pkg.steps.NativeBuild;
-import org.apache.camel.quarkus.core.JvmOnlyRecorder;
-import org.jboss.logging.Logger;
-
-class Aws2KmsProcessor {
- private static final Logger LOG = Logger.getLogger(Aws2KmsProcessor.class);
-
- private static final String FEATURE = "camel-aws2-kms";
-
- @BuildStep
- FeatureBuildItem feature() {
- return new FeatureBuildItem(FEATURE);
- }
-
- /**
- * Remove this once this extension starts supporting the native mode.
- */
- @BuildStep(onlyIf = NativeBuild.class)
- @Record(value = ExecutionTime.RUNTIME_INIT)
- void warnJvmInNative(JvmOnlyRecorder recorder) {
- JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time
- recorder.warnJvmInNative(FEATURE); // warn at runtime
- }
-
-}
diff --git a/extensions-jvm/aws2-kms/integration-test/pom.xml b/extensions-jvm/aws2-kms/integration-test/pom.xml
deleted file mode 100644
index 2cb772b..0000000
--- a/extensions-jvm/aws2-kms/integration-test/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-build-parent-it</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-aws2-kms-integration-test</artifactId>
- <name>Camel Quarkus :: AWS 2 KMS :: Integration Test</name>
- <description>Integration tests for Camel Quarkus AWS 2 KMS extension</description>
-
- <properties>
- <!-- mvnd, a.k.a. Maven Daemon: https://github.com/gnodet/mvnd -->
- <!-- The following rule tells mvnd to build the listed deployment modules before this module. -->
- <!-- This is important because mvnd builds modules in parallel by default. The deployment modules are not -->
- <!-- explicit dependencies of this module in the Maven sense, although they are required by the Quarkus Maven plugin. -->
- <!-- Please update rule whenever you change the dependencies of this module by running -->
- <!-- mvn process-resources -Pformat from the root directory -->
- <mvnd.builder.rule>camel-quarkus-aws2-kms-deployment,camel-quarkus-support-policy-deployment</mvnd.builder.rule>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-kms</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/extensions-jvm/aws2-kms/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/kms/it/Aws2KmsResource.java b/extensions-jvm/aws2-kms/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/kms/it/Aws2KmsResource.java
deleted file mode 100644
index b679ee3..0000000
--- a/extensions-jvm/aws2-kms/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/kms/it/Aws2KmsResource.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.component.aws2.kms.it;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.camel.CamelContext;
-import org.jboss.logging.Logger;
-
-@Path("/aws2-kms")
-@ApplicationScoped
-public class Aws2KmsResource {
-
- private static final Logger LOG = Logger.getLogger(Aws2KmsResource.class);
-
- private static final String COMPONENT_AWS2_KMS = "aws2-kms";
- @Inject
- CamelContext context;
-
- @Path("/load/component/aws2-kms")
- @GET
- @Produces(MediaType.TEXT_PLAIN)
- public Response loadComponentAws2Kms() throws Exception {
- /* This is an autogenerated test */
- if (context.getComponent(COMPONENT_AWS2_KMS) != null) {
- return Response.ok().build();
- }
- LOG.warnf("Could not load [%s] from the Camel context", COMPONENT_AWS2_KMS);
- return Response.status(500, COMPONENT_AWS2_KMS + " could not be loaded from the Camel context").build();
- }
-}
diff --git a/extensions-jvm/aws2-kms/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/kms/it/Aws2KmsTest.java b/extensions-jvm/aws2-kms/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/kms/it/Aws2KmsTest.java
deleted file mode 100644
index 13a42b1..0000000
--- a/extensions-jvm/aws2-kms/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/kms/it/Aws2KmsTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.component.aws2.kms.it;
-
-import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-class Aws2KmsTest {
-
- @Test
- public void loadComponentAws2Kms() {
- /* A simple autogenerated test */
- RestAssured.get("/aws2-kms/load/component/aws2-kms")
- .then()
- .statusCode(200);
- }
-
-}
diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
index 2a3af69..f16de87 100644
--- a/extensions-jvm/pom.xml
+++ b/extensions-jvm/pom.xml
@@ -35,7 +35,6 @@
<modules>
<!-- extensions a..z; do not remove this comment, it is important when sorting via mvn process-resources -Pformat -->
<module>avro-rpc</module>
- <module>aws2-kms</module>
<module>aws2-mq</module>
<module>aws2-msk</module>
<module>aws2-ses</module>
diff --git a/extensions-jvm/aws2-kms/deployment/pom.xml b/extensions/aws2-kms/deployment/pom.xml
similarity index 84%
rename from extensions-jvm/aws2-kms/deployment/pom.xml
rename to extensions/aws2-kms/deployment/pom.xml
index 985f81d..a08e22c 100644
--- a/extensions-jvm/aws2-kms/deployment/pom.xml
+++ b/extensions/aws2-kms/deployment/pom.xml
@@ -50,6 +50,18 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-aws2-kms</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-xml-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-commons-logging-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-aws2-deployment</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions/aws2-kms/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kms/deployment/Aws2KmsProcessor.java b/extensions/aws2-kms/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kms/deployment/Aws2KmsProcessor.java
new file mode 100644
index 0000000..9e7f7b9
--- /dev/null
+++ b/extensions/aws2-kms/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kms/deployment/Aws2KmsProcessor.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.aws2.kms.deployment;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import org.jboss.jandex.DotName;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+
+class Aws2KmsProcessor {
+ private static final String FEATURE = "camel-aws2-kms";
+
+ public static final String AWS_SDK_APPLICATION_ARCHIVE_MARKERS = "software/amazon/awssdk";
+
+ private static final List<String> INTERCEPTOR_PATHS = Arrays.asList(
+ "software/amazon/awssdk/global/handlers/execution.interceptors");
+
+ private static final DotName EXECUTION_INTERCEPTOR_NAME = DotName.createSimple(ExecutionInterceptor.class.getName());
+
+ @BuildStep
+ FeatureBuildItem feature() {
+ return new FeatureBuildItem(FEATURE);
+ }
+
+ @BuildStep(applicationArchiveMarkers = { AWS_SDK_APPLICATION_ARCHIVE_MARKERS })
+ void process(CombinedIndexBuildItem combinedIndexBuildItem,
+ BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
+ BuildProducer<NativeImageResourceBuildItem> resource) {
+
+ INTERCEPTOR_PATHS.forEach(path -> resource.produce(new NativeImageResourceBuildItem(path)));
+
+ List<String> knownInterceptorImpls = combinedIndexBuildItem.getIndex()
+ .getAllKnownImplementors(EXECUTION_INTERCEPTOR_NAME)
+ .stream()
+ .map(c -> c.name().toString()).collect(Collectors.toList());
+
+ reflectiveClasses.produce(new ReflectiveClassBuildItem(false, false,
+ knownInterceptorImpls.toArray(new String[knownInterceptorImpls.size()])));
+
+ reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false,
+ String.class.getCanonicalName()));
+ }
+}
diff --git a/extensions-jvm/aws2-kms/pom.xml b/extensions/aws2-kms/pom.xml
similarity index 97%
rename from extensions-jvm/aws2-kms/pom.xml
rename to extensions/aws2-kms/pom.xml
index e832b4c..d4d67c3 100644
--- a/extensions-jvm/aws2-kms/pom.xml
+++ b/extensions/aws2-kms/pom.xml
@@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
- <module>integration-test</module>
</modules>
</project>
diff --git a/extensions-jvm/aws2-kms/runtime/pom.xml b/extensions/aws2-kms/runtime/pom.xml
similarity index 87%
rename from extensions-jvm/aws2-kms/runtime/pom.xml
rename to extensions/aws2-kms/runtime/pom.xml
index 6190a10..47ea1eb 100644
--- a/extensions-jvm/aws2-kms/runtime/pom.xml
+++ b/extensions/aws2-kms/runtime/pom.xml
@@ -54,6 +54,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-kms</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-aws2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-commons-logging</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions-jvm/aws2-kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions-jvm/aws2-kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions/aws2-kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/pom.xml b/extensions/pom.xml
index f0043b1..5729565 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -58,6 +58,7 @@
<module>aws2-ecs</module>
<module>aws2-eks</module>
<module>aws2-iam</module>
+ <module>aws2-kms</module>
<module>aws2-s3</module>
<module>aws2-sns</module>
<module>aws2-sqs</module>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index bf6c642..c22fdee 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -286,6 +286,12 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-kms</artifactId>
<version>${camel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>netty-nio-client</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>