Skip to content

Commit

Permalink
EES-5617 Update custom Bicep type names to be PascalCased
Browse files Browse the repository at this point in the history
  • Loading branch information
ntsim committed Nov 11, 2024
1 parent ddb0231 commit 5d66047
Show file tree
Hide file tree
Showing 25 changed files with 76 additions and 76 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resourceNamesType } from '../../types.bicep'
import { ResourceNames } from '../../types.bicep'

@description('Specifies common resource naming variables.')
param resourceNames resourceNamesType
param resourceNames ResourceNames

@description('Specifies the location for all resources.')
param location string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resourceNamesType } from '../../types.bicep'
import { ResourceNames } from '../../types.bicep'

@description('Specifies common resource naming variables.')
param resourceNames resourceNamesType
param resourceNames ResourceNames

@description('Specifies the location for all resources.')
param location string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resourceNamesType } from '../../types.bicep'
import { ResourceNames } from '../../types.bicep'

@description('Specifies common resource naming variables.')
param resourceNames resourceNamesType
param resourceNames ResourceNames

@description('Specifies the location for all resources.')
param location string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resourceNamesType, firewallRuleType } from '../../types.bicep'
import { ResourceNames, FirewallRule } from '../../types.bicep'

@description('Specifies common resource naming variables.')
param resourceNames resourceNamesType
param resourceNames ResourceNames

@description('Specifies the location for all resources.')
param location string
Expand All @@ -19,7 +19,7 @@ param dataProcessorFunctionAppExists bool = false
param dataProcessorAppRegistrationClientId string

@description('Public API Storage : Firewall rules.')
param storageFirewallRules firewallRuleType[] = []
param storageFirewallRules FirewallRule[] = []

@description('Specifies a set of tags with which to tag the resource in Azure.')
param tagValues object
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { resourceNamesType, staticWebAppSkuType } from '../../types.bicep'
import { ResourceNames, StaticWebAppSku } from '../../types.bicep'

@description('Common resource naming variables')
param resourceNames resourceNamesType
param resourceNames ResourceNames

@description('Static Web App SKU to use')
param appSku staticWebAppSkuType = 'Free'
param appSku StaticWebAppSku = 'Free'

@description('Tags for the resources')
param tagValues object
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { resourceNamesType, firewallRuleType } from '../../types.bicep'
import { ResourceNames, FirewallRule } from '../../types.bicep'

param resourceNames resourceNamesType
param resourceNames ResourceNames

@description('Specifies the location for all resources.')
param location string
Expand All @@ -9,7 +9,7 @@ param location string
param publicApiDataFileShareQuota int = 1

@description('Public API Storage : Firewall rules.')
param storageFirewallRules firewallRuleType[] = []
param storageFirewallRules FirewallRule[] = []

@description('Specifies a set of tags with which to tag the resource in Azure.')
param tagValues object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import {
AppGatewayRewriteSet
AppGatewayRoute
AppGatewaySite
resourceNamesType
ResourceNames
} from '../../types.bicep'

@description('Common resource naming variables')
param resourceNames resourceNamesType
param resourceNames ResourceNames

@description('The location to create resources in')
param location string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resourceNamesType } from '../../types.bicep'
import { ResourceNames } from '../../types.bicep'

@description('Specifies common resource naming variables.')
param resourceNames resourceNamesType
param resourceNames ResourceNames

@description('Specifies the location for all resources.')
param location string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resourceNamesType } from '../../types.bicep'
import { ResourceNames } from '../../types.bicep'

@description('Specifies common resource naming variables.')
param resourceNames resourceNamesType
param resourceNames ResourceNames

resource coreStorageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' existing = {
name: resourceNames.existingResources.coreStorageAccount
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resourceNamesType } from '../../types.bicep'
import { ResourceNames } from '../../types.bicep'

@description('Specifies common resource naming variables.')
param resourceNames resourceNamesType
param resourceNames ResourceNames

@description('Specifies the location for all resources.')
param location string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resourceNamesType, firewallRuleType, principalNameAndIdType } from '../../types.bicep'
import { ResourceNames, FirewallRule, PrincipalNameAndId } from '../../types.bicep'

@description('Specifies common resource naming variables.')
param resourceNames resourceNamesType
param resourceNames ResourceNames

@description('Specifies the location for all resources.')
param location string
Expand All @@ -23,13 +23,13 @@ param storageSizeGB int = 32
param autoGrowStatus string = 'Disabled'

@description('Firewall rules.')
param firewallRules firewallRuleType[] = []
param firewallRules FirewallRule[] = []

@description('Specifies the subnet id that the PostgreSQL private endpoint will be attached to.')
param privateEndpointSubnetId string

@description('An array of Entra ID admin principal names for this resource')
param entraIdAdminPrincipals principalNameAndIdType[] = []
param entraIdAdminPrincipals PrincipalNameAndId[] = []

@description('Specifies a set of tags with which to tag the resource in Azure.')
param tagValues object
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resourceNamesType } from '../../types.bicep'
import { ResourceNames } from '../../types.bicep'

@description('Specifies common resource naming variables.')
param resourceNames resourceNamesType
param resourceNames ResourceNames

@description('Specifies a set of tags with which to tag the resource in Azure.')
param tagValues object
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resourceNamesType } from '../../types.bicep'
import { ResourceNames } from '../../types.bicep'

@description('Specifies common resource naming variables.')
param resourceNames resourceNamesType
param resourceNames ResourceNames

var subnets = resourceNames.existingResources.subnets

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { azureFileshareMountType } from '../types.bicep'
import { AzureFileshareMount } from '../types.bicep'

@description('Specifies the Web / Function App name that these settings belong to')
param appName string
Expand All @@ -25,7 +25,7 @@ param existingStagingAppSettings object
param existingProductionAppSettings object

@description('Specifies additional Azure Storage Accounts to make available to the staging slot')
param azureFileShares azureFileshareMountType[] = []
param azureFileShares AzureFileshareMount[] = []

@description('Set specific appsettings to be slot specific values')
resource functionSlotConfig 'Microsoft.Web/sites/config@2023-12-01' = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { entraIdAuthenticationType } from '../types.bicep'
import { EntraIdAuthentication } from '../types.bicep'

@description('Specifies the location for all resources.')
param location string
Expand Down Expand Up @@ -106,7 +106,7 @@ param volumeMounts {
}[] = []

@description('An existing App Registration registered with Entra ID that will be used to control access to this Container App')
param entraIdAuthentication entraIdAuthenticationType?
param entraIdAuthentication EntraIdAuthentication?

@description('A set of tags with which to tag the resource in Azure')
param tagValues object
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { containerRegistryRoleType } from '../types.bicep'
import { ContainerRegistryRole } from '../types.bicep'

@description('Specifies the name of an existing Container Registry to be use as the scope of the role assignment')
param containerRegistryName string
Expand All @@ -11,7 +11,7 @@ param principalIds string[]
// roles to support here, in conjunction with the limited set of roles that the deploying service
// principal is allowed to assign.
@description('The Container Registry-specific role to assign')
param role containerRegistryRoleType
param role ContainerRegistryRole

// See https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#containers for Container-specific built in role ids.
var rolesToRoleIds = {
Expand Down
16 changes: 8 additions & 8 deletions infrastructure/templates/public-api/components/functionApp.bicep
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { firewallRuleType, azureFileshareMountType, entraIdAuthenticationType } from '../types.bicep'
import { FirewallRule, AzureFileshareMount, EntraIdAuthentication } from '../types.bicep'

@description('Specifies the location for all resources.')
param location string
Expand Down Expand Up @@ -47,7 +47,7 @@ param userAssignedManagedIdentityParams {
}?

@description('An existing App Registration registered with Entra ID that will be used to control access to this Function App')
param entraIdAuthentication entraIdAuthenticationType?
param entraIdAuthentication EntraIdAuthentication?

@description('Specifies the SKU for the Function App hosting plan')
param sku object
Expand All @@ -71,10 +71,10 @@ param healthCheck {
}?

@description('Specifies additional Azure Storage Accounts to make available to this Function App')
param azureFileShares azureFileshareMountType[] = []
param azureFileShares AzureFileshareMount[] = []

@description('Specifies firewall rules for the various storage accounts in use by the Function App')
param storageFirewallRules firewallRuleType[] = []
param storageFirewallRules FirewallRule[] = []

var reserved = appServicePlanOS == 'Linux'

Expand Down Expand Up @@ -182,10 +182,10 @@ var commonSiteProperties = {
enabled: true
httpsOnly: true
serverFarmId: appServicePlan.id

// This property integrates the Function App into a VNet given the supplied subnet id.
virtualNetworkSubnetId: subnetId

clientAffinityEnabled: true
reserved: reserved
siteConfig: {
Expand Down Expand Up @@ -396,15 +396,15 @@ module functionAppSlotSettings 'appServiceSlotConfig.bicep' = {
stagingOnlySettings: {
SLOT_NAME: 'staging'
DurableManagementStorage: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=${slot1StorageAccountModule.outputs.connectionStringSecretName})'

// The following property tell the Function App slot that its deployment code file share (as identified by the WEBSITE_CONTENTSHARE setting)
// resides in the specified Storage account.
WEBSITE_CONTENTAZUREFILECONNECTIONSTRING: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=${slot1StorageAccountModule.outputs.connectionStringSecretName})'
}
prodOnlySettings: {
SLOT_NAME: 'production'
DurableManagementStorage: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=${slot2StorageAccountModule.outputs.connectionStringSecretName})'

// The following property tell the Function App slot that its deployment code file share (as identified by the WEBSITE_CONTENTSHARE setting)
// resides in the specified Storage account.
WEBSITE_CONTENTAZUREFILECONNECTIONSTRING: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=${slot2StorageAccountModule.outputs.connectionStringSecretName})'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { keyVaultRoleType } from '../types.bicep'
import { KeyVaultRole } from '../types.bicep'

@description('Specifies the name of the Key Vault.')
param keyVaultName string
Expand All @@ -11,7 +11,7 @@ param principalIds string[]
// roles to support here, in conjunction with the limited set of roles that the deploying service
// principal is allowed to assign.
@description('Specifies the Key Vault role to assign to the service principals')
param role keyVaultRoleType
param role KeyVaultRole

var rolesToRoleIds = {
'Secrets User': '4633458b-17de-408a-b874-0445c86b69e6'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { firewallRuleType, principalNameAndIdType } from '../types.bicep'
import { FirewallRule, PrincipalNameAndId } from '../types.bicep'

@description('Specifies the location for all resources.')
param location string
Expand Down Expand Up @@ -40,10 +40,10 @@ param geoRedundantBackup string = 'Disabled'
param databaseNames string[]

@description('An array of firewall rules containing IP address ranges')
param firewallRules firewallRuleType[] = []
param firewallRules FirewallRule[] = []

@description('An array of Entra ID admin principal names for this resource')
param entraIdAdminPrincipals principalNameAndIdType[] = []
param entraIdAdminPrincipals PrincipalNameAndId[] = []

@description('A set of tags with which to tag the resource in Azure')
param tagValues object
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { privateDnsZoneType } from '../types.bicep'
import { PrivateDnsZone } from '../types.bicep'

@description('Specifies the type of zone to create')
param zoneType privateDnsZoneType
param zoneType PrivateDnsZone

@description('Specifies an optional name for the zone, if "custom" zoneType was chosen')
param customName string?
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { privateDnsZoneType } from '../types.bicep'
import { PrivateDnsZone } from '../types.bicep'

@description('Specifies the name of the service being connected via private endpoint')
@minLength(0)
Expand All @@ -16,7 +16,7 @@ param subnetId string
param location string

@description('Specifies the type of service being attached to the private endpoint')
param serviceType privateDnsZoneType
param serviceType PrivateDnsZone

@description('A set of tags with which to tag the resource in Azure')
param tagValues object
Expand All @@ -34,8 +34,8 @@ var serviceTypeToGroupIds = {
var privateEndpointName = '${serviceName}-pep'
var privateDnsZoneName = serviceTypeToDnsZoneNames[serviceType]

// A private endpoint that establishes a link between a VNet and an Azure service
// that supports Private Link. This takes the form of an IP address that is
// A private endpoint that establishes a link between a VNet and an Azure service
// that supports Private Link. This takes the form of an IP address that is
// resolvable by a private DNS zone.
resource privateEndpoint 'Microsoft.Network/privateEndpoints@2024-01-01' = {
name: privateEndpointName
Expand Down Expand Up @@ -67,7 +67,7 @@ resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing
name: privateDnsZoneName
}

// The private DNS zone group establishes a hard connection between the service being
// The private DNS zone group establishes a hard connection between the service being
// connected and the DNS records in the private DNS zone. It handles updates to DNS
// records automatically.
resource privateDnsZoneGroup 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2024-01-01' = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { staticWebAppSkuType } from '../types.bicep'
import { StaticWebAppSku } from '../types.bicep'

@description('Name of the resource.')
param name string
Expand All @@ -8,7 +8,7 @@ param name string
param location string = 'westeurope'

@description('Static Web App SKU to use.')
param sku staticWebAppSkuType = 'Free'
param sku StaticWebAppSku = 'Free'

@description('A set of tags for the resource.')
param tagValues object
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { firewallRuleType } from '../types.bicep'
import { FirewallRule } from '../types.bicep'

@description('Specifies the location for all resources.')
param location string
Expand All @@ -10,7 +10,7 @@ param storageAccountName string
param allowedSubnetIds string[] = []

@description('Storage Account Network Firewall Rules')
param firewallRules firewallRuleType[] = []
param firewallRules FirewallRule[] = []

@description('Storage Account SKU')
param skuStorageResource 'Standard_LRS' | 'Standard_GRS' | 'Standard_RAGRS' | 'Standard_ZRS' | 'Premium_LRS' | 'Premium_ZRS' | 'Standard_GZRS' | 'Standard_RAGZRS' = 'Standard_LRS'
Expand Down Expand Up @@ -60,7 +60,7 @@ module storeADOConnectionStringToKeyVault './keyVaultSecret.bicep' = {
params: {
keyVaultName: keyVaultName
isEnabled: true
secretValue: storageAccountConnectionString
secretValue: storageAccountConnectionString
contentType: 'text/plain'
secretName: connectionStringSecretName
}
Expand Down
Loading

0 comments on commit 5d66047

Please sign in to comment.