Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TH2-5234] Provided ability to limit messageIds request by lookupLimitDays argument #367

Merged
merged 5 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Nikita-Smirnov-Exactpro marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM gradle:7.6-jdk11 AS build
FROM gradle:8.7-jdk11 AS build
ARG Prelease_version=0.0.0
COPY ./ .
RUN gradle clean build dockerPrepare -Prelease_version=${Prelease_version}

FROM adoptopenjdk/openjdk11:alpine
ENV CRADLE_INSTANCE_NAME=instance1 \

Check warning on line 7 in Dockerfile

View workflow job for this annotation

GitHub Actions / build-job / Build Docker image and push to ghcr.io / docker-push

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "CASSANDRA_PASSWORD") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
CASSANDRA_DATA_CENTER=kos \
CASSANDRA_HOST=cassandra \
CASSANDRA_PORT=9042 \
Expand Down
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Report data provider (5.11.0)
# Report data provider (5.13.0)

# Overview
This component serves as a backend for rpt-viewer. It will connect to the cassandra database via cradle api and expose the data stored in there as REST resources.
Expand Down Expand Up @@ -295,6 +295,17 @@ spec:

# Release notes

## 5.13.0
* Provided ability to limit `messageIds` request by `lookupLimitDays` argument or `messageIdsLookupLimit` option
* Updated:
* th2 gradle plugin: `0.1.1`
* common: `5.14.0-dev`
* gradle api: `5.4.2-dev`
* common-utils: `2.3.0-dev`
* ktor-bom: `2.3.12`
* ehcache: `3.10.8`
* kotlin-logging: `5.1.4`

## 5.12.0
* Migrate to th2 gradle plugin `0.0.8`
* Updated common: `5.12.0-dev`
Expand Down
24 changes: 11 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id 'org.jetbrains.kotlin.jvm' version '1.8.22'
id "com.exactpro.th2.gradle.component" version "0.0.8"
id "com.exactpro.th2.gradle.component" version "0.1.1"
id 'application'
}

ext {
dockerImageVersion = release_version
cradleVersion = '5.3.0-dev'
cradleVersion = '5.4.2-dev'
}

group 'com.exactpro.th2'
Expand Down Expand Up @@ -42,45 +42,43 @@ dependencies {
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'

implementation group: 'net.jpountz.lz4', name: 'lz4', version: '1.3.0'

implementation 'org.apache.commons:commons-lang3'

implementation('com.exactpro.th2:common:5.12.0-dev') {
implementation('com.exactpro.th2:common:5.14.0-dev') {
exclude group: 'com.exactpro.th2', module: 'cradle-core'
exclude group: 'com.exactpro.th2', module: 'cradle-cassandra'
}
implementation 'com.exactpro.th2:common-utils:2.2.3-dev'
implementation 'com.exactpro.th2:common-utils:2.3.0-dev'

implementation "com.exactpro.th2:cradle-core:${cradleVersion}"

implementation "com.exactpro.th2:cradle-cassandra:${cradleVersion}"

implementation 'com.exactpro.th2:grpc-data-provider:0.2.0-dev'

implementation 'io.github.microutils:kotlin-logging:3.0.5'
implementation 'io.github.oshai:kotlin-logging:5.1.4'

implementation 'io.prometheus:simpleclient'

implementation(platform('io.ktor:ktor-bom:2.3.3'))
implementation(platform('io.ktor:ktor-bom:2.3.12'))
implementation 'io.ktor:ktor-server-netty'
implementation 'io.ktor:ktor-server'

implementation 'org.ehcache:ehcache:3.8.1'
implementation 'org.ehcache:ehcache:3.10.8'
implementation('org.glassfish.jaxb:jaxb-runtime:2.3.9') {
because("'2.3.9' version has 'EDL 1.0' license instead of 'CDDL GPL 1.1' in the '2.3.1'")
}

testImplementation('io.mockk:mockk:1.12.4') { // The last version bases on kotlin 1.6.0
testImplementation('io.mockk:mockk:1.13.12') { // The last version bases on kotlin 1.6.0
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-reflect' // because we need kotlin reflect with different version
}
testImplementation('org.jetbrains.kotlin:kotlin-reflect') {
because('mockk needs it')
}
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.2"
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
testImplementation "org.junit.jupiter:junit-jupiter-params:5.11.0"

testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.0'
}

tasks.withType(KotlinCompile).configureEach {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
################################################################################

kotlin.code.style=official
release_version=5.12.0
release_version=5.13.0
docker_image_name=
22 changes: 3 additions & 19 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
################################################################################
# Copyright 2009-2020 Exactpro (Exactpro Systems Limited)
#
# 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
#
# http://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.
################################################################################

#Tue Apr 14 11:21:33 MSK 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading