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.

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 logging UploadUrl in log file #255

Merged
merged 8 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion StoreBroker/Helpers.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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 = @(
Expand Down
4 changes: 2 additions & 2 deletions StoreBroker/StoreIngestionApi.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions StoreBroker/StoreIngestionApplicationApi.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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 += ""
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions StoreBroker/StoreIngestionFlightingApi.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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 += ""
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 2 additions & 3 deletions StoreBroker/StoreIngestionIapApi.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down