Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove invoke prerequisites check #24

Merged
merged 1 commit into from
Nov 23, 2022
Merged

fix: remove invoke prerequisites check #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

### Platforms

- [VMware Cloud Foundation][vmware-cloud-foundation] 4.2.1 and later
- [VMware Cloud Foundation][vmware-cloud-foundation] 4.2.1 or later

### Operating Systems

Expand All @@ -25,14 +25,14 @@
### PowerShell Editions and Versions

- [Microsoft Windows PowerShell 5.1][microsoft-powershell]
- [PowerShell Core 7.2.0 and later][microsoft-powershell]
- [PowerShell Core 7.2.0 or later][microsoft-powershell]

### PowerShell Modules

- [`VMware.PowerCLI`][module-vmware-powercli] 12.4.1 and later
- [`VMware.vSphere.SsoAdmin`][module-vmware-vsphere-ssoadmin] 1.3.7 an later
- [`PowerVCF`][module-powervcf] 2.2.0 and later
- [`PowerValidatedSolutions`][module-powervalidatedsolutions] 1.7.0 and later
- [`VMware.PowerCLI`][module-vmware-powercli] 12.4.1 or later
- [`VMware.vSphere.SsoAdmin`][module-vmware-vsphere-ssoadmin] 1.3.7 or later
- [`PowerVCF`][module-powervcf] 2.2.0 or later
- [`PowerValidatedSolutions`][module-powervalidatedsolutions] 1.7.0 or later

### Browsers

Expand Down Expand Up @@ -60,7 +60,7 @@ Install-Module -Name VMware.CloudFoundation.Reporting
To verify the modules are installed, run the following command in the PowerShell console.

```powershell
Get-InstalledModule
Test-VcfReportingPrereq
```

Once installed, any cmdlets associated with `VMware.CloudFoundation.Reporting` and the supporting PowerShell modules will be available for use.
Expand Down
8 changes: 1 addition & 7 deletions VMware.CloudFoundation.Reporting.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ Function Invoke-VcfHealthReport {
if (Test-VCFAuthentication -server $sddcManagerFqdn -user $sddcManagerUser -pass $sddcManagerPass) {
$defaultReport = Start-CreateReportDirectory -path $reportPath -sddcManagerFqdn $sddcManagerFqdn -reportType health # Setup Report Location and Report File
if (!(Test-Path -Path $reportPath)) {Write-Warning "Unable to locate report path $reportPath, enter a valid path and try again"; Write-Host ""; Break }
if ($message = Test-VcfReportingPrereq) {Write-Warning $message; Write-Host ""; Break }
if ($PsBoundParameters.ContainsKey("allDomains")) {
$reportname = $defaultReport.Split('.')[0] + "-" + $sddcManagerFqdn.Split(".")[0] + ".htm"
$workflowMessage = "VMware Cloud Foundation instance ($sddcManagerFqdn)"
Expand Down Expand Up @@ -385,7 +384,6 @@ Function Invoke-VcfAlertReport {
if (Test-VCFAuthentication -server $sddcManagerFqdn -user $sddcManagerUser -pass $sddcManagerPass) {
$defaultReport = Start-CreateReportDirectory -path $reportPath -sddcManagerFqdn $sddcManagerFqdn -reportType alert # Setup Report Location and Report File
if (!(Test-Path -Path $reportPath)) {Write-Warning "Unable to locate report path $reportPath, enter a valid path and try again"; Write-Host ""; Break }
if ($message = Test-VcfReportingPrereq) {Write-Warning $message; Write-Host ""; Break }
if ($PsBoundParameters.ContainsKey("allDomains")) {
$reportname = $defaultReport.Split('.')[0] + "-" + $sddcManagerFqdn.Split(".")[0] + ".htm"
$workflowMessage = "VMware Cloud Foundation instance ($sddcManagerFqdn)"
Expand Down Expand Up @@ -524,7 +522,6 @@ Function Invoke-VcfConfigReport {
if (Test-VCFAuthentication -server $sddcManagerFqdn -user $sddcManagerUser -pass $sddcManagerPass) {
$defaultReport = Start-CreateReportDirectory -path $reportPath -sddcManagerFqdn $sddcManagerFqdn -reportType config # Setup Report Location and Report File
if (!(Test-Path -Path $reportPath)) {Write-Warning "Unable to locate report path $reportPath, enter a valid path and try again"; Write-Host ""; Break }
if ($message = Test-VcfReportingPrereq) {Write-Warning $message; Write-Host ""; Break }
if ($PsBoundParameters.ContainsKey("allDomains")) {
$reportname = $defaultReport.Split('.')[0] + "-" + $sddcManagerFqdn.Split(".")[0] + ".htm"
$workflowMessage = "VMware Cloud Foundation instance ($sddcManagerFqdn)"
Expand Down Expand Up @@ -657,7 +654,6 @@ Function Invoke-VcfUpgradePrecheck {
if (Test-VCFAuthentication -server $sddcManagerFqdn -user $sddcManagerUser -pass $sddcManagerPass) {
$defaultReport = Start-CreateReportDirectory -path $reportPath -sddcManagerFqdn $sddcManagerFqdn -reportType upgrade # Setup Report Location and Report File
if (!(Test-Path -Path $reportPath)) {Write-Warning "Unable to locate report path $reportPath, enter a valid path and try again"; Write-Host ""; Break }
if ($message = Test-VcfReportingPrereq) {Write-Warning $message; Write-Host ""; Break }
$reportname = $defaultReport.Split('.')[0] + "-" + $workloadDomain + ".htm"
$workflowMessage = "Workload Domain ($workloadDomain)"
Start-SetupLogFile -Path $reportPath -ScriptName $MyInvocation.MyCommand.Name # Setup Log Location and Log File
Expand Down Expand Up @@ -791,7 +787,6 @@ Function Invoke-VcfPasswordPolicy {
if (Test-VCFAuthentication -server $sddcManagerFqdn -user $sddcManagerUser -pass $sddcManagerPass) {
$defaultReport = Start-CreateReportDirectory -path $reportPath -sddcManagerFqdn $sddcManagerFqdn -reportType policy # Setup Report Location and Report File
if (!(Test-Path -Path $reportPath)) {Write-Warning "Unable to locate report path $reportPath, enter a valid path and try again"; Write-Host ""; Break }
if ($message = Test-VcfReportingPrereq) {Write-Warning $message; Write-Host ""; Break }
if ($PsBoundParameters.ContainsKey("allDomains")) {
$reportname = $defaultReport.Split('.')[0] + "-" + $sddcManagerFqdn.Split(".")[0] + ".htm"
$workflowMessage = "VMware Cloud Foundation instance ($sddcManagerFqdn)"
Expand Down Expand Up @@ -906,7 +901,6 @@ Function Invoke-VcfOverviewReport {
if (Test-VCFAuthentication -server $sddcManagerFqdn -user $sddcManagerUser -pass $sddcManagerPass) {
$defaultReport = Start-CreateReportDirectory -path $reportPath -sddcManagerFqdn $sddcManagerFqdn -reportType overview # Setup Report Location and Report File
if (!(Test-Path -Path $reportPath)) {Write-Warning "Unable to locate report path $reportPath, enter a valid path and try again"; Write-Host ""; Break }
if ($message = Test-VcfReportingPrereq) {Write-Warning $message; Write-Host ""; Break }
$reportname = $defaultReport.Split('.')[0] + "-" + $sddcManagerFqdn.Split(".")[0] + ".htm"
$workflowMessage = "VMware Cloud Foundation instance ($sddcManagerFqdn)"
Start-SetupLogFile -Path $reportPath -ScriptName $MyInvocation.MyCommand.Name # Setup Log Location and Log File
Expand Down Expand Up @@ -8442,7 +8436,7 @@ Function Test-VcfReportingPrereq {
Try {
$modules = @(
@{ Name=("PowerVCF"); Version=("2.2.0")}
@{ Name=("PowerValidatedSolutions"); Version=("1.6.0")}
@{ Name=("PowerValidatedSolutions"); Version=("1.7.0")}
@{ Name=("VMware.PowerCLI"); Version=("12.4.1")}
@{ Name=("VMware.vSphere.SsoAdmin"); Version=("1.3.7")}
)
Expand Down