Made Invoke-AutoRest take in a single $autoRestArguments parameter.

This commit is contained in:
Michael Yanni 2019-12-05 22:06:14 -08:00
Родитель 0655b8b8ac
Коммит 108ace1246
1 изменённых файлов: 6 добавлений и 9 удалений

Просмотреть файл

@ -17,14 +17,9 @@ function Invoke-Block([scriptblock]$cmd) {
} }
} }
function Invoke-AutoRest($debugFlags, $requireFile, $outputFolder, $inputFile, $title, $namespace, $repoRoot) { function Invoke-AutoRest($autoRestArguments, $repoRoot) {
Invoke-Block { Invoke-Block {
$outputFlag = if($outputFolder) { "--output-folder=$outputFolder" } else { '' } $command = "npx autorest-beta $autoRestArguments"
$inputFlag = if($inputFile) { "--input-file=$inputFile" } else { '' }
$titleFlag = if($title) { "--title=$title" } else { '' }
$namespaceFlag = if($namespace) { "--namespace=$namespace" } else { '' }
$requireFlag = if($requireFile) { "--require=$requireFile" } else { '' }
$command = "npx autorest-beta $debugFlags $requireFlag $outputFlag $inputFlag $titleFlag $namespaceFlag"
$commandText = $command.Replace($repoRoot, "`$(SolutionDir)") $commandText = $command.Replace($repoRoot, "`$(SolutionDir)")
Write-Host ">" $commandText Write-Host ">" $commandText
@ -47,7 +42,8 @@ foreach ($testName in $testNames)
{ {
$inputFile = Join-Path $testServerSwaggerPath "$testName.json" $inputFile = Join-Path $testServerSwaggerPath "$testName.json"
$namespace = $testName.Replace('-', '_') $namespace = $testName.Replace('-', '_')
Invoke-AutoRest $debugFlags $configurationPath -inputFile $inputFile -title $testName -namespace $namespace -repoRoot $repoRoot $autoRestArguments = "$debugFlags --require=$configurationPath --input-file=$inputFile --title=$testName --namespace=$namespace"
Invoke-AutoRest $autoRestArguments $repoRoot
} }
# Sample configuration # Sample configuration
@ -58,5 +54,6 @@ foreach ($projectName in $projectNames)
{ {
$projectDirectory = Join-Path $sampleDirectory $projectName $projectDirectory = Join-Path $sampleDirectory $projectName
$configurationPath = Join-Path $projectDirectory 'readme.md' $configurationPath = Join-Path $projectDirectory 'readme.md'
Invoke-AutoRest $debugFlags $configurationPath -repoRoot $repoRoot $autoRestArguments = "$debugFlags --require=$configurationPath"
Invoke-AutoRest $autoRestArguments $repoRoot
} }