Skip to content

Commit 9e101f5

Browse files
authored
chore: retrieve tokens from vault (#112)
1 parent d52a2b2 commit 9e101f5

File tree

6 files changed

+49
-17
lines changed

6 files changed

+49
-17
lines changed

.github/workflows/tag_linux.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66
- 'v*'
77
- '!v*opentelemetry'
88
- '!v*opentracing'
9-
109
jobs:
1110
release-linux-profiler-x86_64:
1211
permissions:
1312
contents: write
13+
id-token: write
1414
runs-on: ubuntu-latest
1515
env:
1616
DOCKER_BUILDKIT: 1
@@ -26,11 +26,16 @@ jobs:
2626
with:
2727
submodules: 'true'
2828
persist-credentials: false
29+
- uses: grafana/shared-workflows/actions/get-vault-secrets@28361cdb22223e5f1e34358c86c20908e7248760
30+
with:
31+
repo_secrets: |
32+
DOCKERHUB_USERNAME=dockerhub:user
33+
DOCKERHUB_PASSWORD=dockerhub:token
2934
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 #v3.4.0
3035
name: Login to Docker Hub
3136
with:
32-
username: ${{ secrets.DOCKERHUB_USERNAME }}
33-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
37+
username: ${{ env.DOCKERHUB_USERNAME }}
38+
password: ${{ env.DOCKERHUB_PASSWORD }}
3439
- run: make bump_version && git diff --exit-code
3540
- run: make docker/build
3641
- run: make docker/push
@@ -42,6 +47,7 @@ jobs:
4247
release-linux-profiler-aarch64:
4348
permissions:
4449
contents: write
50+
id-token: write
4551
runs-on: github-hosted-ubuntu-arm64-large
4652
env:
4753
DOCKER_BUILDKIT: 1
@@ -57,11 +63,16 @@ jobs:
5763
with:
5864
submodules: 'true'
5965
persist-credentials: false
66+
- uses: grafana/shared-workflows/actions/get-vault-secrets@28361cdb22223e5f1e34358c86c20908e7248760
67+
with:
68+
repo_secrets: |
69+
DOCKERHUB_USERNAME=dockerhub:user
70+
DOCKERHUB_PASSWORD=dockerhub:token
6071
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 #v3.4.0
6172
name: Login to Docker Hub
6273
with:
63-
username: ${{ secrets.DOCKERHUB_USERNAME }}
64-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
74+
username: ${{ env.DOCKERHUB_USERNAME }}
75+
password: ${{ env.DOCKERHUB_PASSWORD }}
6576
- run: make bump_version && git diff --exit-code
6677
- run: make docker/build
6778
- run: make docker/push
@@ -73,6 +84,7 @@ jobs:
7384
release-linux-profiler:
7485
permissions:
7586
contents: read
87+
id-token: write
7688
needs: ['release-linux-profiler-x86_64', 'release-linux-profiler-aarch64']
7789
runs-on: ubuntu-latest
7890
env:
@@ -88,9 +100,14 @@ jobs:
88100
with:
89101
submodules: 'true'
90102
persist-credentials: false
103+
- uses: grafana/shared-workflows/actions/get-vault-secrets@28361cdb22223e5f1e34358c86c20908e7248760
104+
with:
105+
repo_secrets: |
106+
DOCKERHUB_USERNAME=dockerhub:user
107+
DOCKERHUB_PASSWORD=dockerhub:token
91108
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 #v3.4.0
92109
name: Login to Docker Hub
93110
with:
94-
username: ${{ secrets.DOCKERHUB_USERNAME }}
95-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
111+
username: ${{ env.DOCKERHUB_USERNAME }}
112+
password: ${{ env.DOCKERHUB_PASSWORD }}
96113
- run: make docker/manifest

.github/workflows/tag_managed_helper.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99

1010
permissions:
1111
contents: write
12+
id-token: write
1213

1314
jobs:
1415
release-managed-helper:
@@ -27,11 +28,15 @@ jobs:
2728
- run: make bump_version && git diff --exit-code
2829
- run: dotnet build -c Release
2930
working-directory: Pyroscope
31+
- uses: grafana/shared-workflows/actions/get-vault-secrets@28361cdb22223e5f1e34358c86c20908e7248760
32+
with:
33+
repo_secrets: |
34+
NUGET_API_KEY=nuget:api_key
3035
- name: Publish the package to nuget.org
31-
run: dotnet nuget push Pyroscope/bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
36+
run: dotnet nuget push Pyroscope/bin/Release/*.nupkg -k "${NUGET_API_KEY}" -s https://api.nuget.org/v3/index.json
3237
working-directory: Pyroscope
3338
env:
34-
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }}
39+
NUGET_API_KEY: ${{ env.NUGET_API_KEY }}
3540
- name: Release
3641
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
3742
if: startsWith(github.ref, 'refs/tags/')

.github/workflows/tag_tracing_opentelemetry_helper.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
permissions:
99
contents: write
10+
id-token: write
1011

1112
jobs:
1213
release-opentelemetry-lib:
@@ -22,11 +23,15 @@ jobs:
2223
dotnet-version: '6.0'
2324
- run: dotnet build -c Release
2425
working-directory: Pyroscope/Pyroscope.OpenTelemetry
26+
- uses: grafana/shared-workflows/actions/get-vault-secrets@28361cdb22223e5f1e34358c86c20908e7248760
27+
with:
28+
repo_secrets: |
29+
NUGET_API_KEY=nuget:api_key
2530
- name: Publish the package to nuget.org
26-
run: dotnet nuget push bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
31+
run: dotnet nuget push bin/Release/*.nupkg -k "${NUGET_API_KEY}" -s https://api.nuget.org/v3/index.json
2732
working-directory: Pyroscope/Pyroscope.OpenTelemetry
2833
env:
29-
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }}
34+
NUGET_API_KEY: ${{ env.NUGET_API_KEY }}
3035
- name: Release
3136
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
3237
if: startsWith(github.ref, 'refs/tags/')

.github/workflows/tag_tracing_opentracing_helper.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
permissions:
99
contents: write
10+
id-token: write
1011

1112
jobs:
1213
release-opentracing-lib:
@@ -22,11 +23,15 @@ jobs:
2223
dotnet-version: '6.0'
2324
- run: dotnet build -c Release
2425
working-directory: Pyroscope/Pyroscope.OpenTracing
26+
- uses: grafana/shared-workflows/actions/get-vault-secrets@28361cdb22223e5f1e34358c86c20908e7248760
27+
with:
28+
repo_secrets: |
29+
NUGET_API_KEY=nuget:api_key
2530
- name: Publish the package to nuget.org
26-
run: dotnet nuget push bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
31+
run: dotnet nuget push bin/Release/*.nupkg -k "${NUGET_API_KEY}" -s https://api.nuget.org/v3/index.json
2732
working-directory: Pyroscope/Pyroscope.OpenTracing
2833
env:
29-
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }}
34+
NUGET_API_KEY: ${{ env.NUGET_API_KEY }}
3035
- name: Release
3136
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
3237
if: startsWith(github.ref, 'refs/tags/')

Pyroscope/Pyroscope/Pyroscope.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8-
<PackageVersion>0.10.0</PackageVersion>
9-
<AssemblyVersion>0.10.0</AssemblyVersion>
10-
<FileVersion>0.10.0</FileVersion>
8+
<PackageVersion>0.12.0</PackageVersion>
9+
<AssemblyVersion>0.12.0</AssemblyVersion>
10+
<FileVersion>0.12.0</FileVersion>
1111
<LangVersion>10</LangVersion>
1212
</PropertyGroup>
1313

profiler/src/ProfilerEngine/Datadog.Profiler.Native/PyroscopePprofSink.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "httplib.h"
1111
#include "url.hpp"
1212

13-
#define PYROSCOPE_SPY_VERSION "0.10.0"
13+
#define PYROSCOPE_SPY_VERSION "0.12.0"
1414

1515
class PyroscopePprofSink : public PProfExportSink
1616
{

0 commit comments

Comments
 (0)