Skip to content

Commit f114f1b

Browse files
cmgrotecmgrote
authored
Merge pull request #2243 from atlanhq/dependencies
chore(deps): consolidate dependency updates
2 parents d47f6b4 + 72be670 commit f114f1b

52 files changed

Lines changed: 391 additions & 110 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/custom-package-container.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
runs-on: ubuntu-latest
2525
name: "${{inputs.package_name}} container"
2626
steps:
27-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
27+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2828
with:
2929
ref: ${{ inputs.branch != '' && inputs.branch || github.ref }}
3030
- uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
3131
- name: Log in to container registry
32-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
32+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
3333
with:
3434
registry: ghcr.io
3535
username: ${{ github.actor }}

‎.github/workflows/finish-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
needs: validate
9898
runs-on: ubuntu-latest
9999
steps:
100-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
100+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
101101
with:
102102
ref: ${{ needs.validate.outputs.release_sha }}
103103
fetch-depth: 0
@@ -153,7 +153,7 @@ jobs:
153153
needs: [validate, create-release]
154154
runs-on: ubuntu-latest
155155
steps:
156-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
156+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
157157
with:
158158
ref: main
159159
fetch-depth: 0

‎.github/workflows/merge.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
outputs:
3030
version: ${{ steps.get_version.outputs.version }}
3131
steps:
32-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
32+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3333
with:
3434
ref: ${{ github.event.inputs.branch || github.ref }}
35-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
35+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
3636
with:
3737
java-version: 21
3838
distribution: temurin
@@ -143,8 +143,8 @@ jobs:
143143
runs-on: ubuntu-latest
144144
name: "JavaDocs"
145145
steps:
146-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
147-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
146+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
147+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
148148
with:
149149
java-version: 21
150150
distribution: temurin
@@ -164,8 +164,8 @@ jobs:
164164
runs-on: ubuntu-latest
165165
name: "Snapshot"
166166
steps:
167-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
168-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
167+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
168+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
169169
with:
170170
java-version: 21
171171
distribution: temurin
@@ -194,12 +194,12 @@ jobs:
194194
runs-on: ubuntu-latest
195195
name: "Base image"
196196
steps:
197-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
197+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
198198
with:
199199
ref: ${{ github.event.inputs.branch || github.ref }}
200200
- uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
201201
- name: Log in to container registry
202-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
202+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
203203
with:
204204
registry: ghcr.io
205205
username: ${{ github.actor }}

‎.github/workflows/pr-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
pr-build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
15-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
14+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
15+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
1616
with:
1717
distribution: temurin
1818
java-version: 21
@@ -32,8 +32,8 @@ jobs:
3232
pr-test:
3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
36-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
35+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
36+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
3737
with:
3838
distribution: temurin
3939
java-version: 21

‎.github/workflows/prepare-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
prepare:
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
with:
2727
fetch-depth: 0
2828

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
outputs:
2525
version: ${{ steps.get_version.outputs.version }}
2626
steps:
27-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
28-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
27+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2929
with:
3030
java-version: 21
3131
distribution: temurin
@@ -125,8 +125,8 @@ jobs:
125125
runs-on: ubuntu-latest
126126
name: "Release"
127127
steps:
128-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
129-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
128+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
129+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
130130
with:
131131
java-version: 21
132132
distribution: temurin
@@ -155,10 +155,10 @@ jobs:
155155
runs-on: ubuntu-latest
156156
name: "Containers"
157157
steps:
158-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
158+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
159159
- uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
160160
- name: Log in to container registry
161-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
161+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
162162
with:
163163
registry: ghcr.io
164164
username: ${{ github.actor }}

‎.github/workflows/test.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
runs-on: ubuntu-latest
1515
name: "Build"
1616
steps:
17-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
18-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
17+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
18+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
1919
with:
2020
java-version: 21
2121
distribution: temurin
@@ -38,7 +38,7 @@ jobs:
3838
outputs:
3939
tests: ${{ steps.test-files.outputs.tests }}
4040
steps:
41-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
41+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4242
- name: List integration tests
4343
id: test-files
4444
run: |
@@ -58,12 +58,12 @@ jobs:
5858
group: ${{ matrix.tests }}
5959
name: "Integration"
6060
steps:
61-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
61+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6262
- name: Download artifacts
6363
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
6464
with:
6565
name: build-artifacts
66-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
66+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
6767
with:
6868
java-version: 21
6969
distribution: temurin
@@ -90,7 +90,7 @@ jobs:
9090
tests: ${{ steps.test-directories.outputs.tests }}
9191
asset-import-chunks: ${{ steps.asset-import-chunks.outputs.chunks }}
9292
steps:
93-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
93+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9494
- name: List package tests
9595
id: test-directories
9696
run: |
@@ -125,12 +125,12 @@ jobs:
125125
include: ${{fromJson(needs.list-packages.outputs.asset-import-chunks)}}
126126
name: "asset-import: chunk ${{ matrix.chunk }}"
127127
steps:
128-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
128+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
129129
- name: Download artifacts
130130
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
131131
with:
132132
name: build-artifacts
133-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
133+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
134134
with:
135135
java-version: 21
136136
distribution: temurin
@@ -169,12 +169,12 @@ jobs:
169169
# - name: Free disk space
170170
# if: matrix.tests == 'asset-import'
171171
# uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
172-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
172+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
173173
- name: Download artifacts
174174
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
175175
with:
176176
name: build-artifacts
177-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
177+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
178178
with:
179179
java-version: 21
180180
distribution: temurin

‎buildSrc/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ repositories {
99
}
1010

1111
dependencies {
12-
implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.3.0")
13-
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.1.0")
12+
implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.3.10")
13+
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.2.1")
1414
implementation("io.freefair.gradle:lombok-plugin:9.2.0")
1515
implementation("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.3.0")
1616
implementation("com.adarshr:gradle-test-logger-plugin:4.0.0")

‎gradle/libs.versions.toml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
22
jackson = "2.21.0"
33
slf4j = "2.0.17"
4-
elasticsearch = "9.2.4"
4+
elasticsearch = "9.3.0"
55
freemarker = "2.3.34"
66
classgraph = "4.8.184"
7-
testng = "7.11.0"
7+
testng = "7.12.0"
88
log4j = "2.25.3"
99
wiremock = "3.13.2"
1010
jnanoid = "2.0.0"
11-
awssdk = "2.41.10"
12-
gcs = "26.74.0"
11+
awssdk = "2.41.24"
12+
gcs = "26.75.0"
1313
system-stubs = "2.1.8"
1414
fastcsv = "4.1.0"
1515
poi = "5.5.1"
@@ -25,19 +25,19 @@ sqlite = "3.51.1.0"
2525
jakarta-mail = "2.1.3"
2626
angus-mail = "2.0.5"
2727
pkl = "0.30.2"
28-
adls = "12.26.0"
29-
azure = "1.18.1"
28+
adls = "12.26.2"
29+
azure = "1.18.2"
3030
guava = "33.5.0-jre"
31-
openlineage = "1.42.1"
32-
kotlin = "2.3.0"
31+
openlineage = "1.43.0"
32+
kotlin = "2.3.10"
3333
kotlin-mu = "3.0.5"
3434
rocksdb = "10.4.2"
35-
jetty = "12.1.5"
36-
netty = "4.2.9.Final"
35+
jetty = "12.1.6"
36+
netty = "4.2.10.Final"
3737
rhino = "1.9.0"
3838
nimbus = "10.7"
3939
otel = "1.58.0"
40-
otel-instrumentation = "2.23.0-alpha"
40+
otel-instrumentation = "2.24.0-alpha"
4141

4242
[libraries]
4343
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }

‎package-toolkit/runtime/src/main/kotlin/com/atlan/pkg/Utils.kt‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,10 @@ object Utils {
395395
}
396396
return when (default) {
397397
// TODO: likely need to extend to other types
398-
is List<*> -> getOrDefault(null, default as List<String>) as T
398+
is List<*> -> {
399+
getOrDefault(null, default as List<String>) as T
400+
}
401+
399402
else -> {
400403
// Recognize the default file location, and if found treat it as
401404
// a blank value
@@ -1101,17 +1104,29 @@ object Utils {
11011104
*/
11021105
fun getBackingStore(directory: String = Paths.get(separator, "tmp").toString()): ObjectStorageSyncer =
11031106
when (val cloud = getEnvVar("CLOUD_PROVIDER", "local")) {
1104-
"aws" -> S3Sync(getEnvVar("AWS_S3_BUCKET_NAME"), getEnvVar("AWS_S3_REGION"), logger)
1105-
"gcp" -> GCSSync(getEnvVar("GCP_PROJECT_ID"), getEnvVar("GCP_STORAGE_BUCKET"), logger, "")
1106-
"azure" -> ADLSSync(getEnvVar("AZURE_STORAGE_ACCOUNT"), getEnvVar("AZURE_STORAGE_CONTAINER_NAME"), logger, "", "", getEnvVar("AZURE_STORAGE_ACCESS_KEY"))
1107+
"aws" -> {
1108+
S3Sync(getEnvVar("AWS_S3_BUCKET_NAME"), getEnvVar("AWS_S3_REGION"), logger)
1109+
}
1110+
1111+
"gcp" -> {
1112+
GCSSync(getEnvVar("GCP_PROJECT_ID"), getEnvVar("GCP_STORAGE_BUCKET"), logger, "")
1113+
}
1114+
1115+
"azure" -> {
1116+
ADLSSync(getEnvVar("AZURE_STORAGE_ACCOUNT"), getEnvVar("AZURE_STORAGE_CONTAINER_NAME"), logger, "", "", getEnvVar("AZURE_STORAGE_ACCESS_KEY"))
1117+
}
1118+
11071119
"local" -> {
11081120
if (getEnvVar("AWS_S3_BUCKET_NAME").isNotBlank()) {
11091121
S3Sync(getEnvVar("AWS_S3_BUCKET_NAME"), getEnvVar("AWS_S3_REGION"), logger)
11101122
} else {
11111123
LocalSync(directory, logger)
11121124
}
11131125
}
1114-
else -> throw IllegalStateException("Unable to determine cloud provider: $cloud")
1126+
1127+
else -> {
1128+
throw IllegalStateException("Unable to determine cloud provider: $cloud")
1129+
}
11151130
}
11161131

11171132
/**
@@ -1196,12 +1211,17 @@ object Utils {
11961211
val base = basePath.toAbsolutePath().normalize()
11971212
val resolved = base.resolve(userProvided).normalize()
11981213
when {
1199-
!resolved.startsWith(base) ->
1214+
!resolved.startsWith(base) -> {
12001215
throw IllegalArgumentException("Path traversal attempt detected -- will not proceed due to security implications.")
1201-
userProvided.contains('\u0000') ->
1216+
}
1217+
1218+
userProvided.contains('\u0000') -> {
12021219
throw IllegalArgumentException("Null bytes in the path or filename are not allowed.")
1203-
resolved.toAbsolutePath().toString().length > 800 ->
1220+
}
1221+
1222+
resolved.toAbsolutePath().toString().length > 800 -> {
12041223
throw IllegalArgumentException("User-provided path and filename are too long (exceeds maximum length of 800 characters).")
1224+
}
12051225
}
12061226
return resolved
12071227
}

0 commit comments

Comments
 (0)