Skip to content

Commit a2a384c

Browse files
authored
Merge branch 'main' into authz-tests-rb
Signed-off-by: Nils Bandener <[email protected]>
2 parents d81d43e + 345fe26 commit a2a384c

File tree

79 files changed

+3620
-578
lines changed

Some content is hidden

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

79 files changed

+3620
-578
lines changed

.github/workflows/auto-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Get tag
2222
id: tag
2323
uses: dawidd6/action-get-tag@v1
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- name: Download release notes
2626
run: |
2727
curl -s -o release-notes.md https://raw.githubusercontent.com/opensearch-project/security/main/release-notes/opensearch-security.release-notes-${{ steps.tag.outputs.tag }}.md

.github/workflows/automatic-merges.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
automatic-merge-version-bumps:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616

1717
- id: find-triggering-pr
1818
uses: peternied/find-triggering-pr@v1

.github/workflows/changelog_verifier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
if: github.repository == 'opensearch-project/security'
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
with:
1414
token: ${{ secrets.GITHUB_TOKEN }}
1515
ref: ${{ github.event.pull_request.head.sha }}

.github/workflows/ci.yml

Lines changed: 46 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
separateTestsNames: ${{ steps.set-matrix.outputs.separateTestsNames }}
2525
steps:
2626
- name: Set up JDK for build and test
27-
uses: actions/setup-java@v4
27+
uses: actions/setup-java@v5
2828
with:
2929
distribution: temurin # Temurin is a distribution of adoptium
3030
java-version: 21
3131

3232
- name: Checkout security
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434

3535
- name: Generate list of tasks
3636
id: set-matrix
@@ -50,13 +50,13 @@ jobs:
5050

5151
steps:
5252
- name: Set up JDK for build and test
53-
uses: actions/setup-java@v4
53+
uses: actions/setup-java@v5
5454
with:
5555
distribution: temurin # Temurin is a distribution of adoptium
5656
java-version: ${{ matrix.jdk }}
5757

5858
- name: Checkout security
59-
uses: actions/checkout@v4
59+
uses: actions/checkout@v5
6060

6161
- name: Build and Test
6262
uses: gradle/gradle-build-action@v3
@@ -93,13 +93,13 @@ jobs:
9393
- name: Run start commands
9494
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
9595
- name: Set up JDK for build and test
96-
uses: actions/setup-java@v4
96+
uses: actions/setup-java@v5
9797
with:
9898
distribution: temurin # Temurin is a distribution of adoptium
9999
java-version: ${{ matrix.jdk }}
100100

101101
- name: Checkout security
102-
uses: actions/checkout@v4
102+
uses: actions/checkout@v5
103103

104104
- name: Build and Test
105105
uses: gradle/gradle-build-action@v3
@@ -119,7 +119,7 @@ jobs:
119119
needs: ["test-windows", "test-linux", "integration-tests-windows", "integration-tests-linux", "spi-tests-linux", "spi-tests-windows", "sample-plugin-integration-tests-linux", "sample-plugin-integration-tests-windows"]
120120
runs-on: ubuntu-latest
121121
steps:
122-
- uses: actions/checkout@v4
122+
- uses: actions/checkout@v5
123123
- uses: actions/download-artifact@v5
124124
with:
125125
path: downloaded-artifacts
@@ -150,13 +150,13 @@ jobs:
150150

151151
steps:
152152
- name: Set up JDK for build and test
153-
uses: actions/setup-java@v4
153+
uses: actions/setup-java@v5
154154
with:
155155
distribution: temurin # Temurin is a distribution of adoptium
156156
java-version: ${{ matrix.jdk }}
157157

158158
- name: Checkout security
159-
uses: actions/checkout@v4
159+
uses: actions/checkout@v5
160160

161161
- name: Run Integration Tests
162162
uses: gradle/gradle-build-action@v3
@@ -193,13 +193,13 @@ jobs:
193193
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
194194

195195
- name: Set up JDK for build and test
196-
uses: actions/setup-java@v4
196+
uses: actions/setup-java@v5
197197
with:
198198
distribution: temurin # Temurin is a distribution of adoptium
199199
java-version: ${{ matrix.jdk }}
200200

201201
- name: Checkout security
202-
uses: actions/checkout@v4
202+
uses: actions/checkout@v5
203203

204204
- name: Build and Test
205205
uses: gradle/gradle-build-action@v3
@@ -236,13 +236,13 @@ jobs:
236236
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
237237

238238
- name: Set up JDK for build and test
239-
uses: actions/setup-java@v4
239+
uses: actions/setup-java@v5
240240
with:
241241
distribution: temurin # Temurin is a distribution of adoptium
242242
java-version: ${{ matrix.jdk }}
243243

244244
- name: Checkout security
245-
uses: actions/checkout@v4
245+
uses: actions/checkout@v5
246246

247247
- name: Run SPI Tests
248248
uses: gradle/gradle-build-action@v3
@@ -269,13 +269,13 @@ jobs:
269269

270270
steps:
271271
- name: Set up JDK for build and test
272-
uses: actions/setup-java@v4
272+
uses: actions/setup-java@v5
273273
with:
274274
distribution: temurin # Temurin is a distribution of adoptium
275275
java-version: ${{ matrix.jdk }}
276276

277277
- name: Checkout security
278-
uses: actions/checkout@v4
278+
uses: actions/checkout@v5
279279

280280
- name: Run SPI Tests
281281
uses: gradle/gradle-build-action@v3
@@ -312,13 +312,13 @@ jobs:
312312
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
313313

314314
- name: Set up JDK for build and test
315-
uses: actions/setup-java@v4
315+
uses: actions/setup-java@v5
316316
with:
317317
distribution: temurin # Temurin is a distribution of adoptium
318318
java-version: ${{ matrix.jdk }}
319319

320320
- name: Checkout security
321-
uses: actions/checkout@v4
321+
uses: actions/checkout@v5
322322

323323
- name: Run SampleResourcePlugin Integration Tests
324324
uses: gradle/gradle-build-action@v3
@@ -344,13 +344,13 @@ jobs:
344344

345345
steps:
346346
- name: Set up JDK for build and test
347-
uses: actions/setup-java@v4
347+
uses: actions/setup-java@v5
348348
with:
349349
distribution: temurin # Temurin is a distribution of adoptium
350350
java-version: ${{ matrix.jdk }}
351351

352352
- name: Checkout security
353-
uses: actions/checkout@v4
353+
uses: actions/checkout@v5
354354

355355
- name: Run SampleResourcePlugin Integration Tests
356356
uses: gradle/gradle-build-action@v3
@@ -377,13 +377,13 @@ jobs:
377377

378378
steps:
379379
- name: Set up JDK for build and test
380-
uses: actions/setup-java@v4
380+
uses: actions/setup-java@v5
381381
with:
382382
distribution: temurin # Temurin is a distribution of adoptium
383383
java-version: ${{ matrix.jdk }}
384384

385385
- name: Checkout security
386-
uses: actions/checkout@v4
386+
uses: actions/checkout@v5
387387

388388
- name: Run Resource Tests
389389
uses: gradle/gradle-build-action@v3
@@ -395,13 +395,13 @@ jobs:
395395
backward-compatibility-build:
396396
runs-on: ubuntu-latest
397397
steps:
398-
- uses: actions/setup-java@v4
398+
- uses: actions/setup-java@v5
399399
with:
400400
distribution: temurin # Temurin is a distribution of adoptium
401401
java-version: 21
402402

403403
- name: Checkout Security Repo
404-
uses: actions/checkout@v4
404+
uses: actions/checkout@v5
405405

406406
- name: Build BWC tests
407407
uses: gradle/gradle-build-action@v3
@@ -419,13 +419,13 @@ jobs:
419419
runs-on: ${{ matrix.platform }}
420420

421421
steps:
422-
- uses: actions/setup-java@v4
422+
- uses: actions/setup-java@v5
423423
with:
424424
distribution: temurin # Temurin is a distribution of adoptium
425425
java-version: ${{ matrix.jdk }}
426426

427427
- name: Checkout Security Repo
428-
uses: actions/checkout@v4
428+
uses: actions/checkout@v5
429429

430430
- id: build-previous
431431
uses: ./.github/actions/run-bwc-suite
@@ -439,8 +439,8 @@ jobs:
439439
code-ql:
440440
runs-on: ubuntu-latest
441441
steps:
442-
- uses: actions/checkout@v4
443-
- uses: actions/setup-java@v4
442+
- uses: actions/checkout@v5
443+
- uses: actions/setup-java@v5
444444
with:
445445
distribution: temurin # Temurin is a distribution of adoptium
446446
java-version: 21
@@ -450,14 +450,31 @@ jobs:
450450
- run: ./gradlew clean assemble
451451
- uses: github/codeql-action/analyze@v3
452452

453+
build-health:
454+
runs-on: ubuntu-latest
455+
steps:
456+
- uses: actions/checkout@v5
457+
- uses: actions/setup-java@v4
458+
with:
459+
distribution: temurin # Temurin is a distribution of adoptium
460+
java-version: 21
461+
- run: ./gradlew clean buildHealth
462+
463+
- uses: actions/upload-artifact@v4
464+
if: always()
465+
with:
466+
name: dependency-analysis
467+
path: |
468+
./build/reports/dependency-analysis/
469+
453470
build-artifact-names:
454471
runs-on: ubuntu-latest
455472
steps:
456473
- name: Setup Environment
457-
uses: actions/checkout@v4
474+
uses: actions/checkout@v5
458475

459476
- name: Configure Java
460-
uses: actions/setup-java@v4
477+
uses: actions/setup-java@v5
461478
with:
462479
distribution: temurin
463480
java-version: 21

.github/workflows/code-hygiene.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Check if all files end in newline
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v5
1212

1313
- name: Linelint
1414
uses: fernandrone/[email protected]
@@ -17,9 +17,9 @@ jobs:
1717
runs-on: ubuntu-latest
1818
name: Spotless scan
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121

22-
- uses: actions/setup-java@v4
22+
- uses: actions/setup-java@v5
2323
with:
2424
distribution: temurin # Temurin is a distribution of adoptium
2525
java-version: 21
@@ -33,9 +33,9 @@ jobs:
3333
runs-on: ubuntu-latest
3434
name: Checkstyle scan
3535
steps:
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v5
3737

38-
- uses: actions/setup-java@v4
38+
- uses: actions/setup-java@v5
3939
with:
4040
distribution: temurin # Temurin is a distribution of adoptium
4141
java-version: 21
@@ -49,9 +49,9 @@ jobs:
4949
runs-on: ubuntu-latest
5050
name: Spotbugs scan
5151
steps:
52-
- uses: actions/checkout@v4
52+
- uses: actions/checkout@v5
5353

54-
- uses: actions/setup-java@v4
54+
- uses: actions/setup-java@v5
5555
with:
5656
distribution: temurin # Temurin is a distribution of adoptium
5757
java-version: 21
@@ -65,7 +65,7 @@ jobs:
6565
runs-on: ubuntu-latest
6666
name: Check permissions orders
6767
steps:
68-
- uses: actions/checkout@v4
68+
- uses: actions/checkout@v5
6969
- run: npm install yaml
7070

7171
- name: Check permissions order

.github/workflows/dependabot_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
installation_id: 22958780
1919

2020
- name: Check out code
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222
with:
2323
token: ${{ steps.github_app_token.outputs.token }}
2424
ref: ${{ github.head_ref }}
2525

2626
# See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
2727
- name: Set up JDK 21
28-
uses: actions/setup-java@v4
28+
uses: actions/setup-java@v5
2929
with:
3030
java-version: 21
3131
distribution: temurin

.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
test-run: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
1616

1717
steps:
18-
- uses: actions/setup-java@v4
18+
- uses: actions/setup-java@v5
1919
with:
2020
distribution: temurin # Temurin is a distribution of adoptium
2121
java-version: ${{ matrix.jdk }}
2222

23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424

2525
- run: ./gradlew test
2626

.github/workflows/link-checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
linkchecker:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- name: lychee Link Checker
1414
id: lychee
1515
uses: lycheeverse/lychee-action@master

.github/workflows/maven-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
contents: write
1818

1919
steps:
20-
- uses: actions/setup-java@v4
20+
- uses: actions/setup-java@v5
2121
with:
2222
distribution: temurin # Temurin is a distribution of adoptium
2323
java-version: 21
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- name: Load secret
2626
uses: 1password/load-secrets-action@v3
2727
with:

.github/workflows/plugin_install.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
uses: DarshitChanpura/[email protected]
2222

2323
- name: Set up JDK
24-
uses: actions/setup-java@v4
24+
uses: actions/setup-java@v5
2525
with:
2626
distribution: temurin # Temurin is a distribution of adoptium
2727
java-version: ${{ matrix.jdk }}
2828

2929
- name: Checkout Branch
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131

3232
- name: Assemble target plugin
3333
uses: gradle/gradle-build-action@v3

0 commit comments

Comments
 (0)