Merge pull request #11 from ing-bank/update-plugin

Update plugin to latest version

Author: nielsdenissen

airlock-dev-apache-ranger/Dockerfile

@@ -2,7 +2,7 @@ FROM maven:3.5.4-jdk-8
 #FROM openjdk:8u121-jdk
 
 ARG RANGER_VERSION=1.1.0
-ARG RANGER_S3_PLUGIN_VERSION=0.0.1
+ARG RANGER_S3_PLUGIN_VERSION=0.0.2
 
 RUN curl https://jdbc.postgresql.org/download/postgresql-42.2.1.jar -o /opt/postgresql-42.2.1.jar && \
     curl http://mirrors.whoishostingthis.com/apache/ranger/${RANGER_VERSION}/apache-ranger-${RANGER_VERSION}.tar.gz -o /opt/apache-ranger-${RANGER_VERSION}.tar.gz
@@ -15,16 +15,16 @@ WORKDIR /opt
 # TODO: Tried to do some cleanup here, but that removes some necessary plugins
 RUN apt-get -q update && apt-get install -y -q python gcc \
  && apt-get autoclean \
- && tar zxvf apache-ranger-${RANGER_VERSION}.tar.gz \
+ && tar zxf apache-ranger-${RANGER_VERSION}.tar.gz \
  && rm -f apache-ranger-${RANGER_VERSION}.tar.gz \
  && cp pom.xml apache-ranger-${RANGER_VERSION} \
  && rm pom.xml \
  && cd apache-ranger-${RANGER_VERSION} \
- && mvn package assembly:assembly -DskipTests \
+ && mvn -q package assembly:assembly -DskipTests \
  && cp target/ranger-${RANGER_VERSION}-admin.tar.gz /opt \
 # && mvn clean \
  && cd /opt \
- && tar zxvf ranger-${RANGER_VERSION}-admin.tar.gz \
+ && tar zxf ranger-${RANGER_VERSION}-admin.tar.gz \
  && rm -f ranger-${RANGER_VERSION}-admin.tar.gz \
  && rm -rf apache-ranger-${RANGER_VERSION} \
  && chmod +x /opt/ranger-entrypoint.sh
@@ -42,16 +42,16 @@ RUN apt-get install -y net-tools && \
     git checkout tags/${RANGER_S3_PLUGIN_VERSION} && \
     mvn package -DskipTests && \
     mkdir -p ${RANGER_HOME}/ews/webapp/WEB-INF/classes/ranger-plugins/s3/ && \
-    mv /tmp/apache-ranger-s3-plugin/target/ranger-s3-plugin-0.1.jar ${RANGER_HOME}/ews/webapp/WEB-INF/classes/ranger-plugins/s3/ && \
+    mv /tmp/apache-ranger-s3-plugin/target/ranger-s3-plugin-0.2.jar ${RANGER_HOME}/ews/webapp/WEB-INF/classes/ranger-plugins/s3/ && \
     mvn clean && \
     cd /root && \
     rm -rf /tmp/apache-ranger-s3-plugin
 
 COPY resources /tmp/resources
 COPY setup-ranger.sh /tmp
 COPY entrypoint.sh /tmp
-COPY log4j.xml /opt/ranger-1.0.0-admin/ews/webapp/WEB-INF/log4j.xml
-COPY log4j.properties /opt/ranger-1.0.0-admin/ews/webapp/WEB-INF/log4j.properties
+COPY log4j.xml ${RANGER_HOME}/ews/webapp/WEB-INF/log4j.xml
+COPY log4j.properties ${RANGER_HOME}/ews/webapp/WEB-INF/log4j.properties
 
 RUN chmod 777 -R /tmp
 

airlock-dev-apache-ranger/log4j.properties

@@ -17,7 +17,7 @@
 #
 
 
-log4j.rootLogger = debug,xa_log_appender
+log4j.rootLogger = info,xa_log_appender
 
 
 # xa_logger

airlock-dev-apache-ranger/resources/service/ranger-service-s3.json

@@ -5,8 +5,7 @@
     "name": "testservice",
     "description": "FOR TESTING PURPOSES, test service",
     "configs": {
-        "uid": "ceph-admin",
-        "endpoint": "http://ceph:8010/admin",
+        "endpoint": "http://ceph:8010",
         "secretkey": "secretkey",
         "accesskey": "accesskey"
     }

airlock-dev-apache-ranger/resources/servicedef/ranger-servicedef-s3.json

@@ -37,28 +37,12 @@
         "itemId": 2,
         "name": "write",
         "label": "write"
-      },
-      {
-        "itemId": 3,
-        "name": "full_control",
-        "label": "Full control over bucket"
       }
     ],
     "configs":
     [
       {
         "itemId": 1,
-        "name": "uid",
-        "type": "string",
-        "subType": "",
-        "mandatory": true,
-        "validationRegEx": "",
-        "validationMessage": "",
-        "uiHint":"",
-        "label": "Admin user id"
-      },
-      {
-        "itemId": 2,
         "name": "endpoint",
         "type": "string",
         "subType": "",
@@ -69,7 +53,7 @@
         "label": "S3 Endpoint"
       },
       {
-        "itemId": 3,
+        "itemId": 2,
         "name": "accesskey",
         "type": "string",
         "subType": "",
@@ -80,7 +64,7 @@
         "label": "Access key"
       },
       {
-        "itemId": 4,
+        "itemId": 3,
         "name": "secretkey",
         "type": "password",
         "subType": "",