[ranger] branch master updated: RANGER-3937: [Docker] Add capability to run ranger plugins and services with their own versions (#215)
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 de049b958 RANGER-3937: [Docker] Add capability to run ranger plugins and services with their own versions (#215) de049b958 is described below commit de049b958ae6496c91bac5df2fd11d488801e70d Author: Abhishek Kumar AuthorDate: Thu Oct 26 20:34:02 2023 -0700 RANGER-3937: [Docker] Add capability to run ranger plugins and services with their own versions (#215) RANGER-3937: [Docker] Add capability to run ranger plugins and services with their own versions - Co-authored-by: abhishek-kumar --- dev-support/ranger-docker/.env | 17 +++- dev-support/ranger-docker/Dockerfile.ranger-hadoop | 23 +++--- dev-support/ranger-docker/Dockerfile.ranger-hbase | 14 ++--- dev-support/ranger-docker/Dockerfile.ranger-hive | 18 - dev-support/ranger-docker/Dockerfile.ranger-kafka | 14 ++--- dev-support/ranger-docker/Dockerfile.ranger-kms| 10 +- dev-support/ranger-docker/Dockerfile.ranger-knox | 14 ++--- .../ranger-docker/Dockerfile.ranger-tagsync| 16 +++ .../ranger-docker/Dockerfile.ranger-usersync | 12 +-- .../ranger-docker/docker-compose.ranger-hadoop.yml | 6 -- .../ranger-docker/docker-compose.ranger-hbase.yml | 4 ++-- .../ranger-docker/docker-compose.ranger-hive.yml | 4 ++-- .../ranger-docker/docker-compose.ranger-kafka.yml | 4 ++-- .../ranger-docker/docker-compose.ranger-kms.yml| 4 ++-- .../ranger-docker/docker-compose.ranger-knox.yml | 4 ++-- .../docker-compose.ranger-tagsync.yml | 4 ++-- .../docker-compose.ranger-usersync.yml | 4 ++-- 17 files changed, 95 insertions(+), 77 deletions(-) diff --git a/dev-support/ranger-docker/.env b/dev-support/ranger-docker/.env index 5de76425b..60bc4a9f2 100644 --- a/dev-support/ranger-docker/.env +++ b/dev-support/ranger-docker/.env @@ -24,7 +24,8 @@ POSTGRES_VERSION=12 ENABLE_DB_MOUNT=true ZK_VERSION=3.5.9 SOLR_VERSION=8 -RANGER_VERSION=3.0.0-SNAPSHOT + +# service versions HADOOP_VERSION=3.3.0 HBASE_VERSION=2.4.6 HIVE_VERSION=3.1.2 @@ -32,6 +33,20 @@ HIVE_HADOOP_VERSION=3.1.1 KAFKA_VERSION=2.8.1 KNOX_VERSION=1.4.0 +# versions of ranger services +RANGER_VERSION=3.0.0-SNAPSHOT +KMS_VERSION=3.0.0-SNAPSHOT +USERSYNC_VERSION=3.0.0-SNAPSHOT +TAGSYNC_VERSION=3.0.0-SNAPSHOT + +# plugin versions +HDFS_PLUGIN_VERSION=3.0.0-SNAPSHOT +YARN_PLUGIN_VERSION=3.0.0-SNAPSHOT +HIVE_PLUGIN_VERSION=3.0.0-SNAPSHOT +HBASE_PLUGIN_VERSION=3.0.0-SNAPSHOT +KAFKA_PLUGIN_VERSION=3.0.0-SNAPSHOT +KNOX_PLUGIN_VERSION=3.0.0-SNAPSHOT + # To enable debug logs DEBUG_ADMIN=false DEBUG_USERSYNC=false diff --git a/dev-support/ranger-docker/Dockerfile.ranger-hadoop b/dev-support/ranger-docker/Dockerfile.ranger-hadoop index 9970c7cb3..e1fa764e3 100644 --- a/dev-support/ranger-docker/Dockerfile.ranger-hadoop +++ b/dev-support/ranger-docker/Dockerfile.ranger-hadoop @@ -17,13 +17,14 @@ FROM ranger-base:latest ARG HADOOP_VERSION -ARG RANGER_VERSION +ARG HDFS_PLUGIN_VERSION +ARG YARN_PLUGIN_VERSION -COPY ./dist/version /home/ranger/dist/ -COPY ./dist/ranger-${RANGER_VERSION}-hdfs-plugin.tar.gz /home/ranger/dist/ -COPY ./dist/ranger-${RANGER_VERSION}-yarn-plugin.tar.gz /home/ranger/dist/ -COPY ./downloads/hadoop-${HADOOP_VERSION}.tar.gz/home/ranger/dist/ +COPY ./dist/version /home/ranger/dist/ +COPY ./dist/ranger-${HDFS_PLUGIN_VERSION}-hdfs-plugin.tar.gz /home/ranger/dist/ +COPY ./dist/ranger-${YARN_PLUGIN_VERSION}-yarn-plugin.tar.gz /home/ranger/dist/ +COPY ./downloads/hadoop-${HADOOP_VERSION}.tar.gz /home/ranger/dist/ COPY ./scripts/ranger-hadoop-setup.sh /home/ranger/scripts/ COPY ./scripts/ranger-hadoop.sh /home/ranger/scripts/ @@ -34,13 +35,13 @@ COPY ./scripts/ranger-yarn-plugin-install.properties /home/ranger/scripts/ RUN tar xvfz /home/ranger/dist/hadoop-${HADOOP_VERSION}.tar.gz --directory=/opt/ && \ ln -s /opt/hadoop-${HADOOP_VERSION} /opt/hadoop && \ rm -f /home/ranger/dist/hadoop-${HADOOP_VERSION}.tar.gz && \ -tar xvfz /home/ranger/dist/ranger-${RANGER_VERSION}-hdfs-plugin.tar.gz --directory=/opt/ranger && \ -ln -s /opt/ranger/ranger-${RANGER_VERSION}-hdfs-plugin /opt/ranger/ranger-hdfs-plugin && \ -rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-hdfs-plugin.tar.gz && \ +tar xvfz /home/ranger/dist/ranger-${HDFS_PLUGIN_VERSION}-hdfs-plugin.tar.gz --directory=/opt/ranger && \ +ln -s /opt/ranger/ranger-${HDFS_PLUGIN_VERSION}-hdfs-plugin /opt/ranger/ranger-hdfs-plugin && \ +rm -f
[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 9422101b4ea7bac245c4f13d1eb061f8d15daf13 Merge: af4fdfd1b d29c2a471 Author: Madhan Neethiraj AuthorDate: Thu Oct 26 10:03:02 2023 -0700 Merge branch 'master' into RANGER-3923 .../react-webapp/src/components/Editable.jsx | 16 +- .../main/webapp/react-webapp/src/styles/style.css | 7 + .../webapp/react-webapp/src/utils/XAMessages.js| 4 +- .../main/webapp/react-webapp/src/utils/XAUtils.js | 28 +- .../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 179 + .../views/PolicyListing/AddUpdatePolicyForm.jsx| 430 +++-- .../views/PolicyListing/PolicyConditionsComp.jsx | 2 +- .../src/views/PolicyListing/PolicyListing.jsx | 15 +- .../views/PolicyListing/PolicyPermissionItem.jsx | 106 +++-- .../src/views/Resources/ModalResourceComp.jsx | 1 + .../src/views/Resources/ResourceComp.jsx | 64 ++- .../src/views/Resources/ResourceSelectComp.jsx | 20 +- .../src/views/SecurityZone/SecurityZoneForm.jsx| 1 - .../views/ServiceManager/ServiceAuditFilter.jsx| 1 - 14 files changed, 572 insertions(+), 302 deletions(-) diff --cc security-admin/src/main/webapp/react-webapp/src/styles/style.css index f6f3f5529,46e8eeda1..7cb54b7dc mode 100755,100644..100755 --- a/security-admin/src/main/webapp/react-webapp/src/styles/style.css +++ b/security-admin/src/main/webapp/react-webapp/src/styles/style.css @@@ -2559,394 -2554,8 +2559,401 @@@ li.list-group-item:hover .text-word-break { word-break: break-all; } ++ +.gds-table { + margin-left: auto; + margin-right: auto; + width: 700px; +} + +.gds-tr { + text-align: center !important; + padding-top: 100px; + padding-bottom: 20px; + padding-left: 30px; + padding-right: 40px; +} + +.gds-header-wrapper { + background-color: #f3f8f9; + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 1rem; + border-bottom: 1px solid #d6d6d6; + position: sticky; + top: 0; + z-index: 1; +} + +.gds-form-header-wrapper { + background-color: #ff; + display: flex; + justify-content: space-between; + align-items: center; + padding: 1rem; + border-bottom: 1px solid #d6d6d6; + position: sticky; + top: 0; + z-index: 1; +} + +.gds-header { + color: #22; + font-size: 18px; + font-weight: 300; + line-height: 20px; + margin: 0; + padding: 0; + text-transform: none; + flex: 1; +} + +.gds-header-btn-grp { + display: flex; + gap: 0.875rem; +} + +.gds-form-wrap { + max-width: 880px; + margin: 0 auto; + background-color: #fff; +} + +.gds-form-header { + padding-top: 70px; + text-align: center; +} + +.gds-form-step-num { + margin-bottom: 1.5rem; + text-transform: uppercase; + font-size: 1rem; +} + +.gds-form-step-name { + font-size: 1.5rem; + margin-bottom: 3rem; +} + +.gds-form-content { + display: flex; + flex-direction: column; + gap: 2.5rem; +} + +.gds-form-input { + width: 100%; +} + +.gds-add-principle { + display: inline-flex; + justify-content: space-between; + gap: 0.875rem; + width: 100%; + align-items: flex-start; +} + +.flex-1 { + flex: 1; +} + +.gds-text-input { + min-height: 40px; + margin-bottom: 2rem; +} + +.gds-button { + height: 40px; +} + +.gds-tab-content { + width: 760px; /* 52.77% . Max screen size 1440px*/ + margin-left: 120px; + margin-top: 40px; +} + +.gds-request-content { + width: 920px; + margin: 0 auto; +} + +.gds-inline-field-grp { + display: inline-flex; + flex-direction: column; + align-items: flex-start; + gap: 1rem; + margin-bottom: 2rem; +} + +.gds-inline-listing { + border-bottom: 1px solid #eee; + margin-bottom: 1rem; + padding-bottom: 1rem; +} + +.gds-right-inline-field-grp { + display: inline-flex; + flex-direction: column; + align-items: flex-end; + gap: 1rem; + margin-bottom: 2rem; +} + +.gds-left-inline-field { + width: 160px; + flex-shrink: 0; +} + +.gds-right-inline-field { + width: 160px; + text-align: right; + flex-shrink: 0; +} + +.gds-description { + border: none; +} + +.gds-content-border { + border: 1px solid #ee; + border-radius: 16px; + padding: 1.5rem 1.25rem 2.5rem 1.25rem; +} + +.gds-content-header { + font-size: 1.125rem; + padding-bottom: 1rem; + border-bottom: 1px solid #ee; +} + +.gds-card-heading { + font-size: 1.125rem; + padding-bottom: 1rem; + border-bottom: 1px solid #dd; +} + +.gds-card-heading-border { + border-bottom: 1px solid #dd; +} + +.gds-acc-card-header { + padding: 0.5rem 0.75rem; +} + +.gds-heading-5 { + font-size: 1.125rem; +} + +/* .gds-section-title { + padding: 1.5rem 1rem 0rem 1rem; +} */ + +.gds-flex { + display:
[ranger] branch RANGER-3923 updated (af4fdfd1b -> 9422101b4)
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 af4fdfd1b RANGER-4437: trim leading/trialing spaces in datashare/dataset/project/shared-resource names add d29c2a471 RANGER-4010: updated react UI to support multiple resource-sets in policies new 9422101b4 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: .../react-webapp/src/components/Editable.jsx | 16 +- .../main/webapp/react-webapp/src/styles/style.css | 7 + .../webapp/react-webapp/src/utils/XAMessages.js| 4 +- .../main/webapp/react-webapp/src/utils/XAUtils.js | 28 +- .../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 179 + .../views/PolicyListing/AddUpdatePolicyForm.jsx| 430 +++-- .../views/PolicyListing/PolicyConditionsComp.jsx | 2 +- .../src/views/PolicyListing/PolicyListing.jsx | 15 +- .../views/PolicyListing/PolicyPermissionItem.jsx | 106 +++-- .../src/views/Resources/ModalResourceComp.jsx | 1 + .../src/views/Resources/ResourceComp.jsx | 64 ++- .../src/views/Resources/ResourceSelectComp.jsx | 20 +- .../src/views/SecurityZone/SecurityZoneForm.jsx| 1 - .../views/ServiceManager/ServiceAuditFilter.jsx| 1 - 14 files changed, 572 insertions(+), 302 deletions(-)
[ranger] branch master updated: RANGER-4010: updated react UI to support multiple resource-sets in policies
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 d29c2a471 RANGER-4010: updated react UI to support multiple resource-sets in policies d29c2a471 is described below commit d29c2a471be3c4fc46016378b946b75400569a77 Author: Dhaval.Rajpara AuthorDate: Thu Oct 26 02:23:18 2023 -0700 RANGER-4010: updated react UI to support multiple resource-sets in policies Signed-off-by: Madhan Neethiraj --- .../react-webapp/src/components/Editable.jsx | 16 +- .../main/webapp/react-webapp/src/styles/style.css | 5 + .../webapp/react-webapp/src/utils/XAMessages.js| 4 +- .../main/webapp/react-webapp/src/utils/XAUtils.js | 28 +- .../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 179 + .../views/PolicyListing/AddUpdatePolicyForm.jsx| 430 +++-- .../views/PolicyListing/PolicyConditionsComp.jsx | 2 +- .../src/views/PolicyListing/PolicyListing.jsx | 15 +- .../views/PolicyListing/PolicyPermissionItem.jsx | 106 +++-- .../src/views/Resources/ModalResourceComp.jsx | 1 + .../src/views/Resources/ResourceComp.jsx | 66 ++-- .../src/views/Resources/ResourceSelectComp.jsx | 20 +- .../src/views/SecurityZone/SecurityZoneForm.jsx| 1 - .../views/ServiceManager/ServiceAuditFilter.jsx| 1 - 14 files changed, 571 insertions(+), 303 deletions(-) diff --git a/security-admin/src/main/webapp/react-webapp/src/components/Editable.jsx b/security-admin/src/main/webapp/react-webapp/src/components/Editable.jsx index eab4060d0..98495f6cc 100644 --- a/security-admin/src/main/webapp/react-webapp/src/components/Editable.jsx +++ b/security-admin/src/main/webapp/react-webapp/src/components/Editable.jsx @@ -57,7 +57,7 @@ const CheckboxComp = (props) => { setVal(val); }; - const handleAllChekced = (e) => { + const handleAllChecked = (e) => { let val = []; if (e.target.checked) { val = [...options]; @@ -92,7 +92,7 @@ const CheckboxComp = (props) => { checked={isAllChecked()} type="checkbox" label={selectAllLabel} -onChange={(e) => handleAllChekced(e)} +onChange={(e) => handleAllChecked(e)} /> )} @@ -126,7 +126,7 @@ const RadioBtnComp = (props) => { )); }; -const InputboxComp = (props) => { +const InputBoxComp = (props) => { const { value = "", valRef } = props; const [selectedInputVal, setInputVal] = useState(value); const handleChange = (e) => { @@ -160,7 +160,7 @@ const CustomCondition = (props) => { return ( <> {conditionDefVal?.length > 0 && -conditionDefVal.map((m) => { +conditionDefVal.map((m, index) => { let uiHintAttb = m.uiHint != undefined && m.uiHint != "" ? JSON.parse(m.uiHint) : ""; if (uiHintAttb != "") { @@ -249,7 +249,7 @@ const CustomCondition = (props) => { position="right" message={ - {RegexMessage.MESSAGE.policyconditioninfoicon} + {RegexMessage.MESSAGE.policyConditionInfoIcon} } /> @@ -312,7 +312,7 @@ const CustomCondition = (props) => { ); }; -const innitialState = (props) => { +const initialState = (props) => { const { type, selectProps, value } = props; let val = value; if (!val) { @@ -369,7 +369,7 @@ const Editable = (props) => { state: false, errorMSG: "" }); - const [state, dispatch] = useReducer(reducer, props, innitialState); + const [state, dispatch] = useReducer(reducer, props, initialState); const { show, value, target } = state; let isListenerAttached = false; @@ -714,7 +714,7 @@ const Editable = (props) => { ) : type === TYPE_RADIO ? ( ) : type === TYPE_INPUT ? ( - + ) : type === TYPE_CUSTOM ? ( , ', \", `) for policy name.", userNameValidationMsg: ( <> @@ -49,7 +49,7 @@ export const RegexMessage = { ), -policyconditioninfoicon: +policyConditionInfoIcon: "1. JavaScript Condition Examples :\ country_code == 'USA', time_range >= 900 time_range <= 1800 etc.\ 2. Dragging bottom-right corner of javascript condition editor(Textarea) can resizable", diff --git a/security-admin/src/main/webapp/react-webapp/src/utils/XAUtils.js b/security-admin/src/main/webapp/react-webapp/src/utils/XAUtils.js index 20dece45f..93629855c 100644 --- a/security-admin/src/main/webapp/react-webapp/src/utils/XAUtils.js +++ b/security-admin/src/main/webapp/react-webapp/src/utils/XAUtils.js @@ -19,7 +19,13 @@ import