Use IsPresent on switch, throw on Reject

jakkulabs · Mar 28, 2020 · 0f906dd · 0f906dd
1 parent 7e9305e
commit 0f906dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Functions/Public/catalog-service/Request-vRACatalogItem.ps1 b/src/Functions/Public/catalog-service/Request-vRACatalogItem.ps1
@@ -148,7 +148,7 @@
 
                 $Response = Invoke-vRARestMethod -Method POST -URI $URI -Body $JSON -Verbose:$VerbosePreference
 
-                if ($PSBoundParameters.ContainsKey("Wait")) {
+                if ($Wait.IsPresent) {
 
                     While($true) {
 
@@ -158,9 +158,9 @@
 
                         Write-Verbose -Message "State: $($Request.state)"
 
-                        if ($Request.state -eq "SUCCESSFUL" -or $Request.state -Like "*FAILED") {
+                        if ($Request.state -eq "SUCCESSFUL" -or $Request.state -Like "*FAILED" -or $Request.state -Like "*REJECTED") {
 
-                            if ($Request.state -Like "*FAILED") {
+                            if ($Request.state -Like "*FAILED" -or $Request.state -Like "*REJECTED") {
 
                                 throw "$($Request.requestCompletion.completionDetails)"
 

diff --git a/src/Functions/Public/catalog-service/Request-vRAResourceAction.ps1 b/src/Functions/Public/catalog-service/Request-vRAResourceAction.ps1
@@ -137,7 +137,7 @@ function Request-vRAResourceAction {
 
                    $ResponseId = ($Response.Headers.Location) -replace '^http.*requests/',''
 
-                   if ($PSBoundParameters.ContainsKey("Wait")) {
+                   if ($Wait.IsPresent) {
 
                        While($true) {
 
@@ -147,9 +147,9 @@ function Request-vRAResourceAction {
 
                            Write-Verbose -Message "State: $($Request.state)"
 
-                           if ($Request.state -eq "SUCCESSFUL" -or $Request.state -Like "*FAILED") {
+                           if ($Request.state -eq "SUCCESSFUL" -or $Request.state -Like "*FAILED" -or $Request.state -Like "*REJECTED") {
 
-                               if ($Request.state -Like "*FAILED") {
+                               if ($Request.state -Like "*FAILED" -or $Request.state -Like "*REJECTED") {
 
                                    throw "$($Request.requestCompletion.completionDetails)"