Merge branch 'main' into feature/661-aws-s3-transfer-manager

Author: fdelbrayelle

Dockerfile

@@ -1,4 +1,4 @@
-FROM kestra/kestra:latest-no-plugins
+FROM kestra/kestra:latest
 
 RUN mkdir -p /app/plugins
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.vanniktech.maven.publish" version "0.35.0"
+    id "com.vanniktech.maven.publish" version "0.36.0"
     id "io.kestra.gradle.inject-bom-versions" version "1.0.0"
     id 'java-library'
     id "idea"
@@ -129,8 +129,8 @@ dependencies {
 
     // testcontainers
     testImplementation "org.testcontainers:testcontainers:2.0.3"
-    testImplementation "org.testcontainers:junit-jupiter:1.21.3"
-    testImplementation "org.testcontainers:localstack:1.21.3"
+    testImplementation "org.testcontainers:junit-jupiter:1.21.4"
+    testImplementation "org.testcontainers:localstack:1.21.4"
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
 }
 

gradle.properties

@@ -1,2 +1,2 @@
-version=1.4.2-SNAPSHOT
-kestraVersion=1.1.0
+version=2.0.1-SNAPSHOT
+kestraVersion=1.1.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -48,11 +48,9 @@
 @Getter
 @NoArgsConstructor
 @Schema(
-    title = "Query an Amazon Athena table.",
+    title = "Run an Athena query and fetch results",
     description = """
-        The query will wait for completion, except if fetchMode is set to `NONE`, and will output converted rows.
-        Row conversion is based on the types listed in [Athena Data Types](https://docs.aws.amazon.com/athena/latest/ug/data-types.html).
-        Complex data types like array, map, and struct will be converted to a string."""
+        Executes an Athena SQL query and waits for completion unless fetchType is NONE. Converts primitive columns to native types and stores results according to fetchType; default STORE writes an ION file to internal storage. skipHeader defaults to true to drop the header row; complex Athena types (array/map/struct) are returned as strings."""
 )
 @Plugin(
     examples = {
@@ -129,36 +127,45 @@
     }
 )
 public class Query extends AbstractConnection implements RunnableTask<Query.QueryOutput> {
-    @Schema(title = "Athena catalog.")
+    @Schema(
+        title = "Athena catalog",
+        description = "Optional catalog name; use default if omitted."
+    )
     private Property<String> catalog;
 
-    @Schema(title = "Athena database.")
+    @Schema(
+        title = "Athena database",
+        description = "Target database for the query."
+    )
     @NotNull
     private Property<String> database;
 
     @Schema(
-        title = "Athena output location.",
-        description = "The query results will be stored in this output location. Must be an existing S3 bucket."
+        title = "Athena output location",
+        description = "Existing S3 URI where Athena writes result files (required by service)."
     )
     @NotNull
     private Property<String> outputLocation;
 
-    @Schema(title = "Athena SQL query.")
+    @Schema(
+        title = "Athena SQL query",
+        description = "SQL statement executed by Athena."
+    )
     @NotNull
     private Property<String> query;
 
     @Schema(
-        title = "The way you want to store the data.",
-        description = "FETCH_ONE outputs the first row, "
-            + "FETCH outputs all the rows, "
-            + "STORE stores all rows in a file, "
-            + "NONE does nothing — in this case, the task submits the query without waiting for its completion."
+        title = "Fetch strategy",
+        description = "Default STORE writes all rows to internal storage; FETCH loads all rows into memory; FETCH_ONE returns the first row; NONE submits without waiting."
     )
     @NotNull
     @Builder.Default
     private Property<FetchType> fetchType = Property.ofValue(FetchType.STORE);
 
-    @Schema(title = "Whether to skip the first row which is usually the header.")
+    @Schema(
+        title = "Skip header row",
+        description = "If true (default), drop the first returned row, which is usually the column header."
+    )
     @NotNull
     @Builder.Default
     private Property<Boolean> skipHeader = Property.ofValue(true);
@@ -356,29 +363,33 @@ private Object mapCell(ColumnInfo columnInfo, Datum datum) {
     @Getter
     public static class QueryOutput implements Output {
 
-        @Schema(title = "The query execution identifier.")
+        @Schema(
+            title = "Query execution ID",
+            description = "Identifier returned by StartQueryExecution."
+        )
         private String queryExecutionId;
 
         @Schema(
-            title = "List containing the fetched data.",
-            description = "Only populated if `fetchType=FETCH`."
+            title = "Rows",
+            description = "All rows when fetchType is FETCH."
         )
         private List<Object> rows;
 
         @Schema(
-            title = "Map containing the first row of fetched data.",
-            description = "Only populated if `fetchType=FETCH_ONE`."
+            title = "First row",
+            description = "Single row when fetchType is FETCH_ONE."
         )
         private Map<String, Object> row;
 
         @Schema(
-            title = "The URI of stored data.",
-            description = "Only populated if `fetchType=STORE`."
+            title = "Stored data URI",
+            description = "Internal storage URI when fetchType is STORE."
         )
         private URI uri;
 
         @Schema(
-            title = "The size of the fetched rows."
+            title = "Fetched row count",
+            description = "Number of rows returned or stored."
         )
         private Long size;
     }

src/main/java/io/kestra/plugin/aws/athena/Query.java

@@ -32,7 +32,8 @@
 @Getter
 @NoArgsConstructor
 @Schema(
-    title = "Fetch an OAuth access token for an AWS EKS cluster."
+    title = "Generate a presigned EKS authentication token",
+    description = "Builds a short-lived `k8s-aws-v1` token for a given EKS cluster by presigning STS GetCallerIdentity. Requires region and cluster name; expirationDuration defaults to 600s."
 )
 @Plugin(
     examples = {
@@ -55,11 +56,17 @@
 )
 public class EksToken extends AbstractConnection implements RunnableTask<EksToken.Output> {
 
-    @Schema(title = "EKS cluster name.")
+    @Schema(
+        title = "EKS cluster name",
+        description = "Cluster identifier passed in x-k8s-aws-id when presigning."
+    )
     @NotNull
     private Property<String> clusterName;
 
-    @Schema(title = "Token expiration duration in seconds")
+    @Schema(
+        title = "Token TTL (seconds)",
+        description = "Lifetime of the presigned URL; default 600 seconds."
+    )
     @NotNull
     @Builder.Default
     private Property<Long> expirationDuration = Property.ofValue(600L);
@@ -123,7 +130,10 @@ public static URI getStsRegionalEndpointUri(RunContext runContext, Region awsReg
     @Getter
     public static class Output implements io.kestra.core.models.tasks.Output {
         @NotNull
-        @Schema(title = "An OAuth access token for the current user.")
+        @Schema(
+            title = "EKS auth token",
+            description = "Bearer token formatted as k8s-aws-v1.<base64url>; encrypted in outputs when supported."
+        )
         private final Token token;
     }
 
@@ -136,6 +146,10 @@ public static class Token {
         )
         EncryptedString tokenValue;
 
+        @Schema(
+            title = "Token expiration time",
+            description = "Exact UTC expiration timestamp derived from the provided TTL."
+        )
         Instant expirationTime;
     }
-}
+}