Skip to content
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.

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

[DPG][pipeline] integration to swagger pipeline #24355

Merged
merged 2 commits into from
May 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions swagger_to_sdk_config_dpg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"meta": {
"autorest_options": {
"version": "3.7.2",
"use": ["@autorest/python@5.16.0", "@autorest/modelerfour@4.19.3"],
"python": "",
"sdkrel:python-sdks-folder": "./sdk/.",
"version-tolerant": ""
},
"advanced_options": {
"create_sdk_pull_requests": true,
"sdk_generation_pull_request_base": "integration_branch"
},
"repotag": "azure-sdk-for-python",
"version": "0.2.0"
}
}
8 changes: 3 additions & 5 deletions tools/azure-sdk-tools/packaging_tools/auto_codegen.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from pathlib import Path
from subprocess import check_call

from .swaggertosdk.SwaggerToSdkCore import (CONFIG_FILE,)
from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE, CONFIG_FILE_DPG
from .generate_sdk import generate
from .generate_utils import get_package_names, init_new_service, update_servicemetadata

Expand All @@ -20,12 +20,10 @@ def main(generate_input, generate_output):
result = {}
package_total = set()
for input_readme in data["relatedReadmeMdFiles"]:
# skip codegen for data-plane temporarily since it is useless now and may block PR
if 'resource-manager' not in input_readme:
continue
relative_path_readme = str(Path(spec_folder, input_readme))
_LOGGER.info(f"[CODEGEN]({input_readme})codegen begin")
config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True)
config_file = CONFIG_FILE if 'resource-manager' in input_readme else CONFIG_FILE_DPG
config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True)
package_names = get_package_names(sdk_folder)
_LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]")

Expand Down
3 changes: 2 additions & 1 deletion tools/azure-sdk-tools/packaging_tools/auto_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ def main(generate_input, generate_output):
"lite": f"pip install {package_name}",
}
# to distinguish with track1
package["packageName"] = "track2_" + package["packageName"]
if 'azure-mgmt-' in package_name:
package["packageName"] = "track2_" + package["packageName"]
result["packages"].append(package)

with open(generate_output, "w") as writer:
Expand Down
10 changes: 3 additions & 7 deletions tools/azure-sdk-tools/packaging_tools/sdk_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from pathlib import Path
from subprocess import check_call

from .swaggertosdk.SwaggerToSdkCore import (CONFIG_FILE)
from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE, CONFIG_FILE_DPG
from .generate_sdk import generate
from .generate_utils import get_package_names, init_new_service, update_servicemetadata

Expand All @@ -21,14 +21,10 @@ def main(generate_input, generate_output):
package_total = set()

input_readme = data["relatedReadmeMdFile"]
# skip codegen for data-plane temporarily since it is useless now and may block PR
if 'resource-manager' not in input_readme:
#continue
_LOGGER.error(f"[CODEGEN]({input_readme}) 'resource-manager' not in [relatedReadmeMdFile]")
return
relative_path_readme = str(Path(spec_folder, input_readme))
_LOGGER.info(f"[CODEGEN]({input_readme})codegen begin")
config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True)
config_file = CONFIG_FILE if 'resource-manager' in input_readme else CONFIG_FILE_DPG
config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True)
package_names = get_package_names(sdk_folder)
_LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]")

Expand Down
3 changes: 2 additions & 1 deletion tools/azure-sdk-tools/packaging_tools/sdk_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ def main(generate_input, generate_output):
package["artifacts"] = [str(dist_path / package_file) for package_file in os.listdir(dist_path)]
package["result"] = "succeeded"
# to distinguish with track1
package["packageName"] = "track2_" + package["packageName"]
if 'azure-mgmt-' in package_name:
package["packageName"] = "track2_" + package["packageName"]
package["packageFolder"] = package["path"][0]
result["packages"].append(package)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
_LOGGER = logging.getLogger(__name__)

CONFIG_FILE = "swagger_to_sdk_config_autorest.json"
CONFIG_FILE_DPG = "swagger_to_sdk_config_dpg.json"

DEFAULT_COMMIT_MESSAGE = "Generated from {hexsha}"

Expand Down