(ranger) branch RANGER-3923 updated (ef9a05358 -> d5115581d)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch RANGER-3923 in repository https://gitbox.apache.org/repos/asf/ranger.git from ef9a05358 Merge branch 'master' into RANGER-3923 add c7573d067 RANGER-4524:Fix TestRangerMetricsContainerSource class UT add 1d5ac0923 RANGER-3722: Fix Test-case failure add 6c2604500 RANGER-4438: fixed setup scripts to not require java_opts in install.properties new d5115581d Merge branch 'master' into RANGER-3923 The 1 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: kms/scripts/setup.sh | 15 ++- ranger-metrics/pom.xml| 8 security-admin/scripts/setup.sh | 15 ++- .../test/java/org/apache/ranger/rest/TestServiceREST.java | 13 +++-- 4 files changed, 47 insertions(+), 4 deletions(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch RANGER-3923 in repository https://gitbox.apache.org/repos/asf/ranger.git commit d5115581db779cb1631a2312c50a05bb9857dba7 Merge: ef9a05358 6c2604500 Author: Madhan Neethiraj AuthorDate: Sun Nov 26 23:37:09 2023 -0800 Merge branch 'master' into RANGER-3923 kms/scripts/setup.sh | 15 ++- ranger-metrics/pom.xml| 8 security-admin/scripts/setup.sh | 15 ++- .../test/java/org/apache/ranger/rest/TestServiceREST.java | 13 +++-- 4 files changed, 47 insertions(+), 4 deletions(-)
(ranger) branch master updated: RANGER-4438: fixed setup scripts to not require java_opts in install.properties
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 6c2604500 RANGER-4438: fixed setup scripts to not require java_opts in
install.properties
6c2604500 is described below
commit 6c26045215454cd90c36b0f33205edab6751
Author: Madhan Neethiraj
AuthorDate: Sat Nov 25 02:27:28 2023 -0800
RANGER-4438: fixed setup scripts to not require java_opts in
install.properties
---
kms/scripts/setup.sh| 15 ++-
security-admin/scripts/setup.sh | 15 ++-
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh
index e64c32aa1..8fd51eada 100755
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh
@@ -47,6 +47,19 @@ get_prop(){
echo $value
}
+get_prop_or_default() {
+ validateProperty=$(sed '/^\#/d' $2 | grep "^$1\s*=" | tail -n 1) # for
validation
+
+ if test -z "$validateProperty" ;
+ then
+value=$3 # default value
+ else
+value=$(echo $validateProperty | cut -d "=" -f2-)
+ fi
+
+ echo $value
+}
+
PYTHON_COMMAND_INVOKER=$(get_prop 'PYTHON_COMMAND_INVOKER' $PROPFILE)
DB_FLAVOR=$(get_prop 'DB_FLAVOR' $PROPFILE)
SQL_CONNECTOR_JAR=$(get_prop 'SQL_CONNECTOR_JAR' $PROPFILE)
@@ -80,7 +93,7 @@ LOGFILE=$(eval echo "$(get_prop 'LOGFILE' $PROPFILE)")
JAVA_BIN=$(get_prop 'JAVA_BIN' $PROPFILE)
JAVA_VERSION_REQUIRED=$(get_prop 'JAVA_VERSION_REQUIRED' $PROPFILE)
JAVA_ORACLE=$(get_prop 'JAVA_ORACLE' $PROPFILE)
-java_opts=$(get_prop 'java_opts' $PROPFILE)
+java_opts=$(get_prop_or_default 'java_opts' $PROPFILE '')
mysql_core_file=$(get_prop 'mysql_core_file' $PROPFILE)
oracle_core_file=$(get_prop 'oracle_core_file' $PROPFILE)
postgres_core_file=$(get_prop 'postgres_core_file' $PROPFILE)
diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh
index ee53d873b..64b3ed201 100755
--- a/security-admin/scripts/setup.sh
+++ b/security-admin/scripts/setup.sh
@@ -42,6 +42,19 @@ get_prop(){
fi
}
+get_prop_or_default() {
+ validateProperty=$(sed '/^\#/d' $2 | grep "^$1\s*=" | tail -n 1) # for
validation
+
+ if test -z "$validateProperty" ;
+ then
+value=$3 # default value
+ else
+value=$(echo $validateProperty | cut -d "=" -f2-)
+ fi
+
+ echo $value
+}
+
PROPFILE=${RANGER_ADMIN_CONF:-$PWD}/install.properties
if [ ! -f "${PROPFILE}" ]; then
echo "$PROPFILE file not found!!"
@@ -129,7 +142,7 @@ LOGFILES=$(eval echo "$(get_prop 'LOGFILES' $PROPFILE)")
JAVA_BIN=$(get_prop 'JAVA_BIN' $PROPFILE)
JAVA_VERSION_REQUIRED=$(get_prop 'JAVA_VERSION_REQUIRED' $PROPFILE)
JAVA_ORACLE=$(get_prop 'JAVA_ORACLE' $PROPFILE)
-java_opts=$(get_prop 'java_opts' $PROPFILE)
+java_opts=$(get_prop_or_default 'java_opts' $PROPFILE '')
mysql_core_file=$(get_prop 'mysql_core_file' $PROPFILE)
mysql_audit_file=$(get_prop 'mysql_audit_file' $PROPFILE)
oracle_core_file=$(get_prop 'oracle_core_file' $PROPFILE)
(ranger) branch master updated: RANGER-3722: Fix Test-case failure
This is an automated email from the ASF dual-hosted git repository.
bpatel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 1d5ac0923 RANGER-3722: Fix Test-case failure
1d5ac0923 is described below
commit 1d5ac0923d96f9e181ce8786f5cbd911cfb80a45
Author: Bhavik Patel
AuthorDate: Wed Apr 20 17:59:47 2022 +0530
RANGER-3722: Fix Test-case failure
---
.../test/java/org/apache/ranger/rest/TestServiceREST.java | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git
a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
index 6c5addbc9..d049f9949 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
@@ -19,6 +19,7 @@ package org.apache.ranger.rest;
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
@@ -1762,7 +1763,7 @@ public class TestServiceREST {
SearchFilter filter = new SearchFilter();
filter.setParam("serviceType", "value");
- File jsonPolicyFile = new File(importPoliceTestFilePath);
+ File jsonPolicyFile = getFile(importPoliceTestFilePath);
InputStream uploadedInputStream = new
FileInputStream(jsonPolicyFile);
FormDataContentDisposition fileDetail =
FormDataContentDisposition.name("file")
.fileName(jsonPolicyFile.getName()).size(uploadedInputStream.toString().length()).build();
@@ -1827,7 +1828,7 @@ public class TestServiceREST {
SearchFilter filter = new SearchFilter();
filter.setParam("serviceType", "value");
- File jsonPolicyFile = new File(importPoliceTestFilePath);
+ File jsonPolicyFile = getFile(importPoliceTestFilePath);
InputStream uploadedInputStream = new
FileInputStream(jsonPolicyFile);
FormDataContentDisposition fileDetail =
FormDataContentDisposition.name("file")
.fileName(jsonPolicyFile.getName()).size(uploadedInputStream.toString().length()).build();
@@ -1860,6 +1861,14 @@ public class TestServiceREST {
}
+ private File getFile(String testFilePath) throws IOException {
+ File jsonPolicyFile = new File(testFilePath);
+ if
(jsonPolicyFile.getCanonicalPath().contains("/target/jstest")) {
+ jsonPolicyFile = new
File(jsonPolicyFile.getCanonicalPath().replace("/target/jstest", ""));
+ }
+ return jsonPolicyFile;
+ }
+
@Test
public void test51getMetricByType() throws Exception {
String type = "usergroup";
(ranger) branch master updated: RANGER-4524:Fix TestRangerMetricsContainerSource class UT
This is an automated email from the ASF dual-hosted git repository. bpatel pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ranger.git The following commit(s) were added to refs/heads/master by this push: new c7573d067 RANGER-4524:Fix TestRangerMetricsContainerSource class UT c7573d067 is described below commit c7573d06726e42ced28f3e124095ab531c93b75b Author: Bhavik Patel AuthorDate: Fri Nov 10 12:16:17 2023 +0530 RANGER-4524:Fix TestRangerMetricsContainerSource class UT --- ranger-metrics/pom.xml | 8 1 file changed, 8 insertions(+) diff --git a/ranger-metrics/pom.xml b/ranger-metrics/pom.xml index cd877962a..d4036476c 100644 --- a/ranger-metrics/pom.xml +++ b/ranger-metrics/pom.xml @@ -43,6 +43,14 @@ io.netty netty-all + +log4j +* + + +org.slf4j +* +
