Skip to content

Commit ed8cb17

Browse files
authored
[Dpg] update to use global autorest version (Azure#24970)
* code * fix * code
1 parent 41807f0 commit ed8cb17

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

scripts/quickstart_tooling_dpg/main.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
from jinja2 import Environment, FileSystemLoader
66
from subprocess import check_call
77
import time
8-
from typing import Any, Dict
8+
from typing import Any
9+
import json
910

1011
_LOGGER = logging.getLogger(__name__)
1112

1213
_TEMPLATE = Path(__file__).resolve().parent / "template"
1314
_TEMPLATE_TESTS = Path(__file__).resolve().parent / "template_tests"
1415
_TEMPLATE_SAMPLES = Path(__file__).resolve().parent / "template_samples"
1516
_TEMPLATE_CI = Path(__file__).resolve().parent / "template_ci"
17+
_CONFIG_FILE = Path(__file__).resolve() / "../../../swagger_to_sdk_config_dpg.json"
1618

1719

1820
def check_parameters(
@@ -39,7 +41,7 @@ def generate_ci(template_path: Path, folder_path: Path, package_name: str) -> No
3941
with open(ci, "r") as file_in:
4042
content = file_in.readlines()
4143
for line in content:
42-
if f'{package_name}\n' in line:
44+
if f'{package_name}' in line:
4345
return
4446
content.append(f' - name: {package_name}\n')
4547
content.append(f' safeName: {package_name.replace("-", "")}\n')
@@ -75,6 +77,13 @@ def generate_swagger_readme(work_path: str, env: Environment, **kwargs: Any) ->
7577
return swagger_readme
7678

7779

80+
def get_autorest_version() -> str:
81+
with open(_CONFIG_FILE, 'r') as file_in:
82+
config = json.load(file_in)
83+
autorest_use = " ".join(["--use=" + item for item in config["meta"]["autorest_options"]["use"]])
84+
return "--version={} {}".format(config["meta"]["autorest_options"]["version"], autorest_use)
85+
86+
7887
def build_package(**kwargs) -> None:
7988
# prepare template render parameters
8089
output_folder = kwargs.get("output_folder")
@@ -93,17 +102,17 @@ def build_package(**kwargs) -> None:
93102
_LOGGER.info("Build start: %s", package_name)
94103
check_parameters(output_folder)
95104

96-
#generate ci
105+
# generate ci
97106
generate_ci(_TEMPLATE_CI, Path(output_folder).parent, package_name)
98107

99108
# generate swagger readme
100109
env = Environment(loader=FileSystemLoader(_TEMPLATE), keep_trailing_newline=True)
101110
swagger_readme = generate_swagger_readme(output_folder, env, **kwargs)
102111

103112
# generate code with autorest and swagger readme
104-
_LOGGER.info("generate SDK code with autorest")
105-
check_call(f'autorest --version=3.8.1 --use=@autorest/[email protected] --use=@autorest/[email protected]'
106-
f' {swagger_readme}', shell=True)
113+
autorest_cmd = f'autorest {swagger_readme} {get_autorest_version()} '
114+
_LOGGER.info(f"generate SDK code with autorest: {autorest_cmd}")
115+
check_call(autorest_cmd, shell=True)
107116

108117
# generate necessary file(setup.py, CHANGELOG.md, etc)
109118
work_path = Path(output_folder)

scripts/quickstart_tooling_dpg/template/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
]
6161
),
6262
install_requires=[
63-
"azure-core<2.0.0,>=1.23.0",
64-
"msrest>=0.6.21",
63+
"azure-core<2.0.0,>=1.24.0",
64+
"msrest>=0.7.0",
6565
],
6666
python_requires=">=3.6",
6767
)

swagger_to_sdk_config_dpg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"meta": {
33
"autorest_options": {
4-
"version": "3.7.2",
5-
"use": ["@autorest/python@5.16.0", "@autorest/modelerfour@4.19.3"],
4+
"version": "3.8.1",
5+
"use": ["@autorest/python@5.19.0", "@autorest/modelerfour@4.23.5"],
66
"python": "",
77
"sdkrel:python-sdks-folder": "./sdk/.",
88
"version-tolerant": ""

0 commit comments

Comments
 (0)