Skip to content

Commit a5728d5

Browse files
committed
fix error message in hudu
1 parent 6d5056c commit a5728d5

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

Modules/CippExtensions/Public/Hudu/Get-HuduFieldMapping.ps1

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,31 @@ function Get-HuduFieldMapping {
3131
$Configuration = (Get-CIPPAzDataTableEntity @Table).config | ConvertFrom-Json -ea stop
3232
Connect-HuduAPI -configuration $Configuration
3333

34-
$AssetLayouts = Get-HuduAssetLayouts | Select-Object @{Name = 'FieldType' ; Expression = { 'Layouts' } }, @{Name = 'value'; Expression = { $_.id } }, name, fields
34+
try {
35+
$AssetLayouts = Get-HuduAssetLayouts -ErrorAction Stop | Select-Object @{Name = 'FieldType' ; Expression = { 'Layouts' } }, @{Name = 'value'; Expression = { $_.id } }, name, fields
36+
} catch {
37+
$Message = $_.Exception.Message -replace "'" | ConvertFrom-Json -ErrorAction SilentlyContinue
38+
if ($Message) {
39+
$Message = $Message.error
40+
} else {
41+
$Message = $_.Exception.Message
42+
}
43+
44+
Write-Warning "Could not get Hudu Asset Layouts, error: $Message"
45+
Write-LogMessage -Message "Could not get Hudu Asset Layouts, error: $Message " -Level Error -tenant 'CIPP' -API 'HuduMapping'
46+
$AssetLayouts = @(@{FieldType = 'Layouts'; name = "Could not get Hudu Asset Layouts, $Message"; value = -1 })
47+
}
3548
} catch {
36-
$Message = if ($_.ErrorDetails.Message) {
37-
Get-NormalizedError -Message $_.ErrorDetails.Message
49+
$Message = $_.Exception.Message -replace "'" | ConvertFrom-Json -ErrorAction SilentlyContinue
50+
if ($Message) {
51+
$Message = $Message.error
3852
} else {
39-
$_.Exception.message
53+
$Message = $_.Exception.Message
4054
}
4155

56+
Write-Warning "Could not get Hudu Asset Layouts, error: $Message"
4257
Write-LogMessage -Message "Could not get Hudu Asset Layouts, error: $Message " -Level Error -tenant 'CIPP' -API 'HuduMapping'
43-
$AssetLayouts = @(@{name = "Could not get Hudu Asset Layouts, error: $Message"; value = '-1' })
58+
$AssetLayouts = @(@{FieldType = 'Layouts'; name = "Could not get Hudu Asset Layouts, $Message"; value = -1 })
4459
}
4560

4661
$Unset = [PSCustomObject]@{

0 commit comments

Comments
 (0)