Skip to content

Commit d706f15

Browse files
dlin2028dlin2028
authored
Merge branch 'opensearch-project:main' into main
2 parents 3ac8801 + f130915 commit d706f15

File tree

345 files changed

+12528
-4639
lines changed

Some content is hidden

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

345 files changed

+12528
-4639
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @cliu123 @cwperks @DarshitChanpura @davidlago @peternied @RyanL1997 @scrawfor99 @reta @willyborankin
1+
* @cliu123 @cwperks @DarshitChanpura @peternied @RyanL1997 @scrawfor99 @reta @willyborankin

‎.github/actions/start-opensearch-with-one-plugin/action.yml

-128
This file was deleted.

‎.github/workflows/add-untriaged.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
apply-label:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/github-script@v6
11+
- uses: actions/github-script@v7
1212
with:
1313
script: |
1414
github.rest.issues.addLabels({

‎.github/workflows/ci.yml

+22-33
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
separateTestsNames: ${{ steps.set-matrix.outputs.separateTestsNames }}
2020
steps:
2121
- name: Set up JDK for build and test
22-
uses: actions/setup-java@v3
22+
uses: actions/setup-java@v4
2323
with:
2424
distribution: temurin # Temurin is a distribution of adoptium
2525
java-version: 17
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Set up JDK for build and test
48-
uses: actions/setup-java@v3
48+
uses: actions/setup-java@v4
4949
with:
5050
distribution: temurin # Temurin is a distribution of adoptium
5151
java-version: ${{ matrix.jdk }}
@@ -54,51 +54,38 @@ jobs:
5454
uses: actions/checkout@v4
5555

5656
- name: Build and Test
57-
uses: gradle/gradle-build-action@v2
57+
uses: gradle/gradle-build-action@v3
5858
with:
5959
cache-disabled: true
6060
arguments: |
6161
${{ matrix.gradle_task }} -Dbuild.snapshot=false
6262
63-
- uses: alehechka/upload-tartifact@v2
63+
- uses: actions/upload-artifact@v4
6464
if: always()
6565
with:
6666
name: ${{ matrix.platform }}-JDK${{ matrix.jdk }}-${{ matrix.gradle_task }}-reports
6767
path: |
6868
./build/reports/
6969
7070
report-coverage:
71-
needs:
72-
- "test"
73-
- "integration-tests"
71+
needs: ["test", "integration-tests"]
7472
runs-on: ubuntu-latest
7573
steps:
7674
- uses: actions/checkout@v4
77-
- uses: actions/download-artifact@v3
75+
- uses: actions/download-artifact@v4
7876
with:
7977
path: downloaded-artifacts
8078

8179
- name: Display structure of downloaded files
8280
run: ls -R
8381
working-directory: downloaded-artifacts
8482

85-
- name: Extract downloaded artifacts
86-
run: |
87-
for archive in ./*/artifact.tar; do
88-
(cd "$(dirname "$archive")" && tar -xvf artifact.tar)
89-
done
90-
working-directory: downloaded-artifacts
91-
92-
- name: Display structure of downloaded files
93-
run: ls -R
94-
working-directory: downloaded-artifacts
95-
9683
- name: Upload Coverage with retry
97-
uses: Wandalen/wretry.action@v1.3.0
84+
uses: Wandalen/wretry.action@v3.4.0
9885
with:
9986
attempt_limit: 5
10087
attempt_delay: 2000
101-
action: codecov/codecov-action@v3
88+
action: codecov/codecov-action@v4
10289
with: |
10390
token: ${{ secrets.CODECOV_TOKEN }}
10491
fail_ci_if_error: true
@@ -111,12 +98,12 @@ jobs:
11198
fail-fast: false
11299
matrix:
113100
jdk: [11, 17, 21]
114-
platform: [ubuntu-latest] # Removed windows https://github.com/opensearch-project/security/issues/3423
101+
platform: [ubuntu-latest, windows-latest]
115102
runs-on: ${{ matrix.platform }}
116103

117104
steps:
118105
- name: Set up JDK for build and test
119-
uses: actions/setup-java@v3
106+
uses: actions/setup-java@v4
120107
with:
121108
distribution: temurin # Temurin is a distribution of adoptium
122109
java-version: ${{ matrix.jdk }}
@@ -125,7 +112,7 @@ jobs:
125112
uses: actions/checkout@v4
126113

127114
- name: Build and Test
128-
uses: gradle/gradle-build-action@v2
115+
uses: gradle/gradle-build-action@v3
129116
with:
130117
cache-disabled: true
131118
arguments: |
@@ -151,7 +138,7 @@ jobs:
151138

152139
steps:
153140
- name: Set up JDK for build and test
154-
uses: actions/setup-java@v3
141+
uses: actions/setup-java@v4
155142
with:
156143
distribution: temurin # Temurin is a distribution of adoptium
157144
java-version: ${{ matrix.jdk }}
@@ -160,7 +147,7 @@ jobs:
160147
uses: actions/checkout@v4
161148

162149
- name: Build and Test
163-
uses: gradle/gradle-build-action@v2
150+
uses: gradle/gradle-build-action@v3
164151
with:
165152
cache-disabled: true
166153
arguments: |
@@ -169,7 +156,7 @@ jobs:
169156
backward-compatibility-build:
170157
runs-on: ubuntu-latest
171158
steps:
172-
- uses: actions/setup-java@v3
159+
- uses: actions/setup-java@v4
173160
with:
174161
distribution: temurin # Temurin is a distribution of adoptium
175162
java-version: 17
@@ -178,7 +165,7 @@ jobs:
178165
uses: actions/checkout@v4
179166

180167
- name: Build BWC tests
181-
uses: gradle/gradle-build-action@v2
168+
uses: gradle/gradle-build-action@v3
182169
with:
183170
cache-disabled: true
184171
arguments: |
@@ -193,7 +180,7 @@ jobs:
193180
runs-on: ${{ matrix.platform }}
194181

195182
steps:
196-
- uses: actions/setup-java@v3
183+
- uses: actions/setup-java@v4
197184
with:
198185
distribution: temurin # Temurin is a distribution of adoptium
199186
java-version: ${{ matrix.jdk }}
@@ -214,22 +201,22 @@ jobs:
214201
runs-on: ubuntu-latest
215202
steps:
216203
- uses: actions/checkout@v4
217-
- uses: actions/setup-java@v3
204+
- uses: actions/setup-java@v4
218205
with:
219206
distribution: temurin # Temurin is a distribution of adoptium
220207
java-version: 11
221-
- uses: github/codeql-action/init@v2
208+
- uses: github/codeql-action/init@v3
222209
with:
223210
languages: java
224211
- run: ./gradlew clean assemble
225-
- uses: github/codeql-action/analyze@v2
212+
- uses: github/codeql-action/analyze@v3
226213

227214
build-artifact-names:
228215
runs-on: ubuntu-latest
229216
steps:
230217
- uses: actions/checkout@v4
231218

232-
- uses: actions/setup-java@v3
219+
- uses: actions/setup-java@v4
233220
with:
234221
distribution: temurin # Temurin is a distribution of adoptium
235222
java-version: 11
@@ -259,6 +246,8 @@ jobs:
259246

260247
- run: ./gradlew clean assemble -Dbuild.version_qualifier=${{ env.TEST_QUALIFIER }} && test -s ./build/distributions/opensearch-security-${{ env.SECURITY_PLUGIN_VERSION_ONLY_NUMBER }}-${{ env.TEST_QUALIFIER }}-SNAPSHOT.zip
261248

249+
- run: ./gradlew clean publishPluginZipPublicationToZipStagingRepository && test -s ./build/distributions/opensearch-security-${{ env.SECURITY_PLUGIN_VERSION }}.zip && test -s ./build/distributions/opensearch-security-${{ env.SECURITY_PLUGIN_VERSION }}.pom
250+
262251
- name: List files in the build directory if there was an error
263252
run: ls -al ./build/distributions/
264253
if: failure()

‎.github/workflows/code-hygiene.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121

22-
- uses: actions/setup-java@v3
22+
- uses: actions/setup-java@v4
2323
with:
2424
distribution: temurin # Temurin is a distribution of adoptium
25-
java-version: 11
25+
java-version: 17
2626

27-
- uses: gradle/gradle-build-action@v2
27+
- uses: gradle/gradle-build-action@v3
2828
with:
2929
cache-disabled: true
3030
arguments: spotlessCheck
@@ -35,12 +35,12 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@v4
3737

38-
- uses: actions/setup-java@v3
38+
- uses: actions/setup-java@v4
3939
with:
4040
distribution: temurin # Temurin is a distribution of adoptium
4141
java-version: 11
4242

43-
- uses: gradle/gradle-build-action@v2
43+
- uses: gradle/gradle-build-action@v3
4444
with:
4545
cache-disabled: true
4646
arguments: checkstyleMain checkstyleTest checkstyleIntegrationTest
@@ -51,12 +51,12 @@ jobs:
5151
steps:
5252
- uses: actions/checkout@v4
5353

54-
- uses: actions/setup-java@v3
54+
- uses: actions/setup-java@v4
5555
with:
5656
distribution: temurin # Temurin is a distribution of adoptium
5757
java-version: 11
5858

59-
- uses: gradle/gradle-build-action@v2
59+
- uses: gradle/gradle-build-action@v3
6060
with:
6161
cache-disabled: true
6262
arguments: spotbugsMain

‎.github/workflows/integration-tests.yml

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

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

‎.github/workflows/maven-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
contents: write
1818

1919
steps:
20-
- uses: actions/setup-java@v3
20+
- uses: actions/setup-java@v4
2121
with:
2222
distribution: temurin # Temurin is a distribution of adoptium
2323
java-version: 11

0 commit comments

Comments
 (0)