Skip to content

Commit c81c40f

Browse files
committed
Merged PR 178: I believe there is an error when callign Get-VstsEndpoint when its not
I believe there is an error when callign Get-VstsEndpoint when its not required,...
1 parent 0f6b97a commit c81c40f

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

inheritedprocessmigration/vCurrent/processmigratestart.ps1

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,26 @@ $ErrorActionPreference = "Stop"
33

44
# Command
55
$command = Get-VstsInput -Name command -Require
6-
# sourceAccount
7-
$sourceAccountName = Get-VstsInput -Name sourceAccount
8-
$sourceAccountEp = Get-VstsEndpoint -Name $sourceAccountName
9-
$sourceAccountToken = [string]$sourceAccountEp.Auth.Parameters.ApiToken
10-
$sourceAccountUrl = [string]$sourceAccountEp.Url
6+
7+
# sourceAccount
8+
$sourceAccountName = Get-VstsInput -Name sourceAccount
9+
if ($sourceAccountName -ne $null)
10+
{
11+
$sourceAccountEp = Get-VstsEndpoint -Name $sourceAccountName
12+
$sourceAccountToken = [string]$sourceAccountEp.Auth.Parameters.ApiToken
13+
$sourceAccountUrl = [string]$sourceAccountEp.Url
14+
}
1115
# sourceProcessName
1216

1317
$sourceProcessName = Get-VstsInput -Name sourceProcessName
1418
# TargetAccount
1519
$targetAccountName = Get-VstsInput -Name targetAccount
16-
$targetAccountEp = Get-VstsEndpoint -Name $targetAccountName
17-
$targetAccountToken = [string]$targetAccountEp.Auth.Parameters.ApiToken
18-
$targetAccountUrl = [string]$targetAccountEp.Url
20+
if ($targetAccountName -ne $null)
21+
{
22+
$targetAccountEp = Get-VstsEndpoint -Name $targetAccountName
23+
$targetAccountToken = [string]$targetAccountEp.Auth.Parameters.ApiToken
24+
$targetAccountUrl = [string]$targetAccountEp.Url
25+
}
1926
# targetProcessName
2027
$targetProcessName = Get-VstsInput -Name targetProcessName
2128
# processFilename
@@ -25,13 +32,13 @@ $logLevel = Get-VstsInput -Name logLevel -Require
2532
# logFilename
2633
$logFilename = Get-VstsInput -Name logFilename -Require
2734
# overwritePicklist
28-
$overwritePicklist = Get-VstsInput -Name overwritePicklist -Require
35+
$overwritePicklist = Get-VstsInput -Name overwritePicklist -Require -AsBool
2936
# continueOnRuleImportFailure
30-
$continueOnRuleImportFailure = Get-VstsInput -Name continueOnRuleImportFailure -Require
37+
$continueOnRuleImportFailure = Get-VstsInput -Name continueOnRuleImportFailure -Require -AsBool
3138
# continueOnFieldDefaultValueFailure
32-
$continueOnFieldDefaultValueFailure = Get-VstsInput -Name continueOnFieldDefaultValueFailure -Require
39+
$continueOnFieldDefaultValueFailure = Get-VstsInput -Name continueOnFieldDefaultValueFailure -Require -AsBool
3340
# skipImportFormContributions
34-
$skipImportFormContributions = Get-VstsInput -Name skipImportFormContributions -Require
41+
$skipImportFormContributions = Get-VstsInput -Name skipImportFormContributions -Require -AsBool
3542

3643
get-childitem -path env:INPUT_*
3744
get-childitem -path env:ENDPOINT_*
@@ -88,4 +95,7 @@ Write-VstsTaskVerbose $command
8895

8996
process-migrator --mode=$command --config=$configFile
9097

98+
Write-VstsTaskVerbose "Removing $configFile file to remove PAT tokens from file system."
99+
Remove-Item $configFile
100+
91101

0 commit comments

Comments
 (0)