Skip to content

Commit acdeb09

Browse files
authored
support v2 folder (#41472)
1 parent d7193e2 commit acdeb09

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

tools/azure-sdk-tools/packaging_tools/sdk_generator.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,25 @@ def main(generate_input, generate_output):
220220
result = {}
221221
python_tag = data.get("python_tag")
222222
package_total = set()
223-
readme_and_tsp = data.get("relatedReadmeMdFiles", []) + data.get("relatedTypeSpecProjectFolder", [])
223+
readme_and_tsp = [("relatedReadmeMdFiles", item) for item in data.get("relatedReadmeMdFiles", [])] + [
224+
("relatedTypeSpecProjectFolder", item) for item in data.get("relatedTypeSpecProjectFolder", [])
225+
]
224226
run_in_pipeline = data.get("runMode") is not None
225-
for readme_or_tsp in readme_and_tsp:
227+
for input_type, readme_or_tsp in readme_and_tsp:
226228
_LOGGER.info(f"[CODEGEN]({readme_or_tsp})codegen begin")
227229
try:
228230
code_generation_start_time = time.time()
229-
if "resource-manager" in readme_or_tsp:
231+
if input_type == "relatedTypeSpecProjectFolder":
232+
del_outdated_generated_files(str(Path(spec_folder, readme_or_tsp)))
233+
config = gen_typespec(
234+
readme_or_tsp,
235+
spec_folder,
236+
data["headSha"],
237+
data["repoHttpsUrl"],
238+
run_in_pipeline,
239+
data.get("apiVersion"),
240+
)
241+
elif "resource-manager" in readme_or_tsp:
230242
relative_path_readme = str(Path(spec_folder, readme_or_tsp))
231243
del_outdated_files(relative_path_readme)
232244
generate_mgmt = partial(
@@ -242,18 +254,8 @@ def main(generate_input, generate_output):
242254
config = generate_mgmt()
243255
if need_regen_for_multiapi_package(spec_folder, readme_or_tsp):
244256
generate_mgmt()
245-
elif "data-plane" in readme_or_tsp:
246-
config = gen_dpg(readme_or_tsp, data.get("autorestConfig", ""), dpg_relative_folder(spec_folder))
247257
else:
248-
del_outdated_generated_files(str(Path(spec_folder, readme_or_tsp)))
249-
config = gen_typespec(
250-
readme_or_tsp,
251-
spec_folder,
252-
data["headSha"],
253-
data["repoHttpsUrl"],
254-
run_in_pipeline,
255-
data.get("apiVersion"),
256-
)
258+
config = gen_dpg(readme_or_tsp, data.get("autorestConfig", ""), dpg_relative_folder(spec_folder))
257259
_LOGGER.info(f"code generation cost time: {int(time.time() - code_generation_start_time)} seconds")
258260
except Exception as e:
259261
_LOGGER.error(f"fail to generate sdk for {readme_or_tsp}: {str(e)}")

0 commit comments

Comments
 (0)