Skip to content
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

Update neptune rafa #601

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update neptune rafa #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca0817b
Neptune - adjustments due to upgrade rdf4jQueryparserSparql version
RefaelAdi Oct 13, 2024
de1c696
Merge pull request #599 from IBM/update_neprun_rafa
RefaelAdi Oct 13, 2024
37e5071
Neptune plug-in - update gradle dependencies+fix test
RefaelAdi Oct 13, 2024
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
4 changes: 2 additions & 2 deletions filter-plugin/logstash-filter-neptune-aws-guardium/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ dependencies {
implementation group: 'org.eclipse.rdf4j', name: 'rdf4j-queryparser-sparql', version: versions.dependencies.rdf4jQueryparserSparql

implementation fileTree(dir: LOGSTASH_CORE_PATH, include: "build/libs/logstash-core-*.*.*.jar")
implementation fileTree(dir: GUARDIUM_UNIVERSALCONNECTOR_COMMONS_PATH, include: "guardium-universalconnector-commons-*.*.*.jar")
implementation fileTree(dir: GUARDIUM_UNIVERSALCONNECTOR_COMMONS_PATH, include: "common-*.*.*.jar")

testImplementation 'org.junit.jupiter:junit-jupiter:' + versions.dependencies.junitJupiter
testImplementation 'org.jruby:jruby-complete:' + versions.dependencies.jrubyComplete

testImplementation fileTree(dir: GUARDIUM_UNIVERSALCONNECTOR_COMMONS_PATH, include: "guardium-universalconnector-commons-*.*.*.jar")
testImplementation fileTree(dir: GUARDIUM_UNIVERSALCONNECTOR_COMMONS_PATH, include: "common-*.*.*.jar")

}

Expand Down
6 changes: 4 additions & 2 deletions ...ash-filter-neptune-aws-guardium/src/main/java/com/ibm/neptune/connector/ParserHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,10 @@ public static Accessor parseAccessor(Event event, Record record) throws Exceptio
if (!callerIAM.isEmpty()) {

String[] temp = callerIAM.split(ApplicationConstants.DOUBLE_COLON)[1].split(":user/");
dbUser = temp[1];

if (temp.length == 1)
dbUser = temp[0];
else
dbUser = temp[1];
}

accessor.setSourceProgram(ApplicationConstants.UNKNOWN_STRING);
Expand Down
4 changes: 2 additions & 2 deletions ...sh-filter-neptune-aws-guardium/src/main/java/com/ibm/neptune/connector/SparkQLParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ public void meet(ValueConstant node) throws Exception {

@Override
public void meet(ProjectionElem node) throws Exception {
if (te instanceof DescribeOperator && !node.getSourceName().contains(ApplicationConstants.DESCRB)) {
list.add(node.getSourceName());
if (te instanceof DescribeOperator && !node.getName().contains(ApplicationConstants.DESCRB)) {
list.add(node.getName());
}
super.meet(node);
}
Expand Down
Loading