From 8faa5c7d551f7d7fcc270b0d0340a4361b81657d Mon Sep 17 00:00:00 2001
From: Chris Kruining <c.kruining@4dotnet.nl>
Date: Thu, 28 Nov 2024 10:40:39 +0100
Subject: [PATCH] getting an exception locally. seems there is a bug in the
 tricep output???

---
 .github/workflows/app.yml       |  3 ++
 infrastructure/app.bicep        | 82 +++++++++++++--------------------
 infrastructure/bicepconfig.json |  8 +---
 infrastructure/main.bicep       |  3 +-
 infrastructure/monitoring.bicep |  1 +
 infrastructure/registry.bicep   |  1 +
 6 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index dbbd9e1..9971ab8 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -76,6 +76,9 @@ jobs:
           sparse-checkout: |
             infrastructure
 
+      - name: Test bicep
+        run: az bicep build ./infrastructure/main.bicep
+
       - name: Az CLI login
         uses: azure/login@v2
         with:
diff --git a/infrastructure/app.bicep b/infrastructure/app.bicep
index 7510894..1e4ca7c 100644
--- a/infrastructure/app.bicep
+++ b/infrastructure/app.bicep
@@ -1,6 +1,15 @@
 import { Context } from 'br/Tricep:types:latest'
 import { with_name } from 'br/Tricep:common/context:latest'
-import { container_app_environment, container_app, container, with_app_logs, with_auto_scaling, with_environment } from 'br/Tricep:recommended/app/container-app:latest'
+import { with_managed_identity } from 'br/Tricep:common/identity:latest'
+import {
+  container_app_environment
+  container_app
+  container
+  with_public_access
+  with_app_logs
+  with_auto_scaling
+  with_environment
+} from 'br/Tricep:recommended/app/container-app:latest'
 
 targetScope = 'resourceGroup'
 
@@ -8,71 +17,42 @@ param context Context
 param version string
 @secure()
 param registryUrl string
-param customerId string
-param sharedKey string
 
 var appName = 'app'
 
-var environmentConfig = container_app_environment(with_name(context, 'app'), [
-  with_app_logs(customerId, sharedKey)
-  {
-    properties: {
-      appLogsConfiguration: {
-        destination: 'azure-monitor'
-      }
-      peerAuthentication: {
-        mtls: {
-          enabled: false
-        }
-      }
-      peerTrafficConfiguration: {
-        encryption: {
-          enabled: false
-        }
-      }
-    }
-  }
-])
+var environmentConfig = container_app_environment(with_name(context, appName), [])
 var appConfig = container_app(
-  with_name(context, 'app'),
+  context,
   [
-    container('${context.project}-${appName}', '${registryUrl}/${context.project}-${appName}:${version}')
+    container({
+      name: '${context.project}-${appName}'
+      image: '${registryUrl}/${context.project}-${appName}:${version}'
+    })
   ],
   [
+    with_managed_identity()
     with_environment(environment.id)
     with_auto_scaling(0, 1, {
       ruleName: {
         concurrentRequests: '10'
       }
     })
+    with_public_access({
+      port: 3000
+      cors: {
+        allowedOrigins: [
+          // 'https://localhost:3000'
+          '*'
+        ]
+        allowCredentials: true
+        allowedHeaders: ['*']
+        allowedMethods: ['Get, POST']
+        maxAge: 0
+      }
+    })
     {
       properties: {
         configuration: {
-          activeRevisionsMode: 'Single'
-
-          ingress: {
-            external: true
-            targetPort: 3000
-            transport: 'auto'
-            allowInsecure: false
-            traffic: [
-              {
-                weight: 100
-                latestRevision: true
-              }
-            ]
-            corsPolicy: {
-              allowedOrigins: [
-                // 'https://localhost:3000'
-                '*'
-              ]
-              allowCredentials: true
-              allowedHeaders: ['*']
-              allowedMethods: ['Get, POST']
-              maxAge: 0
-            }
-          }
-
           registries: [
             {
               identity: 'system'
@@ -88,12 +68,14 @@ var appConfig = container_app(
 resource environment 'Microsoft.App/managedEnvironments@2024-03-01' = {
   name: environmentConfig.name
   location: environmentConfig.location
+  tags: environmentConfig.tags
   properties: environmentConfig.properties
 }
 
 resource app 'Microsoft.App/containerApps@2024-03-01' = {
   name: appConfig.name
   location: appConfig.location
+  tags: appConfig.tags
   identity: appConfig.identity
   properties: appConfig.properties
 }
diff --git a/infrastructure/bicepconfig.json b/infrastructure/bicepconfig.json
index 622d0de..dc847c0 100644
--- a/infrastructure/bicepconfig.json
+++ b/infrastructure/bicepconfig.json
@@ -1,12 +1,6 @@
 {
     "experimentalFeaturesEnabled": {
-        "assertions": true,
-        "testFramework": true,
-        "extensibility": true,
-        "resourceDerivedTypes": true,
-        "resourceTypedParamsAndOutputs": true,
-        "sourceMapping": true,
-        "symbolicNameCodegen": true
+        "resourceTypedParamsAndOutputs": true
     },
     "moduleAliases": {
         "br": {
diff --git a/infrastructure/main.bicep b/infrastructure/main.bicep
index 5130d1b..31d0d79 100644
--- a/infrastructure/main.bicep
+++ b/infrastructure/main.bicep
@@ -12,9 +12,8 @@ param registryUrl string
 param deployedAt string = utcNow('yyyyMMdd')
 
 var context = create_context({
-  name: ''
   project: projectName
-  nameConventionTemplate: '$type-$env-$loc-$project-$name'
+  nameConventionTemplate: '$type-$environment-$location-$project'
   location: location
   environment: environment
   deployedAt: deployedAt
diff --git a/infrastructure/monitoring.bicep b/infrastructure/monitoring.bicep
index 9740965..202f16c 100644
--- a/infrastructure/monitoring.bicep
+++ b/infrastructure/monitoring.bicep
@@ -13,5 +13,6 @@ var logAnalyticsConfig = log_analytics(context, [
 resource monitoring 'Microsoft.OperationalInsights/workspaces@2023-09-01' = {
   name: logAnalyticsConfig.name
   location: logAnalyticsConfig.location
+  tags: logAnalyticsConfig.tags
   properties: logAnalyticsConfig.properties
 }
diff --git a/infrastructure/registry.bicep b/infrastructure/registry.bicep
index dddded3..1b45c5d 100644
--- a/infrastructure/registry.bicep
+++ b/infrastructure/registry.bicep
@@ -22,6 +22,7 @@ var registryConfig = container_registry(context, [
 resource registry 'Microsoft.ContainerRegistry/registries@2023-07-01' = {
   name: registryConfig.name
   location: registryConfig.location
+  tags: registryConfig.tags
   sku: registryConfig.sku
   identity: registryConfig.identity
   properties: registryConfig.properties