Skip to content

Commit df2fb37

Browse files
tpcarmantpcarman
committed
Fix warning messages
1 parent e6adf18 commit df2fb37

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+254
-140
lines changed

‎AsBuiltReport.Microsoft.Azure/AsBuiltReport.Microsoft.Azure.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
"Assignments": 1,
5555
"Definitions": 0
5656
},
57+
"PrivateEndpoint": 2,
5758
"RecoveryServicesVault": 1,
5859
"RouteTable": 1,
5960
"SiteRecovery": 1,

‎AsBuiltReport.Microsoft.Azure/Language/en-GB/MicrosoftAzure.psd1‎

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ GetAbrAzBastion = ConvertFrom-StringData @'
348348

349349
# Azure DNS Private Resolver (Get-AbrAzDnsPrivateResolver)
350350
GetAbrAzDnsPrivateResolver = ConvertFrom-StringData @'
351-
InfoLevel = DnsPrivateResolver InfoLevel set at {0},
351+
InfoLevel = DnsPrivateResolver InfoLevel set at {0}.
352352
Collecting = Collecting Azure DNS Private Resolver information.
353353
SectionInfo = Azure Private DNS Resolver is a service that securely resolves DNS queries for private resources in Azure VNets, enabling seamless communication between on-premises and cloud environments without exposing traffic to the public internet. It centralises DNS management and supports hybrid cloud architectures.
354354
ParagraphDetail = The following sections detail the configuration of the DNS private resolver(s) within the {0} subscription.
@@ -831,13 +831,11 @@ GetAbrAzPrivateEndpoint = ConvertFrom-StringData @'
831831
TargetSubResource = Target Sub-Resource
832832
ConnectionStatus = Connection Status
833833
Response = Response
834-
Approved = Approved
835834
Pending = Pending
836835
Rejected = Rejected
837836
Disconnected = Disconnected
838837
Tags = Tags
839838
None = None
840-
Succeeded = Succeeded
841839
'@
842840

843841
# Azure Recovery Services Vault (Get-AbrAzRecoveryServicesVault)
@@ -1077,13 +1075,48 @@ GetAbrAzVirtualNetworkSubnet = ConvertFrom-StringData @'
10771075
GetAbrAzFirewallPolicy = ConvertFrom-StringData @'
10781076
InfoLevel = FirewallPolicy InfoLevel set at {0}.
10791077
Collecting = Collecting Azure Firewall policy information.
1080-
SectionInfo = Azure Firewall Policy is a top-level resource that contains security and operational settings for Azure Firewall. It allows you to define rule hierarchies and enforce compliance using a centralised policy structure. Policies support inheritance allowing child policies to inherit rules from parent policies.
1081-
Heading = Firewall Policies
1078+
SectionInfo = Azure Firewall Policy is a top-level resource that contains security and operational settings for Azure Firewall. It allows you to define rule hierarchies and enforce compliance using a centralized policy structure. Policies support inheritance allowing child policies to inherit rules from parent policies.
10821079
Name = Name
10831080
ResourceGroup = Resource Group
10841081
Location = Location
1082+
Subscription = Subscription
1083+
SubscriptionID = Subscription ID
10851084
ProvisioningState = Provisioning State
1086-
ThreatIntelMode = Threat Intelligence Mode
1085+
ParentPolicy = Parent Policy
1086+
PolicyTier = Policy Tier
1087+
ThreatIntelMode = Threat Intel Mode
1088+
IntrusionDetectionMode = Intrusion Detection Mode
1089+
DnsServers = DNS Servers
1090+
DnsProxy = DNS Proxy
1091+
Priority = Priority
1092+
Rules = Rules
1093+
Action = Action
1094+
InheritedFrom = Inherited From
1095+
Description = Description
1096+
SourceAddresses = Source Addresses
1097+
SourceIpGroups = Source IP Groups
1098+
DestinationAddresses = Destination Addresses
1099+
DestinationIpGroups = Destination IP Groups
1100+
DestinationFqdns = Destination FQDNs
1101+
DestinationPorts = Destination Ports
1102+
TranslatedAddress = Translated Address
1103+
TranslatedPort = Translated Port
1104+
TranslatedFqdn = Translated FQDN
1105+
TargetFQDNs = Target FQDNs
1106+
TargetUrls = Target URLs
1107+
Protocols = Protocols
1108+
WebCategories = Web Categories
1109+
Heading = Firewall Policies
1110+
RcgHeading = Rule Collection Groups
1111+
RcgTableHeading = Rule Collection Groups
1112+
RcTableHeading = Rule Collections
1113+
AppRuleTableHeading = Application Rule
1114+
NetRuleTableHeading = Network Rule
1115+
DnatRuleTableHeading = DNAT Rule
1116+
NoRuleCollections = No rule collections found in {0}.
1117+
NoParentPolicy = Unable to retrieve parent policy.
1118+
NoParentPolicyRCG = Unable to retrieve parent policy rule collection groups.
1119+
TableHeading = Firewall Policy
10871120
Alert = Alert
10881121
Deny = Deny
10891122
Found = Found {0} rule collection group(s) in {1} policy.
@@ -1094,6 +1127,8 @@ GetAbrAzFirewallPolicy = ConvertFrom-StringData @'
10941127
Enabled = Enabled
10951128
Disabled = Disabled
10961129
Off = Off
1130+
Default = Default (Azure provided)
1131+
Skipping = Skipping null rule collection group reference
10971132
'@
10981133

10991134
}

‎AsBuiltReport.Microsoft.Azure/Language/en-US/MicrosoftAzure.psd1‎

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ GetAbrAzBastion = ConvertFrom-StringData @'
348348

349349
# Azure DNS Private Resolver (Get-AbrAzDnsPrivateResolver)
350350
GetAbrAzDnsPrivateResolver = ConvertFrom-StringData @'
351-
InfoLevel = DnsPrivateResolver InfoLevel set at {0},
351+
InfoLevel = DnsPrivateResolver InfoLevel set at {0}.
352352
Collecting = Collecting Azure DNS Private Resolver information.
353353
SectionInfo = Azure Private DNS Resolver is a service that securely resolves DNS queries for private resources in Azure VNets, enabling seamless communication between on-premises and cloud environments without exposing traffic to the public internet. It centralises DNS management and supports hybrid cloud architectures.
354354
ParagraphDetail = The following sections detail the configuration of the DNS private resolver(s) within the {0} subscription.
@@ -831,13 +831,11 @@ GetAbrAzPrivateEndpoint = ConvertFrom-StringData @'
831831
TargetSubResource = Target Sub-Resource
832832
ConnectionStatus = Connection Status
833833
Response = Response
834-
Approved = Approved
835834
Pending = Pending
836835
Rejected = Rejected
837836
Disconnected = Disconnected
838837
Tags = Tags
839838
None = None
840-
Succeeded = Succeeded
841839
'@
842840

843841
# Azure Recovery Services Vault (Get-AbrAzRecoveryServicesVault)
@@ -1078,12 +1076,47 @@ GetAbrAzFirewallPolicy = ConvertFrom-StringData @'
10781076
InfoLevel = FirewallPolicy InfoLevel set at {0}.
10791077
Collecting = Collecting Azure Firewall policy information.
10801078
SectionInfo = Azure Firewall Policy is a top-level resource that contains security and operational settings for Azure Firewall. It allows you to define rule hierarchies and enforce compliance using a centralized policy structure. Policies support inheritance allowing child policies to inherit rules from parent policies.
1081-
Heading = Firewall Policies
10821079
Name = Name
10831080
ResourceGroup = Resource Group
10841081
Location = Location
1082+
Subscription = Subscription
1083+
SubscriptionID = Subscription ID
10851084
ProvisioningState = Provisioning State
1086-
ThreatIntelMode = Threat Intelligence Mode
1085+
ParentPolicy = Parent Policy
1086+
PolicyTier = Policy Tier
1087+
ThreatIntelMode = Threat Intel Mode
1088+
IntrusionDetectionMode = Intrusion Detection Mode
1089+
DnsServers = DNS Servers
1090+
DnsProxy = DNS Proxy
1091+
Priority = Priority
1092+
Rules = Rules
1093+
Action = Action
1094+
InheritedFrom = Inherited From
1095+
Description = Description
1096+
SourceAddresses = Source Addresses
1097+
SourceIpGroups = Source IP Groups
1098+
DestinationAddresses = Destination Addresses
1099+
DestinationIpGroups = Destination IP Groups
1100+
DestinationFqdns = Destination FQDNs
1101+
DestinationPorts = Destination Ports
1102+
TranslatedAddress = Translated Address
1103+
TranslatedPort = Translated Port
1104+
TranslatedFqdn = Translated FQDN
1105+
TargetFQDNs = Target FQDNs
1106+
TargetUrls = Target URLs
1107+
Protocols = Protocols
1108+
WebCategories = Web Categories
1109+
Heading = Firewall Policies
1110+
RcgHeading = Rule Collection Groups
1111+
RcgTableHeading = Rule Collection Groups
1112+
RcTableHeading = Rule Collections
1113+
AppRuleTableHeading = Application Rule
1114+
NetRuleTableHeading = Network Rule
1115+
DnatRuleTableHeading = DNAT Rule
1116+
NoRuleCollections = No rule collections found in {0}.
1117+
NoParentPolicy = Unable to retrieve parent policy.
1118+
NoParentPolicyRCG = Unable to retrieve parent policy rule collection groups.
1119+
TableHeading = Firewall Policy
10871120
Alert = Alert
10881121
Deny = Deny
10891122
Found = Found {0} rule collection group(s) in {1} policy.
@@ -1094,6 +1127,8 @@ GetAbrAzFirewallPolicy = ConvertFrom-StringData @'
10941127
Enabled = Enabled
10951128
Disabled = Disabled
10961129
Off = Off
1130+
Default = Default (Azure provided)
1131+
Skipping = Skipping null rule collection group reference
10971132
'@
10981133

10991134
}

‎AsBuiltReport.Microsoft.Azure/Src/Private/Get-AbrAsrProtectedItems.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function Get-AbrAsrProtectedItems {
6969
}
7070
}
7171
} Catch {
72-
Write-PScriboMessage $($_.Exception.Message)
72+
Write-PScriboMessage -IsWarning $($_.Exception.Message)
7373
}
7474
}
7575

‎AsBuiltReport.Microsoft.Azure/Src/Private/Get-AbrAzAvailabilitySet.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function Get-AbrAzAvailabilitySet {
6868
}
6969
}
7070
} Catch {
71-
Write-PScriboMessage $($_.Exception.Message)
71+
Write-PScriboMessage -IsWarning $($_.Exception.Message)
7272
}
7373
}
7474

‎AsBuiltReport.Microsoft.Azure/Src/Private/Get-AbrAzBastion.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ function Get-AbrAzBastion {
5353
$LocalizedData.Subscription = "$($AzSubscriptionLookup.(($AzBastion.Id).split('/')[2]))"
5454
$LocalizedData.SubscriptionID = ($AzBastion.Id).split('/')[2]
5555
$LocalizedData.ProvisioningState = $AzBastion.ProvisioningState
56-
$LocalizedData.VirtualNetworkSubnet = $AzBastion.IpConfigurations.subnet.id.split('/')[-1]
56+
$LocalizedData.VirtualNetworkSubnet = if ($AzBastion.IpConfigurations.subnet.id) { $AzBastion.IpConfigurations.subnet.id.split('/')[-1] } else { $LocalizedData.None }
5757
$LocalizedData.PublicDnsName = $AzBastion.DnsName
58-
$LocalizedData.PublicIpAddress = $AzBastion.IpConfigurations.publicipaddress.id.split('/')[-1]
58+
$LocalizedData.PublicIpAddress = if ($AzBastion.IpConfigurations.publicipaddress.id) { $AzBastion.IpConfigurations.publicipaddress.id.split('/')[-1] } else { $LocalizedData.None }
5959
}
6060

6161
if ($Options.ShowTags) {
@@ -107,7 +107,7 @@ function Get-AbrAzBastion {
107107
}
108108
}
109109
} Catch {
110-
Write-PScriboMessage $($_.Exception.Message)
110+
Write-PScriboMessage -IsWarning $($_.Exception.Message)
111111
}
112112
}
113113

‎AsBuiltReport.Microsoft.Azure/Src/Private/Get-AbrAzDnsPrivateResolver.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ function Get-AbrAzDnsPrivateResolver {
153153
}
154154
}
155155
} Catch {
156-
Write-PScriboMessage $($_.Exception.Message)
156+
Write-PScriboMessage -IsWarning $($_.Exception.Message)
157157
}
158158
}
159159

‎AsBuiltReport.Microsoft.Azure/Src/Private/Get-AbrAzExpressRouteCircuit.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ function Get-AbrAzExpressRouteCircuit {
109109
}
110110
}
111111
} Catch {
112-
Write-PScriboMessage $($_.Exception.Message)
112+
Write-PScriboMessage -IsWarning $($_.Exception.Message)
113113
}
114114
}
115115

‎AsBuiltReport.Microsoft.Azure/Src/Private/Get-AbrAzFirewall.ps1‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,23 @@ function Get-AbrAzFirewall {
4343
$LocalizedData.Subscription = "$($AzSubscriptionLookup.(($AzFirewall.Id).split('/')[2]))"
4444
$LocalizedData.SubscriptionID = ($AzFirewall.Id).split('/')[2]
4545
#'Virtual Network' = ''
46-
$LocalizedData.FirewallPolicy = ($AzFirewall.FirewallPolicy.id).Split('/')[-1]
46+
$LocalizedData.FirewallPolicy = if ($AzFirewall.FirewallPolicy.id) {
47+
($AzFirewall.FirewallPolicy.id).Split('/')[-1]
48+
} else {
49+
$LocalizedData.None
50+
}
4751
$LocalizedData.ProvisioningState = $AzFirewall.ProvisioningState
4852
$LocalizedData.SKU = $AzFirewall.Sku.Tier
49-
$LocalizedData.Subnet = ($AzFirewall.IpConfigurations | Where-Object {$null -ne $_.PrivateIPAddress}).Subnet.Id.Split('/')[-1]
50-
$LocalizedData.PublicIP = ($AzFirewall.IpConfigurations | Where-Object {$null -ne $_.PrivateIPAddress}).PublicIpAddress.Id.Split('/')[-1]
53+
$LocalizedData.Subnet = if (($AzFirewall.IpConfigurations | Where-Object {$null -ne $_.PrivateIPAddress}).Subnet.Id) {
54+
($AzFirewall.IpConfigurations | Where-Object {$null -ne $_.PrivateIPAddress}).Subnet.Id.Split('/')[-1]
55+
} else {
56+
$LocalizedData.None
57+
}
58+
$LocalizedData.PublicIP = if (($AzFirewall.IpConfigurations | Where-Object {$null -ne $_.PrivateIPAddress}).PublicIpAddress.Id) {
59+
($AzFirewall.IpConfigurations | Where-Object {$null -ne $_.PrivateIPAddress}).PublicIpAddress.Id.Split('/')[-1]
60+
} else {
61+
$LocalizedData.None
62+
}
5163
$LocalizedData.PrivateIP = ($AzFirewall.IpConfigurations | Where-Object {$null -ne $_.PrivateIPAddress}).PrivateIpAddress
5264
##ToDo: App Rules
5365
}
@@ -118,7 +130,7 @@ function Get-AbrAzFirewall {
118130
}
119131
}
120132
} Catch {
121-
Write-PScriboMessage $($_.Exception.Message)
133+
Write-PScriboMessage -IsWarning $($_.Exception.Message)
122134
}
123135
}
124136

‎AsBuiltReport.Microsoft.Azure/Src/Private/Get-AbrAzFirewallNatRule.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ function Get-AbrAzFirewallNatRule {
9797
}
9898
}
9999
} Catch {
100-
Write-PScriboMessage $($_.Exception.Message)
100+
Write-PScriboMessage -IsWarning $($_.Exception.Message)
101101
}
102102
}
103103

0 commit comments

Comments
 (0)