You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2023/06/15 15:29:32 UTC
[nifi] branch support/nifi-1.x updated: NIFI-11690 - include extension info for SupportsSensitiveDynamicPrope… (#7379)
This is an automated email from the ASF dual-hosted git repository.
bbende pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new b6d4099a14 NIFI-11690 - include extension info for SupportsSensitiveDynamicPrope… (#7379)
b6d4099a14 is described below
commit b6d4099a1499caa6d1cc577a0ea88d97789276e2
Author: greyp9 <gr...@users.noreply.github.com>
AuthorDate: Thu Jun 15 11:27:51 2023 -0400
NIFI-11690 - include extension info for SupportsSensitiveDynamicPrope… (#7379)
* NIFI-11690 - include extension info for SupportsSensitiveDynamicProperties in C2 manifest
* NIFI-11690 - include extension info for SupportsSensitiveDynamicProperties in C2 manifest
* NIFI-11690 - include extension info for SupportsSensitiveDynamicProperties in C2 manifest
---
.../component/api/ConfigurableComponentDefinition.java | 4 ++++
.../component/api/ConfigurableExtensionDefinition.java | 13 +++++++++++++
.../java/org/apache/nifi/extension/manifest/Extension.java | 10 ++++++++++
.../manifest/impl/StandardRuntimeManifestBuilder.java | 1 +
.../apache/nifi/runtime/manifest/TestRuntimeManifest.java | 3 +++
5 files changed, 31 insertions(+)
diff --git a/c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ConfigurableComponentDefinition.java b/c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ConfigurableComponentDefinition.java
index b6d41a33b8..cd7347eff8 100644
--- a/c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ConfigurableComponentDefinition.java
+++ b/c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ConfigurableComponentDefinition.java
@@ -34,6 +34,10 @@ public interface ConfigurableComponentDefinition {
void setSupportsDynamicProperties(boolean supportsDynamicProperties);
+ boolean getSupportsSensitiveDynamicProperties();
+
+ void setSupportsSensitiveDynamicProperties(boolean supportsSensitiveDynamicProperties);
+
List<DynamicProperty> getDynamicProperties();
void setDynamicProperties(List<DynamicProperty> dynamicProperties);
diff --git a/c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ConfigurableExtensionDefinition.java b/c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ConfigurableExtensionDefinition.java
index 3ef484a0b1..99216c7cf9 100644
--- a/c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ConfigurableExtensionDefinition.java
+++ b/c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ConfigurableExtensionDefinition.java
@@ -28,6 +28,8 @@ public abstract class ConfigurableExtensionDefinition extends ExtensionComponent
private Map<String, PropertyDescriptor> propertyDescriptors;
private boolean supportsDynamicProperties;
+ private boolean supportsSensitiveDynamicProperties;
+
private List<DynamicProperty> dynamicProperties;
@Override
@@ -52,6 +54,17 @@ public abstract class ConfigurableExtensionDefinition extends ExtensionComponent
this.supportsDynamicProperties = supportsDynamicProperties;
}
+ @Override
+ @ApiModelProperty("Whether or not this component makes use of sensitive dynamic (user-set) properties.")
+ public boolean getSupportsSensitiveDynamicProperties() {
+ return supportsSensitiveDynamicProperties;
+ }
+
+ @Override
+ public void setSupportsSensitiveDynamicProperties(boolean supportsSensitiveDynamicProperties) {
+ this.supportsSensitiveDynamicProperties = supportsSensitiveDynamicProperties;
+ }
+
@Override
@ApiModelProperty("Describes the dynamic properties supported by this component")
public List<DynamicProperty> getDynamicProperties() {
diff --git a/nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension/manifest/Extension.java b/nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension/manifest/Extension.java
index b238debb45..2346e31e9f 100644
--- a/nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension/manifest/Extension.java
+++ b/nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension/manifest/Extension.java
@@ -51,6 +51,8 @@ public class Extension {
@XmlElement(name = "property")
private List<Property> properties;
+ private boolean supportsSensitiveDynamicProperties;
+
@XmlElementWrapper
@XmlElement(name = "dynamicProperty")
private List<DynamicProperty> dynamicProperties;
@@ -154,6 +156,14 @@ public class Extension {
this.properties = properties;
}
+ public boolean getSupportsSensitiveDynamicProperties() {
+ return supportsSensitiveDynamicProperties;
+ }
+
+ public void setSupportsSensitiveDynamicProperties(boolean supportsSensitiveDynamicProperties) {
+ this.supportsSensitiveDynamicProperties = supportsSensitiveDynamicProperties;
+ }
+
@ApiModelProperty(value = "The dynamic properties of the extension")
public List<DynamicProperty> getDynamicProperties() {
return dynamicProperties;
diff --git a/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java b/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java
index 9139206833..09593a47b6 100644
--- a/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java
+++ b/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java
@@ -504,6 +504,7 @@ public class StandardRuntimeManifestBuilder implements RuntimeManifestBuilder {
final List<DynamicProperty> dynamicProperties = extension.getDynamicProperties();
if (isNotEmpty(dynamicProperties)) {
configurableComponentDefinition.setSupportsDynamicProperties(true);
+ configurableComponentDefinition.setSupportsSensitiveDynamicProperties(extension.getSupportsSensitiveDynamicProperties());
configurableComponentDefinition.setDynamicProperties(
dynamicProperties.stream()
.map(this::getDynamicProperty)
diff --git a/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java b/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java
index 633d776637..7dfa1536ab 100644
--- a/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java
+++ b/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java
@@ -105,6 +105,7 @@ class TestRuntimeManifest {
assertFalse(listHdfsDefinition.getSideEffectFree());
assertFalse(listHdfsDefinition.getTriggerWhenAnyDestinationAvailable());
assertFalse(listHdfsDefinition.getSupportsDynamicProperties());
+ assertFalse(listHdfsDefinition.getSupportsSensitiveDynamicProperties());
assertNull(listHdfsDefinition.getDynamicProperties());
assertFalse(listHdfsDefinition.getSupportsDynamicRelationships());
assertNull(listHdfsDefinition.getDynamicRelationship());
@@ -251,6 +252,7 @@ class TestRuntimeManifest {
assertFalse(executeSqlDef.getReadsAttributes().isEmpty());
assertNotNull(executeSqlDef.getReadsAttributes().get(0).getName());
assertNotNull(executeSqlDef.getReadsAttributes().get(0).getDescription());
+ assertTrue(executeSqlDef.getSupportsSensitiveDynamicProperties());
// Verify RouteOnAttribute dynamic relationships and dynamic properties
final ProcessorDefinition routeOnAttributeDef = getProcessorDefinition(bundles, "nifi-standard-nar",
@@ -262,6 +264,7 @@ class TestRuntimeManifest {
assertNotNull(routeOnAttributeDef.getDynamicRelationship().getDescription());
assertTrue(routeOnAttributeDef.getSupportsDynamicProperties());
+ assertFalse(routeOnAttributeDef.getSupportsSensitiveDynamicProperties());
assertNotNull(routeOnAttributeDef.getDynamicProperties());
assertFalse(routeOnAttributeDef.getDynamicProperties().isEmpty());
assertNotNull(routeOnAttributeDef.getDynamicProperties().get(0).getName());