diff --git a/packages/autorest.python/autorest/postprocess/venvtools.py b/packages/autorest.python/autorest/postprocess/venvtools.py index ebacce9eda1..1c24d8f8ba4 100644 --- a/packages/autorest.python/autorest/postprocess/venvtools.py +++ b/packages/autorest.python/autorest/postprocess/venvtools.py @@ -48,7 +48,7 @@ def create( def python_run( # pylint: disable=inconsistent-return-statements - venv_context, module, command, directory=_ROOT_DIR, *, error_ok=False + venv_context, module, command, directory=_ROOT_DIR ) -> Optional[str]: try: cmd_line = [ @@ -70,6 +70,5 @@ def python_run( # pylint: disable=inconsistent-return-statements return f.read() except subprocess.CalledProcessError as err: print(err) - if not error_ok: - sys.exit(1) + sys.exit(1) return None diff --git a/packages/autorest.python/venvtools.py b/packages/autorest.python/venvtools.py index 978b17d62ad..2894e5a4796 100644 --- a/packages/autorest.python/venvtools.py +++ b/packages/autorest.python/venvtools.py @@ -56,7 +56,7 @@ def create_venv_with_package(packages): subprocess.check_call(pip_call + packages) yield myenv -def python_run(venv_context, module, command=None, *, additional_dir=".", error_ok=False): +def python_run(venv_context, module, command=None, *, additional_dir="."): try: cmd_line= [ venv_context.env_exe, @@ -70,5 +70,4 @@ def python_run(venv_context, module, command=None, *, additional_dir=".", error_ ) except subprocess.CalledProcessError as err: print(err) - if not error_ok: - sys.exit(1) + sys.exit(1) diff --git a/packages/cadl-python/src/emitter.ts b/packages/cadl-python/src/emitter.ts index 9404a070c5e..80f52ad9d65 100644 --- a/packages/cadl-python/src/emitter.ts +++ b/packages/cadl-python/src/emitter.ts @@ -32,19 +32,15 @@ import { getFormat, getMinItems, getMaxItems, - getNamespaceFullName, EmitContext, listServices, Union, isNullType, SyntaxKind, - emitFile, Type, - getKnownValues, } from "@cadl-lang/compiler"; import { getAuthentication, - getContentTypes, getHeaderFieldName, getHttpOperation, getPathParamName, @@ -52,7 +48,6 @@ import { getServers, HttpAuth, HttpOperationParameter, - HttpOperationParameters, HttpOperationRequestBody, HttpOperationResponse, HttpOperationResponseContent, @@ -72,10 +67,11 @@ import { DpgContext, } from "@azure-tools/cadl-dpg"; import { getResourceOperation } from "@cadl-lang/rest"; -import { execAsync, resolveModuleRoot, saveCodeModelAsYaml } from "./external-process.js"; +import { resolveModuleRoot, saveCodeModelAsYaml } from "./external-process.js"; import { dirname } from "path"; import { fileURLToPath } from "url"; import { dump } from "js-yaml"; +import { execFileSync } from "child_process"; interface HttpServerParameter { type: "endpointPath"; @@ -152,7 +148,7 @@ export async function $onEmit(context: EmitContext) { commandArgs.push("--debug"); } if (!program.compilerOptions.noEmit && !program.hasError()) { - await execAsync(process.execPath, commandArgs); + execFileSync(process.execPath, commandArgs); } } @@ -1256,7 +1252,7 @@ function getNamespaces(context: DpgContext): Set { function emitCodeModel(context: EmitContext) { const dpgContext = createDpgContext(context); - const clientNamespaceString = getClientNamespaceString(dpgContext); + const clientNamespaceString = getClientNamespaceString(dpgContext)?.toLowerCase(); // Get types const codeModel: Record = { namespace: clientNamespaceString, diff --git a/packages/cadl-python/tasks.py b/packages/cadl-python/tasks.py index 4892de069ea..4369010e032 100644 --- a/packages/cadl-python/tasks.py +++ b/packages/cadl-python/tasks.py @@ -50,10 +50,10 @@ def _run_cadl(cmds): def _run_single_cadl(cmd): result = run(cmd, warn=True) - if result.ok or result.return_code is None: + if result.ok: print(Fore.GREEN + f'Call "{cmd}" done with success') return True print(Fore.RED + f'Call "{cmd}" failed with {result.return_code}\n{result.stdout}\n{result.stderr}') - output_folder = re.findall(r"--output-path=([^\s]+)", cmd)[0] + output_folder = re.findall(r"--output-dir=([^\s]+)", cmd)[0] shutil.rmtree(output_folder, ignore_errors=True) return False