Skip to content

Commit bd1182e

Browse files
lordgamezszaszm
authored andcommitted
MINIFICPP-2467 PutCouchbaseKey processor and controller
MINIFICPP-2468 Introduces Couchbase extension with support for inserting data to Couchbase DB using PutCouchbaseKey processor using username/password authentication through CouchbaseClusterService controller service. This PR also upgrades the following thirdparty libraries: - Spdlog 1.12.0 -> 1.14.1 - Fmt 10.1.0 -> 11.0.2 Closes #1875 Signed-off-by: Marton Szasz <[email protected]>
1 parent db574c8 commit bd1182e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1694
-22
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [push, pull_request, workflow_dispatch]
33
env:
44
DOCKER_CMAKE_FLAGS: -DDOCKER_VERIFY_THREAD=3 -DUSE_SHARED_LIBS= -DSTRICT_GSL_CHECKS=AUDIT -DCI_BUILD=ON -DENABLE_AWS=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_AZURE=ON -DENABLE_SQL=ON \
55
-DENABLE_SPLUNK=ON -DENABLE_GCP=ON -DENABLE_OPC=ON -DENABLE_PYTHON_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_KUBERNETES=ON -DENABLE_TEST_PROCESSORS=ON -DENABLE_PROMETHEUS=ON \
6-
-DENABLE_ELASTICSEARCH=ON -DENABLE_GRAFANA_LOKI=ON -DDOCKER_BUILD_ONLY=ON
6+
-DENABLE_ELASTICSEARCH=ON -DENABLE_GRAFANA_LOKI=ON -DENABLE_COUCHBASE=ON -DDOCKER_BUILD_ONLY=ON
77
SCCACHE_GHA_ENABLE: true
88
CCACHE_DIR: ${{ GITHUB.WORKSPACE }}/.ccache
99
jobs:
@@ -26,6 +26,7 @@ jobs:
2626
-DENABLE_BZIP2=ON
2727
-DENABLE_CIVET=ON
2828
-DENABLE_CONTROLLER=ON
29+
-DENABLE_COUCHBASE=ON
2930
-DENABLE_ELASTICSEARCH=ON
3031
-DENABLE_ENCRYPT_CONFIG=ON
3132
-DENABLE_EXPRESSION_LANGUAGE=ON
@@ -131,6 +132,7 @@ jobs:
131132
-DENABLE_BZIP2=ON
132133
-DENABLE_CIVET=ON
133134
-DENABLE_CONTROLLER=ON
135+
-DENABLE_COUCHBASE=ON
134136
-DENABLE_COVERAGE=
135137
-DENABLE_ELASTICSEARCH=ON
136138
-DENABLE_ENCRYPT_CONFIG=ON
@@ -245,6 +247,7 @@ jobs:
245247
-DENABLE_BZIP2=ON
246248
-DENABLE_CIVET=ON
247249
-DENABLE_CONTROLLER=ON
250+
-DENABLE_COUCHBASE=OFF
248251
-DENABLE_ELASTICSEARCH=OFF
249252
-DENABLE_ENCRYPT_CONFIG=ON
250253
-DENABLE_EXPRESSION_LANGUAGE=ON
@@ -342,6 +345,7 @@ jobs:
342345
-DENABLE_BZIP2=ON
343346
-DENABLE_CIVET=ON
344347
-DENABLE_CONTROLLER=ON
348+
-DENABLE_COUCHBASE=ON
345349
-DENABLE_ELASTICSEARCH=ON
346350
-DENABLE_ENCRYPT_CONFIG=ON
347351
-DENABLE_EXPRESSION_LANGUAGE=ON

.github/workflows/verify-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [workflow_dispatch]
33
env:
44
DOCKER_CMAKE_FLAGS: -DDOCKER_VERIFY_THREAD=3 -DUSE_SHARED_LIBS= -DSTRICT_GSL_CHECKS=AUDIT -DCI_BUILD=ON -DENABLE_AWS=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_AZURE=ON -DENABLE_SQL=ON \
55
-DENABLE_SPLUNK=ON -DENABLE_GCP=ON -DENABLE_OPC=ON -DENABLE_PYTHON_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_KUBERNETES=ON -DENABLE_TEST_PROCESSORS=ON -DENABLE_PROMETHEUS=ON \
6-
-DENABLE_ELASTICSEARCH=OFF -DENABLE_GRAFANA_LOKI=ON -DDOCKER_BUILD_ONLY=ON
6+
-DENABLE_ELASTICSEARCH=OFF -DENABLE_GRAFANA_LOKI=ON -DENABLE_COUCHBASE=ON -DDOCKER_BUILD_ONLY=ON
77
CCACHE_DIR: ${{ GITHUB.WORKSPACE }}/.ccache
88
jobs:
99
rocky-build:

CONTROLLERS.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717

1818
- [AWSCredentialsService](#AWSCredentialsService)
1919
- [AzureStorageCredentialsService](#AzureStorageCredentialsService)
20+
- [CouchbaseClusterService](#CouchbaseClusterService)
2021
- [ElasticsearchCredentialsControllerService](#ElasticsearchCredentialsControllerService)
2122
- [GCPCredentialsControllerService](#GCPCredentialsControllerService)
2223
- [JsonRecordSetReader](#JsonRecordSetReader)
@@ -71,6 +72,23 @@ In the list below, the names of required properties appear in bold. Any other pr
7172
| **Use Managed Identity Credentials** | false | true<br/>false | If true Managed Identity credentials will be used together with the Storage Account Name for authentication. |
7273

7374

75+
## CouchbaseClusterService
76+
77+
### Description
78+
79+
Provides a centralized Couchbase connection and bucket passwords management. Bucket passwords can be specified via dynamic properties.
80+
81+
### Properties
82+
83+
In the list below, the names of required properties appear in bold. Any other properties (not in bold) are considered optional. The table also indicates any default values, and whether a property supports the NiFi Expression Language.
84+
85+
| Name | Default Value | Allowable Values | Description |
86+
|-----------------------|---------------|------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|
87+
| **Connection String** | | | The hostnames or ip addresses of the bootstraping nodes and optional parameters. Syntax: couchbase://node1,node2,nodeN?param1=value1&param2=value2&paramN=valueN |
88+
| User Name | | | The user name to authenticate MiNiFi as a Couchbase client. |
89+
| User Password | | | The user password to authenticate MiNiFi as a Couchbase client.<br/>**Sensitive Property: true** |
90+
91+
7492
## ElasticsearchCredentialsControllerService
7593

7694
### Description

LICENSE

Lines changed: 153 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ This product bundles 'Kubernetes Client Library for C' (kubernetes-client/c), wh
214214
This project bundles a configuration file from 'Kubernetes Metrics Server' (kubernetes-sigs/metrics-server), which is available under an ALv2 license
215215
This project bundles 'OpenSSL' which is available under an ALv2 license
216216
This project bundles 'gRPC' which is available under an ALv2 license
217+
This project bundles 'couchbase-cxx-client' which is available under an ALv2 license
217218

218219
The Apache NiFi - MiNiFi C++ project contains subcomponents with separate copyright
219220
notices and license terms. Your use of the source code for the these
@@ -1002,7 +1003,7 @@ These libraries are in the public domain (or the equivalent where that is not po
10021003

10031004
regexp.c and regexp.h from https://github.com/ccxvii/minilibs sha 875c33568b5a4aa4fb3dd0c52ea98f7f0e5ca684
10041005

1005-
This product bundles snappy within librdkafka, under the license below.
1006+
This product bundles snappy within librdkafka and couchbase-cxx-client, under the license below.
10061007

10071008
LICENSE.snappy
10081009
--------------------------------------------------------------
@@ -3307,3 +3308,154 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
33073308
The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial portions of the Software.
33083309

33093310
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3311+
3312+
3313+
This product bundles HdrHistogram within couchbase-cxx-client, under the license below.
3314+
3315+
Creative Commons Legal Code
3316+
3317+
CC0 1.0 Universal
3318+
3319+
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
3320+
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
3321+
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
3322+
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
3323+
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
3324+
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
3325+
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
3326+
HEREUNDER.
3327+
3328+
Statement of Purpose
3329+
3330+
The laws of most jurisdictions throughout the world automatically confer
3331+
exclusive Copyright and Related Rights (defined below) upon the creator
3332+
and subsequent owner(s) (each and all, an "owner") of an original work of
3333+
authorship and/or a database (each, a "Work").
3334+
3335+
Certain owners wish to permanently relinquish those rights to a Work for
3336+
the purpose of contributing to a commons of creative, cultural and
3337+
scientific works ("Commons") that the public can reliably and without fear
3338+
of later claims of infringement build upon, modify, incorporate in other
3339+
works, reuse and redistribute as freely as possible in any form whatsoever
3340+
and for any purposes, including without limitation commercial purposes.
3341+
These owners may contribute to the Commons to promote the ideal of a free
3342+
culture and the further production of creative, cultural and scientific
3343+
works, or to gain reputation or greater distribution for their Work in
3344+
part through the use and efforts of others.
3345+
3346+
For these and/or other purposes and motivations, and without any
3347+
expectation of additional consideration or compensation, the person
3348+
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
3349+
is an owner of Copyright and Related Rights in the Work, voluntarily
3350+
elects to apply CC0 to the Work and publicly distribute the Work under its
3351+
terms, with knowledge of his or her Copyright and Related Rights in the
3352+
Work and the meaning and intended legal effect of CC0 on those rights.
3353+
3354+
1. Copyright and Related Rights. A Work made available under CC0 may be
3355+
protected by copyright and related or neighboring rights ("Copyright and
3356+
Related Rights"). Copyright and Related Rights include, but are not
3357+
limited to, the following:
3358+
3359+
i. the right to reproduce, adapt, distribute, perform, display,
3360+
communicate, and translate a Work;
3361+
ii. moral rights retained by the original author(s) and/or performer(s);
3362+
iii. publicity and privacy rights pertaining to a person's image or
3363+
likeness depicted in a Work;
3364+
iv. rights protecting against unfair competition in regards to a Work,
3365+
subject to the limitations in paragraph 4(a), below;
3366+
v. rights protecting the extraction, dissemination, use and reuse of data
3367+
in a Work;
3368+
vi. database rights (such as those arising under Directive 96/9/EC of the
3369+
European Parliament and of the Council of 11 March 1996 on the legal
3370+
protection of databases, and under any national implementation
3371+
thereof, including any amended or successor version of such
3372+
directive); and
3373+
vii. other similar, equivalent or corresponding rights throughout the
3374+
world based on applicable law or treaty, and any national
3375+
implementations thereof.
3376+
3377+
2. Waiver. To the greatest extent permitted by, but not in contravention
3378+
of, applicable law, Affirmer hereby overtly, fully, permanently,
3379+
irrevocably and unconditionally waives, abandons, and surrenders all of
3380+
Affirmer's Copyright and Related Rights and associated claims and causes
3381+
of action, whether now known or unknown (including existing as well as
3382+
future claims and causes of action), in the Work (i) in all territories
3383+
worldwide, (ii) for the maximum duration provided by applicable law or
3384+
treaty (including future time extensions), (iii) in any current or future
3385+
medium and for any number of copies, and (iv) for any purpose whatsoever,
3386+
including without limitation commercial, advertising or promotional
3387+
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
3388+
member of the public at large and to the detriment of Affirmer's heirs and
3389+
successors, fully intending that such Waiver shall not be subject to
3390+
revocation, rescission, cancellation, termination, or any other legal or
3391+
equitable action to disrupt the quiet enjoyment of the Work by the public
3392+
as contemplated by Affirmer's express Statement of Purpose.
3393+
3394+
3. Public License Fallback. Should any part of the Waiver for any reason
3395+
be judged legally invalid or ineffective under applicable law, then the
3396+
Waiver shall be preserved to the maximum extent permitted taking into
3397+
account Affirmer's express Statement of Purpose. In addition, to the
3398+
extent the Waiver is so judged Affirmer hereby grants to each affected
3399+
person a royalty-free, non transferable, non sublicensable, non exclusive,
3400+
irrevocable and unconditional license to exercise Affirmer's Copyright and
3401+
Related Rights in the Work (i) in all territories worldwide, (ii) for the
3402+
maximum duration provided by applicable law or treaty (including future
3403+
time extensions), (iii) in any current or future medium and for any number
3404+
of copies, and (iv) for any purpose whatsoever, including without
3405+
limitation commercial, advertising or promotional purposes (the
3406+
"License"). The License shall be deemed effective as of the date CC0 was
3407+
applied by Affirmer to the Work. Should any part of the License for any
3408+
reason be judged legally invalid or ineffective under applicable law, such
3409+
partial invalidity or ineffectiveness shall not invalidate the remainder
3410+
of the License, and in such case Affirmer hereby affirms that he or she
3411+
will not (i) exercise any of his or her remaining Copyright and Related
3412+
Rights in the Work or (ii) assert any associated claims and causes of
3413+
action with respect to the Work, in either case contrary to Affirmer's
3414+
express Statement of Purpose.
3415+
3416+
4. Limitations and Disclaimers.
3417+
3418+
a. No trademark or patent rights held by Affirmer are waived, abandoned,
3419+
surrendered, licensed or otherwise affected by this document.
3420+
b. Affirmer offers the Work as-is and makes no representations or
3421+
warranties of any kind concerning the Work, express, implied,
3422+
statutory or otherwise, including without limitation warranties of
3423+
title, merchantability, fitness for a particular purpose, non
3424+
infringement, or the absence of latent or other defects, accuracy, or
3425+
the present or absence of errors, whether or not discoverable, all to
3426+
the greatest extent permissible under applicable law.
3427+
c. Affirmer disclaims responsibility for clearing rights of other persons
3428+
that may apply to the Work or any use thereof, including without
3429+
limitation any person's Copyright and Related Rights in the Work.
3430+
Further, Affirmer disclaims responsibility for obtaining any necessary
3431+
consents, permissions or other rights required for any use of the
3432+
Work.
3433+
d. Affirmer understands and acknowledges that Creative Commons is not a
3434+
party to this document and has no duty or obligation with respect to
3435+
this CC0 or use of the Work.
3436+
3437+
3438+
This product bundles llhttp within couchbase-cxx-client, under the license below.
3439+
3440+
This software is licensed under the MIT License.
3441+
3442+
Copyright Fedor Indutny, 2018.
3443+
3444+
Permission is hereby granted, free of charge, to any person obtaining a
3445+
copy of this software and associated documentation files (the
3446+
"Software"), to deal in the Software without restriction, including
3447+
without limitation the rights to use, copy, modify, merge, publish,
3448+
distribute, sublicense, and/or sell copies of the Software, and to permit
3449+
persons to whom the Software is furnished to do so, subject to the
3450+
following conditions:
3451+
3452+
The above copyright notice and this permission notice shall be included
3453+
in all copies or substantial portions of the Software.
3454+
3455+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
3456+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
3457+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
3458+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
3459+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
3460+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
3461+
USE OR OTHER DEALINGS IN THE SOFTWARE.

NOTICE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ This software includes third party software subject to the following copyrights:
7373
- RE2 - Copyright (c) 2009 The RE2 Authors. All rights reserved.
7474
- c-ares - Copyright (c) 1998 Massachusetts Institute of Technology Copyright (c) 2007 - 2023 Daniel Stenberg with many contributors, see AUTHORS file.
7575
- lua - Copyright (c) 1994–2023 Lua.org, PUC-Rio.
76+
- couchbase-cxx-client - Copyright 2023-Present Couchbase, Inc.
77+
- snappy - Copyright 2011, Google Inc.
78+
- llhttp - Copyright Fedor Indutny, 2018.
7679

7780
The licenses for these third party components are included in LICENSE.txt
7881

0 commit comments

Comments
 (0)