Skip to content

Commit 2cfff32

Browse files
GavinRay97GavinRay97
authored
Merge pull request #52 from hasura/gavin/dep-updates-vuln
Update Quarkus, snowflake-jdbc, mysql-connector-j
2 parents a141741 + 0ffa283 commit 2cfff32

File tree

9 files changed

+147
-14
lines changed

9 files changed

+147
-14
lines changed

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version=1.0.1
22

33
#Gradle properties
44
quarkusPluginId=io.quarkus
5-
quarkusPluginVersion=3.9.4
5+
quarkusPluginVersion=3.19.4
66
quarkusPlatformGroupId=io.quarkus
77
quarkusPlatformArtifactId=quarkus-bom
8-
quarkusPlatformVersion=3.9.4
8+
quarkusPlatformVersion=3.19.4

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-rc-1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎ndc-app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ dependencies {
2626
api("io.quarkus:quarkus-cache")
2727
api("io.quarkus:quarkus-kotlin")
2828
api("io.quarkus:quarkus-micrometer-registry-prometheus")
29-
api("io.quarkus:quarkus-resteasy-reactive")
30-
api("io.quarkus:quarkus-resteasy-reactive-jackson")
29+
api("io.quarkus:quarkus-rest")
30+
api("io.quarkus:quarkus-rest-jackson")
3131
api("io.quarkus:quarkus-smallrye-fault-tolerance")
3232
api("io.quarkus:quarkus-smallrye-openapi")
3333
api("io.quarkus:quarkus-vertx")

‎ndc-cli/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ dependencies {
2222
implementation("info.picocli:picocli:4.7.5")
2323

2424
implementation("com.oracle.database.jdbc:ojdbc8:19.18.0.0")
25-
implementation("com.mysql:mysql-connector-j:8.4.0")
26-
implementation("net.snowflake:snowflake-jdbc:3.16.1")
25+
implementation("com.mysql:mysql-connector-j:9.2.0")
26+
implementation("net.snowflake:snowflake-jdbc:3.23.1")
2727
implementation("io.trino:trino-jdbc:466")
2828
}
2929

‎ndc-connector-mysql/.hasura-connector/connector-metadata.yaml

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,56 @@
11
packagingDefinition:
22
type: PrebuiltDockerImage
3-
dockerImage: "ghcr.io/hasura/ndc-jvm-mysql:v1.0.11"
3+
dockerImage: "ghcr.io/hasura/ndc-jvm-mysql:v1.0.13"
4+
45
supportedEnvironmentVariables:
56
- name: JDBC_URL
67
description: "The JDBC URL to connect to the database"
8+
79
commands:
810
update:
911
type: Dockerized
1012
dockerImage: ghcr.io/hasura/ndc-jvm-cli:v1.0.5
11-
commandArgs: [update, --database, MYSQL, --schemas, $JDBC_SCHEMAS, --outfile, /etc/connector/configuration.json]
13+
commandArgs: [update, --database, MYSQL, --schemas, $JDBC_SCHEMAS, --outfile, /etc/connector/configuration.json]
14+
15+
nativeToolchainDefinition:
16+
commands:
17+
start:
18+
type: ShellScript
19+
bash: |
20+
#!/usr/bin/env bash
21+
set -eu -o pipefail
22+
HASURA_CONFIGURATION_DIRECTORY="$HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH" \
23+
java -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=$HASURA_CONNECTOR_PORT -Djava.util.logging.manager=org.jboss.logmanager.LogManager \
24+
-jar "$HASURA_DDN_NATIVE_CONNECTOR_DIR/quarkus-run.jar"
25+
powershell: |
26+
$ErrorActionPreference = "Stop"
27+
$env:HASURA_CONFIGURATION_DIRECTORY="$env:HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH";
28+
java `
29+
-Dquarkus.http.host=0.0.0.0 `
30+
-Dquarkus.http.port=$env:HASURA_CONNECTOR_PORT `
31+
-Djava.util.logging.manager=org.jboss.logmanager.LogManager `
32+
-jar "$env:HASURA_DDN_NATIVE_CONNECTOR_DIR\quarkus-run.jar"
33+
update:
34+
type: ShellScript
35+
bash: |
36+
#!/usr/bin/env bash
37+
set -e -o pipefail
38+
"$HASURA_DDN_NATIVE_CONNECTOR_PLUGIN_DIR/bin/ndc-cli" update \
39+
--database MYSQL \
40+
--schemas $JDBC_SCHEMAS \
41+
--outfile "$HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH/configuration.json"
42+
powershell: |
43+
$ErrorActionPreference = "Stop"
44+
& "$env:HASURA_DDN_NATIVE_CONNECTOR_PLUGIN_DIR\bin\ndc-cli.exe" update `
45+
--database MYSQL `
46+
--schemas $env:JDBC_SCHEMAS `
47+
--outfile "$env:HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH\configuration.json"
48+
watch:
49+
type: ShellScript
50+
bash: |
51+
#!/usr/bin/env bash
52+
echo "Watch is not supported for this connector"
53+
exit 1
54+
powershell: |
55+
Write-Output "Watch is not supported for this connector"
56+
exit 1

‎ndc-connector-oracle/.hasura-connector/connector-metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
packagingDefinition:
22
type: PrebuiltDockerImage
3-
dockerImage: "ghcr.io/hasura/ndc-jvm-oracle:v1.0.9"
3+
dockerImage: "ghcr.io/hasura/ndc-jvm-oracle:v1.0.13"
44
nativeToolchainDefinition:
55
commands:
66
start:

‎ndc-connector-snowflake/.hasura-connector/connector-metadata.yaml

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,58 @@
11
packagingDefinition:
22
type: PrebuiltDockerImage
3-
dockerImage: "ghcr.io/hasura/ndc-jvm-snowflake:v1.0.7"
3+
dockerImage: "ghcr.io/hasura/ndc-jvm-snowflake:v1.0.9"
4+
45
supportedEnvironmentVariables:
56
- name: JDBC_URL
67
description: "The JDBC URL to connect to the database"
78
- name: JDBC_SCHEMAS
89
description: "A comma-separated list of schemas to include in the metadata"
10+
911
commands:
1012
update:
1113
type: Dockerized
1214
dockerImage: ghcr.io/hasura/ndc-jvm-cli:v1.0.5-snowflake
1315
commandArgs: [update, --database, SNOWFLAKE, --schemas, $JDBC_SCHEMAS, --outfile, /etc/connector/configuration.json]
1416

15-
17+
nativeToolchainDefinition:
18+
commands:
19+
start:
20+
type: ShellScript
21+
bash: |
22+
#!/usr/bin/env bash
23+
set -eu -o pipefail
24+
HASURA_CONFIGURATION_DIRECTORY="$HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH" \
25+
java -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=$HASURA_CONNECTOR_PORT -Djava.util.logging.manager=org.jboss.logmanager.LogManager \
26+
-jar "$HASURA_DDN_NATIVE_CONNECTOR_DIR/quarkus-run.jar"
27+
powershell: |
28+
$ErrorActionPreference = "Stop"
29+
$env:HASURA_CONFIGURATION_DIRECTORY="$env:HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH";
30+
java `
31+
-Dquarkus.http.host=0.0.0.0 `
32+
-Dquarkus.http.port=$env:HASURA_CONNECTOR_PORT `
33+
-Djava.util.logging.manager=org.jboss.logmanager.LogManager `
34+
-jar "$env:HASURA_DDN_NATIVE_CONNECTOR_DIR\quarkus-run.jar"
35+
update:
36+
type: ShellScript
37+
bash: |
38+
#!/usr/bin/env bash
39+
set -e -o pipefail
40+
"$HASURA_DDN_NATIVE_CONNECTOR_PLUGIN_DIR/bin/ndc-cli" update \
41+
--database SNOWFLAKE \
42+
--schemas $JDBC_SCHEMAS \
43+
--outfile "$HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH/configuration.json"
44+
powershell: |
45+
$ErrorActionPreference = "Stop"
46+
& "$env:HASURA_DDN_NATIVE_CONNECTOR_PLUGIN_DIR\bin\ndc-cli.exe" update `
47+
--database SNOWFLAKE `
48+
--schemas $env:JDBC_SCHEMAS `
49+
--outfile "$env:HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH\configuration.json"
50+
watch:
51+
type: ShellScript
52+
bash: |
53+
#!/usr/bin/env bash
54+
echo "Watch is not supported for this connector"
55+
exit 1
56+
powershell: |
57+
Write-Output "Watch is not supported for this connector"
58+
exit 1

‎ndc-connector-snowflake/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
implementation(project(":ndc-app"))
3434

3535
// JDBC driver
36-
implementation("net.snowflake:snowflake-jdbc:3.16.1")
36+
implementation("net.snowflake:snowflake-jdbc:3.23.1")
3737

3838
implementation("org.jooq.pro:jooq:3.19.8")
3939
modules {

‎ndc-connector-trino/.hasura-connector/connector-metadata.yaml

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,56 @@
11
packagingDefinition:
22
type: PrebuiltDockerImage
3-
dockerImage: "ghcr.io/hasura/ndc-jvm-trino:v1.0.1"
3+
dockerImage: "ghcr.io/hasura/ndc-jvm-trino:v1.0.3"
4+
45
supportedEnvironmentVariables:
56
- name: JDBC_URL
67
description: "The JDBC URL to connect to the database"
8+
79
commands:
810
update:
911
type: Dockerized
1012
dockerImage: ghcr.io/hasura/ndc-jvm-cli:v1.0.5
1113
commandArgs: [update, --database, TRINO, --schemas, $JDBC_SCHEMAS, --outfile, /etc/connector/configuration.json]
14+
15+
nativeToolchainDefinition:
16+
commands:
17+
start:
18+
type: ShellScript
19+
bash: |
20+
#!/usr/bin/env bash
21+
set -eu -o pipefail
22+
HASURA_CONFIGURATION_DIRECTORY="$HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH" \
23+
java -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=$HASURA_CONNECTOR_PORT -Djava.util.logging.manager=org.jboss.logmanager.LogManager \
24+
-jar "$HASURA_DDN_NATIVE_CONNECTOR_DIR/quarkus-run.jar"
25+
powershell: |
26+
$ErrorActionPreference = "Stop"
27+
$env:HASURA_CONFIGURATION_DIRECTORY="$env:HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH";
28+
java `
29+
-Dquarkus.http.host=0.0.0.0 `
30+
-Dquarkus.http.port=$env:HASURA_CONNECTOR_PORT `
31+
-Djava.util.logging.manager=org.jboss.logmanager.LogManager `
32+
-jar "$env:HASURA_DDN_NATIVE_CONNECTOR_DIR\quarkus-run.jar"
33+
update:
34+
type: ShellScript
35+
bash: |
36+
#!/usr/bin/env bash
37+
set -e -o pipefail
38+
"$HASURA_DDN_NATIVE_CONNECTOR_PLUGIN_DIR/bin/ndc-cli" update \
39+
--database TRINO \
40+
--schemas $JDBC_SCHEMAS \
41+
--outfile "$HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH/configuration.json"
42+
powershell: |
43+
$ErrorActionPreference = "Stop"
44+
& "$env:HASURA_DDN_NATIVE_CONNECTOR_PLUGIN_DIR\bin\ndc-cli.exe" update `
45+
--database TRINO `
46+
--schemas $env:JDBC_SCHEMAS `
47+
--outfile "$env:HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH\configuration.json"
48+
watch:
49+
type: ShellScript
50+
bash: |
51+
#!/usr/bin/env bash
52+
echo "Watch is not supported for this connector"
53+
exit 1
54+
powershell: |
55+
Write-Output "Watch is not supported for this connector"
56+
exit 1

0 commit comments

Comments
 (0)