Skip to content

Commit ce046ac

Browse files
authored
Merge branch 'main' into feat/bump-deps
2 parents a568275 + 3eb33ca commit ce046ac

File tree

18 files changed

+73
-1593
lines changed

18 files changed

+73
-1593
lines changed

.github/actions/bootstrap/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
using: "composite"
1313
steps:
1414

15-
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
15+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
1616
with:
1717
go-version-file: 'go.mod'
1818

@@ -28,4 +28,4 @@ runs:
2828
# See https://goreleaser.com/blog/supply-chain-security/
2929
- name: installs syft for generating the SBOM with goreleaser
3030
if: "${{ inputs.goreleaser == 'true' }}"
31-
uses: anchore/sbom-action/download-syft@f325610c9f50a54015d37c8d16cb3b0e2c8f4de0 # v0.18.0
31+
uses: anchore/sbom-action/download-syft@9f7302141466aa6482940f15371237e9d9f4c34a # v0.19.0

.github/dependabot.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ updates:
1212

1313
# GitHub actions
1414
- package-ecosystem: "github-actions"
15-
directory: "/"
15+
directories:
16+
- "/"
17+
- "/.github/actions/*"
1618
reviewers:
1719
- "elastic/observablt-ci"
1820
schedule:
@@ -23,17 +25,3 @@ updates:
2325
github-actions:
2426
patterns:
2527
- "*"
26-
27-
# GitHub composite actions
28-
- package-ecosystem: "github-actions"
29-
directory: "/.github/actions/bootstrap"
30-
schedule:
31-
interval: "weekly"
32-
day: "sunday"
33-
time: "22:00"
34-
reviewers:
35-
- "elastic/observablt-ci"
36-
groups:
37-
github-actions:
38-
patterns:
39-
- "*"

.github/workflows/docs-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
docs-preview:
12-
uses: elastic/docs-builder/.github/workflows/preview-build.yml@4fd8e89dd8147ac5301c55a24f9dfce0bedb06cf # main
12+
uses: elastic/docs-builder/.github/workflows/preview-build.yml@b133c9db88bc1d1bd83464bd6e275b010601f7af # 0.34.1
1313
with:
1414
path-pattern: docs/**
1515
permissions:

.github/workflows/docs-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
docs-preview:
10-
uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@4fd8e89dd8147ac5301c55a24f9dfce0bedb06cf # main
10+
uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@b133c9db88bc1d1bd83464bd6e275b010601f7af # main
1111
permissions:
1212
contents: none
1313
id-token: write
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: github-commands-comment
3+
4+
on:
5+
pull_request_target:
6+
types:
7+
- opened
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
comment:
14+
runs-on: ubuntu-latest
15+
permissions:
16+
pull-requests: write
17+
steps:
18+
- uses: elastic/oblt-actions/elastic/github-commands@v1

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
fetch-depth: 0
2626

27-
- uses: elastic/oblt-actions/aws/auth@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
27+
- uses: elastic/oblt-actions/aws/auth@476391c0e6815110ce488b8b09c80ed61848a28a # v1
2828
with:
2929
aws-account-id: "267093732750"
3030

@@ -53,15 +53,15 @@ jobs:
5353
run: make release
5454

5555
# Store artifacts to help with troubleshooting
56-
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
56+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
5757
if: always()
5858
with:
5959
name: release
6060
path: "dist/*.*"
6161
retention-days: 5
6262

6363
- name: generate build provenance (binaries)
64-
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
64+
uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
6565
with:
6666
subject-path: "${{ github.workspace }}/dist/*.*"
6767

@@ -71,13 +71,13 @@ jobs:
7171
run: .ci/get-docker-provenance.sh
7272

7373
- name: generate build provenance (containers x86_64)
74-
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
74+
uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
7575
with:
7676
subject-name: ${{ steps.image.outputs.name_1 }}
7777
subject-digest: ${{ steps.image.outputs.digest_1 }}
7878

7979
- name: generate build provenance (containers arm64)
80-
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
80+
uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
8181
with:
8282
subject-name: ${{ steps.image.outputs.name_2 }}
8383
subject-digest: ${{ steps.image.outputs.digest_2 }}
@@ -89,7 +89,7 @@ jobs:
8989
VERSION: ${{ github.ref_name }}
9090

9191
- if: ${{ success() }}
92-
uses: elastic/oblt-actions/slack/send@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
92+
uses: elastic/oblt-actions/slack/send@476391c0e6815110ce488b8b09c80ed61848a28a # v1
9393
with:
9494
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
9595
channel-id: "#apm-aws-lambda"
@@ -98,7 +98,7 @@ jobs:
9898
Build: (<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|here>)
9999
100100
- if: ${{ failure() }}
101-
uses: elastic/oblt-actions/slack/send@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
101+
uses: elastic/oblt-actions/slack/send@476391c0e6815110ce488b8b09c80ed61848a28a # v1
102102
with:
103103
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
104104
channel-id: "#apm-aws-lambda"

.github/workflows/smoke-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
- uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3
4343
with:
4444
terraform_version: 1.2.3
45-
- uses: elastic/oblt-actions/aws/auth@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
46-
- uses: elastic/oblt-actions/google/auth@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
45+
- uses: elastic/oblt-actions/aws/auth@476391c0e6815110ce488b8b09c80ed61848a28a # v1
46+
- uses: elastic/oblt-actions/google/auth@476391c0e6815110ce488b8b09c80ed61848a28a # v1
4747
- uses: google-github-actions/get-secretmanager-secrets@a8440875e1c2892062aef9061228d4f1af8f919b # v2.2.3
4848
with:
4949
export_to_environment: true
@@ -67,7 +67,7 @@ jobs:
6767
run: make smoketest/cleanup
6868

6969
- if: always()
70-
uses: elastic/oblt-actions/slack/notify-result@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
70+
uses: elastic/oblt-actions/slack/notify-result@476391c0e6815110ce488b8b09c80ed61848a28a # v1
7171
with:
7272
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
7373
channel-id: "#apm-aws-lambda"

.github/workflows/test-reporter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
report:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: elastic/oblt-actions/test-report@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
20+
- uses: elastic/oblt-actions/test-report@476391c0e6815110ce488b8b09c80ed61848a28a # v1
2121
with:
2222
artifact: /test-results(.*)/
2323
name: 'Test Report $1'

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: ./.github/actions/bootstrap
3939
- name: Test
4040
run: make test junitfile="${{ matrix.platform }}-junit-report.xml"
41-
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
41+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
4242
if: success() || failure()
4343
with:
4444
name: test-results-${{ matrix.platform }}
@@ -56,7 +56,7 @@ jobs:
5656
- name: Build
5757
run: make dist
5858

59-
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
59+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
6060
if: always()
6161
with:
6262
name: snapshots
@@ -93,7 +93,7 @@ jobs:
9393
runs-on: ubuntu-latest
9494
steps:
9595
- id: check
96-
uses: elastic/oblt-actions/check-dependent-jobs@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
96+
uses: elastic/oblt-actions/check-dependent-jobs@476391c0e6815110ce488b8b09c80ed61848a28a # v1
9797
with:
9898
jobs: ${{ toJSON(needs) }}
9999
- run: ${{ steps.check.outputs.is-success }}

NOTICE.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ Third party libraries used by the Elastic APM AWS Lambda extension.
1919

2020
--------------------------------------------------------------------------------
2121
Module : github.com/aws/aws-sdk-go-v2/config
22-
Version : v1.29.13
23-
Time : 2025-04-03T18:31:54Z
22+
Version : v1.29.14
23+
Time : 2025-04-10T18:32:01Z
2424
Licence : Apache-2.0
2525

26-
Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/[email protected].13/LICENSE.txt:
26+
Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/[email protected].14/LICENSE.txt:
2727

2828

2929
Apache License
@@ -231,11 +231,11 @@ Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/confi
231231

232232
--------------------------------------------------------------------------------
233233
Module : github.com/aws/aws-sdk-go-v2/credentials
234-
Version : v1.17.66
235-
Time : 2025-04-03T18:31:54Z
234+
Version : v1.17.67
235+
Time : 2025-04-10T18:32:01Z
236236
Licence : Apache-2.0
237237

238-
Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/[email protected].66/LICENSE.txt:
238+
Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/[email protected].67/LICENSE.txt:
239239

240240

241241
Apache License
@@ -1291,11 +1291,11 @@ Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/inter
12911291

12921292
--------------------------------------------------------------------------------
12931293
Module : github.com/aws/aws-sdk-go-v2/service/acm
1294-
Version : v1.31.2
1295-
Time : 2025-04-03T18:31:54Z
1294+
Version : v1.32.0
1295+
Time : 2025-04-28T18:22:09Z
12961296
Licence : Apache-2.0
12971297

1298-
Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/service/acm@v1.31.2/LICENSE.txt:
1298+
Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/service/acm@v1.32.0/LICENSE.txt:
12991299

13001300

13011301
Apache License
@@ -1927,11 +1927,11 @@ Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/servi
19271927

19281928
--------------------------------------------------------------------------------
19291929
Module : github.com/aws/aws-sdk-go-v2/service/secretsmanager
1930-
Version : v1.35.3
1931-
Time : 2025-04-03T18:31:54Z
1930+
Version : v1.35.4
1931+
Time : 2025-04-16T18:34:35Z
19321932
Licence : Apache-2.0
19331933

1934-
Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/service/[email protected].3/LICENSE.txt:
1934+
Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/service/[email protected].4/LICENSE.txt:
19351935

19361936

19371937
Apache License
@@ -2563,11 +2563,11 @@ Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/servi
25632563

25642564
--------------------------------------------------------------------------------
25652565
Module : github.com/aws/aws-sdk-go-v2/service/sts
2566-
Version : v1.33.18
2567-
Time : 2025-04-03T18:31:54Z
2566+
Version : v1.33.19
2567+
Time : 2025-04-10T18:32:01Z
25682568
Licence : Apache-2.0
25692569

2570-
Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/service/[email protected].18/LICENSE.txt:
2570+
Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/service/[email protected].19/LICENSE.txt:
25712571

25722572

25732573
Apache License
@@ -3537,11 +3537,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/[email protected]/LICENS
35373537

35383538
--------------------------------------------------------------------------------
35393539
Module : go.elastic.co/fastjson
3540-
Version : v1.5.0
3541-
Time : 2025-02-13T12:25:25Z
3540+
Version : v1.5.1
3541+
Time : 2025-05-06T14:56:09Z
35423542
Licence : MIT
35433543

3544-
Contents of probable licence file $GOMODCACHE/go.elastic.co/[email protected].0/LICENSE:
3544+
Contents of probable licence file $GOMODCACHE/go.elastic.co/[email protected].1/LICENSE:
35453545

35463546
Copyright 2018 Elasticsearch BV
35473547

0 commit comments

Comments
 (0)