Skip to content

eng, automation, fix hardcode on resources service #46126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weidongxu-microsoft merged 3 commits into from
Jul 23, 2025
Merged

eng, automation, fix hardcode on resources service #46126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0030650
eng, automation, fix hardcode on resources service
weidongxu-microsoft Jul 23, 2025
7bb8d34
run black
weidongxu-microsoft Jul 23, 2025
6dbdcfa
Merge branch 'main' into eng_automation-fix-resources-tag
weidongxu-microsoft Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions eng/automation/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -494,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)
Expand Down
2 changes: 1 addition & 1 deletion eng/automation/generate_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion eng/automation/parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down