Skip to content

Commit 3c02b46

Browse files
committed
ci: clean Azure Key Vault secret retrieval in reusable reviews
1 parent 55070d1 commit 3c02b46

2 files changed

Lines changed: 30 additions & 18 deletions

File tree

.github/workflows/reusable-claude-review.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,23 +109,29 @@ jobs:
109109
client-id: ${{ inputs.azure_client_id }}
110110
tenant-id: ${{ inputs.azure_tenant_id }}
111111
subscription-id: ${{ inputs.azure_subscription_id }}
112+
enable-AzPSSession: true
112113

113114
- name: Fetch Claude OAuth token from Azure Key Vault
114115
id: keyvault
116+
uses: azure/powershell@6101bc5f8a23168669e44f7e68db621ec5ecbc6e # v2
115117
env:
116118
AZURE_KEY_VAULT_NAME: ${{ inputs.azure_key_vault_name }}
117119
CLAUDE_SECRET_NAME: ${{ inputs.claude_secret_name }}
118-
run: |
119-
set -euo pipefail
120+
with:
121+
azPSVersion: latest
122+
inlineScript: |
123+
$ErrorActionPreference = "Stop"
120124
121-
claude_token="$(az keyvault secret show --vault-name "${AZURE_KEY_VAULT_NAME}" --name "${CLAUDE_SECRET_NAME}" --query value -o tsv)"
122-
if [ -z "${claude_token}" ]; then
123-
echo "Failed to read Claude token from Azure Key Vault secret '${CLAUDE_SECRET_NAME}'."
124-
exit 1
125-
fi
125+
$vaultName = $env:AZURE_KEY_VAULT_NAME
126+
$secretName = $env:CLAUDE_SECRET_NAME
127+
$claudeToken = Get-AzKeyVaultSecret -VaultName $vaultName -Name $secretName -AsPlainText
128+
129+
if ([string]::IsNullOrWhiteSpace($claudeToken)) {
130+
throw "Failed to read Claude token from Azure Key Vault secret '$secretName'."
131+
}
126132
127-
echo "::add-mask::${claude_token}"
128-
echo "claude_code_oauth_token=${claude_token}" >> "${GITHUB_OUTPUT}"
133+
Write-Output "::add-mask::$claudeToken"
134+
"claude_code_oauth_token=$claudeToken" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
129135
130136
- name: Resolve pull request metadata
131137
id: pr

.github/workflows/reusable-opencode-review.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,23 +180,29 @@ jobs:
180180
client-id: ${{ inputs.azure_client_id }}
181181
tenant-id: ${{ inputs.azure_tenant_id }}
182182
subscription-id: ${{ inputs.azure_subscription_id }}
183+
enable-AzPSSession: true
183184

184185
- name: Fetch OpenCode model key from Azure Key Vault
185186
id: keyvault
187+
uses: azure/powershell@6101bc5f8a23168669e44f7e68db621ec5ecbc6e # v2
186188
env:
187189
AZURE_KEY_VAULT_NAME: ${{ inputs.azure_key_vault_name }}
188190
ZHIPU_SECRET_NAME: ${{ inputs.zhipu_secret_name }}
189-
run: |
190-
set -euo pipefail
191+
with:
192+
azPSVersion: latest
193+
inlineScript: |
194+
$ErrorActionPreference = "Stop"
191195
192-
zhipu_api_key="$(az keyvault secret show --vault-name "${AZURE_KEY_VAULT_NAME}" --name "${ZHIPU_SECRET_NAME}" --query value -o tsv)"
193-
if [ -z "${zhipu_api_key}" ]; then
194-
echo "Failed to read OpenCode API key from Azure Key Vault secret '${ZHIPU_SECRET_NAME}'."
195-
exit 1
196-
fi
196+
$vaultName = $env:AZURE_KEY_VAULT_NAME
197+
$secretName = $env:ZHIPU_SECRET_NAME
198+
$zhipuApiKey = Get-AzKeyVaultSecret -VaultName $vaultName -Name $secretName -AsPlainText
199+
200+
if ([string]::IsNullOrWhiteSpace($zhipuApiKey)) {
201+
throw "Failed to read OpenCode API key from Azure Key Vault secret '$secretName'."
202+
}
197203
198-
echo "::add-mask::${zhipu_api_key}"
199-
echo "zhipu_api_key=${zhipu_api_key}" >> "${GITHUB_OUTPUT}"
204+
Write-Output "::add-mask::$zhipuApiKey"
205+
"zhipu_api_key=$zhipuApiKey" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
200206
201207
- name: Resolve pull request metadata
202208
id: pr

0 commit comments

Comments
 (0)