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 45704230be NIFI-14164: Fixed integration tests that were missed in
initial implementation of NIFI-14164
45704230be is described below
commit 45704230be1fb4e256e35f97da545d5dfe597e2f
Author: Mark Payne <[email protected]>
AuthorDate: Fri Jan 17 10:42:19 2025 -0500
NIFI-14164: Fixed integration tests that were missed in initial
implementation of NIFI-14164
Signed-off-by: Pierre Villard <[email protected]>
This closes #9644.
---
.../processors/aws/AbstractAWSCredentialsProviderProcessor.java | 2 +-
.../java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java | 9 +++++----
.../elasticsearch/integration/ConsumeElasticsearch_IT.java | 1 +
.../org/apache/nifi/kafka/service/Kafka3ConnectionService.java | 2 +-
.../java/org.apache.nifi.py4j/PythonControllerInteractionIT.java | 2 ++
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java
index a4e8fe51c9..e4885fa9c3 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java
@@ -255,7 +255,7 @@ public abstract class
AbstractAWSCredentialsProviderProcessor<ClientType extends
return null;
}
- final String endpointOverride = overrideValue.getValue();
+ final String endpointOverride =
overrideValue.evaluateAttributeExpressions().getValue();
return new AwsClientBuilder.EndpointConfiguration(endpointOverride,
region.getName());
}
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
index c4be60baa8..7af4dc8433 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
@@ -30,6 +30,7 @@ import com.amazonaws.services.s3.model.Tag;
import org.apache.commons.codec.binary.Base64;
import org.apache.nifi.fileresource.service.StandardFileResourceService;
import org.apache.nifi.fileresource.service.api.FileResourceService;
+import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -508,7 +509,7 @@ public class ITPutS3Object extends AbstractS3IT {
runner.setProperty(PutS3Object.BUCKET_WITHOUT_DEFAULT_VALUE,
BUCKET_NAME);
runner.setProperty(PutS3Object.KEY,
AbstractS3IT.SAMPLE_FILE_RESOURCE_NAME);
- assertEquals(BUCKET_NAME,
context.getProperty(PutS3Object.BUCKET_WITHOUT_DEFAULT_VALUE).toString());
+ assertEquals(BUCKET_NAME,
context.getProperty(PutS3Object.BUCKET_WITHOUT_DEFAULT_VALUE).evaluateAttributeExpressions((FlowFile)
null).toString());
assertEquals(SAMPLE_FILE_RESOURCE_NAME,
context.getProperty(PutS3Object.KEY).evaluateAttributeExpressions(Collections.emptyMap()).toString());
assertEquals(TEST_PARTSIZE_LONG.longValue(),
context.getProperty(PutS3Object.MULTIPART_PART_SIZE).asDataSize(DataUnit.B).longValue());
@@ -518,7 +519,7 @@ public class ITPutS3Object extends AbstractS3IT {
public void testLocalStatePersistence() throws IOException {
final TestRunner runner = initTestRunner();
- final String bucket =
runner.getProcessContext().getProperty(PutS3Object.BUCKET_WITHOUT_DEFAULT_VALUE).getValue();
+ final String bucket =
runner.getProcessContext().getProperty(PutS3Object.BUCKET_WITHOUT_DEFAULT_VALUE).evaluateAttributeExpressions((FlowFile)
null).getValue();
final String key =
runner.getProcessContext().getProperty(PutS3Object.KEY).evaluateAttributeExpressions(Collections.emptyMap()).getValue();
final String cacheKey1 = runner.getProcessor().getIdentifier() + "/" +
bucket + "/" + key;
final String cacheKey2 = runner.getProcessor().getIdentifier() + "/" +
bucket + "/" + key + "-v2";
@@ -592,7 +593,7 @@ public class ITPutS3Object extends AbstractS3IT {
final TestRunner runner = initTestRunner();
final PutS3Object processor = (PutS3Object) runner.getProcessor();
- final String bucket =
runner.getProcessContext().getProperty(PutS3Object.BUCKET_WITHOUT_DEFAULT_VALUE).getValue();
+ final String bucket =
runner.getProcessContext().getProperty(PutS3Object.BUCKET_WITHOUT_DEFAULT_VALUE).evaluateAttributeExpressions((FlowFile)
null).getValue();
final String key =
runner.getProcessContext().getProperty(PutS3Object.KEY).evaluateAttributeExpressions(Collections.emptyMap()).getValue();
final String cacheKey1 = runner.getProcessor().getIdentifier() + "/" +
bucket + "/" + key + "-bv1";
final String cacheKey2 = runner.getProcessor().getIdentifier() + "/" +
bucket + "/" + key + "-bv2";
@@ -668,7 +669,7 @@ public class ITPutS3Object extends AbstractS3IT {
final TestRunner runner = initTestRunner();
final PutS3Object processor = (PutS3Object) runner.getProcessor();
- final String bucket =
runner.getProcessContext().getProperty(PutS3Object.BUCKET_WITHOUT_DEFAULT_VALUE).getValue();
+ final String bucket =
runner.getProcessContext().getProperty(PutS3Object.BUCKET_WITHOUT_DEFAULT_VALUE).evaluateAttributeExpressions((FlowFile)
null).getValue();
final String key =
runner.getProcessContext().getProperty(PutS3Object.KEY).evaluateAttributeExpressions(Collections.emptyMap()).getValue();
final String cacheKey = runner.getProcessor().getIdentifier() + "/" +
bucket + "/" + key + "-sr";
diff --git
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/integration/ConsumeElasticsearch_IT.java
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/integration/ConsumeElasticsearch_IT.java
index 73f0bc730a..5e2d5fe5c7 100644
---
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/integration/ConsumeElasticsearch_IT.java
+++
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/integration/ConsumeElasticsearch_IT.java
@@ -35,6 +35,7 @@ class ConsumeElasticsearch_IT extends
AbstractJsonQueryElasticsearch_IT {
runner.setProperty(ConsumeElasticsearch.RANGE_FIELD, RANGE_FIELD);
runner.setProperty(ConsumeElasticsearch.RANGE_FIELD_SORT_ORDER,
RANGE_SORT_ORDER);
runner.removeProperty(ConsumeElasticsearch.RANGE_INITIAL_VALUE);
+ runner.setValidateExpressionUsage(false);
}
@Test
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java
index 8b808efc21..a212709407 100644
---
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java
+++
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java
@@ -369,7 +369,7 @@ public class Kafka3ConnectionService extends
AbstractControllerService implement
final int requestTimeoutMs = getRequestTimeoutMs(propertyContext);
properties.put(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG,
requestTimeoutMs);
- final long timePeriod =
propertyContext.getProperty(METADATA_WAIT_TIME).asTimePeriod(TimeUnit.MILLISECONDS);
+ final long timePeriod =
propertyContext.getProperty(METADATA_WAIT_TIME).evaluateAttributeExpressions().asTimePeriod(TimeUnit.MILLISECONDS);
properties.put(ProducerConfig.MAX_BLOCK_MS_CONFIG, timePeriod);
return properties;
diff --git
a/nifi-extension-bundles/nifi-py4j-extension-bundle/nifi-py4j-integration-tests/src/test/java/org.apache.nifi.py4j/PythonControllerInteractionIT.java
b/nifi-extension-bundles/nifi-py4j-extension-bundle/nifi-py4j-integration-tests/src/test/java/org.apache.nifi.py4j/PythonControllerInteractionIT.java
index f83593e978..1e83deda2b 100644
---
a/nifi-extension-bundles/nifi-py4j-extension-bundle/nifi-py4j-integration-tests/src/test/java/org.apache.nifi.py4j/PythonControllerInteractionIT.java
+++
b/nifi-extension-bundles/nifi-py4j-extension-bundle/nifi-py4j-integration-tests/src/test/java/org.apache.nifi.py4j/PythonControllerInteractionIT.java
@@ -472,6 +472,7 @@ public class PythonControllerInteractionIT {
private TestRunner createRecordTransformRunner(final String type) throws
InitializationException {
final TestRunner runner = createProcessor("SetRecordField");
+ runner.setValidateExpressionUsage(false);
final JsonTreeReader reader = new JsonTreeReader();
final JsonRecordSetWriter writer = new JsonRecordSetWriter();
@@ -724,6 +725,7 @@ public class PythonControllerInteractionIT {
final AsyncLoadedProcessor processor =
bridge.createProcessor(createId(), type, version, true, true);
final TestRunner runner = TestRunners.newTestRunner(processor);
+ runner.setValidateExpressionUsage(false);
final long maxInitTime = System.currentTimeMillis() +
TimeUnit.SECONDS.toMillis(30L);
while (true) {
