Moving to Microsoft.App API (#1)

Author: jeffhollan

.github/workflows/with-dapr-build.yaml

@@ -79,7 +79,6 @@ jobs:
       - name: Deploy bicep
         uses: azure/CLI@v1
         with:
-          azcliversion: 2.29.2
           inlineScript: |
             az group create -g ${{ secrets.RESOURCE_GROUP }} -l canadacentral
             az deployment group create -g ${{ secrets.RESOURCE_GROUP }} -f ./with-dapr/deploy/main.bicep \

.github/workflows/with-fqdn-build.yaml

@@ -80,7 +80,6 @@ jobs:
       - name: Deploy bicep
         uses: azure/CLI@v1
         with:
-          azcliversion: 2.29.2
           inlineScript: |
             az group create -g ${{ secrets.RESOURCE_GROUP }} -l canadacentral
             az deployment group create -g ${{ secrets.RESOURCE_GROUP }} -f ./with-fqdn/deploy/main.bicep \

with-dapr/deploy/container-app.bicep

@@ -12,19 +12,18 @@ param environmentVars array = []
 @secure()
 param containerRegistryPassword string
 
-resource containerApp 'Microsoft.Web/containerApps@2021-03-01' = {
+resource containerApp 'Microsoft.App/containerApps@2022-01-01-preview' = {
   name: containerAppName
-  kind: 'containerapp'
   location: location
   properties: {
-    kubeEnvironmentId: environmentId
+    managedEnvironmentId: environmentId
     configuration: {
       secrets: [
         {
           name: 'registry-password'
           value: containerRegistryPassword
         }
-      ]      
+      ]
       registries: [
         {
           server: containerRegistry
@@ -36,6 +35,11 @@ resource containerApp 'Microsoft.Web/containerApps@2021-03-01' = {
         external: isExternalIngress
         targetPort: containerPort
       }
+      dapr: {
+        enabled: true
+        appPort: containerPort
+        appId: containerAppName
+      }
     }
     template: {
       containers: [
@@ -48,11 +52,6 @@ resource containerApp 'Microsoft.Web/containerApps@2021-03-01' = {
       scale: {
         minReplicas: 0
       }
-      dapr: {
-        enabled: true
-        appPort: containerPort
-        appId: containerAppName
-      }
     }
   }
 }

with-dapr/deploy/environment.bicep

@@ -2,7 +2,6 @@ param location string
 param environmentName string
 param logAnalyticsWorkspaceName string = 'logs-${environmentName}'
 
-
 resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2020-03-01-preview' = {
   name: logAnalyticsWorkspaceName
   location: location
@@ -17,12 +16,10 @@ resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2020-03
   })
 }
 
-resource environment 'Microsoft.Web/kubeEnvironments@2021-02-01' = {
+resource environment 'Microsoft.App/managedEnvironments@2022-01-01-preview' = {
   name: environmentName
   location: location
   properties: {
-    type: 'managed'
-    internalLoadBalancerEnabled: false
     appLogsConfiguration: {
       destination: 'log-analytics'
       logAnalyticsConfiguration: {

with-fqdn/deploy/container-app.bicep

@@ -12,19 +12,18 @@ param environmentVars array = []
 @secure()
 param containerRegistryPassword string
 
-resource containerApp 'Microsoft.Web/containerApps@2021-03-01' = {
+resource containerApp 'Microsoft.App/containerApps@2022-01-01-preview' = {
   name: containerAppName
-  kind: 'containerapp'
   location: location
   properties: {
-    kubeEnvironmentId: environmentId
+    managedEnvironmentId: environmentId
     configuration: {
       secrets: [
         {
           name: 'registry-password'
           value: containerRegistryPassword
         }
-      ]      
+      ]
       registries: [
         {
           server: containerRegistry

with-fqdn/deploy/environment.bicep

@@ -2,7 +2,6 @@ param location string
 param environmentName string
 param logAnalyticsWorkspaceName string = 'logs-${environmentName}'
 
-
 resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2020-03-01-preview' = {
   name: logAnalyticsWorkspaceName
   location: location
@@ -17,12 +16,10 @@ resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2020-03
   })
 }
 
-resource environment 'Microsoft.Web/kubeEnvironments@2021-02-01' = {
+resource environment 'Microsoft.App/managedEnvironments@2022-01-01-preview' = {
   name: environmentName
   location: location
   properties: {
-    type: 'managed'
-    internalLoadBalancerEnabled: false
     appLogsConfiguration: {
       destination: 'log-analytics'
       logAnalyticsConfiguration: {