diff --git a/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md b/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md index 86839899e2..73b9664853 100644 --- a/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md +++ b/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md @@ -383,6 +383,14 @@ In special cases, manual actions may be required to provision certain resources To successfully deploy the sites module using the `fa.parameters.json` parameter file, you need to create an Azure Active Directory App with its API endpoint enabled (e.g., `api://`) and add a secret. The secret value needs then to be stored in a Key Vault secret. +Finally, the elements described above must further be configured in the following files: + +| File | Parameter | Notes | +| - | - | - | +| `modules\Microsoft.Web\sites\.test\common\deploy.bicep` | `appSettingsKeyValuePairs.EASYAUTH_SECRET` | Key Vault secret URI without version (e.g., 'https://Test-KeyVault.vault.azure.net/secrets/aBcDeFghIjK69Ln') | +| `modules\Microsoft.Web\sites\.test\common\deploy.bicep` | `authSettingV2Configuration.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App (e.g., '11111111-1111-1111-1111-11111111111') | +| `modules\Microsoft.Web\sites\.test\common\deploy.bicep` | `authSettingV2Configuration.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app (e.g., 'api://11111111-1111-1111-1111-11111111111') | + # 5. Update module test files Once the required dependencies are deployed, there is one more step left to get as many module pipelines running as possible. @@ -400,9 +408,6 @@ For this reason, make sure to update the references in the following modules onc | `modules\Microsoft.Compute\virtualMachineScaleSets\.test\windows.parameters.json` | `extensionDiskEncryptionConfig.value.settings.KeyEncryptionKeyURL` | | | `modules\Microsoft.Sql\managedInstances\.test\parameters.json` | `keys.value.uri` | | | `modules\Microsoft.Network\applicationGateways\.test\parameters.json` | `sslCertificates.value.properties.keyVaultSecretId` | | -| `modules\Microsoft.Web\sites\.test\fa.parameters.json` | `appSettingsKeyValuePairs.value.EASYAUTH_SECRET` | Key Vault secret URI without version | -| `modules\Microsoft.Web\sites\.test\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App | -| `modules\Microsoft.Web\sites\.test\fa.parameters.json` | `authSettingV2Configuration.value.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app | diff --git a/modules/Microsoft.Web/sites/.test/FunctionAppCommon/dependencies.bicep b/modules/Microsoft.Web/sites/.test/functionAppCommon/dependencies.bicep similarity index 100% rename from modules/Microsoft.Web/sites/.test/FunctionAppCommon/dependencies.bicep rename to modules/Microsoft.Web/sites/.test/functionAppCommon/dependencies.bicep diff --git a/modules/Microsoft.Web/sites/.test/FunctionAppCommon/deploy.test.bicep b/modules/Microsoft.Web/sites/.test/functionAppCommon/deploy.test.bicep similarity index 93% rename from modules/Microsoft.Web/sites/.test/FunctionAppCommon/deploy.test.bicep rename to modules/Microsoft.Web/sites/.test/functionAppCommon/deploy.test.bicep index 8e3d4bec39..05c7a931c4 100644 --- a/modules/Microsoft.Web/sites/.test/FunctionAppCommon/deploy.test.bicep +++ b/modules/Microsoft.Web/sites/.test/functionAppCommon/deploy.test.bicep @@ -53,7 +53,7 @@ module diagnosticDependencies '../../../../.shared/dependencyConstructs/diagnost // ============== // // Test Execution // // ============== // - +// For the below test case, please consider the guidelines described here: https://github.com/Azure/ResourceModules/wiki/Getting%20started%20-%20Scenario%202%20Onboard%20module%20library%20and%20CI%20environment#microsoftwebsites module testDeployment '../../deploy.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' @@ -64,7 +64,7 @@ module testDeployment '../../deploy.bicep' = { appInsightId: resourceGroupResources.outputs.applicationInsightsResourceId appSettingsKeyValuePairs: { AzureFunctionsJobHost__logging__logLevel__default: 'Trace' - EASYAUTH_SECRET: 'https://adp-<>-az-kv-x-001.${environment().suffixes.keyvaultDns}/secrets/Modules-Test-SP-Password' + EASYAUTH_SECRET: 'https://<>-KeyVault${environment().suffixes.keyvaultDns}/secrets/Modules-Test-SP-Password' FUNCTIONS_EXTENSION_VERSION: '~4' FUNCTIONS_WORKER_RUNTIME: 'dotnet' }