Refreshed bicep

.azure/modules/api-appservice.bicep

@@ -1,7 +1,6 @@
-
 param name string 
 param location string 
-param tags object
+param tags object = {}
 @minLength(1)
 @allowed(['Development', 'QA', 'Staging', 'Production'])
 param environment string = 'Development'
@@ -17,7 +16,7 @@ resource apiResource 'Microsoft.Web/sites@2023-12-01' = {
   name: name
   location: location
   kind: kind
-  tags: tags
+  tags: empty(tags) ? null : tags
   properties: {
     serverFarmId: planId
     siteConfig: {
@@ -38,6 +37,9 @@ resource apiResource 'Microsoft.Web/sites@2023-12-01' = {
       ]
     }
   }
+  identity: {
+    type: 'SystemAssigned'
+  }
 }
 
 output id string = apiResource.id

.azure/modules/appcs-appconfigurationsetting.bicep

@@ -27,7 +27,7 @@ resource name_appcsKeys 'Microsoft.AppConfiguration/configurationStores/keyValue
   properties: {
     value: appcsValues[i]
     contentType: contentType
-    tags: tags
+    tags: empty(tags) ? null : tags
   }
 }]
 

.azure/modules/appcs-appconfigurationstore.bicep

@@ -45,7 +45,7 @@ resource name_appcsKeys 'Microsoft.AppConfiguration/configurationStores/keyValue
   properties: {
     value: appcsValues[i]
     contentType: contentType
-    tags: tags
+    tags: empty(tags) ? null : tags
   }
   dependsOn: [
     name_resource

.azure/modules/appi-applicationinsights.bicep

@@ -1,6 +1,6 @@
 
 param location string 
-param tags object
+param tags object = {}
 param name string 
 param Application_Type string 
 param Flow_Type string 
@@ -9,7 +9,7 @@ param workResourceId string
 resource appiResource 'Microsoft.Insights/components@2020-02-02' = {
   name: name
   location: location
-  tags: tags
+  tags: empty(tags) ? null : tags
   kind:'web'
   properties: {
     Application_Type: Application_Type

.azure/modules/bot-botservice.bicep

@@ -30,7 +30,7 @@ resource keyVaultName 'Microsoft.KeyVault/vaults@2023-07-01' = {
       family: 'A'
       name: 'standard'
     }
-    accessPolicies: []
+    enableRbacAuthorization: true
     enabledForTemplateDeployment: true
   }
 }

.azure/modules/func-functionsapp.bicep

@@ -1,7 +1,10 @@
 param name string
 param location string
+param tags object = {}
 param planId string
 param stName string
+param stSubscriptionId string = subscription().subscriptionId
+param stResourceGroupName string = resourceGroup().name
 param appiKey string
 param appiConnection string
 param use32BitWorkerProcess bool = true
@@ -29,14 +32,17 @@ param funcRuntime string = 'dotnet'
 ])
 param funcVersion int = 4
 
+param alwaysOn bool = false
+
 resource functionapp 'Microsoft.Web/sites@2023-12-01' = {
   name: name 
   kind: 'functionapp'
   location: location
-  tags: {}
+  tags: empty(tags) ? null : tags
   properties: {
     serverFarmId: planId
     siteConfig: {
+      alwaysOn: alwaysOn
       appSettings: [
         {
           name: 'FUNCTIONS_EXTENSION_VERSION'
@@ -56,11 +62,11 @@ resource functionapp 'Microsoft.Web/sites@2023-12-01' = {
         }
         {
           name: 'AzureWebJobsStorage'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${stName};AccountKey=${listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', stName), '2019-06-01').keys[0].value};EndpointSuffix=core.windows.net'
+          value: 'DefaultEndpointsProtocol=https;AccountName=${stName};AccountKey=${listKeys(resourceId(stSubscriptionId, stResourceGroupName, 'Microsoft.Storage/storageAccounts', stName), '2019-06-01').keys[0].value};EndpointSuffix=core.windows.net'
         }
         {
           name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${stName};AccountKey=${listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', stName), '2019-06-01').keys[0].value};EndpointSuffix=core.windows.net'
+          value: 'DefaultEndpointsProtocol=https;AccountName=${stName};AccountKey=${listKeys(resourceId(stSubscriptionId, stResourceGroupName, 'Microsoft.Storage/storageAccounts', stName), '2019-06-01').keys[0].value};EndpointSuffix=core.windows.net'
         }
         {
           name: 'WEBSITE_CONTENTSHARE'
@@ -76,7 +82,9 @@ resource functionapp 'Microsoft.Web/sites@2023-12-01' = {
         }
       ]
       use32BitWorkerProcess: use32BitWorkerProcess
-    }
-
+    }    
+  }
+  identity: {
+    type: 'SystemAssigned'
   }
 }

.azure/modules/kv-keyvault.bicep

@@ -1,31 +1,27 @@
-@description('Name of the Key Vault. (kv)')
-@minLength(3)
-@maxLength(24)
-param name string
-
+param name string 
 param location string 
-
 param sku string 
-
 param tenantId string 
-
-param tags object
+param tags object = {}
+param accessPolicies array = []
+param enableRbacAuthorization bool = true
 
 resource kvResource 'Microsoft.KeyVault/vaults@2023-07-01' = {
   name: name
   location: location
-  tags: tags
+  tags: empty(tags) ? null : tags
   properties: {
     enabledForDeployment: true
     enabledForDiskEncryption: true
     enabledForTemplateDeployment: true
     tenantId: tenantId
-    publicNetworkAccess:'Enabled'
-    accessPolicies: []
+    publicNetworkAccess: 'Enabled'
     sku: {
       name: sku
       family: 'A'
-    }
+    }    
+    accessPolicies: accessPolicies == [] && enableRbacAuthorization == true ? null : accessPolicies
+    enableRbacAuthorization: enableRbacAuthorization
     networkAcls: {
       defaultAction: 'Allow'
       bypass: 'AzureServices'

.azure/modules/plan-appserviceplan.bicep

@@ -2,13 +2,13 @@
 param name string 
 param location string 
 param sku string 
-param tags object
+param tags object = {}
 
-resource planResource 'Microsoft.Web/serverfarms@2023-12-01' = {
+resource planResource 'Microsoft.Web/serverfarms@2023-01-01' = {
   name: name
   kind:'Windows'
   location: location
-  tags: tags
+  tags: empty(tags) ? null : tags
   properties: {
     reserved: false    
   }

.azure/modules/rg-resourcegroup.bicep

@@ -2,10 +2,10 @@ targetScope='subscription'
 
 param name string
 param location string
-param tags object 
+param tags object = {}
 
 resource rgResource 'Microsoft.Resources/resourceGroups@2024-03-01' = {
   name: name
   location: location
-  tags: tags
+  tags: empty(tags) ? null : tags
 }

.azure/modules/sql-sqlserver.bicep

@@ -4,7 +4,7 @@ param name string
 
 param location string = resourceGroup().location
 
-param tags object
+param tags object = {}
 
 @minLength(1)
 @maxLength(60)
@@ -24,7 +24,7 @@ var nameLower = toLower(name)
 resource sqlServer 'Microsoft.Sql/servers@2023-08-01-preview' = {
   name: nameLower
   location: location  
-  tags: tags  
+  tags: empty(tags) ? null : tags  
   properties: {
     administratorLogin: adminLogin
     administratorLoginPassword: adminPassword

.azure/modules/sql-sqlserverdatabase.bicep

@@ -3,7 +3,7 @@
 @maxLength(60)
 param name string
 param location string = resourceGroup().location
-param tags object
+param tags object = {}
 @minLength(1)
 @maxLength(60)
 param adminLogin string
@@ -17,20 +17,20 @@ param endIpAddress string = '0.0.0.0'
 @minLength(1)
 @maxLength(60)
 param sqldbName string
+param sqlCapacity int = 5
 param collation string = 'SQL_Latin1_General_CP1_CI_AS'
 @allowed([
   'Basic'
   'Standard'
   'Premium'
 ])
 param sku string = 'Basic'
-param sqlCapacity int = 5
 param maxSizeBytes int = 1073741824
 
 resource sqlServer 'Microsoft.Sql/servers@2023-08-01-preview' = {
   name: name
   location: location
-  tags: tags
+  tags: empty(tags) ? null : tags
   properties: {
     administratorLogin: adminLogin
     administratorLoginPassword: adminPassword
@@ -47,6 +47,7 @@ resource sqlServerFirewall 'Microsoft.Sql/servers/firewallRules@2023-08-01-previ
 }
 
 output id string = sqlServer.id
+output name string = sqlServer.name
 
 resource sqlDatabase 'Microsoft.Sql/servers/databases@2023-05-01-preview' = {
   parent: sqlServer
@@ -57,14 +58,12 @@ resource sqlDatabase 'Microsoft.Sql/servers/databases@2023-05-01-preview' = {
   }
   sku: {
     name: sku
-    tier: sku // (e.g., Basic, GeneralPurpose, BusinessCritical)
-    //family: 'skuFamily' // e.g., Gen4, Gen5)
-    capacity: sqlCapacity // (e.g., 5)
+    tier: sku // Replace with the desired SKU tier (e.g., Basic, GeneralPurpose, BusinessCritical)
+    //family: 'skuFamily' // Replace with the desired SKU family (e.g., Gen4, Gen5)
+    capacity: sqlCapacity // Replace with the desired capacity (e.g., 1, 2, 4)
   }
   properties: {
     collation: collation
     maxSizeBytes: maxSizeBytes
   }
 }
-
-output sqldbId string = sqlDatabase.id

.azure/modules/sqldb-sqldatabase.bicep

@@ -2,7 +2,7 @@
 @maxLength(60)
 param name string
 param location string = resourceGroup().location
-param tags object
+param tags object = {}
 @description('Sku for the database')
 @allowed([
   'Basic'
@@ -18,7 +18,7 @@ param sqlName string
 resource sqlDatabase 'Microsoft.Sql/servers/databases@2023-08-01-preview' = {
   name: '${sqlName}/${name}'
   location: location
-  tags: tags
+  tags: empty(tags) ? null : tags
   sku: {
     name: sku
     tier: sku // (e.g., Basic, GeneralPurpose, BusinessCritical)

.azure/modules/st-storageaccount.bicep

@@ -1,16 +1,12 @@
-@description('Name of the Storage Account. (st)')
-@minLength(3)
-@maxLength(24)
-param name string
-
 param location string
-param tags object
+param tags object = {}
+param name string 
 param sku string 
 
 resource stResource 'Microsoft.Storage/storageAccounts@2023-01-01' = {
   name: name
   location: location
-  tags: tags
+  tags: empty(tags) ? null : tags
   sku: {
     name: sku
   }

.azure/modules/stapp-staticwebapp.bicep

@@ -13,12 +13,23 @@ param sku string = 'Free'
 @description('Tags to add to the resources')
 param tags object = {}
 
-resource name_resource 'Microsoft.Web/staticSites@2023-12-01' = {
+@description('Git Repository URL')
+param repositoryUrl string
+
+@description('Git Branch')
+param branch string = 'main'
+
+resource name_resource 'Microsoft.Web/staticSites@2022-09-01' = {
   name: name
   location: location
-  tags: tags
+  tags: empty(tags) ? null : tags
   sku: {
     tier: sku
     name: sku
   }
+  properties: {
+    repositoryUrl: repositoryUrl
+    branch: branch
+  }
 }
+