Merge pull request #83 from delegateas/features/controllable-app-service-naming-in-bicep

Optional app service name override

Author: Lucki2g

Infrastructure/main.bicep

@@ -4,6 +4,9 @@ param websitePassword string
 @secure()
 param sessionSecret string
 
+@description('Custom name for the App Service. If not provided, defaults to wa-{solutionId}')
+param appServiceName string = ''
+
 param adoOrganizationUrl string = ''
 param adoProjectName string = ''
 param adoRepositoryName string = ''
@@ -28,6 +31,7 @@ param entraIdAllowedGroups string = ''
 param disablePasswordAuth bool = false
 
 var location = resourceGroup().location
+var resolvedAppServiceName = empty(appServiceName) ? 'wa-${solutionId}' : appServiceName
 
 @description('Create an App Service Plan')
 resource appServicePlan 'Microsoft.Web/serverfarms@2021-02-01' = {
@@ -44,7 +48,7 @@ resource appServicePlan 'Microsoft.Web/serverfarms@2021-02-01' = {
 
 @description('Create a Web App')
 resource webApp 'Microsoft.Web/sites@2021-02-01' = {
-  name: 'wa-${solutionId}'
+  name: resolvedAppServiceName
   location: location
   identity: {
     type: 'SystemAssigned'
@@ -70,7 +74,7 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
         }
         {
           name: 'NEXTAUTH_URL'
-          value: 'https://wa-${solutionId}.azurewebsites.net'
+          value: 'https://${resolvedAppServiceName}.azurewebsites.net'
         }
         {
           name: 'WEBSITE_NODE_DEFAULT_VERSION'
@@ -119,5 +123,6 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
 
 @description('Output the web app name and managed identity info')
 output webAppName string = webApp.name
+output webAppUrl string = 'https://${webApp.properties.defaultHostName}'
 output managedIdentityPrincipalId string = webApp.identity.principalId
 output managedIdentityClientId string = webApp.identity.tenantId

Setup/azure-pipelines-deploy-jobs.yml

@@ -23,6 +23,9 @@ parameters:
   - name: websiteName
     type: string
     default: ''
+  - name: appServiceName
+    type: string
+    default: ''
   - name: adoOrganizationUrl
     type: string
     default: ''
@@ -69,6 +72,7 @@ steps:
           --parameters websitePassword="${{ parameters.websitePassword }}" `
           --parameters sessionSecret="${{ parameters.websiteSessionSecret }}" `
           --parameters solutionId="${{ parameters.websiteName }}" `
+          --parameters appServiceName="${{ parameters.appServiceName }}" `
           --parameters adoOrganizationUrl="${{ parameters.adoOrganizationUrl }}" `
           --parameters adoProjectName="${{ parameters.adoProjectName }}" `
           --parameters adoRepositoryName="${{ parameters.adoRepositoryName }}" `

Setup/azure-pipelines-external.yml

@@ -28,6 +28,9 @@
 #   - EnableEntraIdAuth (string: 'true' or 'false', default: 'false')
 #   - DisablePasswordAuth (string: 'true' or 'false', default: 'false')
 #   - EntraIdAllowedGroups (comma-separated list of Entra ID group object IDs)
+#
+# Optional variables (for custom naming):
+#   - AppServiceName (custom App Service name, defaults to wa-{WebsiteName} if not provided)
 
 trigger: none
 pr: none
@@ -97,6 +100,7 @@ stages:
               websitePassword: $(WebsitePassword)
               websiteSessionSecret: $(WebsiteSessionSecret)
               websiteName: $(WebsiteName)
+              appServiceName: ${{ coalesce(variables.AppServiceName, '') }}
               adoOrganizationUrl: $(System.CollectionUri)
               adoProjectName: $(System.TeamProject)
               adoRepositoryName: ${{ coalesce(variables.AdoRepositoryName, '') }}

Website/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "website",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "private": true,
   "scripts": {
     "dev": "next dev",