Skip to content

Commit a2e36be

Browse files
authored
DATAGO-121329: Explicitly use vault token for reading SolaceDev packages (#48)
1 parent b1b0261 commit a2e36be

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

.github/workflows/build-integrationtest.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
path: jwt-github
6666
jwtGithubAudience: https://github.com/${{ github.repository_owner }}
6767
exportToken: true
68-
secrets: secret/data/tools/githubactions RE_BOT_PACKAGES_READ_ONLY_CLASSIC_USER | GITHUB_USER ;
69-
secret/data/tools/githubactions RE_BOT_PACKAGES_READ_ONLY_CLASSIC_TOKEN | GITHUB_TOKEN ;
68+
secrets: secret/data/tools/githubactions RE_BOT_PACKAGES_READ_ONLY_CLASSIC_USER | PACKAGES_READ_USER ;
69+
secret/data/tools/githubactions RE_BOT_PACKAGES_READ_ONLY_CLASSIC_TOKEN | PACKAGES_READ_TOKEN ;
7070

7171
- name: Warn of Vault Login Failure
7272
if: steps.secrets.outcome != 'success'
@@ -97,6 +97,9 @@ jobs:
9797
echo "GITHUB_PACKAGES_DEPLOY=$GITHUB_PACKAGES_DEPLOY" >> $GITHUB_ENV
9898
9999
- name: Static Code Analysis
100+
env:
101+
PACKAGES_READ_USER: ${{ steps.secrets.outputs.PACKAGES_READ_USER }}
102+
PACKAGES_READ_TOKEN: ${{ steps.secrets.outputs.PACKAGES_READ_TOKEN }}
100103
run: mvn -B compile process-classes pmd:aggregate-pmd-check spotbugs:check --settings "${GITHUB_WORKSPACE}/maven/settings.xml"
101104

102105
- name: Unit/Integration Tests JDK 8 (zulu)
@@ -109,6 +112,9 @@ jobs:
109112
run: docker info
110113

111114
- name: Run Unit/Integration Tests
115+
env:
116+
PACKAGES_READ_USER: ${{ steps.secrets.outputs.PACKAGES_READ_USER }}
117+
PACKAGES_READ_TOKEN: ${{ steps.secrets.outputs.PACKAGES_READ_TOKEN }}
112118
run: >-
113119
mvn -B clean jacoco:report -Dit.test=SolaceSparkIntegrationTestSuite verify
114120
--settings "${GITHUB_WORKSPACE}/maven/settings.xml"

.github/workflows/release.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
jwtGithubAudience: https://github.com/${{ github.repository_owner }}
5454
exportToken: true
5555
secrets:
56-
secret/data/tools/githubactions RE_BOT_PACKAGES_READ_WRITE_CLASSIC_USER | GITHUB_USER ;
57-
secret/data/tools/githubactions RE_BOT_PACKAGES_READ_WRITE_CLASSIC_TOKEN | GITHUB_TOKEN ;
56+
secret/data/tools/githubactions RE_BOT_PACKAGES_READ_ONLY_CLASSIC_USER | PACKAGES_READ_USER ;
57+
secret/data/tools/githubactions RE_BOT_PACKAGES_READ_ONLY_CLASSIC_TOKEN | PACKAGES_READ_TOKEN ;
5858
secret/data/tools/githubactions MAVEN_GPG_KEY_PASSPHRASE | MAVEN_GPG_KEY_PASSPHRASE ;
5959
secret/data/tools/githubactions MAVEN_GPG_KEY | MAVEN_GPG_KEY ;
6060
secret/data/tools/githubactions MAVEN_USERNAME | MAVEN_USERNAME ;
@@ -128,12 +128,16 @@ jobs:
128128
129129
- name: Deploy Artifacts (GH Packages)
130130
env:
131+
PACKAGES_READ_USER: ${{ steps.secrets.outputs.PACKAGES_READ_USER }}
132+
PACKAGES_READ_TOKEN: ${{ steps.secrets.outputs.PACKAGES_READ_TOKEN }}
131133
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132134
run: >-
133135
mvn deploy -B -DreleaseTarget=github -s maven/settings.xml $SKIP_FLAGS_ALL_TESTS
134136
135137
- name: Deploy Artifacts (Maven Central)
136138
env:
139+
PACKAGES_READ_USER: ${{ steps.secrets.outputs.PACKAGES_READ_USER }}
140+
PACKAGES_READ_TOKEN: ${{ steps.secrets.outputs.PACKAGES_READ_TOKEN }}
137141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
138142
run: >-
139143
mvn deploy -B -DreleaseTarget=central -s maven/settings.xml $SKIP_FLAGS_ALL_TESTS

maven/settings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<servers>
3737
<server>
3838
<id>github-solacedev</id>
39-
<username>${env.GITHUB_USER}</username>
40-
<password>${env.GITHUB_TOKEN}</password>
39+
<username>${env.PACKAGES_READ_USER}</username>
40+
<password>${env.PACKAGES_READ_TOKEN}</password>
4141
</server>
4242
<server>
4343
<id>github</id>

0 commit comments

Comments
 (0)