Skip to content

chore(deps): bump HikariCP from 4.+ to 5.0.1 #3

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
8599f8f
driver core functionality
sergiyv-improving Jun 1, 2022
ef109f2
remove unnecessary folders
sergiyv-improving Jun 1, 2022
9f4eb58
fix issue with JDBC call arguments in wrapper classes
sergiyv-improving Jun 2, 2022
b1ab8d3
add wrapper classes
sergiyv-improving Jun 3, 2022
f629eac
refactor of WrapperUtil to properly handle association between JDBC r…
sergiyv-improving Jun 7, 2022
303ddd7
refactor Plugin Manager to avoid code repetition and handle thrown ex…
sergiyv-improving Jun 9, 2022
7dc84a9
rename
sergiyv-improving Jun 9, 2022
3670ad2
introduce JdbcCallable and JdbcRunnable as a way to handle JDBC call …
sergiyv-improving Jun 9, 2022
39fb1ca
code analysis
sergiyv-improving Jun 9, 2022
3a75ccf
fix issue with a wrapper class instantiation
sergiyv-improving Jun 9, 2022
23d81da
minor renames
sergiyv-improving Jun 9, 2022
6d46925
minor renames
sergiyv-improving Jun 9, 2022
1c696ee
Merge pull request #2 from Bit-Quill/driver-core
sergiyv-improving Jun 9, 2022
e65e83e
chore: add Github workflow to run tests on manual triggers, PRs, and …
Jun 9, 2022
054a536
Set gradlew to be executable
Jun 9, 2022
c3e39a1
Add gradle wrapper file
Jun 9, 2022
17acae2
replaced openInitialConnection() in ConnectionPlugin interface with c…
sergiyv-improving Jun 9, 2022
e722c3d
Temporarily disable integration tests
Jun 10, 2022
c09fc27
Merge pull request #4 from Bit-Quill/plugin-interface-connect
sergiyv-improving Jun 10, 2022
82cf47c
Merge pull request #3 from Bit-Quill/infrastructure
crystall-bitquill Jun 10, 2022
57c5b60
Bump junit-jupiter-api from 5.6.0 to 5.8.2
dependabot[bot] Jun 10, 2022
c3ba4df
Bump checker-qual from 3.22.0 to 3.22.1
dependabot[bot] Jun 10, 2022
5d0fd0f
introduced PluginService
sergiyv-improving Jun 10, 2022
3aefce5
legal headers
sergiyv-improving Jun 10, 2022
4005415
provide target object reference for ConnectionPlugin.execute()
sergiyv-improving Jun 10, 2022
e16e88e
Merge pull request #10 from Bit-Quill/plugin-host-node-list
sergiyv-improving Jun 10, 2022
a4a6145
Merge pull request #6 from Bit-Quill/dependabot/gradle/main/org.junit…
sergiyv-improving Jun 13, 2022
e57cfe7
Merge pull request #8 from Bit-Quill/dependabot/gradle/main/org.check…
sergiyv-improving Jun 13, 2022
a47c406
feat: setNodeListProvider (#11)
karenc-bq Jun 13, 2022
fb1c9e6
notify plugins that connection changed
sergiyv-improving Jun 14, 2022
7b3d648
added unt tests
sergiyv-improving Jun 14, 2022
49ea54f
rebase
sergiyv-improving Jun 14, 2022
75eb3f0
code review
sergiyv-improving Jun 14, 2022
200ccc9
code review
sergiyv-improving Jun 14, 2022
b377356
Merge pull request #12 from Bit-Quill/notify-connection-changed
sergiyv-improving Jun 14, 2022
0c90c6a
Connection string provider (#14)
karenc-bq Jun 14, 2022
7239e20
Add checkstyle and auto formatting (#13)
crystall-bitquill Jun 15, 2022
6976cdf
feat: implement setReadOnly (#16)
karenc-bq Jun 15, 2022
ac6bc26
notify plugin about host list changed
sergiyv-improving Jun 15, 2022
8e8b649
notify plugin about host list changed
sergiyv-improving Jun 15, 2022
99e5e64
minor changes
sergiyv-improving Jun 15, 2022
f857bb4
code review
sergiyv-improving Jun 15, 2022
d1c865a
code review
sergiyv-improving Jun 15, 2022
f57bc64
Merge pull request #18 from Bit-Quill/notify-topology-changed
sergiyv-improving Jun 15, 2022
b09c306
test: unit test for connectionUrlParser (#15)
karenc-bq Jun 15, 2022
e7e960b
introduce marker interfaces for host list providers (#20)
sergiyv-improving Jun 16, 2022
a459deb
Add code coverage check (#19)
crystall-bitquill Jun 16, 2022
fc6f609
Exclude Spotless check, fail on Checkstyle warnings (#21)
crystall-bitquill Jun 16, 2022
c5f5808
fix: nullpointer exception raised due to currentHostSpec not being se…
karenc-bq Jun 16, 2022
46a164d
configuration profiles (#24)
sergiyv-improving Jun 18, 2022
11f40fc
Plugin manager release resources (#26)
sergiyv-improving Jun 21, 2022
a35fb3c
chore: update copyright headers (#28)
karenc-bq Jun 21, 2022
b9c85bb
Token Substitute for DriverInfo (#27)
crystall-bitquill Jun 21, 2022
e0addb3
fix issue with empty database in connection string (#29)
sergiyv-improving Jun 22, 2022
38051d0
feat: implement inTransaction status (#23)
karenc-bq Jun 22, 2022
ef6ed0d
feat: implement AuroraHostListProvider (#25)
karenc-bq Jun 22, 2022
ad90a15
chore: add spotbugs plugin for static code analysis (#30)
crystall-bitquill Jun 22, 2022
51c2e62
Bump checker-qual from 3.22.1 to 3.22.2 (#17)
dependabot[bot] Jun 22, 2022
573dbde
chore: restructure project to allow subprojects (#31)
karenc-bq Jun 24, 2022
5319d07
wip
Jun 23, 2022
f784e59
Fixed some docker problems
Jun 28, 2022
b4fa34c
Configure logging
Jun 29, 2022
0825889
Synchronization for JDBC calls (#36)
crystall-bitquill Jun 29, 2022
33a2051
adjust socket/connect timeout, adjust testcontainers versions
Jun 30, 2022
c688253
Run standard Postgres integration tests as part of GitHub Actions
Jun 30, 2022
bc30556
Merge branch 'main' into integration
Jun 30, 2022
88844ce
Adjust test environment variable names
Jul 1, 2022
83e7b12
Fix issue where standard postgres test host and standard postgres con…
Jul 4, 2022
59fe479
Add missing dependency
Jul 4, 2022
69c2575
More environment variable renaming
Jul 4, 2022
947c52e
Standard Postgres tests working
Jul 4, 2022
02606b0
Add gitattributes file to control line endings for gradlew
Jul 4, 2022
68eb5f9
Remove dos2unix command
Jul 4, 2022
04b7997
Run container tests from jar
Jul 5, 2022
e3a9a87
Enable gh actions
Jul 5, 2022
d261d27
chore: update license (#38)
karenc-bq Jul 5, 2022
34121ea
Rework WrapperUtils reentrant lock to be part of the ConnectionPlugin…
crystall-bitquill Jul 6, 2022
3bf93af
chore: add resource bundle for log and error messages (#44)
karenc-bq Jul 7, 2022
1d0e8f9
Cache plugin (#39)
sergiyv-improving Jul 8, 2022
6f2ea32
chore(deps): bump com.diffplug.spotless from 6.7.2 to 6.8.0 (#42)
dependabot[bot] Jul 8, 2022
de652c2
chore(deps): bump me.champeau.gradle.jmh from 0.5.0 to 0.5.3 (#33)
dependabot[bot] Jul 8, 2022
32d8739
Fix ConnectionUrlParserTest failures, register driver in setup for St…
Jul 11, 2022
1c73c82
Register driver properly in StandardPostgresBaseTest
Jul 11, 2022
31df2b0
update dependencies versions (#46)
sergiyv-improving Jul 11, 2022
76718de
Remove upterm session
Jul 11, 2022
fffc96f
Merge branch 'main' into integration
Jul 11, 2022
688ce85
Update env variable names in main.yml
Jul 11, 2022
3e0e90c
Add jar to testImplementation configuration
Jul 11, 2022
e387fa7
Change default cluster region
Jul 11, 2022
fec37c7
test: add benchmarks for the driver proxy (#37)
karenc-bq Jul 11, 2022
7e0e309
Add license header to test build.gradle.kts file
Jul 11, 2022
2905743
Update patch version of dependencies
Jul 11, 2022
36af0f4
Re-enable code analysis
Jul 11, 2022
40ee407
Implement integration test framework
aaron-congo Jul 11, 2022
7e88896
Update README.md
sergiyvamz Jul 11, 2022
8d27805
chore(deps): bump HikariCP from 4.+ to 5.0.1
dependabot[bot] Jul 11, 2022
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: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* text=auto
gradlew text eol=lf
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: "gradle"
directory: "/"
target-branch: "main"
schedule:
interval: "weekly"
11 changes: 11 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
### Summary

<!--- General summary / title -->

### Description

<!--- Details of what you changed -->

### Additional Reviewers

<!-- Any additional reviewers -->
128 changes: 128 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
name: Main CI

on:
workflow_dispatch:
push:
branches:
- main
pull_request:
branches:
- '*'
paths-ignore:
- '**/*.md'

concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
build-driver:
name: 'Run non-container integration tests'
runs-on: ubuntu-latest
steps:
- name: 'Clone repository'
uses: actions/checkout@v2

- name: 'Set up JDK 8'
uses: actions/setup-java@v1
with:
java-version: 8

- name: 'Run all checks'
run: ./gradlew check

- name: 'Generate code coverage report'
run: ./gradlew jacocoTestReport

- name: 'Archive test results'
if: always()
uses: actions/upload-artifact@v3
with:
name: 'junit-report'
path: ./driver-proxy/build/reports/tests/test/
retention-days: 3

- name: 'Archive Coverage Report'
if: always()
uses: actions/upload-artifact@v3
with:
name: 'coverage-report'
path: ./driver-proxy/build/reports/jacoco/test/
retention-days: 3

aurora-postgres-integration-tests:
concurrency: IntegrationTests
name: 'Run Aurora Postgres container integration tests'
runs-on: ubuntu-latest
steps:
- name: 'Clone repository'
uses: actions/checkout@v2
with:
fetch-depth: 50
- name: 'Set up JDK 8'
uses: actions/setup-java@v1
with:
java-version: 8
- name: 'Configure AWS credentials'
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
- name: 'Set up temp AWS credentials'
run: |
creds=($(aws sts get-session-token \
--duration-seconds 3600 \
--query 'Credentials.[AccessKeyId, SecretAccessKey, SessionToken]' \
--output text \
| xargs));
echo "::add-mask::${creds[0]}"
echo "::add-mask::${creds[1]}"
echo "::add-mask::${creds[2]}"
echo "TEMP_AWS_ACCESS_KEY_ID=${creds[0]}" >> $GITHUB_ENV
echo "TEMP_AWS_SECRET_ACCESS_KEY=${creds[1]}" >> $GITHUB_ENV
echo "TEMP_AWS_SESSION_TOKEN=${creds[2]}" >> $GITHUB_ENV
- name: 'Run integration tests'
run: |
./gradlew --no-parallel --no-daemon test-integration-aurora-postgres
env:
AURORA_POSTGRES_CLUSTER_IDENTIFIER: ${{ secrets.AURORA_POSTGRES_CLUSTER_IDENTIFIER }}-${{ github.run_id }}
AURORA_POSTGRES_USERNAME: ${{ secrets.AURORA_POSTGRES_USERNAME }}
AURORA_POSTGRES_PASSWORD: ${{ secrets.AURORA_POSTGRES_PASSWORD }}
AWS_ACCESS_KEY_ID: ${{ env.TEMP_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ env.TEMP_AWS_SECRET_ACCESS_KEY }}
AWS_SESSION_TOKEN: ${{ env.TEMP_AWS_SESSION_TOKEN }}
- name: 'Archive junit results'
if: always()
uses: actions/upload-artifact@v2
with:
name: 'junit-report'
path: ./driver-proxy/build/reports/tests/
retention-days: 5

standard-postgres-integration-tests:
concurrency: IntegrationTests
name: 'Run Standard Postgres container integration tests'
runs-on: ubuntu-latest
steps:
- name: 'Clone repository'
uses: actions/checkout@v2
with:
fetch-depth: 50
- name: 'Set up JDK 8'
uses: actions/setup-java@v1
with:
java-version: 8
- name: 'Run integration tests'
run: |
./gradlew --no-parallel --no-daemon test-integration-standard-postgres
env:
TEST_USERNAME: ${{ secrets.STANDARD_POSTGRES_USERNAME }}
TEST_PASSWORD: ${{ secrets.STANDARD_POSTGRES_PASSWORD }}
- name: 'Archive junit results'
if: always()
uses: actions/upload-artifact@v2
with:
name: 'junit-report'
path: ./driver-proxy/build/reports/tests/
retention-days: 5
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Compiled class file
*.class
build/
.gradle/
/.idea

# Log file
*.log
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# jdbc-proxy-driver
# jdbc-proxy-driver

[![build_status](https://github.com/awslabs/aws-advanced-jdbc-wrapper/actions/workflows/main.yml/badge.svg)](https://github.com/awslabs/aws-advanced-jdbc-wrapper/actions/workflows/main.yml)
[![License: MIT](https://img.shields.io/badge/license-MIT-c30014.svg)](LICENSE)
23 changes: 23 additions & 0 deletions THIRD-PARTY-LICENSES
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Copyright (c) 1997, PostgreSQL Global Development Group
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
7 changes: 7 additions & 0 deletions benchmarks/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Benchmarks for AWS JDBC Proxy Driver

## Usage
1. Build the benchmarks with the following command `../gradlew jmhJar`.
1. the JAR file will be outputted to `build/libs`
2. Run the benchmarks with the following command `java -jar build/libs/benchmarks-0.1.0-SNAPSHOT-jmh.jar`.
1. you may have to update the command based on the exact version of the produced JAR file
21 changes: 21 additions & 0 deletions benchmarks/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* AWS JDBC Proxy Driver
* Copyright Amazon.com Inc. or affiliates.
* See the LICENSE file in the project root for more information.
*/

plugins {
id("me.champeau.jmh")
}

dependencies {
jmhImplementation(project(":aws-jdbc-proxy-driver"))

testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
testImplementation("org.mockito:mockito-inline:4.+")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
}

tasks.named<Test>("test") {
useJUnitPlatform()
}
Empty file added benchmarks/gradle.properties
Empty file.
Loading