Skip to content

Commit 5ebba6e

Browse files
authored
[DPG][pipeline] integration to swagger pipeline (Azure#24355)
* add data-plane generation * choose different config file
1 parent d9b91d4 commit 5ebba6e

File tree

6 files changed

+28
-14
lines changed

6 files changed

+28
-14
lines changed

swagger_to_sdk_config_dpg.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"meta": {
3+
"autorest_options": {
4+
"version": "3.7.2",
5+
"use": ["@autorest/[email protected]", "@autorest/[email protected]"],
6+
"python": "",
7+
"sdkrel:python-sdks-folder": "./sdk/.",
8+
"version-tolerant": ""
9+
},
10+
"advanced_options": {
11+
"create_sdk_pull_requests": true,
12+
"sdk_generation_pull_request_base": "integration_branch"
13+
},
14+
"repotag": "azure-sdk-for-python",
15+
"version": "0.2.0"
16+
}
17+
}

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from pathlib import Path
55
from subprocess import check_call
66

7-
from .swaggertosdk.SwaggerToSdkCore import (CONFIG_FILE,)
7+
from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE, CONFIG_FILE_DPG
88
from .generate_sdk import generate
99
from .generate_utils import get_package_names, init_new_service, update_servicemetadata
1010

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ def main(generate_input, generate_output):
4343
"lite": f"pip install {package_name}",
4444
}
4545
# to distinguish with track1
46-
package["packageName"] = "track2_" + package["packageName"]
46+
if 'azure-mgmt-' in package_name:
47+
package["packageName"] = "track2_" + package["packageName"]
4748
result["packages"].append(package)
4849

4950
with open(generate_output, "w") as writer:

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from pathlib import Path
55
from subprocess import check_call
66

7-
from .swaggertosdk.SwaggerToSdkCore import (CONFIG_FILE)
7+
from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE, CONFIG_FILE_DPG
88
from .generate_sdk import generate
99
from .generate_utils import get_package_names, init_new_service, update_servicemetadata
1010

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

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ def main(generate_input, generate_output):
3939
package["artifacts"] = [str(dist_path / package_file) for package_file in os.listdir(dist_path)]
4040
package["result"] = "succeeded"
4141
# to distinguish with track1
42-
package["packageName"] = "track2_" + package["packageName"]
42+
if 'azure-mgmt-' in package_name:
43+
package["packageName"] = "track2_" + package["packageName"]
4344
package["packageFolder"] = package["path"][0]
4445
result["packages"].append(package)
4546

tools/azure-sdk-tools/packaging_tools/swaggertosdk/SwaggerToSdkCore.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
_LOGGER = logging.getLogger(__name__)
2323

2424
CONFIG_FILE = "swagger_to_sdk_config_autorest.json"
25+
CONFIG_FILE_DPG = "swagger_to_sdk_config_dpg.json"
2526

2627
DEFAULT_COMMIT_MESSAGE = "Generated from {hexsha}"
2728

0 commit comments

Comments
 (0)