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

#41: Allow configuring startup timeout #40

Merged
merged 15 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ server/versionsMavenPluginRules.xml linguist-gene
dependencies.md linguist-generated=true
doc/changes/changelog.md linguist-generated=true
go-client/go.sum linguist-generated=true

server/.settings/org.eclipse.jdt.core.prefs linguist-generated=true
server/.settings/org.eclipse.jdt.ui.prefs linguist-generated=true
8 changes: 5 additions & 3 deletions .github/workflows/broken_links_checker.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .github/workflows/ci-build-next-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
cancel-in-progress: true
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
distribution: "temurin"
java-version: 17
cache: 'maven'
cache: "maven"
- name: Run tests and build with Maven
run: |
mvn --file server/ --batch-mode --update-snapshots clean package -DtrimStackTrace=false \
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,23 @@ jobs:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
steps:
- name: Free Disk Space
run: |
sudo rm -rf /usr/local/lib/android
sudo rm -rf /usr/share/dotnet
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
distribution: "temurin"
java-version: 11
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.19
id: go
go-version: "1.20"
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dependencies_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
distribution: "temurin"
java-version: 11
cache: 'maven'
cache: "maven"
- name: Checking dependencies for vulnerabilities
run: mvn --batch-mode org.sonatype.ossindex.maven:ossindex-maven-plugin:audit --file server/pom.xml
run: mvn --batch-mode org.sonatype.ossindex.maven:ossindex-maven-plugin:audit --file server/pom.xml
6 changes: 3 additions & 3 deletions .github/workflows/project-keeper-verify.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/project-keeper.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions .github/workflows/release_droid_prepare_original_checksum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
distribution: "temurin"
java-version: 11
cache: 'maven'
cache: "maven"
- name: Enable testcontainer reuse
run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties"
- name: Run tests and build with Maven
Expand All @@ -28,4 +28,4 @@ jobs:
with:
name: original_checksum
retention-days: 5
path: original_checksum
path: original_checksum
7 changes: 3 additions & 4 deletions .github/workflows/release_droid_print_quick_checksum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
distribution: "temurin"
java-version: 11
cache: 'maven'
cache: "maven"
- name: Build with Maven skipping tests
run: mvn --file server/pom.xml --batch-mode clean verify -DskipTests
- name: Print checksum
run: echo 'checksum_start==';find server/target -maxdepth 1 -name *.jar -exec sha256sum "{}" + | xargs;echo '==checksum_end'

10 changes: 5 additions & 5 deletions .github/workflows/release_droid_upload_github_release_assets.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 28 additions & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
# https://golangci-lint.run/usage/configuration/
linters:
enable-all: false
enable-all: false
presets:
- bugs
- comment
- complexity
- error
- format
- import
- metalinter
- module
- performance
- sql
#- style
- test
- unused
disable:
- gofumpt # "gofmt" is OK for us, no need for stricter rules (https://github.com/mvdan/gofumpt)
- gci # No need to explicitly format imports using GCI (https://github.com/daixiang0/gci)
- depguard # No need to restrict imported packages (https://github.com/OpenPeeDeeP/depguard)
- goerr113 # Using static errors is not necessary (https://github.com/Djarvur/go-err113)
- wrapcheck # Wrapping errors is not necessary (https://github.com/tomarrell/wrapcheck#tldr)
- paralleltest # Running tests in parallel is not possible

# Fix later
- revive # Many naming issues, may cause breaking changes
- testpackage # Naming of test package causes compile errors in test
run:
tests: true
2 changes: 1 addition & 1 deletion .project-keeper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ sources:
path: go-client/go.mod
linkReplacements:
- https://javalin.io/javalin|https://javalin.io/
version: 0.3.3
version: 0.3.4
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ package test
import testSetupAbstraction "github.com/exasol/exasol-test-setup-abstraction-server/go-client"

func myTest() {
exasol, err := testSetupAbstraction.New().CloudSetupConfigFilePath("myConfig.json").DockerDbVersion("7.1.21").Start()
exasol, err := testSetupAbstraction.New().
CloudSetupConfigFilePath("myConfig.json").
DockerDbVersion("7.1.23").
StartupTimeout(time.Minute * 10).
Start()
if err != nil {
panic("failed to start test setup")
}
Expand Down
26 changes: 13 additions & 13 deletions dependencies.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions doc/changes/changelog.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions doc/changes/changes_0.3.4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Exasol Test Setup Abstraction Server 0.3.4, released 2023-10-19

Code name: Configure startup timeout

## Summary

This release increases the timeout for starting the server using the Go client from 500s to 10 minutes. This might be necessary in case of a slow machine. The release also allows configuring the timeout.

The release also upgrades the default Exasol version to 7.1.23.

**Note**: This release contains the following third party libraries with vulnerabilities:
* `io.netty:netty-handler`: CVE-2023-4586 CWE-300: Channel Accessible by Non-Endpoint ('Man-in-the-Middle') (6.5);
* `fr.turri:aXMLRPC`: CVE-2020-36641 CWE-611: Improper Restriction of XML External Entity Reference ('XXE') (9.8);

We assume that these vulnerabilities are not exploitable.

## Features

* #41: Added configuration for server startup timeout

## Dependency Updates

### Server for the Exasol Test-Setup Abstraction

#### Compile Dependency Updates

* Updated `com.exasol:exasol-test-setup-abstraction-java:2.0.2` to `2.0.4`
* Updated `io.javalin:javalin:5.6.1` to `5.6.3`

#### Runtime Dependency Updates

* Updated `org.slf4j:slf4j-jdk14:2.0.7` to `2.0.9`

#### Test Dependency Updates

* Updated `io.rest-assured:rest-assured:5.3.1` to `5.3.2`
* Updated `org.junit.jupiter:junit-jupiter-engine:5.9.3` to `5.10.0`
* Updated `org.junit.jupiter:junit-jupiter-params:5.9.3` to `5.10.0`
* Updated `org.mockito:mockito-junit-jupiter:5.4.0` to `5.6.0`

#### Plugin Dependency Updates

* Updated `com.exasol:error-code-crawler-maven-plugin:1.2.3` to `1.3.0`
* Updated `org.apache.maven.plugins:maven-assembly-plugin:3.5.0` to `3.6.0`
* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.3.0` to `3.4.0`
* Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.0.0` to `3.1.2`
* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.0.0` to `3.1.2`
* Updated `org.basepom.maven:duplicate-finder-maven-plugin:1.5.1` to `2.0.1`
* Updated `org.codehaus.mojo:flatten-maven-plugin:1.4.1` to `1.5.0`
* Updated `org.codehaus.mojo:versions-maven-plugin:2.15.0` to `2.16.0`
* Updated `org.jacoco:jacoco-maven-plugin:0.8.9` to `0.8.10`

### Go-client

#### Compile Dependency Updates

* Updated `golang:1.19` to `1.20`
* Updated `github.com/exasol/exasol-driver-go:v1.0.0` to `v1.0.3`

#### Test Dependency Updates

* Updated `github.com/antchfx/xmlquery:v1.3.17` to `v1.3.18`
Loading
Loading