Commit 547ee80a authored by Alex Aisting's avatar Alex Aisting

* Cloned from develop

parent 50ff3f4e
Pipeline #791 failed
HELP.md
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**
!**/src/test/**
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
out/
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/test-output/
/.nb-gradle/
### VS Code ###
.vscode/
stages:
- build
- deploy
include:
- project: "contact-tracing/dev-ops"
file: "/gitlab/infectionconfirmer/.gitlab-ci-image-build.yml"
- project: "contact-tracing/dev-ops"
file: "/gitlab/infectionconfirmer/.gitlab-ci-deploy.yml"
\ No newline at end of file
## Build jar file
FROM docker.repo.tehik.ee/gradle:5.5.1-jdk11 as builder
ENV GRADLE_USER_HOME=`pwd`/.gradle
RUN mkdir -p /opt/build
COPY . /opt/build
WORKDIR /opt/build
RUN gradle build \
&& gradle --build-cache assemble
# Run jar file
FROM docker.repo.tehik.ee/openjdk:11
ENV JAR_FILE="infectionconfirmer-0.0.1-SNAPSHOT.jar"
COPY --from=builder /opt/build/build/libs/$JAR_FILE $USER_HOME/app.jar
COPY hsm/libcs_pkcs11_R2_live.so /usr/lib/libcs_pkcs11_R2.so
COPY hsm/libcs_pkcs11_R2.so /usr/lib/libcs_pkcs11_R2_test.so
## This file in config_map will be mounted by volume COPY hsm/cs_pkcs11_R2.cfg /etc/utimaco/
CMD java $JAVA_OPTS -Dspring.profiles.active=${PROFILE} -Djava.security.egd=file:/dev/./urandom -jar $USER_HOME/app.jar
FROM adoptopenjdk/openjdk11
ARG env
ENV JAR_FILE="infectionconfirmer-0.0.1-SNAPSHOT.jar"
ENV JAR_PATH="./build/libs"
VOLUME /tmp
COPY hsm/cs_pkcs11_R2.cfg /etc/utimaco/
COPY hsm/libcs_pkcs11_R2.so /usr/lib/
COPY $JAR_PATH/$JAR_FILE $USER_HOME/app.jar
CMD java $JAVA_OPTS -Dspring.profiles.active=$env -Djava.security.egd=file:/dev/./urandom -jar $USER_HOME/app.jar
\ No newline at end of file
# infection-confirmer
plugins {
id 'org.springframework.boot' version '2.2.6.RELEASE'
id 'io.spring.dependency-management' version '1.0.9.RELEASE'
id 'java'
id "org.sonarqube" version "2.7"
id 'jacoco'
}
group = 'ee.tracker'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '11'
configurations {
developmentOnly
runtimeClasspath {
extendsFrom developmentOnly
}
compileOnly {
extendsFrom annotationProcessor
}
}
repositories {
mavenCentral()
maven {
url 'https://maven.icefire-lab.eu/repository'
}
}
sonarqube {
properties {
property 'sonar.coverage.exclusions', "**/ee/tracker/infectionconfirmer/tests/**,**/ee/tracker/infectionconfirmer/controllers/**,**/ee/tracker/infectionconfirmer/entity/**"
}
}
dependencies {
compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.9.2'
compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.9.2'
compile "io.springfox:springfox-bean-validators:2.9.2"
annotationProcessor 'org.projectlombok:lombok'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.projectlombok:lombok'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'org.liquibase:liquibase-core:3.8.0'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.2.0.RELEASE'
implementation 'org.springframework.boot:spring-boot-starter-log4j2'
implementation 'org.postgresql:postgresql:42.2.9'
implementation 'org.hsqldb:hsqldb:2.4.0'
implementation 'com.nimbusds:nimbus-jose-jwt:8.3'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
implementation 'org.springframework.boot:spring-boot-starter-test:2.2.0.RELEASE'
implementation 'org.testng:testng:7.0.0'
implementation 'commons-codec:commons-codec:1.14'
implementation 'commons-lang:commons-lang:2.6'
implementation 'commons-io:commons-io:2.6'
implementation 'ee.icefire:devtools:0.6-SNAPSHOT'
implementation files('libs/iaikpkcs11-wrapper-1.5.jar')
developmentOnly 'org.springframework.boot:spring-boot-devtools'
testCompile "org.mockito:mockito-core:2.+"
}
test {
useJUnitPlatform()
}
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
exec "$JAVACMD" "$@"
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
#!/usr/bin/env bash
set -e
./jenkins/gitinfo.sh > src/main/resources/build.json
mkdir -p ./src/test/java/ee/tracker/infectionconfirmer/tests/unit
cp ./src/main/java/ee/tracker/infectionconfirmer/tests/unit/* ./src/test/java/ee/tracker/infectionconfirmer/tests/unit
cp /etc/appconf/infection-confirmer/* ./src/main/resources
cp /etc/appconf/infection-confirmer-hsm/* ./hsm
./gradlew clean javadoc build -x javadoc sonarqube -Dsonar.host.url=https://sonar-dp3t.icefire-lab.eu -Dsonar.login=149d2f31ba49a25d1fc3f84bbd8c36e6daae3cd2
ls ./build/libs
#!/usr/bin/env bash
ps -fu root | grep java
./jenkins/deployImpl.sh $1 infectionconfirmer $2 $2
sudo docker image rmi $(sudo docker image ls -f='dangling=true' -q) -f || true
sudo docker build -f DockerfileIcefire --build-arg env=$1 -t $2:$1 .
set +e
sudo docker container stop $( sudo docker container ls | grep 0.0.0.0:$4 | awk '{print $1}') || true
set -e
sudo docker run -p $4:$3 -e "env=$1" $2:$1 > /var/dp3tlogs/$2-$1.log 2>&1 &
sudo docker container ls
echo "{"
echo " \"buildDate\": \""$(date "+%Y-%m-%d %H:%M:%S %z")"\","
echo " \"branch\": \""$(git rev-parse --abbrev-ref HEAD)"\","
echo " \"lastCommitHash\": \""$(git log -1 --pretty=format:%h)"\","
echo " \"lastCommitAuthor\": \""$(git log -1 --pretty=format:%ae)"\","
echo " \"lastCommitDate\": \""$(git log -1 --pretty=format:%ad --date=iso)"\","
echo " \"lastCommitComment\": \""$(git log -1 --pretty=format:%s)"\""
echo "}"
lombok.addLombokGeneratedAnnotation = true
\ No newline at end of file
apiVersion: apps/v1
kind: StatefulSet
metadata:
annotations:
labels:
app: dp3t-infectionconfirmer-__AUTH_ENVIRONMENT__
name: dp3t-infectionconfirmer-__AUTH_ENVIRONMENT__
namespace: covid-app
spec:
updateStrategy:
type: RollingUpdate
replicas: 1
selector:
matchLabels:
app: dp3t-infectionconfirmer-__AUTH_ENVIRONMENT__
serviceName: dp3t-infectionconfirmer-__AUTH_ENVIRONMENT__
template:
metadata:
annotations:
labels:
app: dp3t-infectionconfirmer-__AUTH_ENVIRONMENT__
spec:
containers:
- envFrom:
- secretRef:
name: dp3t-infectionconfirmer
optional: false
image: __CI_REGISTRY_IMAGE__:__CI_COMMIT_TAG__
imagePullPolicy: Always
name: dp3t-infectionconfirmer-__AUTH_ENVIRONMENT__
ports:
- containerPort: 8083
protocol: TCP
resources:
limits:
cpu: 1000m
memory: 1024Mi
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
imagePullSecrets:
- name: dp3t-infectionconfirmer-registry
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: dp3t-infectionconfirmeringress-__AUTH_ENVIRONMENT__
namespace: covid-app
annotations:
certmanager.k8s.io/cluster-issuer: selfsigning-issuer
ingress.kubernetes.io/proxy-body-size: 200M
nginx.ingress.kubernetes.io/proxy-body-size: 200M
nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"
nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
spec:
rules:
- host: covapp.__AUTH_ENVIRONMENT_DOMAIN__.tehik.ee
http:
paths:
- backend:
serviceName: dp3t-infectionconfirmerservice-__AUTH_ENVIRONMENT__
servicePort: 8083
path: /infectionconfirmer
tls:
- hosts:
- covapp.__AUTH_ENVIRONMENT_DOMAIN__.tehik.ee
secretName: dp3t-auth-ssl
\ No newline at end of file
apiVersion: v1
kind: Service
metadata:
annotations:
field.cattle.io/targetWorkloadIds: '["statefulset:covid-app:dp3t-infectionconfirmer-__AUTH_ENVIRONMENT__"]'
name: dp3t-infectionconfirmerservice-__AUTH_ENVIRONMENT__
namespace: covid-app
spec:
ports:
- port: 8083
protocol: TCP
targetPort: 8083
rootProject.name = 'infectionconfirmer'
\ No newline at end of file
package ee.tracker.infectionconfirmer;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@ComponentScan
@ComponentScan(basePackages = "ee.icefire.devtools")
@EnableScheduling
public class InfectionConfirmerApplication {
public static void main(String[] args) {
SpringApplication.run(InfectionConfirmerApplication.class, args); }
}
package ee.tracker.infectionconfirmer.config;
import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.context.annotation.Import;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE) //on class level
@Import(BeanValidatorPluginsConfiguration.class)
public @interface AddToSwagger {
}
\ No newline at end of file
package ee.tracker.infectionconfirmer.config;
import ee.tracker.infectionconfirmer.service.BatchService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@Configuration
@EnableScheduling
@Component
public class BatchConfiguration {
@Autowired
BatchService batchService;