(nifi) branch main updated: NIFI-12588: Flow Analysis Rules (#8241)
This is an automated email from the ASF dual-hosted git repository.
mcgilman 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 f1cac06f2a NIFI-12588: Flow Analysis Rules (#8241)
f1cac06f2a is described below
commit f1cac06f2aa40a3b4f5f3e9415500cc007df37ee
Author: Scott Aslan
AuthorDate: Fri Jan 12 17:15:23 2024 -0500
NIFI-12588: Flow Analysis Rules (#8241)
* [NIFI-12588] Flow Analysis Rules listing
review feedback
update goto dialog title
remove transitional states of enable
fix CS goto
remove access policy UX
check canModifyController
update currentTime
move interfaces
update sorting, inline CS creation, CS goto
use Edit in dialog titles
* review feedback
* input current user
This closes #8241
---
.../web/api/entity/FlowAnalysisRulesEntity.java| 22 ++
.../apache/nifi/web/api/ControllerResource.java| 1 +
.../pages/flow-designer/state/flow/flow.effects.ts | 12 -
.../settings/feature/settings-routing.module.ts| 17 +-
.../app/pages/settings/feature/settings.module.ts | 2 +
.../settings/service/flow-analysis-rule.service.ts | 99
.../flow-analysis-rules.actions.ts | 123 ++
.../flow-analysis-rules.effects.ts}| 224 +
.../flow-analysis-rules.reducer.ts | 123 ++
.../flow-analysis-rules.selectors.ts | 54 +
.../settings/state/flow-analysis-rules/index.ts| 122 ++
.../nifi/src/app/pages/settings/state/index.ts | 4 +
.../pages/settings/state/reporting-tasks/index.ts | 5 +
.../reporting-tasks/reporting-tasks.effects.ts | 14 +-
.../create-flow-analysis-rule.component.html} | 6 +-
.../create-flow-analysis-rule.component.scss} | 9 -
.../create-flow-analysis-rule.component.spec.ts| 61 +
.../create-flow-analysis-rule.component.ts | 62 +
.../edit-flow-analysis-rule.component.html | 93 +++
.../edit-flow-analysis-rule.component.scss}| 34 ++-
.../edit-flow-analysis-rule.component.spec.ts | 105
.../edit-flow-analysis-rule.component.ts | 161 +
.../flow-analysis-rule-table.component.html} | 86 ---
.../flow-analysis-rule-table.component.scss} | 15 +-
.../flow-analysis-rule-table.component.spec.ts}| 14 +-
.../flow-analysis-rule-table.component.ts | 268 +
.../flow-analysis-rules.component.html | 35 ++-
.../flow-analysis-rules.component.spec.ts | 9 +-
.../flow-analysis-rules.component.ts | 131 +-
.../flow-analysis-rules.module.ts | 16 +-
.../edit-reporting-task.component.ts | 13 +-
.../reporting-task-table.component.html| 46 ++--
.../extension-types/extension-types.selectors.ts | 5 +
.../src/main/nifi/src/app/state/shared/index.ts| 5 -
.../controller-service-table.component.html| 12 +-
35 files changed, 1765 insertions(+), 243 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowAnalysisRulesEntity.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowAnalysisRulesEntity.java
index 3e91e1d3ee..e185620a54 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowAnalysisRulesEntity.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowAnalysisRulesEntity.java
@@ -16,7 +16,12 @@
*/
package org.apache.nifi.web.api.entity;
+import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.nifi.web.api.dto.util.TimeAdapter;
+
+import java.util.Date;
import java.util.Set;
/**
@@ -25,6 +30,7 @@ import java.util.Set;
@XmlRootElement(name = "flowAnalysisRulesEntity")
public class FlowAnalysisRulesEntity extends Entity {
+private Date currentTime;
private Set flowAnalysisRules;
/**
@@ -38,4 +44,20 @@ public class FlowAnalysisRulesEntity extends Entity {
this.flowAnalysisRules = flowAnalysisRules;
}
+/**
+ * @return current time on the server
+ */
+@XmlJavaTypeAdapter(TimeAdapter.class)
+@Schema(
+description = "The current time on the system.",
+type = "string"
+)
+public Date getCurrentTime() {
+return currentTime;
+}
+
+public void setCurrentTime(Date currentTime) {
+this.currentTime = currentTime;
+}
(nifi) branch support/nifi-1.x updated: NIFI-12606: Upgrade parent Apache POM to version 31
This is an automated email from the ASF dual-hosted git repository. joewitt 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 037ab2886f NIFI-12606: Upgrade parent Apache POM to version 31 037ab2886f is described below commit 037ab2886fbf017e67074773b618c3ce8c96abeb Author: Matt Burgess AuthorDate: Fri Jan 12 15:34:51 2024 -0500 NIFI-12606: Upgrade parent Apache POM to version 31 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4bfd115153..58126bf940 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.apache apache -30 +31 org.apache.nifi
(nifi) branch main updated: NIFI-12606: Upgrade parent Apache POM to version 31 This closes #8242.
This is an automated email from the ASF dual-hosted git repository. joewitt 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 be16a423ed NIFI-12606: Upgrade parent Apache POM to version 31 This closes #8242. be16a423ed is described below commit be16a423ed8a1082e1692bfe75e7afe3660e4e35 Author: Matt Burgess AuthorDate: Fri Jan 12 15:34:51 2024 -0500 NIFI-12606: Upgrade parent Apache POM to version 31 This closes #8242. Signed-off-by: Joseph Witt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d73af259d..348b0f27d1 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.apache apache -30 +31 org.apache.nifi
(nifi) branch main updated: NIFI-12607 This closes #8243. remove kernel 2.6 TIMED_WAIT documentation
This is an automated email from the ASF dual-hosted git repository. joewitt 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 2179d16bdc NIFI-12607 This closes #8243. remove kernel 2.6 TIMED_WAIT documentation 2179d16bdc is described below commit 2179d16bdc3b79b34fce111ce6272561faec08c5 Author: theBestAndrew <13425633+thebestand...@users.noreply.github.com> AuthorDate: Fri Jan 12 16:23:48 2024 -0500 NIFI-12607 This closes #8243. remove kernel 2.6 TIMED_WAIT documentation Signed-off-by: Joseph Witt --- nifi-docs/src/main/asciidoc/administration-guide.adoc | 6 -- 1 file changed, 6 deletions(-) diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index 332290f382..8da36bdcbd 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -159,12 +159,6 @@ Set how long sockets stay in a TIMED_WAIT state when closed:: You don't want your sockets to sit and linger too long given that you want to be able to quickly setup and teardown new sockets. It is a good idea to read more about it and adjust to something like - -for kernel 2.6 - -sudo sysctl -w net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait="1" - -for kernel 3.0 sudo sysctl -w net.netfilter.nf_conntrack_tcp_timeout_time_wait="1"
(nifi) branch main updated: NIFI-12589: Queue Listing (#8235)
This is an automated email from the ASF dual-hosted git repository.
scottyaslan 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 a7546a7095 NIFI-12589: Queue Listing (#8235)
a7546a7095 is described below
commit a7546a7095670fc871f0a45750183677fb72538a
Author: Matt Gilman
AuthorDate: Fri Jan 12 16:09:48 2024 -0500
NIFI-12589: Queue Listing (#8235)
* NIFI-12589:
- Introducing queue listing.
- View flowfile content.
- Download flowfile content.
- View flowfile dialog.
* NIFI-12589:
- Addressing review feedback.
* NIFI-12589:
- Fixing merge conflict and removing additional @ts-ignore.
This closes #8235
---
.../src/main/nifi/src/app/app-routing.module.ts| 5 +
.../src/main/nifi/src/app/app.module.ts| 1 -
.../state/access-policy/access-policy.effects.ts | 34 +--
.../component-access-policies.component.ts | 17 +-
.../global-access-policies.component.ts| 17 +-
.../service/canvas-context-menu.service.ts | 15 +-
.../flow-designer/service/canvas-view.service.ts | 5 +
.../pages/flow-designer/state/flow/flow.actions.ts | 8 +-
.../pages/flow-designer/state/flow/flow.effects.ts | 12 +
.../app/pages/flow-designer/state/flow/index.ts| 4 +
.../flow-designer/ui/canvas/canvas.component.ts| 27 +-
.../new-canvas-item/new-canvas-item.component.ts | 3 +-
.../nifi/src/app/pages/provenance/state/index.ts | 2 +-
.../pages/queue/feature/queue-routing.module.ts| 40 +++
.../app/pages/queue/feature/queue.component.html | 27 ++
.../app/pages/queue/feature/queue.component.scss | 16 +
.../pages/queue/feature/queue.component.spec.ts| 48 +++
.../src/app/pages/queue/feature/queue.component.ts | 40 +++
.../src/app/pages/queue/feature/queue.module.ts| 33 +++
.../src/app/pages/queue/service/queue.service.ts | 122
.../app/pages/{provenance => queue}/state/index.ts | 22 +-
.../app/pages/queue/state/queue-listing/index.ts | 109 +++
.../state/queue-listing/queue-listing.actions.ts | 86 ++
.../state/queue-listing/queue-listing.effects.ts | 322 +
.../state/queue-listing/queue-listing.reducer.ts | 62
.../state/queue-listing/queue-listing.selectors.ts | 52
.../flowfile-dialog/flowfile-dialog.component.html | 229 +++
.../flowfile-dialog/flowfile-dialog.component.scss | 41 +++
.../flowfile-dialog.component.spec.ts | 60
.../flowfile-dialog/flowfile-dialog.component.ts} | 55 ++--
.../flowfile-table/flowfile-table.component.html | 147 ++
.../flowfile-table/flowfile-table.component.scss | 50
.../flowfile-table.component.spec.ts | 40 +++
.../flowfile-table/flowfile-table.component.ts | 142 +
.../queue-listing/queue-listing-routing.module.ts | 33 +++
.../ui/queue-listing/queue-listing.component.html | 48 +++
.../ui/queue-listing/queue-listing.component.scss | 16 +
.../queue-listing/queue-listing.component.spec.ts | 41 +++
.../ui/queue-listing/queue-listing.component.ts| 108 +++
.../queue/ui/queue-listing/queue-listing.module.ts | 43 +++
.../controller-service-state.effects.ts| 26 +-
.../src/main/nifi/src/app/state/shared/index.ts| 11 +
.../provenance-event-dialog.component.ts | 5 +-
.../main/nifi/src/assets/styles/listing-table.scss | 9 +-
44 files changed, 2093 insertions(+), 140 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app-routing.module.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app-routing.module.ts
index 37c7aec4e1..3a70a49d5b 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app-routing.module.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app-routing.module.ts
@@ -68,6 +68,11 @@ const routes: Routes = [
canMatch: [authenticationGuard],
loadChildren: () =>
import('./pages/bulletins/feature/bulletins.module').then((m) =>
m.BulletinsModule)
},
+{
+path: 'queue',
+canMatch: [authenticationGuard],
+loadChildren: () =>
import('./pages/queue/feature/queue.module').then((m) => m.QueueModule)
+},
{
path: '',
canMatch: [authenticationGuard],
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts
index f19e2ab92c..4fde32890c 100644
---
(nifi) branch support/nifi-1.x updated: NIFI-12561 Fixed MergeContent DELIMITER_STRATEGY_NONE Handling
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 3c3ce0d51a NIFI-12561 Fixed MergeContent DELIMITER_STRATEGY_NONE
Handling
3c3ce0d51a is described below
commit 3c3ce0d51a08c70a0d80670c595dcfb8fbac1ea5
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Mon Jan 8 23:22:49 2024 +0100
NIFI-12561 Fixed MergeContent DELIMITER_STRATEGY_NONE Handling
This closes #8222
Signed-off-by: David Handermann
(cherry picked from commit 4efabdcf51e89c93738b0dbab3eafefd12faec6a)
---
.../nifi/processors/standard/MergeContent.java | 4 ++-
.../nifi/processors/standard/TestMergeContent.java | 29 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
index 7409eeffac..cce150e30d 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
@@ -697,8 +697,10 @@ public class MergeContent extends BinFiles {
final String delimiterStrategyValue =
context.getProperty(DELIMITER_STRATEGY).getValue();
if
(DELIMITER_STRATEGY_FILENAME.getValue().equals(delimiterStrategyValue)) {
return getDelimiterFileContent(context, wrappers, descriptor);
-} else {
+} else if
(DELIMITER_STRATEGY_TEXT.getValue().equals(delimiterStrategyValue)) {
return getDelimiterTextContent(context, wrappers, descriptor);
+} else {
+return null;
}
}
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
index 4b2984b6b4..1a66141a1d 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
@@ -590,6 +590,35 @@ public class TestMergeContent {
bundle.assertAttributeEquals(CoreAttributes.MIME_TYPE.key(),
"application/plain-text");
}
+@Test
+void testSimpleBinaryConcatNoDelimiters() {
+final TestRunner runner = TestRunners.newTestRunner(new
MergeContent());
+runner.setProperty(MergeContent.MAX_BIN_AGE, "1 sec");
+runner.setProperty(MergeContent.MERGE_FORMAT,
MergeContent.MERGE_FORMAT_CONCAT);
+runner.setProperty(MergeContent.DELIMITER_STRATEGY,
MergeContent.DELIMITER_STRATEGY_NONE);
+// set dependent values to ensure they're not used; see NIFI-12561
+runner.setProperty(MergeContent.HEADER, "aHeader");
+runner.setProperty(MergeContent.DEMARCATOR, "; ");
+runner.setProperty(MergeContent.FOOTER, "aFooter");
+
+final Map attributes = new HashMap<>();
+attributes.put(CoreAttributes.MIME_TYPE.key(),
"application/plain-text");
+
+runner.enqueue("First", attributes);
+runner.enqueue("Second", attributes);
+runner.enqueue("Third", attributes);
+runner.run(2);
+
+runner.assertQueueEmpty();
+runner.assertTransferCount(MergeContent.REL_MERGED, 1);
+runner.assertTransferCount(MergeContent.REL_FAILURE, 0);
+runner.assertTransferCount(MergeContent.REL_ORIGINAL, 3);
+
+final MockFlowFile bundle =
runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
+bundle.assertContentEquals("FirstSecondThird");
+bundle.assertAttributeEquals(CoreAttributes.MIME_TYPE.key(),
"application/plain-text");
+}
+
@Test
public void testTextDelimitersValidation() {
final TestRunner runner = TestRunners.newTestRunner(new
MergeContent());
(nifi) branch main updated (f95dde1630 -> 4efabdcf51)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from f95dde1630 NIFI-12599 Added READ_FILESYSTEM Permissions to Lookup Services add 4efabdcf51 NIFI-12561 Fixed MergeContent DELIMITER_STRATEGY_NONE Handling No new revisions were added by this update. Summary of changes: .../nifi/processors/standard/MergeContent.java | 4 ++- .../nifi/processors/standard/TestMergeContent.java | 29 ++ 2 files changed, 32 insertions(+), 1 deletion(-)
(nifi) branch support/nifi-1.x updated: NIFI-12599 Added READ_FILESYSTEM Permissions to Lookup Services
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 c39bdda02f NIFI-12599 Added READ_FILESYSTEM Permissions to Lookup
Services
c39bdda02f is described below
commit c39bdda02f817c5efed94671f56fe21d14be6993
Author: Pierre Villard
AuthorDate: Thu Jan 11 22:27:22 2024 +0400
NIFI-12599 Added READ_FILESYSTEM Permissions to Lookup Services
This closes #8236
Signed-off-by: David Handermann
(cherry picked from commit f95dde16309b9a521bbadb4db639519410bc80e2)
---
.../java/org/apache/nifi/lookup/CSVRecordLookupService.java | 10 ++
.../org/apache/nifi/lookup/PropertiesFileLookupService.java | 11 ++-
.../org/apache/nifi/lookup/SimpleCsvFileLookupService.java| 11 +++
.../java/org/apache/nifi/lookup/XMLFileLookupService.java | 10 ++
4 files changed, 41 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/CSVRecordLookupService.java
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/CSVRecordLookupService.java
index bfbefee237..84b8c42351 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/CSVRecordLookupService.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/CSVRecordLookupService.java
@@ -19,11 +19,14 @@ package org.apache.nifi.lookup;
import org.apache.commons.csv.CSVParser;
import org.apache.commons.csv.CSVRecord;
import org.apache.commons.lang3.StringUtils;
+import org.apache.nifi.annotation.behavior.Restricted;
+import org.apache.nifi.annotation.behavior.Restriction;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnDisabled;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.RequiredPermission;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.reporting.InitializationException;
@@ -56,6 +59,13 @@ import java.util.stream.Stream;
"the columns are returned as a Record. All returned fields will be
strings. The first line of the csv file " +
"is considered as header."
)
+@Restricted(
+restrictions = {
+@Restriction(
+requiredPermission =
RequiredPermission.READ_FILESYSTEM,
+explanation = "Provides operator the ability to read
from any file that NiFi has access to.")
+}
+)
public class CSVRecordLookupService extends AbstractCSVLookupService
implements RecordLookupService {
private static final Set REQUIRED_KEYS =
Collections.unmodifiableSet(Stream.of(KEY).collect(Collectors.toSet()));
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/PropertiesFileLookupService.java
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/PropertiesFileLookupService.java
index 7d78cfd527..628059661f 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/PropertiesFileLookupService.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/PropertiesFileLookupService.java
@@ -17,13 +17,22 @@
package org.apache.nifi.lookup;
import org.apache.commons.configuration2.PropertiesConfiguration;
-
+import org.apache.nifi.annotation.behavior.Restricted;
+import org.apache.nifi.annotation.behavior.Restriction;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.components.RequiredPermission;
import org.apache.nifi.lookup.configuration2.CommonsConfigurationLookupService;
@Tags({"lookup", "cache", "enrich", "join", "properties", "reloadable", "key",
"value"})
@CapabilityDescription("A reloadable properties file-based lookup service")
+@Restricted(
+restrictions = {
+@Restriction(
+requiredPermission =
RequiredPermission.READ_FILESYSTEM,
+explanation = "Provides operator the ability to read
from any file that NiFi has access to.")
+}
+)
public class
(nifi) branch main updated: NIFI-12599 Added READ_FILESYSTEM Permissions to Lookup Services
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 f95dde1630 NIFI-12599 Added READ_FILESYSTEM Permissions to Lookup
Services
f95dde1630 is described below
commit f95dde16309b9a521bbadb4db639519410bc80e2
Author: Pierre Villard
AuthorDate: Thu Jan 11 22:27:22 2024 +0400
NIFI-12599 Added READ_FILESYSTEM Permissions to Lookup Services
This closes #8236
Signed-off-by: David Handermann
---
.../java/org/apache/nifi/lookup/CSVRecordLookupService.java | 10 ++
.../org/apache/nifi/lookup/PropertiesFileLookupService.java | 11 ++-
.../org/apache/nifi/lookup/SimpleCsvFileLookupService.java| 11 +++
.../java/org/apache/nifi/lookup/XMLFileLookupService.java | 10 ++
4 files changed, 41 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/CSVRecordLookupService.java
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/CSVRecordLookupService.java
index 2b8bff90c5..4166c30a3e 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/CSVRecordLookupService.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/CSVRecordLookupService.java
@@ -34,11 +34,14 @@ import java.util.stream.Stream;
import org.apache.commons.csv.CSVParser;
import org.apache.commons.csv.CSVRecord;
import org.apache.commons.lang3.StringUtils;
+import org.apache.nifi.annotation.behavior.Restricted;
+import org.apache.nifi.annotation.behavior.Restriction;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnDisabled;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.RequiredPermission;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.reporting.InitializationException;
@@ -55,6 +58,13 @@ import org.apache.nifi.serialization.record.RecordSchema;
"the columns are returned as a Record. All returned fields will be
strings. The first line of the csv file " +
"is considered as header."
)
+@Restricted(
+restrictions = {
+@Restriction(
+requiredPermission =
RequiredPermission.READ_FILESYSTEM,
+explanation = "Provides operator the ability to read
from any file that NiFi has access to.")
+}
+)
public class CSVRecordLookupService extends AbstractCSVLookupService
implements RecordLookupService {
private static final Set REQUIRED_KEYS =
Collections.unmodifiableSet(Stream.of(KEY).collect(Collectors.toSet()));
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/PropertiesFileLookupService.java
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/PropertiesFileLookupService.java
index 7d78cfd527..628059661f 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/PropertiesFileLookupService.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/PropertiesFileLookupService.java
@@ -17,13 +17,22 @@
package org.apache.nifi.lookup;
import org.apache.commons.configuration2.PropertiesConfiguration;
-
+import org.apache.nifi.annotation.behavior.Restricted;
+import org.apache.nifi.annotation.behavior.Restriction;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.components.RequiredPermission;
import org.apache.nifi.lookup.configuration2.CommonsConfigurationLookupService;
@Tags({"lookup", "cache", "enrich", "join", "properties", "reloadable", "key",
"value"})
@CapabilityDescription("A reloadable properties file-based lookup service")
+@Restricted(
+restrictions = {
+@Restriction(
+requiredPermission =
RequiredPermission.READ_FILESYSTEM,
+explanation = "Provides operator the ability to read
from any file that NiFi has access to.")
+}
+)
public class PropertiesFileLookupService extends
CommonsConfigurationLookupService {
}
diff --git
(nifi) branch support/nifi-1.x updated: NIFI-12602 Upgraded follow-redirects from 1.15.2 to 1.15.4
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 095b394259 NIFI-12602 Upgraded follow-redirects from 1.15.2 to 1.15.4
095b394259 is described below
commit 095b394259c4369b78c3fa949dcda6c74ae07904
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Jan 10 13:23:03 2024 +
NIFI-12602 Upgraded follow-redirects from 1.15.2 to 1.15.4
This closes #8230
Signed-off-by: David Handermann
(cherry picked from commit 9dd832e150886fa03afea3ef05ab0e770fa146fd)
---
.../nifi-registry-web-ui/src/main/package-lock.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json
index fe0a9c3a4d..65ce05549e 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json
@@ -6925,9 +6925,9 @@
}
},
"node_modules/follow-redirects": {
-"version": "1.15.2",
-"resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz;,
-"integrity":
"sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+"version": "1.15.4",
+"resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz;,
+"integrity":
"sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
"dev": true,
"funding": [
{
@@ -22300,9 +22300,9 @@
}
},
"follow-redirects": {
-"version": "1.15.2",
-"resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz;,
-"integrity":
"sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+"version": "1.15.4",
+"resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz;,
+"integrity":
"sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
"dev": true
},
"font-awesome": {
(nifi) branch dependabot/npm_and_yarn/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/follow-redirects-1.15.4 deleted (was 8db0cd7c89)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/follow-redirects-1.15.4 in repository https://gitbox.apache.org/repos/asf/nifi.git was 8db0cd7c89 Bump follow-redirects The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(nifi) branch main updated: NIFI-12602 Upgraded follow-redirects from 1.15.2 to 1.15.4
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 9dd832e150 NIFI-12602 Upgraded follow-redirects from 1.15.2 to 1.15.4
9dd832e150 is described below
commit 9dd832e150886fa03afea3ef05ab0e770fa146fd
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Jan 10 13:23:03 2024 +
NIFI-12602 Upgraded follow-redirects from 1.15.2 to 1.15.4
This closes #8230
Signed-off-by: David Handermann
---
.../nifi-registry-web-ui/src/main/package-lock.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json
index 2d9e451472..5daae18648 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json
@@ -6926,9 +6926,9 @@
}
},
"node_modules/follow-redirects": {
-"version": "1.15.2",
-"resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz;,
-"integrity":
"sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+"version": "1.15.4",
+"resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz;,
+"integrity":
"sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
"dev": true,
"funding": [
{
@@ -22302,9 +22302,9 @@
}
},
"follow-redirects": {
-"version": "1.15.2",
-"resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz;,
-"integrity":
"sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+"version": "1.15.4",
+"resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz;,
+"integrity":
"sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
"dev": true
},
"font-awesome": {
(nifi) 01/02: NIFI-12592 Upgraded Apache Curator from 5.5.0 to 5.6.0
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git commit e520bbcb699a9bc7b99a2bb02f886b8953236c50 Author: mr1716 AuthorDate: Mon Jan 8 09:47:20 2024 -0600 NIFI-12592 Upgraded Apache Curator from 5.5.0 to 5.6.0 Signed-off-by: David Handermann (cherry picked from commit 56be04cc73ef3dbdfaeaf7a498c7f7eecbeec9af) --- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml | 2 +- nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 48a0b2ddcf..024234143b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -23,7 +23,7 @@ pom NiFi: Framework Bundle -5.5.0 +5.6.0 32.1.2-jre 2.9.1 4.3.0 diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml index deff98f391..7feacafdbb 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml @@ -26,7 +26,7 @@ jar -5.5.0 +5.6.0 diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml index 33b4895df1..00721a8181 100644 --- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml +++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml @@ -24,7 +24,7 @@ 1.25.0-SNAPSHOT -5.5.0 +5.6.0
(nifi) 02/02: NIFI-12600 Upgraded Apache Maven from 3.9.5 to 3.9.6
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git commit da3cb28efb16d7fd05e3a802e91469e55c876779 Author: mr1716 AuthorDate: Thu Jan 11 14:55:06 2024 -0500 NIFI-12600 Upgraded Apache Maven from 3.9.5 to 3.9.6 This closes #8238 Signed-off-by: David Handermann (cherry picked from commit 0cc3f447f2e0a400bd38712a816fd66cd94b6e1b) --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index eacdc9ed17..346d645fd0 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
(nifi) branch support/nifi-1.x updated (40f54f27bf -> da3cb28efb)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from 40f54f27bf NIFI-12530: Support CREATE TABLE in Oracle database adapters new e520bbcb69 NIFI-12592 Upgraded Apache Curator from 5.5.0 to 5.6.0 new da3cb28efb NIFI-12600 Upgraded Apache Maven from 3.9.5 to 3.9.6 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .mvn/wrapper/maven-wrapper.properties | 2 +- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml | 2 +- nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml| 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
(nifi) branch main updated (31d04c8575 -> 0cc3f447f2)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 31d04c8575 NIFI-12530: Support CREATE TABLE in Oracle database adapters new 56be04cc73 NIFI-12592 Upgraded Apache Curator from 5.5.0 to 5.6.0 new 0cc3f447f2 NIFI-12600 Upgraded Apache Maven from 3.9.5 to 3.9.6 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .mvn/wrapper/maven-wrapper.properties | 2 +- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(nifi) 02/02: NIFI-12600 Upgraded Apache Maven from 3.9.5 to 3.9.6
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 0cc3f447f2e0a400bd38712a816fd66cd94b6e1b Author: mr1716 AuthorDate: Thu Jan 11 14:55:06 2024 -0500 NIFI-12600 Upgraded Apache Maven from 3.9.5 to 3.9.6 This closes #8238 Signed-off-by: David Handermann --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index eacdc9ed17..346d645fd0 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
(nifi) 01/02: NIFI-12592 Upgraded Apache Curator from 5.5.0 to 5.6.0
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 56be04cc73ef3dbdfaeaf7a498c7f7eecbeec9af Author: mr1716 AuthorDate: Tue Jan 9 12:53:19 2024 -0500 NIFI-12592 Upgraded Apache Curator from 5.5.0 to 5.6.0 This closes #8226 Signed-off-by: David Handermann --- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index ea550d9caf..145eb94faf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -23,7 +23,7 @@ pom NiFi: Framework Bundle -5.5.0 +5.6.0 32.1.2-jre 2.9.1 4.3.0 diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml index b2e8593936..a14e84deaa 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml @@ -26,7 +26,7 @@ jar -5.5.0 +5.6.0
