Updated avm modules

Author: brittneek

infra/main.bicep

@@ -231,16 +231,23 @@ module avmApplicationInsights 'br/public:avm/res/insights/component:0.6.0' = {
 // }
 
 // // ========== Container Registry ========== //
-module avmContainerRegistry 'br/public:avm/res/container-registry/registry:0.9.1' = {
-  name: format(deployment_param.resource_name_format_string, abbrs.containers.containerRegistry)
+module avmContainerRegistry 'modules/container-registry.bicep' = {
+  //name: format(deployment_param.resource_name_format_string, abbrs.containers.containerRegistry)
   params: {
-    name: '${abbrs.containers.containerRegistry}${replace(deployment_param.solution_prefix, '-', '')}'
-    location: deployment_param.resource_group_location
-    acrSku: 'Basic'
-    publicNetworkAccess: 'Enabled'
-    zoneRedundancy: 'Disabled'
+    containerRegistryParams: {
+      acrName: '${abbrs.containers.containerRegistry}${replace(deployment_param.solution_prefix, '-', '')}'
+      location: deployment_param.resource_group_location
+      acrSku: 'Basic'
+      publicNetworkAccess: 'Enabled'
+      zoneRedundancy: 'Disabled'
+    }
+    defaultDeploymentParams: deployment_param
   }
 }
+
+
+
+
 // module containerRegistry 'deploy_container_registry.bicep' = {
 //   name: 'deploy_container_registry'
 //   params: {
@@ -649,7 +656,7 @@ module avmContainerApp 'br/public:avm/res/app/container-app:0.16.0' = {
     containers: [
       {
         name: '${abbrs.containers.containerApp}${deployment_param.solution_prefix}'
-        image: '${deployment_param.public_container_image_endpoint}/contentprocessor:dblee'
+        image: '${deployment_param.public_container_image_endpoint}/contentprocessor:latest'
 
         resources: {
           cpu: '4'
@@ -686,7 +693,7 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.16.0' = {
           {
             server: deployment_param.public_container_image_endpoint
             image: 'contentprocessorapi'
-            imageTag: 'dblee'
+            imageTag: 'latest'
           }
         ]
       : null
@@ -701,7 +708,7 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.16.0' = {
     containers: [
       {
         name: '${abbrs.containers.containerApp}${deployment_param.solution_prefix}-api'
-        image: '${deployment_param.public_container_image_endpoint}/contentprocessorapi:dblee'
+        image: '${deployment_param.public_container_image_endpoint}/contentprocessorapi:latest'
         resources: {
           cpu: '4'
           memory: '8.0Gi'
@@ -1076,7 +1083,7 @@ module avmRoleAssignment_container_app_web 'br/public:avm/ptn/authorization/reso
   params: {
     resourceId: avmAppConfig.outputs.resourceId
     principalId: avmContainerApp_Web.outputs.?systemAssignedMIPrincipalId
-    roleDefinitionId: '516239f1-63e1-4d78-a4de-a74fb236a071' // Built-in  
+    roleDefinitionId: '516239f1-63e1-4d78-a4de-a74fb236a071' // Built-in
     roleName: 'App Configuration Data Reader'
     principalType: 'ServicePrincipal'
   }

infra/modules/container-registry.bicep

@@ -0,0 +1,27 @@
+metadata name = 'Container Registry Module'
+// AVM-compliant Azure Container Registry deployment
+
+import {
+  container_registry_param_type
+  default_deployment_param_type
+} from './types.bicep'
+
+param containerRegistryParams container_registry_param_type
+param defaultDeploymentParams default_deployment_param_type
+
+module avmContainerRegistry 'br/public:avm/res/container-registry/registry:0.9.1' = {
+  name: 'deploy_container_registry'
+  params: {
+    name: containerRegistryParams.acrName
+    location: containerRegistryParams.location
+    acrSku: containerRegistryParams.acrSku
+    publicNetworkAccess: containerRegistryParams.publicNetworkAccess
+    zoneRedundancy: containerRegistryParams.zoneRedundancy
+
+
+  }
+}
+
+
+
+output resourceId string = avmContainerRegistry.outputs.resourceId

infra/modules/types.bicep

@@ -146,6 +146,23 @@ type app_insights_param_type = {
     @description('Search version for the Log Analytics Workspace resource')
     searchVersion: 1
   }
+}
+
+type container_registry_sku_type = 'Basic' | 'Standard' | 'Premium'
+type public_network_access_type = 'Enabled' | 'Disabled'
+type zone_redundancy_type = 'Enabled' | 'Disabled'
 
 
+@export()
+type container_registry_param_type = {
+  @description('Name of the Azure Container Registry')
+  acrName: string
+  @description('Location for the Azure Container Registry')
+  location: string
+  @description('SKU for the Azure Container Registry')
+  acrSku: container_registry_sku_type
+  @description('Public network access setting for the Azure Container Registry')
+  publicNetworkAccess: public_network_access_type
+  @description('Zone redundancy setting for the Azure Container Registry')
+  zoneRedundancy: zone_redundancy_type
 }