Skip to content

Add support for the same unique suffix to used in all resource naming #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cocallaw wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add support for the same unique suffix to used in all resource naming #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d177dd
Add uniqueSuffix logic
cocallaw Feb 9, 2023
6bc7c01
Add uniqueSuffix logic
cocallaw Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions deploy/deploy.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,16 @@ process {
return $validLocations.Contains($Location)
}

# Create unique string to be used in naming for each deployment instance
Function New-UniqueIPAMDeployString {
$unique = (-join ((48..57) + (97..122) | Get-Random -Count 13 | % {[char]$_}))

$script:UIAppName = $UIAppName + "-" + $unique
$script:EngineAppName = $EngineAppName + "-" + $unique

return $unique
}

Function Deploy-IPAMApplications {
Param(
[Parameter(Mandatory=$false)]
Expand Down Expand Up @@ -648,6 +658,8 @@ process {
[string]$EngineAppId,
[Parameter(Mandatory=$true)]
[string]$EngineSecret,
[Parameter(Mandatory=$true)]
[string]$UniqueSuffix,
[Parameter(Mandatory=$false)]
[string]$NamePrefix,
[Parameter(Mandatory=$false)]
Expand All @@ -672,6 +684,10 @@ process {
uiAppId = $UiAppId
}

if($UniqueSuffix) {
$deploymentParameters.Add('uniqueSuffix', $UniqueSuffix)
}

if($NamePrefix) {
$deploymentParameters.Add('namePrefix', $NamePrefix)
}
Expand Down Expand Up @@ -802,8 +818,11 @@ process {
exit
}
}


if ($PSCmdlet.ParameterSetName -in ('Full', 'AppsOnly', 'Function', 'FuncAppsOnly')) {
$unique = New-UniqueIPAMDeployString

$appDetails = Deploy-IPAMApplications `
-UIAppName $UIAppName `
-EngineAppName $EngineAppName `
Expand Down Expand Up @@ -834,6 +853,7 @@ process {

if ($PSCmdlet.ParameterSetName -in ('Full', 'TemplateOnly', 'Function', 'FuncTemplateOnly')) {
$deployment = Deploy-Bicep @appDetails `
-UniqueSuffix $unique `
-NamePrefix $NamePrefix `
-AzureCloud $azureCloud `
-PrivateAcr $PrivateAcr `
Expand Down
24 changes: 12 additions & 12 deletions deploy/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Global parameters
targetScope = 'subscription'

@description('GUID for Resource Naming')
param guid string = newGuid()
@description('Unique String for Resource Naming')
param uniqueSuffix string

@description('Deployment Location')
param location string = deployment().location
Expand Down Expand Up @@ -35,18 +35,18 @@ param tags object = {}

@description('IPAM Resource Names')
param resourceNames object = {
functionName: '${namePrefix}-${uniqueString(guid)}'
appServiceName: '${namePrefix}-${uniqueString(guid)}'
appServicePlanName: '${namePrefix}-asp-${uniqueString(guid)}'
cosmosAccountName: '${namePrefix}-dbacct-${uniqueString(guid)}'
functionName: '${namePrefix}-${uniqueSuffix}'
appServiceName: '${namePrefix}-${uniqueSuffix}'
appServicePlanName: '${namePrefix}-asp-${uniqueSuffix}'
cosmosAccountName: '${namePrefix}-dbacct-${uniqueSuffix}'
cosmosContainerName: '${namePrefix}-ctr'
cosmosDatabaseName: '${namePrefix}-db'
keyVaultName: '${namePrefix}-kv-${uniqueString(guid)}'
workspaceName: '${namePrefix}-law-${uniqueString(guid)}'
managedIdentityName: '${namePrefix}-mi-${uniqueString(guid)}'
resourceGroupName: '${namePrefix}-rg-${uniqueString(guid)}'
storageAccountName: '${namePrefix}stg${uniqueString(guid)}'
containerRegistryName: '${namePrefix}acr${uniqueString(guid)}'
keyVaultName: '${namePrefix}-kv-${uniqueSuffix}'
workspaceName: '${namePrefix}-law-${uniqueSuffix}'
managedIdentityName: '${namePrefix}-mi-${uniqueSuffix}'
resourceGroupName: '${namePrefix}-rg-${uniqueSuffix}'
storageAccountName: '${namePrefix}stg${uniqueSuffix}'
containerRegistryName: '${namePrefix}acr${uniqueSuffix}'
}

// Resource Group
Expand Down