Skip to content

Commit c17520c

Browse files
authored
Minor code style cleanups (#496)
* Clean spurious newline at file beginning * Reformat whitespace for diffability to match other modues * Minor code style reformatting. Minor reformatting of code style.
1 parent 983c54b commit c17520c

21 files changed

Lines changed: 169 additions & 67 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2626
- Updated build to use `Sampler.GitHubTasks` - Fixes [Issue #489](https://github.com/dsccommunity/NetworkingDsc/issues/489).
2727
- Added support for publishing code coverage to `CodeCov.io` and
2828
Azure Pipelines - Fixes [Issue #491](https://github.com/dsccommunity/NetworkingDsc/issues/491).
29+
- Minor reformatting of code style for diffability.
2930

3031
## [8.2.0] - 2020-10-16
3132

source/DSCResources/DSC_DnsConnectionSuffix/DSC_DnsConnectionSuffix.psm1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ function Get-TargetResource
6060
$Ensure = 'Present'
6161
)
6262

63-
$dnsClient = Get-DnsClient -InterfaceAlias $InterfaceAlias -ErrorAction SilentlyContinue
63+
$dnsClient = Get-DnsClient `
64+
-InterfaceAlias $InterfaceAlias `
65+
-ErrorAction SilentlyContinue
6466

6567
$targetResource = @{
6668
InterfaceAlias = $dnsClient.InterfaceAlias

source/DSCResources/DSC_FirewallProfile/DSC_FirewallProfile.psm1

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ function Get-TargetResource
4646
) -join '' )
4747

4848
# Get the current Dns Client Global Settings
49-
$netFirewallProfile = Get-NetFirewallProfile -Name $Name `
49+
$netFirewallProfile = Get-NetFirewallProfile `
50+
-Name $Name `
5051
-ErrorAction Stop
5152

5253
# Generate the return object.
@@ -231,7 +232,8 @@ function Set-TargetResource
231232
) -join '' )
232233

233234
# Get the current Firewall Profile Settings
234-
$netFirewallProfile = Get-NetFirewallProfile -Name $Name `
235+
$netFirewallProfile = Get-NetFirewallProfile `
236+
-Name $Name `
235237
-ErrorAction Stop
236238

237239
# Generate a list of parameters that will need to be changed.
@@ -442,7 +444,8 @@ function Test-TargetResource
442444
$desiredConfigurationMatch = $true
443445

444446
# Get the current Dns Client Global Settings
445-
$netFirewallProfile = Get-NetFirewallProfile -Name $Name `
447+
$netFirewallProfile = Get-NetFirewallProfile `
448+
-Name $Name `
446449
-ErrorAction Stop
447450

448451
# Check each parameter

source/DSCResources/DSC_IPAddress/DSC_IPAddress.psm1

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ function Set-TargetResource
228228
try
229229
{
230230
# Apply the specified IP configuration
231-
New-NetIPAddress @newNetIPAddressParameters -ErrorAction Stop
231+
New-NetIPAddress @newNetIPAddressParameters `
232+
-ErrorAction Stop
232233
}
233234
catch [Microsoft.Management.Infrastructure.CimException]
234235
{
@@ -240,7 +241,8 @@ function Set-TargetResource
240241
Setting New-NetIPaddress will throw [Microsoft.Management.Infrastructure.CimException] if
241242
the IP address is already set. Need to check to make sure the IP is set on correct interface
242243
#>
243-
$verifyNetIPAddressAdapter = Get-NetIPAddress @verifyNetIPAddressAdapterParam -ErrorAction SilentlyContinue
244+
$verifyNetIPAddressAdapter = Get-NetIPAddress @verifyNetIPAddressAdapterParam `
245+
-ErrorAction SilentlyContinue
244246

245247
if ($verifyNetIPAddressAdapter.InterfaceAlias -eq $InterfaceAlias)
246248
{
@@ -343,7 +345,9 @@ function Test-TargetResource
343345
}
344346
} # while
345347

346-
$ipAddressObject = Get-IPAddressPrefix -IPAddress $IPAddress -AddressFamily $AddressFamily
348+
$ipAddressObject = Get-IPAddressPrefix `
349+
-IPAddress $IPAddress `
350+
-AddressFamily $AddressFamily
347351

348352
# Test if the IP Address passed is present
349353
foreach ($singleIP in $ipAddressObject)
@@ -480,7 +484,9 @@ function Assert-ResourceProperty
480484
{
481485
$singleIP = ($singleIPAddress -split '/')[0]
482486

483-
Assert-IPAddress -Address $singleIP -AddressFamily $AddressFamily
487+
Assert-IPAddress `
488+
-Address $singleIP `
489+
-AddressFamily $AddressFamily
484490
}
485491

486492
foreach ($prefixLength in $prefixLengthArray)

source/DSCResources/DSC_IPAddressOption/DSC_IPAddressOption.psm1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ function Set-TargetResource
8383

8484
if ($currentConfig.SkipAsSource -ne $SkipAsSource)
8585
{
86-
Set-NetIPAddress -IPAddress $IPAddress -SkipAsSource $SkipAsSource
86+
Set-NetIPAddress `
87+
-IPAddress $IPAddress `
88+
-SkipAsSource $SkipAsSource
8789
}
8890
}
8991

source/DSCResources/DSC_NetAdapterLso/DSC_NetAdapterLso.psm1

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ function Get-TargetResource
5050

5151
try
5252
{
53-
$netAdapter = Get-NetAdapterLso -Name $Name -ErrorAction Stop
53+
$netAdapter = Get-NetAdapterLso `
54+
-Name $Name `
55+
-ErrorAction Stop
5456
}
5557
catch
5658
{
@@ -131,7 +133,9 @@ function Set-TargetResource
131133

132134
try
133135
{
134-
$netAdapter = Get-NetAdapterLso -Name $Name -ErrorAction Stop
136+
$netAdapter = Get-NetAdapterLso `
137+
-Name $Name `
138+
-ErrorAction Stop
135139
}
136140
catch
137141
{
@@ -154,7 +158,9 @@ function Set-TargetResource
154158
$Name, $Protocol, $($netAdapter.V1IPv4Enabled.ToString()), $($State.ToString()) )
155159
) -join '')
156160

157-
Set-NetAdapterLso -Name $Name -V1IPv4Enabled $State
161+
Set-NetAdapterLso `
162+
-Name $Name `
163+
-V1IPv4Enabled $State
158164
}
159165
elseif ($Protocol -eq 'IPv4' -and $State -ne $netAdapter.IPv4Enabled)
160166
{
@@ -164,7 +170,9 @@ function Set-TargetResource
164170
$Name, $Protocol, $($netAdapter.IPv4Enabled.ToString()), $($State.ToString()) )
165171
) -join '')
166172

167-
Set-NetAdapterLso -Name $Name -IPv4Enabled $State
173+
Set-NetAdapterLso `
174+
-Name $Name `
175+
-IPv4Enabled $State
168176
}
169177
elseif ($Protocol -eq 'IPv6' -and $State -ne $netAdapter.IPv6Enabled)
170178
{
@@ -174,7 +182,9 @@ function Set-TargetResource
174182
$Name, $Protocol, $($netAdapter.IPv6Enabled.ToString()), $($State.ToString()) )
175183
) -join '')
176184

177-
Set-NetAdapterLso -Name $Name -IPv6Enabled $State
185+
Set-NetAdapterLso `
186+
-Name $Name `
187+
-IPv6Enabled $State
178188
}
179189
}
180190
}
@@ -219,7 +229,9 @@ function Test-TargetResource
219229

220230
try
221231
{
222-
$netAdapter = Get-NetAdapterLso -Name $Name -ErrorAction Stop
232+
$netAdapter = Get-NetAdapterLso `
233+
-Name $Name `
234+
-ErrorAction Stop
223235
}
224236
catch
225237
{

source/DSCResources/DSC_NetAdapterName/DSC_NetAdapterName.psm1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ function Set-TargetResource
253253
$($script:localizedData.RenamingNetAdapterNameMessage -f $adapter.Name, $NewName)
254254
) -join '')
255255

256-
$adapter | Rename-NetAdapter -NewName $NewName
256+
$adapter | Rename-NetAdapter `
257+
-NewName $NewName
257258

258259
Write-Verbose -Message ( @( "$($MyInvocation.MyCommand): "
259260
$($script:localizedData.NetAdapterNameRenamedMessage -f $NewName)

source/DSCResources/DSC_NetAdapterRdma/DSC_NetAdapterRdma.psm1

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ function Get-TargetResource
3737
{
3838
Write-Verbose -Message ($script:localizedData.GetNetAdapterRdmaMessage -f $Name)
3939

40-
$netAdapterRdma = Get-NetAdapterRdma -Name $Name -ErrorAction Stop
40+
$netAdapterRdma = Get-NetAdapterRdma `
41+
-Name $Name `
42+
-ErrorAction Stop
4143
}
4244
catch
4345
{
@@ -85,7 +87,9 @@ function Set-TargetResource
8587
{
8688
Write-Verbose -Message ($script:localizedData.GetNetAdapterRdmaMessage -f $Name)
8789

88-
$netAdapterRdma = Get-NetAdapterRdma -Name $Name -ErrorAction Stop
90+
$netAdapterRdma = Get-NetAdapterRdma `
91+
-Name $Name `
92+
-ErrorAction Stop
8993
}
9094
catch
9195
{
@@ -101,7 +105,9 @@ function Set-TargetResource
101105
{
102106
Write-Verbose -Message ($script:localizedData.SetNetAdapterRdmaMessage -f $Name, $Enabled)
103107

104-
Set-NetAdapterRdma -Name $Name -Enabled $Enabled
108+
Set-NetAdapterRdma `
109+
-Name $Name `
110+
-Enabled $Enabled
105111
}
106112
}
107113
}
@@ -137,7 +143,9 @@ function Test-TargetResource
137143
{
138144
Write-Verbose -Message ($script:localizedData.GetNetAdapterRdmaMessage -f $Name)
139145

140-
$netAdapterRdma = Get-NetAdapterRdma -Name $Name -ErrorAction Stop
146+
$netAdapterRdma = Get-NetAdapterRdma `
147+
-Name $Name `
148+
-ErrorAction Stop
141149
}
142150
catch
143151
{

source/DSCResources/DSC_NetAdapterRsc/DSC_NetAdapterRsc.psm1

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ function Get-TargetResource
5050

5151
try
5252
{
53-
$netAdapter = Get-NetAdapterRsc -Name $Name -ErrorAction Stop
53+
$netAdapter = Get-NetAdapterRsc `
54+
-Name $Name `
55+
-ErrorAction Stop
5456
}
5557
catch
5658
{
@@ -132,7 +134,9 @@ function Set-TargetResource
132134

133135
try
134136
{
135-
$netAdapter = Get-NetAdapterRsc -Name $Name -ErrorAction Stop
137+
$netAdapter = Get-NetAdapterRsc `
138+
-Name $Name `
139+
-ErrorAction Stop
136140
}
137141
catch
138142
{
@@ -155,7 +159,9 @@ function Set-TargetResource
155159
$Name, $Protocol, $($netAdapter.IPv4Enabled.ToString()), $($State.ToString()) )
156160
) -join '')
157161

158-
Set-NetAdapterRsc -Name $Name -IPv4Enabled $State
162+
Set-NetAdapterRsc `
163+
-Name $Name `
164+
-IPv4Enabled $State
159165
}
160166
if ($Protocol -in ('IPv6', 'All') -and $State -ne $netAdapter.IPv6Enabled)
161167
{
@@ -165,7 +171,9 @@ function Set-TargetResource
165171
$Name, $Protocol, $($netAdapter.IPv6Enabled.ToString()), $($State.ToString()) )
166172
) -join '')
167173

168-
Set-NetAdapterRsc -Name $Name -IPv6Enabled $State
174+
Set-NetAdapterRsc `
175+
-Name $Name `
176+
-IPv6Enabled $State
169177
}
170178
}
171179
}
@@ -210,7 +218,9 @@ function Test-TargetResource
210218

211219
try
212220
{
213-
$netAdapter = Get-NetAdapterRsc -Name $Name -ErrorAction Stop
221+
$netAdapter = Get-NetAdapterRsc `
222+
-Name $Name `
223+
-ErrorAction Stop
214224
}
215225
catch
216226
{

source/DSCResources/DSC_NetAdapterRss/DSC_NetAdapterRss.psm1

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ function Get-TargetResource
4242

4343
try
4444
{
45-
$netAdapter = Get-NetAdapterRss -Name $Name -ErrorAction Stop
45+
$netAdapter = Get-NetAdapterRss `
46+
-Name $Name `
47+
-ErrorAction Stop
4648
}
4749
catch
4850
{
@@ -97,7 +99,9 @@ function Set-TargetResource
9799

98100
try
99101
{
100-
$netAdapter = Get-NetAdapterRss -Name $Name -ErrorAction Stop
102+
$netAdapter = Get-NetAdapterRss `
103+
-Name $Name `
104+
-ErrorAction Stop
101105
}
102106
catch
103107
{
@@ -120,7 +124,9 @@ function Set-TargetResource
120124
$Name, $Enabled, $($netAdapter.Enabled.ToString()), $($Enabled.ToString()) )
121125
) -join '')
122126

123-
Set-NetAdapterRss -Name $Name -Enabled:$Enabled
127+
Set-NetAdapterRss `
128+
-Name $Name `
129+
-Enabled:$Enabled
124130
}
125131
}
126132
}
@@ -157,7 +163,9 @@ function Test-TargetResource
157163

158164
try
159165
{
160-
$netAdapter = Get-NetAdapterRss -Name $Name -ErrorAction Stop
166+
$netAdapter = Get-NetAdapterRss `
167+
-Name $Name `
168+
-ErrorAction Stop
161169
}
162170
catch
163171
{

0 commit comments

Comments
 (0)