Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
25 changes: 17 additions & 8 deletions 1-Collect/Get-AzureServices.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -377,16 +377,25 @@ foreach ($group in $groupedResources) {
if ($uniqueLocations -isnot [System.Array]) {
$uniqueLocations = @($uniqueLocations)
}
If ($group.Group.ResourceSku -ne 'N/A') {

$uniqueSkus = $group.Group.ResourceSku | Select-Object * -Unique
if ( $uniqueSkus -isnot [System.Array]) {
$uniqueSkus = @($uniqueSkus)
if ($group.Group.ResourceSku -ne 'N/A') {
$skuCounts = $group.Group |
Where-Object { $_.ResourceSku -is [object] } |
Group-Object -Property {
$_.ResourceSku | ConvertTo-Json -Compress
}
$implementedSkus = foreach ($skuGroup in $skuCounts) {
$skuObj = $skuGroup.Group[0].ResourceSku
$newSku = [ordered]@{}
foreach ($prop in $skuObj.PSObject.Properties) {
$newSku[$prop.Name] = $prop.Value
}
$newSku["count"] = $skuGroup.Count
[PSCustomObject]$newSku
}
$summary += [PSCustomObject]@{ResourceCount = $group.Count; ResourceType = $resourceType; ImplementedSkus = $uniqueSkus; ImplementedRegions = $uniqueLocations; meterIds = $uniqueMeterIds }
$summary += [PSCustomObject]@{ResourceCount = $group.Count; ResourceType = $resourceType; ImplementedSkus = $implementedSkus; ImplementedRegions = $uniqueLocations; MeterIds = $uniqueMeterIds }
Comment thread
jfaurskov marked this conversation as resolved.
Outdated
}
Else {
$summary += [PSCustomObject]@{ResourceCount = $group.Count; ResourceType = $resourceType; ImplementedSkus = @("N/A"); ImplementedRegions = $uniqueLocations; meterIds = $uniqueMeterIds }
else {
$summary += [PSCustomObject]@{ResourceCount = $group.Count; ResourceType = $resourceType; ImplementedSkus = @("N/A"); ImplementedRegions = $uniqueLocations; MeterIds = $uniqueMeterIds }
Comment thread
jfaurskov marked this conversation as resolved.
Outdated
}
}
$summary | ConvertTo-Json -Depth 100 | Out-File -FilePath $summaryOutputFile
21 changes: 10 additions & 11 deletions 2-AvailabilityCheck/Get-AvailabilityInformation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -155,22 +155,21 @@ Function Get-ResourceTypeParameters {
function Compare-ObjectsStrict {
param(
[psobject]$Object1,
[psobject]$Object2
[psobject]$Object2,
[string[]]$ExcludeProperty = @("count")
)
write-verbose "Entering Compare-ObjectsStrict"
$norm1 = ($Object1.PSObject.Properties |
Write-Verbose "Entering Compare-ObjectsStrict"
# Filter out excluded properties
$props1 = $Object1.PSObject.Properties | Where-Object { $ExcludeProperty -notcontains $_.Name }
$props2 = $Object2.PSObject.Properties | Where-Object { $ExcludeProperty -notcontains $_.Name }
$norm1 = ($props1 | Sort-Object Name | ForEach-Object { "$($_.Name)=$($_.Value)" }) -join ';'
$norm2 = ($props2 |
Sort-Object Name |
ForEach-Object { "$($_.Name)=$($_.Value)" }) -join ';'

$norm2 = ($Object2.PSObject.Properties |
Sort-Object Name |
ForEach-Object { "$($_.Name)=$($_.Value)" }) -join ';'

Write-Verbose "Comparing objects:"
Write-Verbose " Object1: $norm1"
Write-Verbose " Object2: $norm2"
Write-Verbose " Object1 (norm): $norm1"
Write-Verbose " Object2 (norm): $norm2"
Write-Verbose " Match: $($norm1 -eq $norm2)"

return $norm1 -eq $norm2
}

Expand Down
12 changes: 8 additions & 4 deletions 7-Report/Get-Report.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ Function Set-SvcAvailReportObj {
[string]$resourceType,
[int]$resourceCount,
[array]$implementedRegions,
[string]$skuCount,
[string]$sku,
[string]$skuAvailability,
[string]$serviceAvailability
Expand All @@ -116,6 +117,7 @@ Function Set-SvcAvailReportObj {
ResourceType = $resourceType
ResourceCount = $resourceCount
ImplementedRegions = ($implementedRegions -join ", ")
SKUCount = $skuCount
sku = $sku
"SKU available" = $skuAvailability
"Service available" = $serviceAvailability
Expand Down Expand Up @@ -145,21 +147,23 @@ If ($availabilityInfoPath) {
if ($item.ImplementedSkus -and $item.ImplementedSkus[0] -ne "N/A") {
if ( $regionAvailability -eq "Available") {
ForEach ($sku in $item.SelectedRegion.SKUs) {
$skuName = ($sku.PSObject.Properties | Where-Object { $_.Name -ne 'available' } | ForEach-Object { $_.Value }) -join "_"
$reportItem = Set-SvcAvailReportObj -resourceType $resourceType -resourceCount $itemCount -implementedRegions $item.ImplementedRegions -sku $skuName -skuAvailability $sku.available -serviceAvailability $regionAvailability
$skuName = ($sku.PSObject.Properties | Where-Object { $_.Name -ne 'available'-and $_.Name -ne 'count' } | ForEach-Object { $_.Value }) -join "_"
Comment thread
jfaurskov marked this conversation as resolved.
Outdated
$skuCount = $sku.count
$reportItem = Set-SvcAvailReportObj -resourceType $resourceType -resourceCount $itemCount -implementedRegions $item.ImplementedRegions -skuCount $skuCount -sku $skuName -skuAvailability $sku.available -serviceAvailability $regionAvailability
$reportData += $reportItem
}
}
else {
ForEach ($sku in $item.ImplementedSkus) {
$skuName = ($sku.PSObject.Properties | Where-Object { $_.Name -ne 'available' } | ForEach-Object { $_.Value }) -join "_"
Comment thread
jfaurskov marked this conversation as resolved.
Outdated
$reportItem = Set-SvcAvailReportObj -resourceType $resourceType -resourceCount $itemCount -implementedRegions $item.ImplementedRegions -sku $skuName -skuAvailability "false" -serviceAvailability $regionAvailability
$skuCount = $sku.count
$reportItem = Set-SvcAvailReportObj -resourceType $resourceType -resourceCount $itemCount -implementedRegions $item.ImplementedRegions -skuCount $skuCount -sku $skuName -skuAvailability "false" -serviceAvailability $regionAvailability
$reportData += $reportItem
}
}
}
else {
$reportItem = Set-SvcAvailReportObj -resourceType $resourceType -resourceCount $itemCount -implementedRegions $item.ImplementedRegions -sku "N/A" -skuAvailability "N/A" -serviceAvailability $regionAvailability
$reportItem = Set-SvcAvailReportObj -resourceType $resourceType -resourceCount $itemCount -implementedRegions $item.ImplementedRegions -skuCount "N/A" -sku "N/A" -skuAvailability "N/A" -serviceAvailability $regionAvailability
$reportData += $reportItem
}
}
Expand Down