update web site config to avm

Azure · Jul 5, 2024 · cef4144 · cef4144
1 parent 00648d5
commit cef4144
Show file tree

Hide file tree

Showing 23 changed files with 179 additions and 127 deletions.
diff --git a/templates/todo/common/infra/bicep/app/website-config.bicep b/templates/todo/common/infra/bicep/app/website-config.bicep
diff --git a/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/infra/main.bicep b/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/infra/main.bicep
@@ -44,6 +44,7 @@ var actualDatabaseName = !empty(cosmosDatabaseName) ? cosmosDatabaseName : 'Todo
 var webUri = 'https://${web.outputs.defaultHostname}'
 var apiUri = 'https://${api.outputs.defaultHostname}'
 var apimApiUri = 'https://${apim.outputs.name}.azure-api.net/todo'
+var apimServiceId = useAPIM ? apim.outputs.resourceId : ''
 
 // Organize resources in a resource group
 resource rg 'Microsoft.Resources/resourceGroups@2021-04-01' = {
@@ -53,7 +54,7 @@ resource rg 'Microsoft.Resources/resourceGroups@2021-04-01' = {
 }
 
 // The application frontend
-module web 'br/public:avm/res/web/site:0.3.4' = {
+module web 'br/public:avm/res/web/site:0.3.9' = {
   name: 'web'
   scope: rg
   params: {
@@ -68,11 +69,17 @@ module web 'br/public:avm/res/web/site:0.3.4' = {
       linuxFxVersion: 'node|20-lts'
       alwaysOn: true
     }
+    logsConfiguration: {
+      applicationLogs: { fileSystem: { level: 'Verbose' } }
+      detailedErrorMessages: { enabled: true }
+      failedRequestsTracing: { enabled: true }
+      httpLogs: { fileSystem: { enabled: true, retentionInDays: 1, retentionInMb: 35 } }
+    }
   }
 }
 
 // The application backend
-module api 'br/public:avm/res/web/site:0.3.4' = {
+module api 'br/public:avm/res/web/site:0.3.9' = {
   name: 'api'
   scope: rg
   params: {
@@ -102,6 +109,12 @@ module api 'br/public:avm/res/web/site:0.3.4' = {
       SCM_DO_BUILD_DURING_DEPLOYMENT: 'False'
       ENABLE_ORYX_BUILD: 'True'
     }
+    logsConfiguration: {
+      applicationLogs: { fileSystem: { level: 'Verbose' } }
+      detailedErrorMessages: { enabled: true }
+      failedRequestsTracing: { enabled: true }
+      httpLogs: { fileSystem: { enabled: true, retentionInDays: 1, retentionInMb: 35 } }
+    }
   }
 }
 
@@ -336,13 +349,19 @@ module apim 'br/public:avm/res/api-management/service:0.2.0' = if (useAPIM) {
 }
 
 //Configures the API settings for an api app within the Azure API Management (APIM) service.
-module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' = if (useAPIM) {
+module apiConfig 'br/public:avm/res/web/site:0.3.9' = if (useAPIM) {
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
-    apiName: apimApiName
-    apiAppName: api.outputs.name
+    kind: 'app'
+    name: api.outputs.name
+    serverFarmResourceId: appServicePlan.outputs.resourceId
+    location: location
+    apiManagementConfiguration: {
+      apiManagementConfig: {
+        id: '${apimServiceId}/apis/${apimApiName}'
+      }
+    }
   }
 }
 

diff --git a/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/repo.yaml b/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/repo.yaml
@@ -118,9 +118,6 @@ repo:
     - from: ../../../../common/infra/bicep/app/applicationinsights-dashboard.bicep
       to: ./infra/app/applicationinsights-dashboard.bicep
 
-    - from: ../../../../common/infra/bicep/app/website-config.bicep
-      to: ./infra/app/website-config.bicep
-
     - from: ./../../
       to: ./
       ignore:

diff --git a/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/infra/main.bicep b/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/infra/main.bicep
@@ -56,6 +56,7 @@ var actualDatabaseName = !empty(sqlDatabaseName) ? sqlDatabaseName : defaultData
 var webUri = 'https://${web.outputs.defaultHostname}'
 var apiUri = 'https://${api.outputs.defaultHostname}'
 var apimApiUri = 'https://${apim.outputs.name}.azure-api.net/todo'
+var apimServiceId = useAPIM ? apim.outputs.resourceId : ''
 
 // Organize resources in a resource group
 resource rg 'Microsoft.Resources/resourceGroups@2021-04-01' = {
@@ -77,7 +78,7 @@ module web 'br/public:avm/res/web/static-site:0.3.0' = {
 }
 
 // The application backend
-module api 'br/public:avm/res/web/site:0.3.4' = {
+module api 'br/public:avm/res/web/site:0.3.9' = {
   name: 'api'
   scope: rg
   params: {
@@ -107,6 +108,12 @@ module api 'br/public:avm/res/web/site:0.3.4' = {
       SCM_DO_BUILD_DURING_DEPLOYMENT: 'False'
       ENABLE_ORYX_BUILD: 'True'
     }
+    logsConfiguration: {
+      applicationLogs: { fileSystem: { level: 'Verbose' } }
+      detailedErrorMessages: { enabled: true }
+      failedRequestsTracing: { enabled: true }
+      httpLogs: { fileSystem: { enabled: true, retentionInDays: 1, retentionInMb: 35 } }
+    }
     storageAccountResourceId: storage.outputs.resourceId
   }
 }
@@ -355,13 +362,19 @@ module apim 'br/public:avm/res/api-management/service:0.2.0' = if (useAPIM) {
 }
 
 //Configures the API settings for an api app within the Azure API Management (APIM) service.
-module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' = if (useAPIM) {
+module apiConfig 'br/public:avm/res/web/site:0.3.9' = if (useAPIM) {
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
-    apiName: apimApiName
-    apiAppName: api.outputs.name
+    kind: 'app'
+    name: api.outputs.name
+    serverFarmResourceId: appServicePlan.outputs.resourceId
+    location: location
+    apiManagementConfiguration: {
+      apiManagementConfig: {
+        id: '${apimServiceId}/apis/${apimApiName}'
+      }
+    }
   }
 }
 

diff --git a/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/repo.yaml b/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/repo.yaml
@@ -118,9 +118,6 @@ repo:
     - from: ../../../../common/infra/bicep/app/applicationinsights-dashboard.bicep
       to: ./infra/app/applicationinsights-dashboard.bicep
 
-    - from: ../../../../common/infra/bicep/app/website-config.bicep
-      to: ./infra/app/website-config.bicep
-
     - from: ../../../../common/infra/bicep/app/sql-deployment-script.bicep
       to: ./infra/app/sql-deployment-script.bicep
 

diff --git a/templates/todo/projects/csharp-sql/.repo/bicep/infra/main.bicep b/templates/todo/projects/csharp-sql/.repo/bicep/infra/main.bicep
@@ -54,6 +54,7 @@ var actualDatabaseName = !empty(sqlDatabaseName) ? sqlDatabaseName : defaultData
 var webUri = 'https://${web.outputs.defaultHostname}'
 var apiUri = 'https://${api.outputs.defaultHostname}'
 var apimApiUri = 'https://${apim.outputs.name}.azure-api.net/todo'
+var apimServiceId = useAPIM ? apim.outputs.resourceId : ''
 
 // Organize resources in a resource group
 resource rg 'Microsoft.Resources/resourceGroups@2021-04-01' = {
@@ -63,7 +64,7 @@ resource rg 'Microsoft.Resources/resourceGroups@2021-04-01' = {
 }
 
 // The application frontend
-module web 'br/public:avm/res/web/site:0.3.2' = {
+module web 'br/public:avm/res/web/site:0.3.9' = {
   name: 'web'
   scope: rg
   params: {
@@ -78,11 +79,17 @@ module web 'br/public:avm/res/web/site:0.3.2' = {
       linuxFxVersion: 'node|20-lts'
       alwaysOn: true
     }
+    logsConfiguration: {
+      applicationLogs: { fileSystem: { level: 'Verbose' } }
+      detailedErrorMessages: { enabled: true }
+      failedRequestsTracing: { enabled: true }
+      httpLogs: { fileSystem: { enabled: true, retentionInDays: 1, retentionInMb: 35 } }
+    }
   }
 }
 
 // The application backend
-module api 'br/public:avm/res/web/site:0.2.0' = {
+module api 'br/public:avm/res/web/site:0.3.9' = {
   name: 'api'
   scope: rg
   params: {
@@ -109,6 +116,12 @@ module api 'br/public:avm/res/web/site:0.2.0' = {
       SCM_DO_BUILD_DURING_DEPLOYMENT: 'False'
       ENABLE_ORYX_BUILD: 'True'
     }
+    logsConfiguration: {
+      applicationLogs: { fileSystem: { level: 'Verbose' } }
+      detailedErrorMessages: { enabled: true }
+      failedRequestsTracing: { enabled: true }
+      httpLogs: { fileSystem: { enabled: true, retentionInDays: 1, retentionInMb: 35 } }
+    }
   }
 }
 
@@ -338,13 +351,19 @@ module apim 'br/public:avm/res/api-management/service:0.2.0' = if (useAPIM) {
 }
 
 //Configures the API settings for an api app within the Azure API Management (APIM) service.
-module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' = if (useAPIM) {
+module apiConfig 'br/public:avm/res/web/site:0.3.9' = if (useAPIM) {
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
-    apiName: apimApiName
-    apiAppName: api.outputs.name
+    kind: 'app'
+    name: api.outputs.name
+    serverFarmResourceId: appServicePlan.outputs.resourceId
+    location: location
+    apiManagementConfiguration: {
+      apiManagementConfig: {
+        id: '${apimServiceId}/apis/${apimApiName}'
+      }
+    }
   }
 }
 

diff --git a/templates/todo/projects/csharp-sql/.repo/bicep/repo.yaml b/templates/todo/projects/csharp-sql/.repo/bicep/repo.yaml
@@ -119,9 +119,6 @@ repo:
     - from: ../../../../common/infra/bicep/app/applicationinsights-dashboard.bicep
       to: ./infra/app/applicationinsights-dashboard.bicep
 
-    - from: ../../../../common/infra/bicep/app/website-config.bicep
-      to: ./infra/app/website-config.bicep
-
     - from: ../../../../common/infra/bicep/app/sql-deployment-script.bicep
       to: ./infra/app/sql-deployment-script.bicep
 

diff --git a/templates/todo/projects/java-mongo-aca/.repo/bicep/infra/main.bicep b/templates/todo/projects/java-mongo-aca/.repo/bicep/infra/main.bicep
@@ -412,16 +412,6 @@ module apim 'br/public:avm/res/api-management/service:0.2.0' = if (useAPIM) {
   }
 }
 
-//Configures the API settings for an api app within the Azure API Management (APIM) service.
-module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' = if (useAPIM) {
-  name: 'apiconfig'
-  scope: rg
-  params: {
-    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
-    apiName: apimApiName
-  }
-}
-
 // Data outputs
 output AZURE_COSMOS_CONNECTION_STRING_KEY string = connectionStringKey
 output AZURE_COSMOS_DATABASE_NAME string = actualDatabaseName

diff --git a/templates/todo/projects/java-mongo-aca/.repo/bicep/repo.yaml b/templates/todo/projects/java-mongo-aca/.repo/bicep/repo.yaml
@@ -122,9 +122,6 @@ repo:
     - from: ../../../../common/infra/bicep/app/applicationinsights-dashboard.bicep
       to: ./infra/app/applicationinsights-dashboard.bicep
 
-    - from: ../../../../common/infra/bicep/app/website-config.bicep
-      to: ./infra/app/website-config.bicep
-
     - from: ./../../
       to: ./
       ignore:

diff --git a/templates/todo/projects/java-mongo/.repo/bicep/infra/main.bicep b/templates/todo/projects/java-mongo/.repo/bicep/infra/main.bicep
@@ -79,6 +79,7 @@ var actualDatabaseName = !empty(cosmosDatabaseName) ? cosmosDatabaseName : defau
 var webUri = 'https://${web.outputs.defaultHostname}'
 var apiUri = 'https://${api.outputs.defaultHostname}'
 var apimApiUri = 'https://${apim.outputs.name}.azure-api.net/todo'
+var apimServiceId = useAPIM ? apim.outputs.resourceId : ''
 
 // Organize resources in a resource group
 resource rg 'Microsoft.Resources/resourceGroups@2021-04-01' = {
@@ -88,7 +89,7 @@ resource rg 'Microsoft.Resources/resourceGroups@2021-04-01' = {
 }
 
 // The application frontend
-module web 'br/public:avm/res/web/site:0.2.0' = {
+module web 'br/public:avm/res/web/site:0.3.9' = {
   name: 'web'
   scope: rg
   params: {
@@ -103,11 +104,17 @@ module web 'br/public:avm/res/web/site:0.2.0' = {
       linuxFxVersion: 'node|20-lts'
       alwaysOn: true
     }
+    logsConfiguration: {
+      applicationLogs: { fileSystem: { level: 'Verbose' } }
+      detailedErrorMessages: { enabled: true }
+      failedRequestsTracing: { enabled: true }
+      httpLogs: { fileSystem: { enabled: true, retentionInDays: 1, retentionInMb: 35 } }
+    }
   }
 }
 
 // The application backend
-module api 'br/public:avm/res/web/site:0.2.0' = {
+module api 'br/public:avm/res/web/site:0.3.9' = {
   name: 'api'
   scope: rg
   params: {
@@ -142,6 +149,12 @@ module api 'br/public:avm/res/web/site:0.2.0' = {
           ['-Djdk.attach.allowAttachSelf=true']),
           ' ')
     }
+    logsConfiguration: {
+      applicationLogs: { fileSystem: { level: 'Verbose' } }
+      detailedErrorMessages: { enabled: true }
+      failedRequestsTracing: { enabled: true }
+      httpLogs: { fileSystem: { enabled: true, retentionInDays: 1, retentionInMb: 35 } }
+    }
   }
 }
 
@@ -344,13 +357,19 @@ module apim 'br/public:avm/res/api-management/service:0.2.0' = if (useAPIM) {
 }
 
 //Configures the API settings for an api app within the Azure API Management (APIM) service.
-module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' = if (useAPIM) {
+module apiConfig 'br/public:avm/res/web/site:0.3.9' = if (useAPIM) {
   name: 'apiconfig'
   scope: rg
   params: {
-    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
-    apiName: apimApiName
-    apiAppName: api.outputs.name
+    kind: 'app'
+    name: api.outputs.name
+    serverFarmResourceId: appServicePlan.outputs.resourceId
+    location: location
+    apiManagementConfiguration: {
+      apiManagementConfig: {
+        id: '${apimServiceId}/apis/${apimApiName}'
+      }
+    }
   }
 }
 

diff --git a/templates/todo/projects/java-mongo/.repo/bicep/repo.yaml b/templates/todo/projects/java-mongo/.repo/bicep/repo.yaml
@@ -115,9 +115,6 @@ repo:
     - from: ../../../../common/infra/bicep/app/applicationinsights-dashboard.bicep
       to: ./infra/app/applicationinsights-dashboard.bicep
 
-    - from: ../../../../common/infra/bicep/app/website-config.bicep
-      to: ./infra/app/website-config.bicep
-
     - from: ./../../
       to: ./
       ignore:

diff --git a/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/infra/main.bicep b/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/infra/main.bicep
@@ -412,16 +412,6 @@ module apim 'br/public:avm/res/api-management/service:0.2.0' = if (useAPIM) {
   }
 }
 
-//Configures the API settings for an api app within the Azure API Management (APIM) service.
-module apiConfig '../../../../../common/infra/bicep/app/website-config.bicep' = if (useAPIM) {
-  name: 'apiconfig'
-  scope: rg
-  params: {
-    apimServiceId: useAPIM ? apim.outputs.resourceId : ''
-    apiName: apimApiName
-  }
-}
-
 // Data outputs
 output AZURE_COSMOS_CONNECTION_STRING_KEY string = connectionStringKey
 output AZURE_COSMOS_DATABASE_NAME string = actualDatabaseName

diff --git a/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/repo.yaml b/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/repo.yaml
@@ -125,9 +125,6 @@ repo:
     - from: ../../../../common/infra/bicep/app/applicationinsights-dashboard.bicep
       to: ./infra/app/applicationinsights-dashboard.bicep
 
-    - from: ../../../../common/infra/bicep/app/website-config.bicep
-      to: ./infra/app/website-config.bicep
-
     - from: ./../../
       to: ./
       ignore: