From f2668ee26065f9cc9758939213ceed04674fe36c Mon Sep 17 00:00:00 2001 From: Pepe Rivera Date: Tue, 11 Jun 2024 12:46:08 -0700 Subject: [PATCH] Fix logging UploadUrl in log file (#255) Fix logging UploadUrl in log file (#255) --------- Co-authored-by: Howard Wolosky --- StoreBroker/Helpers.ps1 | 3 ++- StoreBroker/StoreIngestionApi.psm1 | 4 ++-- StoreBroker/StoreIngestionApplicationApi.ps1 | 6 ++---- StoreBroker/StoreIngestionFlightingApi.ps1 | 6 ++---- StoreBroker/StoreIngestionIapApi.ps1 | 5 ++--- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/StoreBroker/Helpers.ps1 b/StoreBroker/Helpers.ps1 index 04caa5e3..22ab8129 100644 --- 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 index 3bf74c54..a24b7abb 100644 --- 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 index 92d474ae..a09f7a0f 100644 --- 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 { "" }) - $output += "" - $output += "Application Packages : {0}" -f $(if ($ApplicationSubmissionData.applicationPackages.count -eq 0) { "" } 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 -UploadUrl `"$uploadUrl`"") + " `$newSubmission = Get-ApplicationSubmission -AppId $AppId -SubmissionId $submissionId", + " Upload-SubmissionPackage -PackagePath -UploadUrl `$(`$newSubmission.fileUploadUrl)") } if ($AutoCommit) diff --git a/StoreBroker/StoreIngestionFlightingApi.ps1 b/StoreBroker/StoreIngestionFlightingApi.ps1 index 1d0b2417..beb37049 100644 --- 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 { "" }) - $output += "" - $output += "Flight Packages : {0}" -f $(if ($ApplicationFlightSubmissionData.flightPackages.count -eq 0) { "" } 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 -UploadUrl `"$uploadUrl`"") + " `$newSubmission = Get-ApplicationFlightSubmission -AppId $AppId -FlightId $FlightId -SubmissionId $submissionId", + " Upload-SubmissionPackage -PackagePath -UploadUrl `$(`$newSubmission.fileUploadUrl)") } if ($AutoCommit) diff --git a/StoreBroker/StoreIngestionIapApi.ps1 b/StoreBroker/StoreIngestionIapApi.ps1 index cd4a1bc2..01f446a9 100644 --- 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 { "" }) $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 -UploadUrl `"$uploadUrl`"") + " `$newSubmission = Get-InAppProductSubmission -IapId $IapId -SubmissionId $submissionId", + " Upload-SubmissionPackage -PackagePath -UploadUrl `$(`$newSubmission.fileUploadUrl)") } if ($AutoCommit)