This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6943ac0d073aca6beaf234d7f54828e0b5ba37c6 Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Nov 28 11:40:52 2022 +0100 Upgrade AWS SDK v2 to version 2.18.25 Signed-off-by: Andrea Cosentino <[email protected]> --- .../aws2/ddb/Ddb2ClientHealthCheckCustomTest.java | 99 -------------------- .../apache/camel/component/aws2/ec2/aws2-ec2.json | 2 +- .../aws2/eks/EKS2CliientHealthCheckCustomTest.java | 100 --------------------- 3 files changed, 1 insertion(+), 200 deletions(-) diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckCustomTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckCustomTest.java deleted file mode 100644 index f28446cb93e..00000000000 --- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckCustomTest.java +++ /dev/null @@ -1,99 +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.component.aws2.ddb; - -import java.util.Collection; -import java.util.concurrent.TimeUnit; - -import org.apache.camel.CamelContext; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.health.HealthCheck; -import org.apache.camel.health.HealthCheckHelper; -import org.apache.camel.health.HealthCheckRegistry; -import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.testcontainers.shaded.org.awaitility.Awaitility.await; - -public class Ddb2ClientHealthCheckCustomTest extends CamelTestSupport { - - private static final Logger LOG = LoggerFactory.getLogger(Ddb2ClientHealthCheckCustomTest.class); - - CamelContext context; - - @Override - protected CamelContext createCamelContext() throws Exception { - context = super.createCamelContext(); - context.getPropertiesComponent().setLocation("ref:prop"); - Ddb2Component component = new Ddb2Component(context); - component.getConfiguration().setAmazonDDBClient(AWSSDKClientUtils.newDynamoDBClient()); - component.init(); - context.addComponent("aws2-ddb", component); - - // install health check manually (yes a bit cumbersome) - HealthCheckRegistry registry = new DefaultHealthCheckRegistry(); - registry.setCamelContext(context); - Object hc = registry.resolveById("context"); - registry.register(hc); - hc = registry.resolveById("routes"); - registry.register(hc); - hc = registry.resolveById("consumers"); - registry.register(hc); - context.setExtension(HealthCheckRegistry.class, registry); - - return context; - } - - @Override - protected RouteBuilder createRouteBuilder() { - return new RouteBuilder() { - - @Override - public void configure() { - from("direct:listTables") - .to("aws2-ddb://test?enabledInitialDescribeTable=false"); - } - }; - } - - @Test - public void testConnectivity() { - - Collection<HealthCheck.Result> res = HealthCheckHelper.invokeLiveness(context); - boolean up = res.stream().allMatch(r -> r.getState().equals(HealthCheck.State.UP)); - Assertions.assertTrue(up, "liveness check"); - - // health-check readiness should be down - await().atMost(20, TimeUnit.SECONDS).untilAsserted(() -> { - Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context); - boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN)); - boolean containsAws2DdbHealthCheck = res2.stream() - .filter(result -> result.getCheck().getId().startsWith("aws2-ddb-client")) - .findAny() - .isPresent(); - Assertions.assertTrue(down, "liveness check"); - Assertions.assertTrue(containsAws2DdbHealthCheck, "aws2-ddb check"); - }); - - } -} diff --git a/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json b/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json index 21c1b5bd6c7..684b6f51aa4 100644 --- a/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json +++ b/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json @@ -41,7 +41,7 @@ }, "headers": { "CamelAwsEC2ImageId": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "An image ID of the AWS marketplace", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#IMAGE_ID" }, - "CamelAwsEC2InstanceType": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [ "a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal", "c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", "c5.4xlarge" [...] + "CamelAwsEC2InstanceType": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [ "a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal", "c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", "c5.4xlarge" [...] "CamelAwsEC2Operation": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation we want to perform", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#OPERATION" }, "CamelAwsEC2InstanceMinCount": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The minimum number of instances we want to run.", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MIN_COUNT" }, "CamelAwsEC2InstanceMaxCount": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The maximum number of instances we want to run.", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MAX_COUNT" }, diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2CliientHealthCheckCustomTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2CliientHealthCheckCustomTest.java deleted file mode 100644 index cf24d4e9518..00000000000 --- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2CliientHealthCheckCustomTest.java +++ /dev/null @@ -1,100 +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.component.aws2.eks; - -import java.util.Collection; -import java.util.concurrent.TimeUnit; - -import org.apache.camel.CamelContext; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.health.HealthCheck; -import org.apache.camel.health.HealthCheckHelper; -import org.apache.camel.health.HealthCheckRegistry; -import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import software.amazon.awssdk.regions.Region; -import software.amazon.awssdk.services.eks.EksClient; - -import static org.testcontainers.shaded.org.awaitility.Awaitility.await; - -public class EKS2CliientHealthCheckCustomTest extends CamelTestSupport { - - private static final Logger LOG = LoggerFactory.getLogger(EKS2CliientHealthCheckCustomTest.class); - - CamelContext context; - - @Override - protected CamelContext createCamelContext() throws Exception { - context = super.createCamelContext(); - context.getPropertiesComponent().setLocation("ref:prop"); - EKS2Component component = new EKS2Component(context); - component.getConfiguration().setEksClient(EksClient.builder().region(Region.of("Ciao")).build()); - component.init(); - context.addComponent("aws2-eks", component); - - // install health check manually (yes a bit cumbersome) - HealthCheckRegistry registry = new DefaultHealthCheckRegistry(); - registry.setCamelContext(context); - Object hc = registry.resolveById("context"); - registry.register(hc); - hc = registry.resolveById("routes"); - registry.register(hc); - hc = registry.resolveById("consumers"); - registry.register(hc); - context.setExtension(HealthCheckRegistry.class, registry); - - return context; - } - - @Override - protected RouteBuilder createRouteBuilder() { - return new RouteBuilder() { - - @Override - public void configure() { - from("direct:listClusters") - .to("aws2-eks://test?operation=listClusters"); - } - }; - } - - @Test - public void testConnectivity() { - - Collection<HealthCheck.Result> res = HealthCheckHelper.invokeLiveness(context); - boolean up = res.stream().allMatch(r -> r.getState().equals(HealthCheck.State.UP)); - Assertions.assertTrue(up, "liveness check"); - - // health-check readiness should be down - await().atMost(20, TimeUnit.SECONDS).untilAsserted(() -> { - Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context); - boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN)); - boolean containsAws2AthenaHealthCheck = res2.stream() - .filter(result -> result.getCheck().getId().startsWith("aws2-eks-client")) - .findAny() - .isPresent(); - Assertions.assertTrue(down, "liveness check"); - Assertions.assertTrue(containsAws2AthenaHealthCheck, "aws2-eks check"); - }); - - } -}
