This is an automated email from the ASF dual-hosted git repository.
lordgamez pushed a commit to branch MINIFICPP-2276
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/MINIFICPP-2276 by this push:
new effd86c89 Revert minifi c2 json files to yml for NiFi 1.0 line
effd86c89 is described below
commit effd86c89d1bb0af0340a5c8aebae62f7b85827d
Author: Gabor Gyimesi <gamezb...@gmail.com>
AuthorDate: Tue Jan 30 16:03:13 2024 +0100
Revert minifi c2 json files to yml for NiFi 1.0 line
---
.../cluster/containers/MinifiC2ServerContainer.py | 4 +-
.../resources/minifi-c2-server/config-ssl.json | 53 ----------------------
.../resources/minifi-c2-server/config-ssl.yml | 43 ++++++++++++++++++
.../resources/minifi-c2-server/config.json | 41 -----------------
.../resources/minifi-c2-server/config.yml | 31 +++++++++++++
5 files changed, 76 insertions(+), 96 deletions(-)
diff --git
a/docker/test/integration/cluster/containers/MinifiC2ServerContainer.py
b/docker/test/integration/cluster/containers/MinifiC2ServerContainer.py
index 4d011055d..9aebd6a75 100644
--- a/docker/test/integration/cluster/containers/MinifiC2ServerContainer.py
+++ b/docker/test/integration/cluster/containers/MinifiC2ServerContainer.py
@@ -64,8 +64,8 @@ CN=minifi-cpp-flow-{feature_id}:
test_dir = os.environ['TEST_DIRECTORY'] # Based on DockerVerify.sh
mounts = [docker.types.Mount(
type='bind',
- source=os.path.join(test_dir,
"resources/minifi-c2-server/config-ssl.json" if self.ssl else
"resources/minifi-c2-server/config.json"),
-
target='/opt/minifi-c2/minifi-c2-current/files/minifi-test-class/config.application.json.v1'
+ source=os.path.join(test_dir,
"resources/minifi-c2-server/config-ssl.yml" if self.ssl else
"resources/minifi-c2-server/config.yml"),
+
target='/opt/minifi-c2/minifi-c2-current/files/minifi-test-class/config.text.yml.v1'
)]
if self.ssl:
diff --git a/docker/test/integration/resources/minifi-c2-server/config-ssl.json
b/docker/test/integration/resources/minifi-c2-server/config-ssl.json
deleted file mode 100644
index af05c8ff7..000000000
--- a/docker/test/integration/resources/minifi-c2-server/config-ssl.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "MiNiFi Config Version": 3,
- "Flow Controller": {
- "name": "MiNiFi Flow"
- },
- "Processors": [
- {
- "name": "Get files from /tmp/input",
- "id": "2f2a3b47-f5ba-49f6-82b5-bc1c86b96e27",
- "class": "org.apache.nifi.minifi.processors.GetFile",
- "scheduling strategy": "TIMER_DRIVEN",
- "scheduling period": "1000 ms",
- "Properties": {
- "Input Directory": "/tmp/input"
- }
- },
- {
- "name": "Put files to /tmp/output",
- "id": "e143601d-de4f-44ba-a6ec-d1f97d77ec94",
- "class": "org.apache.nifi.minifi.processors.PutFile",
- "scheduling strategy": "EVENT_DRIVEN",
- "auto-terminated relationships list": ["failure", "success"],
- "Properties": {
- "Conflict Resolution Strategy": "fail",
- "Create Missing Directories": "true",
- "Directory": "/tmp/output"
- }
- }
- ],
- "Connections": [
- {
- "name": "GetFile/success/PutFile",
- "id": "098a56ba-f4bf-4323-a3f3-6f8a5e3586bf",
- "source id": "2f2a3b47-f5ba-49f6-82b5-bc1c86b96e27",
- "source relationship names": ["success"],
- "destination id": "e143601d-de4f-44ba-a6ec-d1f97d77ec94"
- }
- ],
- "Controller Services": [
- {
- "name": "SSLContextService",
- "id": "2438e3c8-015a-1000-79ca-83af40ec1994",
- "class": "SSLContextService",
- "Properties": {
- "Client Certificate": [{"value":
"/tmp/resources/minifi-cpp-flow.crt"}],
- "Private Key": [{"value": "/tmp/resources/minifi-cpp-flow.key"}],
- "Passphrase": [{"value": "abcdefgh"}],
- "CA Certificate": [{"value": "/tmp/resources/root_ca.crt"}]
- }
- }
- ],
- "Remote Process Groups": []
-}
diff --git a/docker/test/integration/resources/minifi-c2-server/config-ssl.yml
b/docker/test/integration/resources/minifi-c2-server/config-ssl.yml
new file mode 100644
index 000000000..5167223d0
--- /dev/null
+++ b/docker/test/integration/resources/minifi-c2-server/config-ssl.yml
@@ -0,0 +1,43 @@
+MiNiFi Config Version: 3
+Flow Controller:
+ name: MiNiFi Flow
+Processors:
+- name: Get files from /tmp/input
+ id: 2f2a3b47-f5ba-49f6-82b5-bc1c86b96e27
+ class: org.apache.nifi.minifi.processors.GetFile
+ scheduling strategy: TIMER_DRIVEN
+ scheduling period: 1000 ms
+ Properties:
+ Input Directory: /tmp/input
+- name: Put files to /tmp/output
+ id: e143601d-de4f-44ba-a6ec-d1f97d77ec94
+ class: org.apache.nifi.minifi.processors.PutFile
+ scheduling strategy: EVENT_DRIVEN
+ auto-terminated relationships list:
+ - failure
+ - success
+ Properties:
+ Conflict Resolution Strategy: fail
+ Create Missing Directories: 'true'
+ Directory: /tmp/output
+Connections:
+- name: GetFile/success/PutFile
+ id: 098a56ba-f4bf-4323-a3f3-6f8a5e3586bf
+ source id: 2f2a3b47-f5ba-49f6-82b5-bc1c86b96e27
+ source relationship names:
+ - success
+ destination id: e143601d-de4f-44ba-a6ec-d1f97d77ec94
+Controller Services:
+ - name: SSLContextService
+ id: 2438e3c8-015a-1000-79ca-83af40ec1994
+ class: SSLContextService
+ Properties:
+ Client Certificate:
+ - value: /tmp/resources/minifi-cpp-flow.crt
+ Private Key:
+ - value: /tmp/resources/minifi-cpp-flow.key
+ Passphrase:
+ - value: abcdefgh
+ CA Certificate:
+ - value: /tmp/resources/root_ca.crt
+Remote Process Groups: []
diff --git a/docker/test/integration/resources/minifi-c2-server/config.json
b/docker/test/integration/resources/minifi-c2-server/config.json
deleted file mode 100644
index ff488a8f4..000000000
--- a/docker/test/integration/resources/minifi-c2-server/config.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "MiNiFi Config Version": 3,
- "Flow Controller": {
- "name": "MiNiFi Flow"
- },
- "Processors": [
- {
- "name": "Get files from /tmp/input",
- "id": "2f2a3b47-f5ba-49f6-82b5-bc1c86b96e27",
- "class": "org.apache.nifi.minifi.processors.GetFile",
- "scheduling strategy": "TIMER_DRIVEN",
- "scheduling period": "1000 ms",
- "Properties": {
- "Input Directory": "/tmp/input"
- }
- },
- {
- "name": "Put files to /tmp/output",
- "id": "e143601d-de4f-44ba-a6ec-d1f97d77ec94",
- "class": "org.apache.nifi.minifi.processors.PutFile",
- "scheduling strategy": "EVENT_DRIVEN",
- "auto-terminated relationships list": ["failure", "success"],
- "Properties": {
- "Conflict Resolution Strategy": "fail",
- "Create Missing Directories": "true",
- "Directory": "/tmp/output"
- }
- }
- ],
- "Connections": [
- {
- "name": "GetFile/success/PutFile",
- "id": "098a56ba-f4bf-4323-a3f3-6f8a5e3586bf",
- "source id": "2f2a3b47-f5ba-49f6-82b5-bc1c86b96e27",
- "source relationship names": ["success"],
- "destination id": "e143601d-de4f-44ba-a6ec-d1f97d77ec94"
- }
- ],
- "Controller Services": [],
- "Remote Process Groups": []
-}
diff --git a/docker/test/integration/resources/minifi-c2-server/config.yml
b/docker/test/integration/resources/minifi-c2-server/config.yml
new file mode 100644
index 000000000..ddac4cd77
--- /dev/null
+++ b/docker/test/integration/resources/minifi-c2-server/config.yml
@@ -0,0 +1,31 @@
+MiNiFi Config Version: 3
+Flow Controller:
+ name: MiNiFi Flow
+Processors:
+- name: Get files from /tmp/input
+ id: 2f2a3b47-f5ba-49f6-82b5-bc1c86b96e27
+ class: org.apache.nifi.minifi.processors.GetFile
+ scheduling strategy: TIMER_DRIVEN
+ scheduling period: 1000 ms
+ Properties:
+ Input Directory: /tmp/input
+- name: Put files to /tmp/output
+ id: e143601d-de4f-44ba-a6ec-d1f97d77ec94
+ class: org.apache.nifi.minifi.processors.PutFile
+ scheduling strategy: EVENT_DRIVEN
+ auto-terminated relationships list:
+ - failure
+ - success
+ Properties:
+ Conflict Resolution Strategy: fail
+ Create Missing Directories: 'true'
+ Directory: /tmp/output
+Connections:
+- name: GetFile/success/PutFile
+ id: 098a56ba-f4bf-4323-a3f3-6f8a5e3586bf
+ source id: 2f2a3b47-f5ba-49f6-82b5-bc1c86b96e27
+ source relationship names:
+ - success
+ destination id: e143601d-de4f-44ba-a6ec-d1f97d77ec94
+Controller Services: []
+Remote Process Groups: []
