Code Cleanup - removing use of ToString()

thycotic-ps · Mar 14, 2021 · db3bf67 · db3bf67
1 parent 09981c8
commit db3bf67
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/src/functions/folders/Get-Folder.ps1 b/src/functions/folders/Get-Folder.ps1
@@ -66,7 +66,7 @@ function Get-Folder {
             . $CheckVersion $TssSession '10.9.000000' $PSCmdlet.MyInvocation
             foreach ($folder in $Id) {
                 $restResponse = $null
-                $uri = $TssSession.ApiUrl, 'folders', $folder.ToString() -join '/'
+                $uri = $TssSession.ApiUrl, 'folders', $folder -join '/'
                 $uri = $uri + '?' + "getAllChildren=$GetChildren" + "&" + "includeAssociatedTemplates=$IncludeTemplate"
 
                 $invokeParams.Uri = $Uri

diff --git a/src/functions/folders/Remove-Folder.ps1 b/src/functions/folders/Remove-Folder.ps1
@@ -43,7 +43,7 @@ function Remove-Folder {
             . $CheckVersion $TssSession '10.9.000000' $PSCmdlet.MyInvocation
             foreach ($folder in $Id) {
                 $restResponse = $null
-                $uri = $TssSession.ApiUrl, 'folders', $folder.ToString() -join '/'
+                $uri = $TssSession.ApiUrl, 'folders', $folder -join '/'
                 $invokeParams.Uri = $uri
                 $invokeParams.Method = 'DELETE'
 

diff --git a/src/functions/reports/Get-Report.ps1 b/src/functions/reports/Get-Report.ps1
@@ -43,7 +43,7 @@ function Get-Report {
             . $CheckVersion $TssSession '10.9.000000' $PSCmdlet.MyInvocation
             foreach ($report in $Id) {
                 $restResponse = $null
-                $uri = $TssSession.ApiUrl, 'reports', $report.ToString() -join '/'
+                $uri = $TssSession.ApiUrl, 'reports', $report -join '/'
                 $invokeParams.Uri = $uri
                 $invokeParams.Method = 'GET'
 

diff --git a/src/functions/reports/Get-ReportCategory.ps1 b/src/functions/reports/Get-ReportCategory.ps1
@@ -54,7 +54,7 @@ function Get-ReportCategory {
             if ($tssReportCatParams['Id']) {
                 foreach ($reportCategory in $Id) {
                     $restResponse = $null
-                    $uri = $TssSession.ApiUrl, 'reports/categories', $reportCategory.ToString() -join '/'
+                    $uri = $TssSession.ApiUrl, 'reports/categories', $reportCategory -join '/'
                     $invokeParams.Uri = $uri
                     $invokeParams.Method = 'GET'
 

diff --git a/src/functions/reports/Remove-ReportCategory.ps1 b/src/functions/reports/Remove-ReportCategory.ps1
@@ -49,18 +49,18 @@ function Remove-ReportCategory {
         Write-Verbose "Provided command parameters: $(. $GetInvocation $PSCmdlet.MyInvocation)"
         if ($tssParams.ContainsKey('TssSession') -and $TssSession.IsValidSession()) {
             . $CheckVersion $TssSession '10.9.000000' $PSCmdlet.MyInvocation
-            foreach ($id in $ReportCategoryId) {
-                $uri = $TssSession.ApiUrl, 'reports/categories', $id.ToString() -join '/'
+            foreach ($category in $ReportCategoryId) {
+                $uri = $TssSession.ApiUrl, 'reports/categories', $category -join '/'
                 $invokeParams.Uri = $uri
                 $invokeParams.Method = 'DELETE'
 
 
                 Write-Verbose "$($invokeParams.Method) $uri"
-                if (-not $PSCmdlet.ShouldProcess("RemoteCategoryId: $id", "$($invokeParams.Method) $uri")) { return }
+                if (-not $PSCmdlet.ShouldProcess("RemoteCategoryId: $category", "$($invokeParams.Method) $uri")) { return }
                 try {
                     $restResponse = Invoke-TssRestApi @invokeParams
                 } catch {
-                    Write-Warning "Issue removing [$id]"
+                    Write-Warning "Issue removing [$category]"
                     $err = $_
                     . $ErrorHandling $err
                 }

diff --git a/src/functions/secrets/Get-SecretField.ps1 b/src/functions/secrets/Get-SecretField.ps1
@@ -88,7 +88,7 @@ function Get-SecretField {
         if ($tssParams.ContainsKey('TssSession') -and $TssSession.IsValidSession()) {
             . $CheckVersion $TssSession '10.9.000000' $PSCmdlet.MyInvocation
             foreach ($secret in $Id) {
-                $uri = $TssSession.ApiUrl, 'secrets', $secret.ToString() -join '/'
+                $uri = $TssSession.ApiUrl, 'secrets', $secret -join '/'
                 $restResponse = $null
 
                 $body = @{}

diff --git a/src/functions/secrets/Remove-Secret.ps1 b/src/functions/secrets/Remove-Secret.ps1
@@ -42,7 +42,7 @@ function Remove-Secret {
         if ($tssParams.ContainsKey('TssSession') -and $TssSession.IsValidSession()) {
             . $CheckVersion $TssSession '10.9.000000' $PSCmdlet.MyInvocation
             foreach ($secret in $Id) {
-                $uri = $TssSession.ApiUrl, "secrets", $secret.ToString() -join '/'
+                $uri = $TssSession.ApiUrl, "secrets", $secret -join '/'
 
                 $invokeParams.Uri = $Uri
 

diff --git a/src/functions/secrets/Stop-SecretChangePassword.ps1 b/src/functions/secrets/Stop-SecretChangePassword.ps1
@@ -42,7 +42,7 @@ function Stop-SecretChangePassword {
             . $CheckVersion $TssSession '10.9.000000' $PSCmdlet.MyInvocation
             foreach ($secret in $Id) {
                 $restResponse = $null
-                $uri = $TssSession.ApiUrl, 'secrets', $secret.ToString(), 'stop-password-change' -join '/'
+                $uri = $TssSession.ApiUrl, 'secrets', $secret, 'stop-password-change' -join '/'
                 $invokeParams.Uri = $uri
                 $invokeParams.Method = 'POST'
 

diff --git a/src/functions/secrettemplates/Get-SecretTemplate.ps1 b/src/functions/secrettemplates/Get-SecretTemplate.ps1
@@ -43,7 +43,7 @@ function Get-SecretTemplate {
             . $CheckVersion $TssSession '10.9.000000' $PSCmdlet.MyInvocation
             foreach ($template in $Id) {
                 $restResponse = $null
-                $uri = $TssSession.ApiUrl, 'secret-templates', $template.ToString() -join '/'
+                $uri = $TssSession.ApiUrl, 'secret-templates', $template -join '/'
                 $invokeParams.Uri = $Uri
                 $invokeParams.Method = 'GET'
 

diff --git a/src/parts/TssVersionObject.ps1 b/src/parts/TssVersionObject.ps1
@@ -47,7 +47,7 @@ process {
             $returnProps = 'Version'
         }
         'Test-TssVersion' {
-            $getLatestUrl = "https://updates.thycotic.net/secretserver/LatestVersion.aspx?v=$($outVersion.Version.ToString())"
+            $getLatestUrl = "https://updates.thycotic.net/secretserver/LatestVersion.aspx?v=$($outVersion.Version)"
             Write-Verbose "Accessing $getLatestUrl to validate latest version"
             try {
                 $latest = Invoke-RestMethod -Uri $getLatestUrl -UseBasicParsing