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

#252: Upgrade extension #262

Merged
merged 41 commits into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
f7e73ff
Upgrade dependencies
kaklakariada Aug 9, 2023
d84b552
Use available version of extension-manager-integration-test-java
kaklakariada Aug 9, 2023
6ad0fa5
Update references
kaklakariada Aug 9, 2023
68c42f3
Enable project keeper for extension
kaklakariada Aug 9, 2023
96c97cb
Update changelog
kaklakariada Aug 9, 2023
1be532c
Upgrade to latest Exasol version
kaklakariada Aug 9, 2023
45002e9
Merge branch 'main' into feature/#252-extension-upgrade
morazow Aug 9, 2023
476d617
Updated pom
morazow Aug 9, 2023
38a9d57
Updated pom with dep
morazow Aug 9, 2023
0d1986d
Refactor finding installations
kaklakariada Aug 9, 2023
0201b1c
Merge branch 'feature/#252-extension-upgrade' of https://github.com/e…
kaklakariada Aug 9, 2023
804edf8
Exclude okio dependency
kaklakariada Aug 9, 2023
f8b9e7a
Refactor tests
kaklakariada Aug 9, 2023
a8d0c62
Fix building the extension
kaklakariada Aug 9, 2023
80c13bc
Fix maven warning about relocated artifact
kaklakariada Aug 9, 2023
040a097
Update alluxio container
kaklakariada Aug 9, 2023
26f6edd
Upgrade localstack
kaklakariada Aug 9, 2023
f05f5fd
Extract script validation logic
kaklakariada Aug 9, 2023
24089fa
Revert alluxio dependency version update
morazow Aug 9, 2023
ac4c5bc
Merge branch 'feature/#252-extension-upgrade' of https://github.com/e…
kaklakariada Aug 9, 2023
bb6b0f4
Add unit tests for the upgrade function
kaklakariada Aug 10, 2023
9be45aa
Add integration tests
kaklakariada Aug 10, 2023
179c6e0
Configure stricter Typescript compiler options
kaklakariada Aug 10, 2023
d1a8200
Code cleanup
kaklakariada Aug 16, 2023
0833a76
Downgrade alluxio container
kaklakariada Aug 16, 2023
0723ff3
Fix NoClassDefFoundError
kaklakariada Aug 16, 2023
65da402
Revert back to old alluxio container
kaklakariada Aug 17, 2023
fa45878
Downgrade alluxio client
kaklakariada Aug 17, 2023
2cbeb86
Run sonar build with Java 17
kaklakariada Aug 17, 2023
568f4c7
Downgrade dependencies to fix integration tests
kaklakariada Aug 17, 2023
3b0855d
Re-add exclusion for netty-all
kaklakariada Aug 17, 2023
734ba26
Fix exclusion
kaklakariada Aug 17, 2023
3770e20
Fix warning from github action
kaklakariada Aug 17, 2023
8c794ac
Fix test expectation
kaklakariada Aug 17, 2023
ae1c36f
Fix extension test
kaklakariada Aug 17, 2023
b65cec6
Setup separate build for extension
kaklakariada Aug 17, 2023
4924849
Fix npm caching
kaklakariada Aug 17, 2023
80c05fe
Fix sonar warning
kaklakariada Aug 17, 2023
7332cc2
Create config file for extension
kaklakariada Aug 17, 2023
1ae5ecf
Add dummy jar for extension tests
kaklakariada Aug 17, 2023
4ae82f3
Update release date
kaklakariada Aug 18, 2023
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 @@ -8,3 +8,6 @@ dependencies.md linguist-generated=true
pk_generated_parent.pom linguist-generated=true
doc/changes/changelog.md linguist-generated=true
extension/package-lock.json linguist-generated=true

.settings/org.eclipse.jdt.core.prefs linguist-generated=true
.settings/org.eclipse.jdt.ui.prefs linguist-generated=true
37 changes: 37 additions & 0 deletions .github/workflows/ci-build-extension.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Extension CI Build

on:
push:
branches:
- main
pull_request:

jobs:
build:
runs-on: ubuntu-22.04
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
steps:
- name: Checkout the repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Node 18
uses: actions/setup-node@v3
with:
node-version: "16"
cache: "npm"
cache-dependency-path: "extension/package-lock.json"
- name: Install dependencies
run: cd extension && npm ci
- name: Prepare dummy jar file
run: |
mkdir target
echo "dummy jar content" > target/exasol-cloud-storage-extension-2.7.3.jar
- name: Run build
run: cd extension && npm run build
- name: Run tests
run: cd extension && npm test
- name: Run linter
run: cd extension && npm run lint
10 changes: 8 additions & 2 deletions .github/workflows/ci-build-next-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,16 @@ jobs:
- 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 --batch-mode --update-snapshots clean javadoc:javadoc -DtrimStackTrace=false \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
- name: Publish Test Report
uses: scacap/action-surefire-report@v1
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
fail_if_no_tests: false
33 changes: 20 additions & 13 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,28 @@ jobs:
build:
name: Build with Exasol ${{ matrix.exasol-docker-version }}
runs-on: ubuntu-latest
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-exasol-${{ matrix.exasol-docker-version }}
cancel-in-progress: true
strategy:
fail-fast: false
matrix:
exasol-docker-version: [ "7.1.21" ]
exasol-docker-version: ["7.1.22"]
env:
DEFAULT_DOCKER_DB_VERSION: "7.1.21"
DEFAULT_DOCKER_DB_VERSION: "7.1.22"
steps:
- name: Checkout the repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up JDK 11
- name: Set up JDK 11 & 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 11
cache: 'maven'
distribution: "temurin"
java-version: |
17
11
cache: "maven"
- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
Expand All @@ -35,9 +40,11 @@ jobs:
restore-keys: ${{ runner.os }}-sonar

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: "1.20"
cache: false

- name: Cache Go modules
uses: actions/cache@v3
with:
Expand All @@ -54,26 +61,26 @@ jobs:
run: mvn --batch-mode clean compile test-compile scalastyle:check scalafix:scalafix
- name: Run tests and build with Maven
run: |
mvn --batch-mode clean verify \
JAVA_HOME=$JAVA_HOME_11_X64 mvn --batch-mode clean verify \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-DtrimStackTrace=false \
-Dcom.exasol.dockerdb.image=${{ matrix.exasol-docker-version }}
env:
EXASOL_DOCKER_VERSION: ${{ matrix.exasol-docker-version }}
- name: Publish Test Report
uses: scacap/action-surefire-report@v1
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' && startsWith(matrix.exasol-docker-version, '7.1') }}
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
- name: Sonar analysis
if: ${{ env.SONAR_TOKEN != null && startsWith(matrix.exasol-docker-version, '7.1') }}
if: ${{ env.SONAR_TOKEN != null && matrix.exasol-docker-version == env.DEFAULT_DOCKER_DB_VERSION }}
run: |
mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
JAVA_HOME=$JAVA_HOME_17_X64 mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-DtrimStackTrace=false \
-Dsonar.organization=exasol \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.login=$SONAR_TOKEN
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/release_droid_prepare_original_checksum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:

env:
DEFAULT_DOCKER_DB_VERSION: "7.1.21"
DEFAULT_DOCKER_DB_VERSION: "7.1.22"

jobs:
build:
Expand All @@ -17,9 +17,9 @@ jobs:
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
distribution: "temurin"
java-version: 11
cache: 'maven'
cache: "maven"
- name: Set up Go
uses: actions/setup-go@v3
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ tmp/
.project
.scala_dependencies
*.sc
/.settings/org.eclipse.core.resources.prefs
/.settings/org.eclipse.jdt.apt.core.prefs

# Ensime
.ensime
Expand Down
5 changes: 4 additions & 1 deletion .project-keeper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ sources:
modules:
- jar_artifact
- integration_tests
- type: npm
path: extension/package.json
version:
fromSource: pom.xml
linkReplacements:
- "http://wiki.fasterxml.com/JacksonModuleScala|https://github.com/FasterXML/jackson-module-scala"
- "https://netty.io/netty-all/|https://netty.io/"
Expand All @@ -20,4 +24,3 @@ excludes:
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build-next-java.yml'"
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_upload_github_release_assets.yml'"
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_prepare_original_checksum.yml'"
- regex: "(?s)E-PK-CORE-53: The dependencies.md file has outdated content.*"
Loading