This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new eba474846c NIFI-15179 Set LocalStack Image to 4.10.0 and Postgres to
18.0
eba474846c is described below
commit eba474846c6c612fb7fd1a39c49478dc782857b9
Author: exceptionfactory <[email protected]>
AuthorDate: Mon Nov 3 16:35:33 2025 -0600
NIFI-15179 Set LocalStack Image to 4.10.0 and Postgres to 18.0
Signed-off-by: Pierre Villard <[email protected]>
This closes #10495.
---
.../processors/aws/kinesis/ConsumeKinesisIT.java | 2 +-
.../aws/dynamodb/AbstractDynamoDBIT.java | 9 +++----
.../nifi/processors/aws/s3/AbstractS3IT.java | 6 ++---
.../apache/nifi/processors/aws/sns/ITPutSNS.java | 6 ++---
.../nifi/processors/aws/sqs/AbstractSQSIT.java | 6 ++---
.../processors/aws/util/LocalStackContainers.java | 29 ++++++++++++++++++++++
.../processors/standard/PutDatabaseRecordIT.java | 2 +-
7 files changed, 40 insertions(+), 20 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/src/test/java/org/apache/nifi/processors/aws/kinesis/ConsumeKinesisIT.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/src/test/java/org/apache/nifi/processors/aws/kinesis/ConsumeKinesisIT.java
index 99e666b34d..74251276c8 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/src/test/java/org/apache/nifi/processors/aws/kinesis/ConsumeKinesisIT.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/src/test/java/org/apache/nifi/processors/aws/kinesis/ConsumeKinesisIT.java
@@ -89,7 +89,7 @@ import static
org.junit.jupiter.api.Timeout.ThreadMode.SEPARATE_THREAD;
class ConsumeKinesisIT {
private static final Logger logger =
LoggerFactory.getLogger(ConsumeKinesisIT.class);
- private static final DockerImageName LOCALSTACK_IMAGE =
DockerImageName.parse("localstack/localstack:latest");
+ private static final DockerImageName LOCALSTACK_IMAGE =
DockerImageName.parse("localstack/localstack:4.10.0");
private static final LocalStackContainer localstack = new
LocalStackContainer(LOCALSTACK_IMAGE).withServices("kinesis", "dynamodb",
"cloudwatch");
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBIT.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBIT.java
index ade84a99ac..0bb94b7b49 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBIT.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBIT.java
@@ -19,12 +19,12 @@ package org.apache.nifi.processors.aws.dynamodb;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processors.aws.region.RegionUtil;
import org.apache.nifi.processors.aws.testutil.AuthUtils;
+import org.apache.nifi.processors.aws.util.LocalStackContainers;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.testcontainers.localstack.LocalStackContainer;
-import org.testcontainers.utility.DockerImageName;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.regions.Region;
@@ -54,9 +54,7 @@ public class AbstractDynamoDBIT {
private static DynamoDbClient client;
- private static final DockerImageName localstackImage =
DockerImageName.parse("localstack/localstack:latest");
-
- private static final LocalStackContainer localstack = new
LocalStackContainer(localstackImage).withServices("dynamodb");
+ private static final LocalStackContainer localstack =
LocalStackContainers.newContainer().withServices("dynamodb");
@BeforeAll
public static void oneTimeSetup() {
@@ -127,7 +125,6 @@ public class AbstractDynamoDBIT {
requestItems.put(table, keysAndAttributes);
final BatchGetItemRequest request =
BatchGetItemRequest.builder().requestItems(requestItems).build();
- final BatchGetItemResponse response =
getClient().batchGetItem(request);
- return response;
+ return getClient().batchGetItem(request);
}
}
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java
index f85cc232e4..aab8495f06 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java
@@ -18,6 +18,7 @@ package org.apache.nifi.processors.aws.s3;
import org.apache.nifi.processors.aws.region.RegionUtil;
import org.apache.nifi.processors.aws.testutil.AuthUtils;
+import org.apache.nifi.processors.aws.util.LocalStackContainers;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -29,7 +30,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.localstack.LocalStackContainer;
-import org.testcontainers.utility.DockerImageName;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.core.sync.RequestBody;
@@ -86,9 +86,7 @@ public abstract class AbstractS3IT {
private static KmsClient kmsClient;
private final List<String> addedKeys = new ArrayList<>();
- private static final DockerImageName localstackImage =
DockerImageName.parse("localstack/localstack:latest");
-
- private static final LocalStackContainer localstack = new
LocalStackContainer(localstackImage).withServices("s3", "kms");
+ private static final LocalStackContainer localstack =
LocalStackContainers.newContainer().withServices("s3", "kms");
@BeforeAll
public static void oneTimeSetup() {
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java
index 694c6946f1..15b1bb78d2 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java
@@ -20,13 +20,13 @@ import org.apache.nifi.processor.Processor;
import org.apache.nifi.processors.aws.AbstractAwsProcessor;
import org.apache.nifi.processors.aws.region.RegionUtil;
import org.apache.nifi.processors.aws.testutil.AuthUtils;
+import org.apache.nifi.processors.aws.util.LocalStackContainers;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.testcontainers.localstack.LocalStackContainer;
-import org.testcontainers.utility.DockerImageName;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.regions.Region;
@@ -46,9 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class ITPutSNS {
- private static final DockerImageName localstackImage =
DockerImageName.parse("localstack/localstack:latest");
-
- private static final LocalStackContainer localstack = new
LocalStackContainer(localstackImage).withServices("sns");
+ private static final LocalStackContainer localstack =
LocalStackContainers.newContainer().withServices("sns");
private static final String CREDENTIALS_FILE =
"src/test/resources/mock-aws-credentials.properties";
private static String topicARN;
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sqs/AbstractSQSIT.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sqs/AbstractSQSIT.java
index 4fd641c7a6..8957f5545a 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sqs/AbstractSQSIT.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sqs/AbstractSQSIT.java
@@ -21,12 +21,12 @@ import org.apache.nifi.processor.Processor;
import org.apache.nifi.processors.aws.AbstractAwsProcessor;
import org.apache.nifi.processors.aws.region.RegionUtil;
import org.apache.nifi.processors.aws.testutil.AuthUtils;
+import org.apache.nifi.processors.aws.util.LocalStackContainers;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.testcontainers.localstack.LocalStackContainer;
-import org.testcontainers.utility.DockerImageName;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.regions.Region;
@@ -37,9 +37,7 @@ import
software.amazon.awssdk.services.sqs.model.CreateQueueResponse;
import static org.junit.jupiter.api.Assertions.assertTrue;
public abstract class AbstractSQSIT {
- private static final DockerImageName localstackImage =
DockerImageName.parse("localstack/localstack:latest");
-
- private static final LocalStackContainer localstack = new
LocalStackContainer(localstackImage).withServices("sqs");
+ private static final LocalStackContainer localstack =
LocalStackContainers.newContainer().withServices("sqs");
private static String queueUrl;
private static SqsClient client;
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/util/LocalStackContainers.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/util/LocalStackContainers.java
new file mode 100644
index 0000000000..3ae49b4c82
--- /dev/null
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/util/LocalStackContainers.java
@@ -0,0 +1,29 @@
+/*
+ * 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.nifi.processors.aws.util;
+
+import org.testcontainers.localstack.LocalStackContainer;
+import org.testcontainers.utility.DockerImageName;
+
+public class LocalStackContainers {
+
+ private static final DockerImageName localStackImageName =
DockerImageName.parse("localstack/localstack:4.10.0");
+
+ public static LocalStackContainer newContainer() {
+ return new LocalStackContainer(localStackImageName);
+ }
+}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordIT.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordIT.java
index e525ca0efe..810f761b5e 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordIT.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordIT.java
@@ -73,7 +73,7 @@ public class PutDatabaseRecordIT {
@BeforeAll
public static void startPostgres() {
- postgres = new
PostgreSQLContainer("postgres:latest").withInitScript("PutDatabaseRecordIT/create-person-table.sql");
+ postgres = new
PostgreSQLContainer("postgres:18.0").withInitScript("PutDatabaseRecordIT/create-person-table.sql");
postgres.start();
}
