Skip to content

Commit c5e4125

Browse files
rebelinuxrebelinux
authored
Merge pull request #38 from rebelinux/dev
Code Cleanup
2 parents 3603633 + 47c2da7 commit c5e4125

File tree

110 files changed

+1136
-1365
lines changed

Some content is hidden

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

110 files changed

+1136
-1365
lines changed

‎AsBuiltReport.NetApp.ONTAP.Style.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ if ($ReportConfig.Report.ShowCoverPageImage) {
7979
BlankLine -Count 1
8080
} Catch {
8181
Write-PScriboMessage -IsWarning "Unable to display cover page image. Please set 'ShowCoverPageImage' to 'false' in the report JSON configuration file to avoid this error."
82+
Write-PScriboMessage -IsWarning $_.Exception.Message
8283
}
8384
}
8485

‎AsBuiltReport.NetApp.ONTAP.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@
7878
"Security": {
7979
"Users": true,
8080
"KMS": true
81+
}
8182
}
82-
}
83-
}
83+
}

‎AsBuiltReport.NetApp.ONTAP.psd1‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -8,125 +8,125 @@
88

99
@{
1010

11-
# Script module or binary module file associated with this manifest.
12-
RootModule = 'AsBuiltReport.NetApp.ONTAP.psm1'
11+
# Script module or binary module file associated with this manifest.
12+
RootModule = 'AsBuiltReport.NetApp.ONTAP.psm1'
1313

14-
# Version number of this module.
15-
ModuleVersion = '0.6.6'
14+
# Version number of this module.
15+
ModuleVersion = '0.6.7'
1616

17-
# Supported PSEditions
18-
# CompatiblePSEditions = @()
17+
# Supported PSEditions
18+
# CompatiblePSEditions = @()
1919

20-
# ID used to uniquely identify this module
21-
GUID = '0ca28a0b-504a-4754-af90-199b59da68f0'
20+
# ID used to uniquely identify this module
21+
GUID = '0ca28a0b-504a-4754-af90-199b59da68f0'
2222

23-
# Author of this module
24-
Author = 'Jonathan Colon Feliciano'
23+
# Author of this module
24+
Author = 'Jonathan Colon Feliciano'
2525

26-
# Company or vendor of this module
27-
#CompanyName = 'Unknown'
26+
# Company or vendor of this module
27+
#CompanyName = 'Unknown'
2828

29-
# Copyright statement for this module
30-
Copyright = '(c) 2023 Jonathan Colon Feliciano. All rights reserved.'
29+
# Copyright statement for this module
30+
Copyright = '(c) 2024 Jonathan Colon Feliciano. All rights reserved.'
3131

32-
# Description of the functionality provided by this module
33-
Description = 'A PowerShell module to generate an as built report on the configuration of NetApp ONTAP.'
32+
# Description of the functionality provided by this module
33+
Description = 'A PowerShell module to generate an as built report on the configuration of NetApp ONTAP.'
3434

35-
# Minimum version of the Windows PowerShell engine required by this module
36-
#PowerShellVersion = '5.1'
35+
# Minimum version of the Windows PowerShell engine required by this module
36+
#PowerShellVersion = '5.1'
3737

38-
# Name of the Windows PowerShell host required by this module
39-
# PowerShellHostName = ''
38+
# Name of the Windows PowerShell host required by this module
39+
# PowerShellHostName = ''
4040

41-
# Minimum version of the Windows PowerShell host required by this module
42-
# PowerShellHostVersion = ''
41+
# Minimum version of the Windows PowerShell host required by this module
42+
# PowerShellHostVersion = ''
4343

44-
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
45-
# DotNetFrameworkVersion = ''
44+
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
45+
# DotNetFrameworkVersion = ''
4646

47-
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
48-
# CLRVersion = ''
47+
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
48+
# CLRVersion = ''
4949

50-
# Processor architecture (None, X86, Amd64) required by this module
51-
# ProcessorArchitecture = ''
50+
# Processor architecture (None, X86, Amd64) required by this module
51+
# ProcessorArchitecture = ''
5252

53-
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(
55-
@{
56-
ModuleName = 'AsBuiltReport.Core';
57-
ModuleVersion = '1.3.0'
58-
},
59-
@{
60-
ModuleName = 'NetApp.ONTAP';
61-
ModuleVersion = '9.10.1.2111'
62-
}
63-
)
53+
# Modules that must be imported into the global environment prior to importing this module
54+
RequiredModules = @(
55+
@{
56+
ModuleName = 'AsBuiltReport.Core';
57+
ModuleVersion = '1.3.0'
58+
},
59+
@{
60+
ModuleName = 'NetApp.ONTAP';
61+
ModuleVersion = '9.10.1.2111'
62+
}
63+
)
6464

65-
# Assemblies that must be loaded prior to importing this module
66-
# RequiredAssemblies = @()
65+
# Assemblies that must be loaded prior to importing this module
66+
# RequiredAssemblies = @()
6767

68-
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
69-
# ScriptsToProcess = @()
68+
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
69+
# ScriptsToProcess = @()
7070

71-
# Type files (.ps1xml) to be loaded when importing this module
72-
# TypesToProcess = @()
71+
# Type files (.ps1xml) to be loaded when importing this module
72+
# TypesToProcess = @()
7373

74-
# Format files (.ps1xml) to be loaded when importing this module
75-
# FormatsToProcess = @()
74+
# Format files (.ps1xml) to be loaded when importing this module
75+
# FormatsToProcess = @()
7676

77-
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
78-
# NestedModules = @()
77+
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
78+
# NestedModules = @()
7979

80-
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
81-
FunctionsToExport = @('Invoke-AsBuiltReport.NetApp.ONTAP')
80+
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
81+
FunctionsToExport = @('Invoke-AsBuiltReport.NetApp.ONTAP')
8282

83-
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
84-
#CmdletsToExport = '*'
83+
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
84+
#CmdletsToExport = '*'
8585

86-
# Variables to export from this module
87-
#VariablesToExport = '*'
86+
# Variables to export from this module
87+
#VariablesToExport = '*'
8888

89-
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
90-
#AliasesToExport = '*'
89+
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
90+
#AliasesToExport = '*'
9191

92-
# DSC resources to export from this module
93-
# DscResourcesToExport = @()
92+
# DSC resources to export from this module
93+
# DscResourcesToExport = @()
9494

95-
# List of all modules packaged with this module
96-
# ModuleList = @()
95+
# List of all modules packaged with this module
96+
# ModuleList = @()
9797

98-
# List of all files packaged with this module
99-
# FileList = @()
98+
# List of all files packaged with this module
99+
# FileList = @()
100100

101-
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
102-
PrivateData = @{
101+
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
102+
PrivateData = @{
103103

104-
PSData = @{
104+
PSData = @{
105105

106-
# Tags applied to this module. These help with module discovery in online galleries.
107-
Tags = 'AsBuiltReport', 'Report', 'NetApp', 'ONTAP', 'Documentation', 'PScribo', 'Windows', 'Linux', 'MacOS', 'PSEdition_Desktop', 'PSEdition_Core'
106+
# Tags applied to this module. These help with module discovery in online galleries.
107+
Tags = 'AsBuiltReport', 'Report', 'NetApp', 'ONTAP', 'Documentation', 'PScribo', 'Windows', 'Linux', 'MacOS', 'PSEdition_Desktop', 'PSEdition_Core'
108108

109-
# A URL to the license for this module.
110-
LicenseUri = 'https://raw.githubusercontent.com/AsBuiltReport/AsBuiltReport.NetApp.ONTAP/master/LICENSE'
109+
# A URL to the license for this module.
110+
LicenseUri = 'https://raw.githubusercontent.com/AsBuiltReport/AsBuiltReport.NetApp.ONTAP/master/LICENSE'
111111

112-
# A URL to the main website for this project.
113-
ProjectUri = 'https://github.com/AsBuiltReport/AsBuiltReport.NetApp.ONTAP'
112+
# A URL to the main website for this project.
113+
ProjectUri = 'https://github.com/AsBuiltReport/AsBuiltReport.NetApp.ONTAP'
114114

115-
# A URL to an icon representing this module.
116-
IconUri = 'https://github.com/AsBuiltReport.png'
115+
# A URL to an icon representing this module.
116+
IconUri = 'https://github.com/AsBuiltReport.png'
117117

118-
# ReleaseNotes of this module
119-
ReleaseNotes = 'https://raw.githubusercontent.com/AsBuiltReport/AsBuiltReport.NetApp.ONTAP/master/CHANGELOG.md'
118+
# ReleaseNotes of this module
119+
ReleaseNotes = 'https://raw.githubusercontent.com/AsBuiltReport/AsBuiltReport.NetApp.ONTAP/master/CHANGELOG.md'
120120

121-
} # End of PSData hashtable
121+
} # End of PSData hashtable
122122

123-
} # End of PrivateData hashtable
123+
} # End of PrivateData hashtable
124124

125-
# HelpInfo URI of this module
126-
# HelpInfoURI = ''
125+
# HelpInfo URI of this module
126+
# HelpInfoURI = ''
127127

128-
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
129-
# DefaultCommandPrefix = ''
128+
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
129+
# DefaultCommandPrefix = ''
130130

131131
}
132132

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# :arrows_counterclockwise: NetApp ONTAP Storage As Built Report Changelog
22

3+
## [0.6.7] - 2024-02-02
4+
5+
### Changed
6+
7+
- Code Cleanup
8+
9+
310
## [0.6.6] - 2023-08-07
411

512
### Changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 AsBuiltReport
3+
Copyright (c) 2024 AsBuiltReport
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Src/Private/Get-AbrOntapCluster.ps1‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function Get-AbrOntapCluster {
55
.DESCRIPTION
66
77
.NOTES
8-
Version: 0.6.3
8+
Version: 0.6.7
99
Author: Jonathan Colon
1010
Twitter: @jcolonfzenpr
1111
Github: rebelinux
@@ -19,7 +19,7 @@ function Get-AbrOntapCluster {
1919
)
2020

2121
begin {
22-
Write-PscriboMessage "Collecting ONTAP cluster information."
22+
Write-PScriboMessage "Collecting ONTAP cluster information."
2323
}
2424

2525
process {
@@ -57,9 +57,8 @@ function Get-AbrOntapCluster {
5757
}
5858
$ClusterSummary | Table @TableParams
5959
}
60-
}
61-
catch {
62-
Write-PscriboMessage -IsWarning $_.Exception.Message
60+
} catch {
61+
Write-PScriboMessage -IsWarning $_.Exception.Message
6362
}
6463
}
6564

‎Src/Private/Get-AbrOntapClusterASUP.ps1‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function Get-AbrOntapClusterASUP {
55
.DESCRIPTION
66
77
.NOTES
8-
Version: 0.6.3
8+
Version: 0.6.7
99
Author: Jonathan Colon
1010
Twitter: @jcolonfzenpr
1111
Github: rebelinux
@@ -19,7 +19,7 @@ function Get-AbrOntapClusterASUP {
1919
)
2020

2121
begin {
22-
Write-PscriboMessage "Collecting ONTAP AutoSupport information."
22+
Write-PScriboMessage "Collecting ONTAP AutoSupport information."
2323
}
2424

2525
process {
@@ -51,15 +51,13 @@ function Get-AbrOntapClusterASUP {
5151
$TableParams['Caption'] = "- $($TableParams.Name)"
5252
}
5353
$Outobj | Table @TableParams
54-
}
55-
catch {
56-
Write-PscriboMessage -IsWarning $_.Exception.Message
54+
} catch {
55+
Write-PScriboMessage -IsWarning $_.Exception.Message
5756
}
5857
}
5958
}
60-
}
61-
catch {
62-
Write-PscriboMessage -IsWarning $_.Exception.Message
59+
} catch {
60+
Write-PScriboMessage -IsWarning $_.Exception.Message
6361
}
6462
}
6563

‎Src/Private/Get-AbrOntapClusterHA.ps1‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function Get-AbrOntapClusterHA {
55
.DESCRIPTION
66
77
.NOTES
8-
Version: 0.6.6
8+
Version: 0.6.7
99
Author: Jonathan Colon
1010
Twitter: @jcolonfzenpr
1111
Github: rebelinux
@@ -19,7 +19,7 @@ function Get-AbrOntapClusterHA {
1919
)
2020

2121
begin {
22-
Write-PscriboMessage "Collecting ONTAP cluster high availability information."
22+
Write-PScriboMessage "Collecting ONTAP cluster high availability information."
2323
}
2424

2525
process {
@@ -32,22 +32,21 @@ function Get-AbrOntapClusterHA {
3232
[PSCustomObject] @{
3333
'Name' = $Nodes.Node
3434
'Partner' = Switch ([string]::IsNullOrEmpty($ClusterHa.Partner)) {
35-
'True' {'-'}
36-
'False' {$ClusterHa.Partner}
37-
default {'Unknwon'}
35+
'True' { '-' }
36+
'False' { $ClusterHa.Partner }
37+
default { 'Unknwon' }
3838
}
3939
'TakeOver Possible' = ConvertTo-TextYN $ClusterHa.TakeoverPossible
4040
'TakeOver State' = Switch ([string]::IsNullOrEmpty($ClusterHa.TakeoverState)) {
41-
'True' {'-'}
42-
'False' {$ClusterHa.TakeoverState}
43-
default {'Unknwon'}
41+
'True' { '-' }
42+
'False' { $ClusterHa.TakeoverState }
43+
default { 'Unknwon' }
4444
}
4545
'HA Mode' = $ClusterHa.CurrentMode.ToUpper()
4646
'HA State' = $ClusterHa.State.ToUpper()
4747
}
48-
}
49-
catch {
50-
Write-PscriboMessage -IsWarning $_.Exception.Message
48+
} catch {
49+
Write-PScriboMessage -IsWarning $_.Exception.Message
5150
}
5251
}
5352
if ($Healthcheck.Cluster.HA) {
@@ -65,9 +64,8 @@ function Get-AbrOntapClusterHA {
6564
}
6665
$NodeSummary | Table @TableParams
6766
}
68-
}
69-
catch {
70-
Write-PscriboMessage -IsWarning $_.Exception.Message
67+
} catch {
68+
Write-PScriboMessage -IsWarning $_.Exception.Message
7169
}
7270
}
7371

0 commit comments

Comments
 (0)