From 0030650dbf6fdfab06c5e5b42d5e2ecea13301f9 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 23 Jul 2025 13:44:52 +0800 Subject: [PATCH 1/2] eng, automation, fix hardcode on resources service --- eng/automation/generate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/automation/generate.py b/eng/automation/generate.py index b5032bcf7f36..8c79a020fce1 100755 --- a/eng/automation/generate.py +++ b/eng/automation/generate.py @@ -173,15 +173,15 @@ def sdk_automation_autorest(config: dict) -> List[dict]: suffix = SUFFIX update_parameters(suffix) - # TODO: use specific function to detect tag in "resources" + # TODO: use specific function to detect tag in "resources" spec/service tag = None - if service == "resources": + if service == "resources" and spec == service: with open(os.path.join(config["specFolder"], readme)) as fin: tag_match = re.search(r"tag: (package-resources-\S+)", fin.read()) if tag_match: tag = tag_match.group(1) else: - tag = "package-resources-2021-01" + tag = "package-resources-2025-04" module = ARTIFACT_FORMAT.format(service) output_folder = OUTPUT_FOLDER_FORMAT.format(service) From 7bb8d3410c54db848bddaa8c8afbb834e3839ed0 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 23 Jul 2025 13:46:32 +0800 Subject: [PATCH 2/2] run black --- eng/automation/generate.py | 14 ++++++++++---- eng/automation/generate_utils.py | 2 +- eng/automation/parameters.py | 4 +++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/eng/automation/generate.py b/eng/automation/generate.py index 8c79a020fce1..65c59a2432ea 100755 --- a/eng/automation/generate.py +++ b/eng/automation/generate.py @@ -198,7 +198,7 @@ def sdk_automation_autorest(config: dict) -> List[dict]: module=module, namespace=namespace, tag=tag, - premium=is_mgmt_premium(module) + premium=is_mgmt_premium(module), ) if succeeded: succeeded = compile_arm_package(sdk_root, module) @@ -423,8 +423,12 @@ def update_changelog_version(sdk_root: str, output_folder: str, current_version: def move_premium_samples(sdk_root: str, service: str, module: str): package_path = "com/" + module.replace("-", "/") - source_sample_dir = os.path.join(sdk_root, "sdk", service, module, "src", "samples", "java", package_path, "generated") - target_sample_dir = os.path.join(sdk_root, "sdk", "resourcemanager", "azure-resourcemanager", "src", "samples", "java", package_path) + source_sample_dir = os.path.join( + sdk_root, "sdk", service, module, "src", "samples", "java", package_path, "generated" + ) + target_sample_dir = os.path.join( + sdk_root, "sdk", "resourcemanager", "azure-resourcemanager", "src", "samples", "java", package_path + ) copy_folder_recursive_sync(source_sample_dir, target_sample_dir) shutil.rmtree(source_sample_dir, ignore_errors=True) @@ -490,7 +494,9 @@ def main(): args["version"] = current_version output_folder = OUTPUT_FOLDER_FORMAT.format(service) namespace = NAMESPACE_FORMAT.format(service) - succeeded = generate(sdk_root, module=module, output_folder=output_folder, namespace=namespace, premium=premium, **args) + succeeded = generate( + sdk_root, module=module, output_folder=output_folder, namespace=namespace, premium=premium, **args + ) if succeeded: succeeded = compile_arm_package(sdk_root, module) diff --git a/eng/automation/generate_utils.py b/eng/automation/generate_utils.py index f53c5b8eb52b..aecbfa20b6f7 100755 --- a/eng/automation/generate_utils.py +++ b/eng/automation/generate_utils.py @@ -135,7 +135,7 @@ def delete_generated_code(path: str) -> None: else: try: # Read file content and check for header - with open(cur_path, 'r', encoding='utf-8') as f: + with open(cur_path, "r", encoding="utf-8") as f: content = f.read() if autorest_generated_header in content or typespec_generated_header in content: os.remove(cur_path) # Delete the file diff --git a/eng/automation/parameters.py b/eng/automation/parameters.py index 1aa3f3eb7b49..cf47224b7887 100755 --- a/eng/automation/parameters.py +++ b/eng/automation/parameters.py @@ -32,7 +32,9 @@ FLUENTLITE_ARGUMENTS = "{0} --azure-arm --verbose --sdk-integration --generate-samples --generate-tests --fluent=lite --java.fluent=lite --java.license-header=MICROSOFT_MIT_SMALL".format( MODELERFOUR_ARGUMENTS ) -FLUENTPREMIUM_ARGUMENTS = "--verbose --generate-samples --fluent --java.fluent --java.license-header=MICROSOFT_MIT_SMALL" +FLUENTPREMIUM_ARGUMENTS = ( + "--verbose --generate-samples --fluent --java.fluent --java.license-header=MICROSOFT_MIT_SMALL" +) FLUENT_PREMIUM_PACKAGES = ( "azure-resourcemanager-appplatform",