Fix logging UploadUrl in log file (#255)

Fix logging UploadUrl in log file (#255) --------- Co-authored-by: Howard Wolosky <[email protected]>
microsoft · Jun 11, 2024 · f2668ee · f2668ee
1 parent fb51a8d
commit f2668ee
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/StoreBroker/Helpers.ps1 b/StoreBroker/Helpers.ps1
@@ -747,7 +747,8 @@ function Send-SBMailMessage
 }
 
 $script:alwaysRedactParametersForLogging = @(
-    'AccessToken' # Would be a security issue
+    'AccessToken', # Would be a security issue
+    'UploadUrl'  # Could contain a live access token
 )
 
 $script:alwaysExcludeParametersForLogging = @(

diff --git a/StoreBroker/StoreIngestionApi.psm1 b/StoreBroker/StoreIngestionApi.psm1
@@ -811,7 +811,7 @@ function Set-SubmissionPackage
 
     Write-InvocationLog
 
-    Write-Log -Message "Attempting to upload the package ($PackagePath) for the submission to $UploadUrl..." -Level Verbose
+    Write-Log -Message "Attempting to upload the package ($PackagePath) for the submission..." -Level Verbose
 
     $azureStorageDll = Get-AzureStorageDllPath -NoStatus:$NoStatus
     $azureStorageDataMovementDll = Get-AzureStorageDataMovementDllPath -NoStatus:$NoStatus
@@ -1001,7 +1001,7 @@ function Get-SubmissionPackage
 
     Write-InvocationLog
 
-    Write-Log -Message "Attempting to download the contents of $UploadUrl to $PackagePath..." -Level Verbose
+    Write-Log -Message "Attempting to download the contents to $PackagePath..." -Level Verbose
 
     $azureStorageDll = Get-AzureStorageDllPath -NoStatus:$NoStatus
     $azureStorageDataMovementDll = Get-AzureStorageDataMovementDllPath -NoStatus:$NoStatus

diff --git a/StoreBroker/StoreIngestionApplicationApi.ps1 b/StoreBroker/StoreIngestionApplicationApi.ps1
@@ -490,9 +490,6 @@ function Format-ApplicationSubmission
         $output += $ApplicationSubmissionData.allowTargetFutureDeviceFamilies | Format-SimpleTableString -IndentationLevel $indentLength
         $output += ""
 
-        $output += "File Upload Url                     : {0}" -f $(if ($ApplicationSubmissionData.fileUploadUrl) { $ApplicationSubmissionData.fileUploadUrl } else { "<None>" })
-        $output += ""
-
         $output += "Application Packages                : {0}" -f $(if ($ApplicationSubmissionData.applicationPackages.count -eq 0) { "<None>" } else { "" })
         $output += $ApplicationSubmissionData.applicationPackages | Format-SimpleTableString -IndentationLevel $indentLength
         $output += ""
@@ -1300,7 +1297,8 @@ function Update-ApplicationSubmission
         {
             Write-Log -Message @(
                 "Your next step is to upload the package using:",
-                "  Upload-SubmissionPackage -PackagePath <package> -UploadUrl `"$uploadUrl`"")
+                "  `$newSubmission = Get-ApplicationSubmission -AppId $AppId -SubmissionId $submissionId",
+                "  Upload-SubmissionPackage -PackagePath <package> -UploadUrl `$(`$newSubmission.fileUploadUrl)")
         }
 
         if ($AutoCommit)

diff --git a/StoreBroker/StoreIngestionFlightingApi.ps1 b/StoreBroker/StoreIngestionFlightingApi.ps1
@@ -698,9 +698,6 @@ function Format-ApplicationFlightSubmission
         $output += "Notes For Certification             : $($ApplicationFlightSubmissionData.notesForCertification)"
         $output += ""
 
-        $output += "File Upload Url                     : {0}" -f $(if ($ApplicationFlightSubmissionData.fileUploadUrl) { $ApplicationFlightSubmissionData.fileUploadUrl } else { "<None>" })
-        $output += ""
-
         $output += "Flight Packages                     : {0}" -f $(if ($ApplicationFlightSubmissionData.flightPackages.count -eq 0) { "<None>" } else { "" })
         $output += $ApplicationFlightSubmissionData.flightPackages | Format-SimpleTableString -IndentationLevel $indentLength
         $output += ""
@@ -1410,7 +1407,8 @@ function Update-ApplicationFlightSubmission
         {
             Write-Log -Message @(
                 "Your next step is to upload the package using:",
-                "  Upload-SubmissionPackage -PackagePath <package> -UploadUrl `"$uploadUrl`"")
+                "  `$newSubmission = Get-ApplicationFlightSubmission -AppId $AppId -FlightId $FlightId -SubmissionId $submissionId",
+                "  Upload-SubmissionPackage -PackagePath <package> -UploadUrl `$(`$newSubmission.fileUploadUrl)")
         }
 
         if ($AutoCommit)

diff --git a/StoreBroker/StoreIngestionIapApi.ps1 b/StoreBroker/StoreIngestionIapApi.ps1
@@ -774,9 +774,7 @@ function Format-InAppProductSubmission
             $output += "Publish Date                        : $(Get-Date -Date $IapSubmissionData.targetPublishDate -Format R)"
         }
 
-        $output += "File Upload Url                     : {0}" -f $(if ($IapSubmissionData.fileUploadUrl) { $IapSubmissionData.fileUploadUrl } else { "<None>" })
         $output += ""
-
         $output += "Pricing                             : $($IapSubmissionData.pricing.priceId)"
 
         $marketSpecificPricings = $IapSubmissionData.pricing.marketSpecificPricings
@@ -1424,7 +1422,8 @@ function Update-InAppProductSubmission
         {
             Write-Log -Message @(
                 "Your next step is to upload the package using:",
-                "  Upload-SubmissionPackage -PackagePath <package> -UploadUrl `"$uploadUrl`"")
+                "  `$newSubmission = Get-InAppProductSubmission -IapId $IapId -SubmissionId $submissionId",
+                "  Upload-SubmissionPackage -PackagePath <package> -UploadUrl `$(`$newSubmission.fileUploadUrl)")
         }
 
         if ($AutoCommit)