Merge branch 'develop'

Author: rootelement

.circleci/config.yml

@@ -38,7 +38,7 @@ builddeploy_steps: &builddeploy_steps
             source awsenvconf
             ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
             source buildenvvar
-            ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
+            ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-global-informix-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
 
 
 jobs:
@@ -70,6 +70,7 @@ workflows:
             branches:
               only:
                 - develop
+                - feature/negative_length_error_fix
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

build.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
 set -eo pipefail
-APP_NAME=$1
 UPDATE_CACHE=""
-#docker-compose -f docker/docker-compose.yml build $APP_NAME
-docker build -f docker/Dockerfile -t $APP_NAME:latest .
-docker create --name app $APP_NAME:latest
+docker-compose -f docker/docker-compose.yml build legacy-challenge-processor
+docker create --name app legacy-challenge-processor:latest
 
 if [ -d node_modules ]
 then
@@ -20,4 +18,5 @@ fi
 if [ "$UPDATE_CACHE" == 1 ]
 then
   docker cp app:/app/node_modules .
-fi
+fi
+

config/default.js

@@ -29,6 +29,21 @@ module.exports = {
   AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET || '',
   AUTH0_PROXY_SERVER_URL: process.env.AUTH0_PROXY_SERVER_URL,
 
+  INFORMIX: {
+    SERVER: process.env.INFORMIX_SERVER || 'informixoltp_tcp', // informix server
+    DATABASE: process.env.INFORMIX_DATABASE || 'tcs_catalog', // informix database
+    HOST: process.env.INFORMIX_HOST || 'localhost', // host
+    PROTOCOL: process.env.INFORMIX_PROTOCOL || 'onsoctcp',
+    PORT: process.env.INFORMIX_PORT || '2021', // port
+    DB_LOCALE: process.env.INFORMIX_DB_LOCALE || 'en_US.57372',
+    USER: process.env.INFORMIX_USER || 'informix', // user
+    PASSWORD: process.env.INFORMIX_PASSWORD || '1nf0rm1x', // password
+    POOL_MAX_SIZE: parseInt(process.env.MAXPOOL, 10) || 60,
+    maxsize: parseInt(process.env.MAXSIZE) || 0,
+    minpool: parseInt(process.env.MINPOOL, 10) || 1,
+    idleTimeout: parseInt(process.env.IDLETIMEOUT, 10) || 3600,
+    timeout: parseInt(process.env.TIMEOUT, 10) || 30000
+  },
   // Topcoder APIs
   V5_CHALLENGE_API_URL: process.env.V5_CHALLENGE_API_URL || 'http://localhost:4000/v5/challenges',
   V5_CHALLENGE_TYPE_API_URL: process.env.V5_CHALLENGE_TYPE_API_URL || 'http://localhost:4000/v5/challenge-types',

docker/Dockerfile

@@ -1,8 +1,49 @@
-FROM node:12
+FROM ibmcom/informix-innovator-c:12.10.FC12W1IE
+
+ARG servername=informix
+
+USER root
+RUN mkdir /app
+WORKDIR /home/informix
+
+RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \
+    echo "deb http://ftp.debian.org/debian/ stretch main non-free contrib" >/etc/apt/sources.list && \
+    echo "deb http://security.debian.org/ stretch/updates main contrib non-free" >>/etc/apt/sources.list
+
+RUN apt-get -qq update && \
+    apt-get -qq install -y wget gcc-6 g++-6 make xz-utils python2.7 git curl
+
+RUN wget -q -O node10.tar.xz https://nodejs.org/dist/v10.15.1/node-v10.15.1-linux-x64.tar.xz \
+   && tar xfJ node10.tar.xz && rm -rf node10.tar.xz
+
+ENV SERVERNAME=$servername
+
+COPY docker/esql /opt/ibm/informix/bin/
+
+RUN chmod +x /opt/ibm/informix/bin/esql
+RUN echo "informixoltp_tcp        onsoctcp        $SERVERNAME               sqlexec" \
+  > /opt/ibm/informix/etc/sqlhosts.informixoltp_tcp
+
+ENV INFORMIXDIR /opt/ibm/informix
+ENV INFORMIX_HOME /home/informix
+ENV INFORMIXSERVER informixoltp_tcp
+ENV INFORMIXTERM terminfo
+ENV CLIENT_LOCALE=en_US.utf8
+ENV DB_LOCALE=en_US.utf8
+ENV DBDATE Y4MD-
+ENV DBDELIMITER "|"
+ENV PATH /home/informix/node-v10.15.1-linux-x64/bin:${INFORMIXDIR}/bin:${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${PATH}
+ENV LD_LIBRARY_PATH ${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${INFORMIXDIR}/lib/cli
+ENV INFORMIXSQLHOSTS /opt/ibm/informix/etc/sqlhosts.informixoltp_tcp
+ENV USER root
+ENV LICENSE accept
+
+RUN ln -s /usr/bin/python2.7 /usr/bin/python
+RUN echo "sqlexec 2021/tcp" >> /etc/services
+
 COPY . /app
 
 WORKDIR /app
-
 RUN rm -rf node_modules && npm install --unsafe-perm
 
-ENTRYPOINT ["npm", "start"]
+ENTRYPOINT [ "npm", "start" ]

docker/api.env

@@ -6,7 +6,3 @@ services:
     build:
       context: ../
       dockerfile: docker/Dockerfile
-    env_file:
-      - api.env
-    network_mode: "host"
-    command: run start

docker/docker-compose.yml

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh 
 : '
 : ************************************************************************
 :
@@ -35,7 +35,7 @@ LDF="-Wl,--no-as-needed"
 
 Usage()
 {
-    echo '
+    echo ' 
 Usage: esql [-e] [-thread] [-glu] [esqlcargs] [-cc] [otherargs] [-o outfile]
             [-cp] [-onlycp] [-np] [-nup]
             [-libs] esqlfile.ec [othersrc.c...] [otherobj.o...] [-lyourlib...]
@@ -58,10 +58,10 @@ Usage: esql [-e] [-thread] [-glu] [esqlcargs] [-cc] [otherargs] [-o outfile]
 
 
 if [  x$UNAMEM = "xx86_64" ]
-then
+then 
     CC="$CC $CC_AMD32"
     CPP="$CPP $CC_AMD32"
-else
+else 
     CC=$CC
     CPP=$CPP
 fi
@@ -215,20 +215,20 @@ LPATH=${LPATH=${INFDIR}/lib}
 
 nettli="FALSE"
 # check for the existence of libraries specified in TLILIB
-if test "x$TLILIB" != "x " -a "x$TLILIB" != "x"
+if test "x$TLILIB" != "x " -a "x$TLILIB" != "x" 
 then
     for lib in $TLILIB
     do
         if test -f $lib
         then
             nettli="TRUE"
-            break
+            break 
         else
             continue
         fi
     done
     # Update SYSNLIB if nettli is false
-    if test "$nettli" = "FALSE"
+    if test "$nettli" = "FALSE" 
     then
         remove=`echo $lib | sed -e s:\/.*\/lib:-l: -e s:[.].*$::`
         SYSNLIB=`echo $SYSNLIB | sed -e s:"$remove":: `
@@ -250,7 +250,7 @@ esac
 
 ONLYCFILES=
 
-while true
+while true 
 do
     case $1 in
         *.c )
@@ -414,8 +414,8 @@ do
                         exit 1
                     fi
                 fi
-                CC="$CC_TH -DIFX_THREAD -D_REENTRANT"
-                CPP="$CPP_TH -DIFX_THREAD -D_REENTRANT"
+                CC="$CC_TH -DIFX_THREAD -D_REENTRANT" 
+                CPP="$CPP_TH -DIFX_THREAD -D_REENTRANT" 
                 SYSLIB="$SYSTHRLIB"
                 SYSNLIB="$SYSNLIB"
             fi
@@ -650,7 +650,7 @@ do
                 PA="$PA $1"
             fi
             shift
-            ;;
+            ;;   
         -local )
             if [ "x$CCOPT" != "x" ]
             then
@@ -749,7 +749,7 @@ do
                 A="$A $1"
                 CA="$CA $1"
                 CPPOPTS="$CPPOPTS $1"
-            fi
+            fi 
             shift
             ;;
 
@@ -804,7 +804,7 @@ do
             if [ "$UPROTECTOPT" != "-n" ]; then
                 $UPROTECT $UPROTECTOPT < $cpoutput > $base.icp
             fi
-
+ 
             if [ "$STAT" = 0 ]; then
                 rm -f $base.tmp $base.pcp
             fi