Merge branch 'main' into dependabot/gradle/org.testcontainers-testcontainers-2.0.3

Author: fdelbrayelle

build.gradle

@@ -150,7 +150,7 @@ configurations {
 }
 
 dependencies {
-    agent "org.aspectj:aspectjweaver:1.9.25"
+    agent "org.aspectj:aspectjweaver:1.9.25.1"
 }
 
 test {

src/main/java/io/kestra/plugin/aws/ConnectionUtils.java

@@ -81,9 +81,9 @@ public static StsClient stsClient(final AbstractConnection.AwsClientConfig awsCl
         StsClientBuilder builder = StsClient.builder();
 
         final String stsEndpointOverride = awsClientConfig.stsEndpointOverride();
-        if (stsEndpointOverride != null) {
+        if(StringUtils.isNotBlank(stsEndpointOverride)) {
             builder.applyMutation(stsClientBuilder ->
-                stsClientBuilder.endpointOverride(URI.create(stsEndpointOverride)));
+                stsClientBuilder.endpointOverride(URI.create(stsEndpointOverride.trim())));
         }
 
         final String regionString = awsClientConfig.region();
@@ -152,8 +152,9 @@ public static <C extends AwsClient, B extends AwsClientBuilder<B, C>> B configur
         if (clientConfig.region() != null) {
             builder.region(Region.of(clientConfig.region()));
         }
-        if (clientConfig.endpointOverride() != null) {
-            builder.endpointOverride(URI.create(clientConfig.endpointOverride()));
+
+        if (StringUtils.isNotBlank(clientConfig.endpointOverride())) {
+            builder.endpointOverride(URI.create(clientConfig.endpointOverride().trim()));
         }
         return builder;
     }

src/main/java/io/kestra/plugin/aws/cloudwatch/Trigger.java

@@ -59,20 +59,20 @@
 )
 public class Trigger extends AbstractTrigger implements PollingTriggerInterface, TriggerOutput<Query.Output> {
     @Schema(
-        title = "Access Key Id in order to connect to AWS.",
-        description = "If no credentials are defined, we will use the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) to fetch credentials."
+        title = "AWS access key ID.",
+        description = "Optional static credential. If omitted, the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) is used."
     )
     protected Property<String> accessKeyId;
 
     @Schema(
-        title = "Secret Key Id in order to connect to AWS.",
-        description = "If no credentials are defined, we will use the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) to fetch credentials."
+        title = "AWS secret access key.",
+        description = "Pairs with `accessKeyId` for static credentials. If omitted, the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) is used."
     )
     protected Property<String> secretKeyId;
 
     @Schema(
-        title = "AWS session token, retrieved from an AWS token service, used for authenticating that this user has received temporary permissions to access a given resource.",
-        description = "If no credentials are defined, we will use the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) to fetch credentials."
+        title = "AWS session token for temporary credentials.",
+        description = "Used with STS- or SSO-issued temporary credentials. If omitted, the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) is used."
     )
     protected Property<String> sessionToken;
 

src/main/java/io/kestra/plugin/aws/emr/CreateClusterAndSubmitSteps.java

@@ -66,28 +66,28 @@
 )
 public class CreateClusterAndSubmitSteps extends AbstractEmrTask implements RunnableTask<CreateClusterAndSubmitSteps.Output> {
 
-    @Schema(title = "Cluster Name.")
+    @Schema(title = "Cluster Name")
     @NotNull
     private Property<String> clusterName;
 
-    @Schema(title = "Release Label.", description = "It specifies the EMR release version label. Pattern is 'emr-x.x.x'.")
+    @Schema(title = "Release Label", description = "It specifies the EMR release version label. Pattern is 'emr-x.x.x'.")
     @NotNull
     @Builder.Default
     private Property<String> releaseLabel = Property.ofValue("emr-5.20.0");
 
     @Schema(
         title = "Steps",
-        description = "List of steps to run."
+        description = "List of steps to run"
     )
     private List<StepConfig> steps;
 
-    @Schema(title = "Applications.", description = "List of applications name: Ex: \"Hive\", \"Spark\", \"Ganglia\"")
+    @Schema(title = "Applications", description = "List of applications name: Ex: \"Hive\", \"Spark\", \"Ganglia\"")
     private Property<List<String>> applications;
 
-    @Schema(title = "Log URI.", description = "The location in Amazon S3 to write the log files of the job flow. If a value is not provided, logs are not created.")
+    @Schema(title = "Log URI", description = "The location in Amazon S3 to write the log files of the job flow. If a value is not provided, logs are not created.")
     private Property<String> logUri;
 
-    @Schema(title = "Job flow Role.", description = """
+    @Schema(title = "Job flow Role", description = """
         Also called instance profile and Amazon EC2 role. An IAM role for an Amazon EMR cluster.
         The Amazon EC2 instances of the cluster assume this role. The default role is EMR_EC2_DefaultRole.
         In order to use the default role, you must have already created it using the CLI or console.

src/main/java/io/kestra/plugin/aws/emr/CreateServerlessApplicationAndStartJob.java

@@ -46,34 +46,34 @@
 public class CreateServerlessApplicationAndStartJob extends AbstractEmrServerlessTask implements RunnableTask<CreateServerlessApplicationAndStartJob.Output> {
 
     @Schema(
-        title = "The EMR release label to use for the application.",
+        title = "The EMR release label to use for the application",
         description = "For example, `emr-6.3.0` or `emr-7.0.0`."
     )
     @NotNull
     private Property<String> releaseLabel;
 
     @Schema(
-        title = "The type of application to create.",
-        description = "Valid values are for instance `SPARK` and `HIVE`."
+        title = "The type of application to create",
+        description = "For example, valid values are `SPARK` and `HIVE`."
     )
     @NotNull
     private Property<String> applicationType;
 
     @Schema(
-        title = "The execution role ARN for the application.",
+        title = "The execution role ARN for the application",
         description = "This role will be assumed by EMR Serverless to access AWS resources on your behalf."
     )
     @NotNull
     private Property<String> executionRoleArn;
 
     @Schema(
-        title = "The name of the job to start."
+        title = "The name of the job to start"
     )
     @NotNull
     private Property<String> jobName;
 
     @Schema(
-        title = "The entry point for the job.",
+        title = "The entry point for the job",
         description = "For `SPARK` applications, this is typically the S3 path to your main application file (e.g., a Python or JAR file). For `HIVE` applications, this is the Hive query to execute."
     )
     @NotNull

src/main/java/io/kestra/plugin/aws/emr/DeleteCluster.java

@@ -51,7 +51,7 @@
     }
 )
 public class DeleteCluster extends AbstractEmrTask implements RunnableTask<VoidOutput> {
-    @Schema(title = "Cluster IDs.", description = "List of cluster IDs to be terminated.")
+    @Schema(title = "Cluster IDs", description = "List of cluster IDs to be terminated.")
     @NotNull
     private Property<List<String>> clusterIds;
 

src/main/java/io/kestra/plugin/aws/emr/DeleteServerlessApplication.java

@@ -53,7 +53,7 @@
 public class DeleteServerlessApplication extends AbstractEmrServerlessTask implements RunnableTask<VoidOutput> {
 
     @Schema(
-        title = "Application IDs.",
+        title = "Application IDs",
         description = "List of EMR Serverless application IDs to delete."
     )
     @NotNull

src/main/java/io/kestra/plugin/aws/emr/StartServerlessJobRun.java

@@ -51,25 +51,25 @@
 public class StartServerlessJobRun extends AbstractEmrServerlessTask implements RunnableTask<StartServerlessJobRun.Output> {
 
     @Schema(
-        title = "The EMR Serverless application ID to run the job on."
+        title = "The EMR Serverless application ID to run the job on"
     )
     @NotNull
     private Property<String> applicationId;
 
     @Schema(
-        title = "The execution role ARN for the job."
+        title = "The execution role ARN for the job"
     )
     @NotNull
     private Property<String> executionRoleArn;
 
     @Schema(
-        title = "The name of the job."
+        title = "The name of the job"
     )
     @NotNull
     private Property<String> jobName;
 
     @Schema(
-        title = "The entry point for the job."
+        title = "The entry point for the job"
     )
     @NotNull
     private Property<String> entryPoint;

src/main/java/io/kestra/plugin/aws/emr/SubmitSteps.java

@@ -56,7 +56,7 @@
     }
 )
 public class SubmitSteps extends AbstractEmrTask implements RunnableTask<VoidOutput> {
-    @Schema(title = "Cluster ID.")
+    @Schema(title = "Cluster ID")
     @NotNull
     private Property<String> clusterId;
 
@@ -68,7 +68,7 @@ public class SubmitSteps extends AbstractEmrTask implements RunnableTask<VoidOut
     private List<StepConfig> steps;
 
     @Schema(
-        title = "Execution role ARN.",
+        title = "Execution role ARN",
         description = """
         The Amazon Resource Name (ARN) of the runtime role for a step on the cluster. The runtime role can be a cross-account IAM role.
         The runtime role ARN is a combination of account ID, role name, and role type using the following format: arn:partition:service:region:account:resource.

src/main/java/io/kestra/plugin/aws/kinesis/RealtimeTrigger.java

@@ -60,20 +60,20 @@
 )
 public class RealtimeTrigger extends AbstractTrigger implements RealtimeTriggerInterface, TriggerOutput<Consume.ConsumedRecord> {
     @Schema(
-        title = "Access Key Id in order to connect to AWS.",
-        description = "If no credentials are defined, we will use the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) to fetch credentials."
+        title = "AWS access key ID.",
+        description = "Optional static credential. If omitted, the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) is used."
     )
     private Property<String> accessKeyId;
 
     @Schema(
-        title = "Secret Key Id in order to connect to AWS.",
-        description = "If no credentials are defined, we will use the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) to fetch credentials."
+        title = "AWS secret access key.",
+        description = "Pairs with `accessKeyId` for static credentials. If omitted, the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) is used."
     )
     private Property<String> secretKeyId;
 
     @Schema(
-        title = "AWS session token, retrieved from an AWS token service, used for authenticating that this user has received temporary permissions to access a given resource.",
-        description = "If no credentials are defined, we will use the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) to fetch credentials."
+        title = "AWS session token for temporary credentials.",
+        description = "Used with STS- or SSO-issued temporary credentials. If omitted, the [default credentials provider chain](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html) is used."
     )
     private Property<String> sessionToken;
 
@@ -404,4 +404,3 @@ private void stop(boolean wait) {
         }
     }
 }
-