Skip to content

Commit 54f3940

Browse files
EMaherCopilot
andcommitted
fix: make APIM_PUBLISHER_EMAIL optional with contoso.com fallback
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent f244ec1 commit 54f3940

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

.github/skills/integration-test-prerequisites/SKILL.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ gh secret set AZURE_SUBSCRIPTION_ID \
140140
--env "${GITHUB_ENVIRONMENT}" \
141141
--body "${SUBSCRIPTION_ID}"
142142

143+
# Optional — falls back to apim-integration-test@contoso.com if not set
143144
gh secret set APIM_PUBLISHER_EMAIL \
144145
--repo "${GITHUB_OWNER}/${GITHUB_REPO}" \
145146
--env "${GITHUB_ENVIRONMENT}" \

.github/workflows/integration-redact-secrets.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ jobs:
8282
[[ -z "${{ secrets.AZURE_CLIENT_ID }}" ]] && missing+=("AZURE_CLIENT_ID")
8383
[[ -z "${{ secrets.AZURE_TENANT_ID }}" ]] && missing+=("AZURE_TENANT_ID")
8484
[[ -z "${{ secrets.AZURE_SUBSCRIPTION_ID }}" ]] && missing+=("AZURE_SUBSCRIPTION_ID")
85-
[[ -z "${{ secrets.APIM_PUBLISHER_EMAIL }}" ]] && missing+=("APIM_PUBLISHER_EMAIL")
8685
if [[ ${#missing[@]} -gt 0 ]]; then
8786
echo "::error::Missing required secrets: ${missing[*]}"
8887
exit 1
@@ -103,7 +102,7 @@ jobs:
103102
run: |
104103
./tests/integration/redact-secrets/run-redact-secrets-test.ps1 `
105104
-SourceSubscriptionId '${{ secrets.AZURE_SUBSCRIPTION_ID }}' `
106-
-PublisherEmail '${{ secrets.APIM_PUBLISHER_EMAIL }}' `
105+
-PublisherEmail '${{ secrets.APIM_PUBLISHER_EMAIL || 'apim-integration-test@contoso.com' }}' `
107106
-SkuName '${{ inputs.sku }}' `
108107
-Location '${{ inputs.location }}' `
109108
-LogLevel '${{ inputs.log_level }}'

.github/workflows/integration-test.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
# Required secrets (in the 'integration-test' environment):
1010
# - AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_SUBSCRIPTION_ID (OIDC login)
11-
# - APIM_PUBLISHER_EMAIL
11+
# - APIM_PUBLISHER_EMAIL (optional; defaults to apim-integration-test@contoso.com)
1212
#
1313
# Required federated credential subject for GitHub OIDC:
1414
# - Match the subject claim format configured for this repo/org.
@@ -106,7 +106,6 @@ jobs:
106106
[[ -z "${{ secrets.AZURE_CLIENT_ID }}" ]] && missing+=("AZURE_CLIENT_ID")
107107
[[ -z "${{ secrets.AZURE_TENANT_ID }}" ]] && missing+=("AZURE_TENANT_ID")
108108
[[ -z "${{ secrets.AZURE_SUBSCRIPTION_ID }}" ]] && missing+=("AZURE_SUBSCRIPTION_ID")
109-
[[ -z "${{ secrets.APIM_PUBLISHER_EMAIL }}" ]] && missing+=("APIM_PUBLISHER_EMAIL")
110109
if [[ ${#missing[@]} -gt 0 ]]; then
111110
echo "::error::Missing required secrets: ${missing[*]}"
112111
exit 1
@@ -148,7 +147,7 @@ jobs:
148147
SkuName = '${{ steps.settings.outputs.skuName }}'
149148
Location = '${{ inputs.location }}'
150149
LogLevel = '${{ steps.settings.outputs.logLevel }}'
151-
PublisherEmail = '${{ secrets.APIM_PUBLISHER_EMAIL }}'
150+
PublisherEmail = '${{ secrets.APIM_PUBLISHER_EMAIL || 'apim-integration-test@contoso.com' }}'
152151
}
153152
./tests/integration/all-resource-types/phases/run-phase1-deploy.ps1 @params
154153

0 commit comments

Comments
 (0)