Fixed bad query syntax and adjusted runtime script for new groups; advancing version number to 1.5.4.

Author: Mike Simpson

DEPLOY.md

@@ -118,16 +118,16 @@ In a terminal window on my local workstation:
         
             $ git clone https://github.com/ualibraries/patron-groups.git ual-patron-groups
             $ cd ual-patron-groups
-            $ git checkout v1.5.3
+            $ git checkout v1.5.4
             
             $ cd src/main/python
             $ sudo pip3 install --trusted-host pypi.python.org -r requirements.txt
             $ python3 setup.py sdist
             $ cd ../../..
             
             $ cd src/main/docker
-            $ cp ../python/dist/petal-1.5.3.tar.gz .
-            $ docker build -t pgrps:1.5.3 .
+            $ cp ../python/dist/petal-1.5.4.tar.gz .
+            $ docker build -t pgrps:1.5.4 .
             $ cd ../../..
 
             $ export LDAP_PASSWD=[ldap password]
@@ -136,4 +136,4 @@ In a terminal window on my local workstation:
             $ docker run -e "LDAP_PASSWD=${LDAP_PASSWD}" \
                          -e "GROUPER_PASSWD=${GROUPER_PASSWD}" \
                          -e "SLACK_WEBHOOK=${SLACK_WEBHOOK}" \
-                         --rm -d pgrps:1.5.3
+                         --rm -d pgrps:1.5.4

README.md

@@ -97,7 +97,7 @@ prerequisites, and then build a source distribution of the module:
     % python setup.py sdist
 
         % ls dist
-        petal-1.5.3.tar.gz
+        petal-1.5.4.tar.gz
         
     % cd ../../..
 
@@ -107,12 +107,12 @@ Change to the Docker source directory, copy the distribution file over
 from the Python side, and build the Docker container image:
 
     % cd src/main/docker
-    % cp ../python/dist/petal-1.5.3.tar.gz .
-    % docker build -t pgrps:1.5.3 .
+    % cp ../python/dist/petal-1.5.4.tar.gz .
+    % docker build -t pgrps:1.5.4 .
 
         % docker images
         REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-        pgrps               1.5.3               16cfafa9d0f1        12 seconds ago      80.1MB
+        pgrps               1.5.4               16cfafa9d0f1        12 seconds ago      80.1MB
         
     % cd ../../..
 
@@ -138,7 +138,7 @@ hand, instantiate using an interactive shell:
     % docker run -e "LDAP_PASSWD=${LDAP_PASSWD}" \
                  -e "GROUPER_PASSWD=${GROUPER_PASSWD}" \
                  -e "SLACK_WEBHOOK=${SLACK_WEBHOOK}" \
-                 --rm -it pgrps:1.5.3 /bin/bash
+                 --rm -it pgrps:1.5.4 /bin/bash
 
         # which petl
         /usr/bin/petl
@@ -161,7 +161,7 @@ in the background:
     % docker run -e "LDAP_PASSWD=${LDAP_PASSWD}" \
                  -e "GROUPER_PASSWD=${GROUPER_PASSWD}" \
                  -e "SLACK_WEBHOOK=${SLACK_WEBHOOK}" \
-                 --rm -d pgrps:1.5.3
+                 --rm -d pgrps:1.5.4
 
 The log output from the "run_petl" invocation should once again wind
 up in the Slack channel associated with the "SLACK_WEBHOOK"

src/main/docker/Dockerfile

@@ -5,7 +5,7 @@ ENV PACKAGES="dumb-init bash python3 python3-dev ca-certificates tzdata" \
     GROUPER_PASSWD="***supply at runtime***" \
     SLACK_WEBHOOK="***supply at runtime***"
 
-ADD petal-1.5.3.tar.gz /var/tmp
+ADD petal-1.5.4.tar.gz /var/tmp
 ADD run_petl /etc/periodic/daily
 
 RUN echo \
@@ -27,8 +27,8 @@ RUN echo \
   && echo "US/Arizona" >  /etc/timezone \
   #
   # install petal
-  && pip install --trusted-host pypi.python.org -r /var/tmp/petal-1.5.3/requirements.txt \
-  && pip install /var/tmp/petal-1.5.3
+  && pip install --trusted-host pypi.python.org -r /var/tmp/petal-1.5.4/requirements.txt \
+  && pip install /var/tmp/petal-1.5.4
 
 ENTRYPOINT [ "/usr/bin/dumb-init", "--" ]
 CMD [ "/usr/sbin/crond", "-f" ]

src/main/docker/run_petl

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-for g in faculty-base staff-base students-base dcc-base retirees-base hsl-base
+for g in faculty-base staff-base students-base ugrads-base grads-base dcc-base retirees-base hsl-base law-base
 do
     /usr/bin/petl --config /etc/petal/petl.ini \
                   --group ${g} \

src/main/python/config/petl.ini

@@ -111,7 +111,7 @@ ldap_query        =
             (isMemberOf=arizona.edu:course:*:*:*:*:*:*:learner)
             (! (studentcpp=*:*:UGRD:*:*:*:*:*:*:*))
         )
-        (
+        (&
             (eduPersonAffiliation=student)
             (isMemberOf=arizona.edu:course:*:*:*:*:*:*:learner)
             (studenthonorsactive=y)

src/main/python/src/petal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.5.3'
+__version__ = '1.5.4'
 
 from .ldap_query import LDAPQuery
 from .grouper_query import GrouperQuery