From 4653072d6c43ff4fbcac28a696cf150d25817776 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 5 Dec 2019 12:46:02 -0800 Subject: [PATCH] Added running samples as part of Generate.ps1. Currently, only runs AppConfiguration. --- eng/Generate.ps1 | 63 ++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/eng/Generate.ps1 b/eng/Generate.ps1 index 4ea1498e..d6b0fb8e 100644 --- a/eng/Generate.ps1 +++ b/eng/Generate.ps1 @@ -1,4 +1,4 @@ -param($name, [switch]$NoDebug) +param($name, [switch]$noDebug) $ErrorActionPreference = 'Stop' function Invoke-Block([scriptblock]$cmd) { @@ -17,28 +17,45 @@ function Invoke-Block([scriptblock]$cmd) { } } -$repoRoot = Resolve-Path "$PSScriptRoot\.." -$testServerTestProject = "$repoRoot\test\AutoRest.TestServer.Tests" -$testConfiguration = "$testServerTestProject\readme.md" -$testServerSwaggerPath = "$repoRoot\node_modules\@microsoft.azure\autorest.testserver\swagger" -$paths = 'url', 'body-string', 'body-complex', 'custom-baseUrl', 'custom-baseUrl-more-options' -if ($name) -{ - $paths = $name -} -$debugFlags = if (!$NoDebug) { '--debug','--verbose' } +function Invoke-AutoRest($debugFlags, $testConfiguration, $outputFolder, $inputFile, $name, $namespace, $repoRoot) { + Invoke-Block { + $outputFlag = if($outputFolder) { "--output-folder=$outputFolder" } else { '' } + $inputFlag = if($inputFile) { "--input-file=$inputFile" } else { '' } + $titleFlag = if($name) { "--title=$name" } else { '' } + $namespaceFlag = if($namespace) { "--namespace=$namespace" } else { '' } + $command = "npx autorest-beta $debugFlags $testConfiguration $outputFlag $inputFlag $titleFlag $namespaceFlag" + $commandText = $command.Replace($repoRoot, "`$(SolutionDir)") -foreach ($path in $paths) -{ - $outputFolder = "$testServerTestProject\$path"; - $inputFile = "$testServerSwaggerPath\$path.json" - $namespace = $path.Replace('-', '_') - Invoke-Block { - $command = "npx autorest-beta $debugFlags $testConfiguration --output-folder=$outputFolder --input-file=$inputFile --title=$path --namespace=$namespace" - $command = $command.Replace($repoRoot, "`$(SolutionDir)") - - Write-Host ">" $command - - npx autorest-beta @debugFlags $testConfiguration --output-folder=$outputFolder --input-file=$inputFile --title=$path --namespace=$namespace + Write-Host ">" $commandText + Invoke-Expression $command } +} + +# General configuration +$repoRoot = Resolve-Path (Join-Path $PSScriptRoot '..') +$debugFlags = if (-not $noDebug) { '--debug', '--verbose' } + +# Test server test configuration +$testServerTestProject = Join-Path $repoRoot 'test' 'AutoRest.TestServer.Tests' +$testConfiguration = Join-Path $testServerTestProject 'readme.md' +$testServerSwaggerPath = Join-Path $repoRoot 'node_modules' '@microsoft.azure' 'autorest.testserver' 'swagger' +$testNames = if ($name) { $name } else { 'url', 'body-string', 'body-complex', 'custom-baseUrl', 'custom-baseUrl-more-options' } + +foreach ($testName in $testNames) +{ + $outputFolder = Join-Path $testServerTestProject $testName + $inputFile = Join-Path $testServerSwaggerPath "$testName.json" + $namespace = $testName.Replace('-', '_') + Invoke-AutoRest $debugFlags $testConfiguration $outputFolder $inputFile $testName $namespace $repoRoot +} + +# Sample configuration +$sampleDirectory = Join-Path $repoRoot 'samples' +$projectNames = 'AppConfiguration' + +foreach ($projectName in $projectNames) +{ + $projectDirectory = Join-Path $sampleDirectory $projectName + $configurationPath = Join-Path $projectDirectory 'readme.md' + Invoke-AutoRest $debugFlags $configurationPath -repoRoot $repoRoot } \ No newline at end of file