Skip to content

Commit 54cccd3

Browse files
SylvainJugeSylvainJuge
committed
Merge branch 'main' of github.com:elastic/ecs-logging-java into dependabot-codeowners
2 parents e72c7c5 + 8f9b5de commit 54cccd3

Some content is hidden

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

51 files changed

+1163
-1199
lines changed

‎.ci/updatecli/values.d/ecs-logging-specs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
spec_path: ecs-logging-core/src/test/resources/spec/spec.json
2-
signedcommit: true

‎.ci/updatecli/values.d/scm.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ scm:
33
owner: elastic
44
repository: ecs-logging-java
55
branch: main
6+
commitusingapi: true
67
# begin update-compose policy values
78
user: obltmachine
89
email: [email protected]

‎.ci/updatecli/values.d/update-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
spec:
22
files:
3-
- "update-compose.yaml"
3+
- "updatecli-compose.yaml"

‎.github/workflows/addToProject.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ name: Auto Assign to Project(s)
44
on:
55
issues:
66
types: [opened, edited, milestoned]
7-
env:
8-
MY_GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }}
97

108
permissions:
119
contents: read
@@ -15,10 +13,24 @@ jobs:
1513
runs-on: ubuntu-latest
1614
name: Assign milestoned to Project
1715
steps:
16+
- name: Get token
17+
id: get_token
18+
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
19+
with:
20+
app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
21+
private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
22+
permissions: >-
23+
{
24+
"organization_projects": "write",
25+
"issues": "read"
26+
}
27+
1828
- name: Assign issues with milestones to project
1929
uses: elastic/[email protected]
2030
if: github.event.issue && github.event.issue.milestone
2131
with:
2232
project: 'https://github.com/orgs/elastic/projects/454'
2333
project_id: '5882982'
2434
column_name: 'Planned'
35+
env:
36+
MY_GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}

‎.github/workflows/catalog-info.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: catalog-info
3+
4+
on:
5+
pull_request:
6+
branches:
7+
- main
8+
paths:
9+
- 'catalog-info.yaml'
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
validate:
16+
runs-on: ubuntu-latest
17+
permissions:
18+
contents: read
19+
packages: read
20+
steps:
21+
- uses: actions/checkout@v4
22+
23+
- uses: elastic/oblt-actions/elastic/validate-catalog@v1
24+

‎.github/workflows/docs-build.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: docs-build
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request_target: ~
8+
merge_group: ~
9+
10+
jobs:
11+
docs-preview:
12+
uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
13+
with:
14+
path-pattern: docs/**
15+
permissions:
16+
deployments: write
17+
id-token: write
18+
contents: read
19+
pull-requests: read

‎.github/workflows/docs-cleanup.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: docs-cleanup
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- closed
7+
8+
jobs:
9+
docs-preview:
10+
uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@main
11+
permissions:
12+
contents: none
13+
id-token: write
14+
deployments: write

‎.github/workflows/labeler.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
types: [opened]
55
pull_request_target:
66
types: [opened]
7-
env:
8-
MY_GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }}
97

108
permissions:
119
contents: read
@@ -17,13 +15,25 @@ jobs:
1715
runs-on: ubuntu-latest
1816
steps:
1917
- name: Add agent-java label
20-
uses: AlexanderWert/[email protected]
18+
uses: AlexanderWert/issue-labeler@32be4a3c3d8f009c2741af471994337c34b4cb6f # v2.3
2119
with:
2220
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2321
configuration-path: .github/labeler-config.yml
2422
enable-versioned-regex: 0
23+
- name: Get token
24+
id: get_token
25+
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
26+
with:
27+
app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
28+
private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
29+
permissions: >-
30+
{
31+
"members": "read",
32+
"organization_projects": "write",
33+
"issues": "read"
34+
}
2535
- name: Check team membership for user
26-
uses: elastic/get-user-teams-membership@v1.0.4
36+
uses: elastic/get-user-teams-membership@1.1.0
2737
id: checkUserMember
2838
with:
2939
username: ${{ github.actor }}
@@ -32,14 +42,14 @@ jobs:
3242
apmmachine
3343
dependabot
3444
obltmachine
35-
GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }}
45+
GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
3646
- name: Show team membership
3747
run: |
3848
echo "::debug::isTeamMember: ${{ steps.checkUserMember.outputs.isTeamMember }}"
3949
echo "::debug::isExcluded: ${{ steps.checkUserMember.outputs.isExcluded }}"
4050
- name: Add community and triage lables
4151
if: steps.checkUserMember.outputs.isTeamMember != 'true' && steps.checkUserMember.outputs.isExcluded != 'true'
42-
uses: AlexanderWert/[email protected]
52+
uses: AlexanderWert/issue-labeler@32be4a3c3d8f009c2741af471994337c34b4cb6f # v2.3
4353
with:
4454
repo-token: "${{ secrets.GITHUB_TOKEN }}"
4555
configuration-path: .github/community-label.yml
@@ -51,3 +61,5 @@ jobs:
5161
project: 'https://github.com/orgs/elastic/projects/454'
5262
project_id: '5882982'
5363
column_name: 'In Progress'
64+
env:
65+
MY_GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}

‎.github/workflows/pre-post-release.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,29 @@ jobs:
5151
runs-on: ubuntu-latest
5252
needs:
5353
- validate-tag
54-
permissions:
55-
contents: write
56-
env:
57-
GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
5854
steps:
55+
- name: Get token
56+
id: get_token
57+
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
58+
with:
59+
app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
60+
private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
61+
permissions: >-
62+
{
63+
"contents": "write",
64+
"pull_requests": "write"
65+
}
66+
repositories: >-
67+
["ecs-logging-java"]
68+
5969
- uses: actions/checkout@v4
6070
with:
6171
ref: ${{ inputs.ref }}
62-
token: ${{ env.GITHUB_TOKEN }}
72+
token: ${{ steps.get_token.outputs.token }}
6373

6474
- uses: elastic/oblt-actions/git/setup@v1
75+
with:
76+
github-token: ${{ steps.get_token.outputs.token }}
6577

6678
- name: Create the release tag (post phase)
6779
if: inputs.phase == 'post'
@@ -93,4 +105,4 @@ jobs:
93105
- name: Create the ${{ inputs.phase }} release PR
94106
run: gh pr create --title="${{ inputs.pr_title }}" --base main --head ${{ env.BRANCH_NAME }} -b "${{ inputs.pr_body }}"
95107
env:
96-
GH_TOKEN: ${{ env.GITHUB_TOKEN }}
108+
GH_TOKEN: ${{ steps.get_token.outputs.token }}

‎.github/workflows/release-step-3.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
steps:
7676
- id: buildkite-run
7777
name: Run Release
78-
uses: elastic/oblt-actions/buildkite/run@v1.5.0
78+
uses: elastic/oblt-actions/buildkite/run@v1
7979
with:
8080
pipeline: ecs-logging-java-release
8181
token: ${{ secrets.BUILDKITE_TOKEN }}
@@ -85,7 +85,7 @@ jobs:
8585
dry_run=${{ inputs.dry_run || 'false' }}
8686
TARBALL_FILE=${{ env.TARBALL_FILE }}
8787
88-
- uses: elastic/oblt-actions/buildkite/download-artifact@v1.5.0
88+
- uses: elastic/oblt-actions/buildkite/download-artifact@v1
8989
with:
9090
build-number: ${{ steps.buildkite-run.outputs.number }}
9191
path: ${{ env.TARBALL_FILE }}
@@ -96,20 +96,20 @@ jobs:
9696
run: tar xvf ${{ env.TARBALL_FILE }}
9797

9898
- name: generate build provenance
99-
uses: actions/attest-build-provenance@951c0c5f8e375ad4efad33405ab77f7ded2358e4 # v1.1.1
99+
uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
100100
with:
101101
subject-path: "${{ github.workspace }}/**/target/*.jar"
102102

103103
- if: ${{ success() }}
104-
uses: elastic/oblt-actions/slack/send@v1.5.0
104+
uses: elastic/oblt-actions/slack/send@v1
105105
with:
106106
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
107107
channel-id: "#apm-agent-java"
108108
message: |
109109
:runner: [${{ github.repository }}] Release *${{ github.ref_name }}* has been triggered in Buildkite: (<${{ steps.buildkite-run.outputs.build }}|build>)
110110
111111
- if: ${{ failure() }}
112-
uses: elastic/oblt-actions/slack/send@v1.5.0
112+
uses: elastic/oblt-actions/slack/send@v1
113113
with:
114114
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
115115
channel-id: "#apm-agent-java"
@@ -123,10 +123,10 @@ jobs:
123123
needs:
124124
- validate-tag
125125
steps:
126-
- uses: elastic/apm-pipeline-library/.github/actions/await-maven-artifact@current
126+
- uses: elastic/oblt-actions/maven/await-artifact@v1
127127
with:
128-
groupid: 'co.elastic.logging'
129-
artifactid: 'ecs-logging-core'
128+
group-id: 'co.elastic.logging'
129+
artifact-id: 'ecs-logging-core'
130130
version: ${{ inputs.version }}
131131

132132
create-github-release:

0 commit comments

Comments
 (0)