Skip to content

Patches for controller service issues #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davetorok wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Patches for controller service issues #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NiFiDeploy.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def handleProcessGroup(Map.Entry pgConfig) {
properties {
procProps.each { p ->
// check if it's a ${referenceToControllerServiceName}
def ref = p.value =~ /\$\{(.*)}/
def ref = p.value =~ /^LotsOfBeer\{(.*)}$/
if (ref) {
def name = ref[0][1] // grab the first capture group (nested inside ArrayList)
// lookup the CS by name and get the newly generated ID instead of the one in a template
Expand Down
5 changes: 4 additions & 1 deletion TemplateInspector.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,13 @@ def parseProcessors(groupName, node) {
p.config.properties?.entry?.each {
def c = y.processGroups[groupName].processors[p.name.text()].config
// check if it's a UUID and try lookup the CS to get the name
if (it.value.text() ==~ /[a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12}/) {
if (it.value.text() ==~ /^[a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12}$/) {
def n = t.snippet.controllerServices.find { cs -> cs.id.text() == it.value.text() }
if (!n.isEmpty()) {
//Warning instead of hard fail, in case the property has a GUID which is not a CS
assert !n.isEmpty() : "Couldn't resolve a Controller Service with ID: ${it.value.text()}"
c[it.key.text()] = '\${' + n.name.text() + "}"
}
} else if (it.value.size() > 0) {
c[it.key.text()] = it.value.size() == 0 ? null : it.value.text()
}
Expand Down