Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions src/private/Invoke-AzOpsChange.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -136,16 +136,11 @@ function Invoke-AzOpsChange {
#Deployment Name
if ($null -ne $templateParameterFilePath) {
$deploymentName = (Get-Item $templateParameterFilePath).BaseName.replace('.parameters', '').Replace(' ', '_')
if ($deploymentName.Length -gt 64) {
$deploymentName = $deploymentName.SubString($deploymentName.IndexOf('-') + 1)
}
}
elseif ($null -ne $templateFilePath) {
$deploymentName = (Get-Item $templateFilePath).BaseName.replace('.json', '').Replace(' ', '_')
if ($deploymentName.Length -gt 64) {
$deploymentName = $deploymentName.SubString($deploymentName.IndexOf('-') + 1)
}
}
$deploymentName = 'AzOps-' + $deploymentName.SubString(0, ($deploymentName.Length -gt 58 )?58:$deploymentName.Length)
#construct deployment object
$AzOpsDeploymentList += [PSCustomObject] @{
[string] 'templateFilePath' = $templateFilePath
Expand Down
6 changes: 3 additions & 3 deletions tests/AzOps.IAB.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ Describe "Tenant E2E Deployment (Integration Test)" -Tag "integration", "e2e", "
Context "In-a-Box" {
# Debug: Get-AzTenantDeployment | Sort-Object -Property Timestamp -Descending | Format-Table
It "Passes ProvisioningState 10-create-managementgroup" {
(Get-AzTenantDeployment -Name "10-create-managementgroup").ProvisioningState | Should -Match "Succeeded"
(Get-AzTenantDeployment -Name "AzOps-10-create-managementgroup").ProvisioningState | Should -Match "Succeeded"
}
It "Passes ProvisioningState 20-create-child-managementgroup" {
(Get-AzTenantDeployment -Name "20-create-child-managementgroup").ProvisioningState | Should -Match "Succeeded"
(Get-AzTenantDeployment -Name "AzOps-20-create-child-managementgroup").ProvisioningState | Should -Match "Succeeded"
}
It "Passes ProvisioningState 30-create-policydefinition-at-managementgroup" {
(Get-AzTenantDeployment -Name "30-create-policydefinition-at-managementgroup").ProvisioningState | Should -Match "Succeeded"
(Get-AzTenantDeployment -Name "AzOps-30-create-policydefinition-at-managementgroup").ProvisioningState | Should -Match "Succeeded"
}
It "Passes Discovery of Tailspin Management Group" {
(Get-ChildItem -Directory -Recurse -Path $env:AZOPS_STATE).Name | Should -Contain 'Tailspin (Tailspin)'
Expand Down