From 3426f557abd4461c92960ff4fc2e4d5330a08639 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 22 Jun 2022 14:44:42 +0800 Subject: [PATCH 1/7] add generate ci --- scripts/quickstart_tooling_dpg/main.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/scripts/quickstart_tooling_dpg/main.py b/scripts/quickstart_tooling_dpg/main.py index 55511e6f95e2..3025447073ad 100644 --- a/scripts/quickstart_tooling_dpg/main.py +++ b/scripts/quickstart_tooling_dpg/main.py @@ -25,6 +25,17 @@ def check_parameters( _LOGGER.info(f'{output} is created') +def generate_ci(package_name: str, folder_name: Path) -> None: + ci = Path(folder_name, "ci.yml") + if not ci.exists(): + with open("ci_template.yml", "r") as file_in: + content = file_in.readlines() + name = package_name.split('-')[-1] + content = [line.replace("MyService", name) for line in content] + with open(str(ci), "w") as file_out: + file_out.writelines(content) + + def generate_test_sample(template_path: Path, target_path: Path, **kwargs: Any) -> None: if not os.path.exists(target_path): os.makedirs(target_path) @@ -71,6 +82,10 @@ def build_package(**kwargs) -> None: _LOGGER.info("Build start: %s", package_name) check_parameters(output_folder) + #generate ci + generate_ci(package_name, Path(output_folder).parent) + + # generate swagger readme env = Environment(loader=FileSystemLoader(_TEMPLATE), keep_trailing_newline=True) swagger_readme = generate_swagger_readme(output_folder, env, **kwargs) From 60a00e567efecc8ab6a7dbd6ad51fcc8a176fe96 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 22 Jun 2022 15:47:33 +0800 Subject: [PATCH 2/7] fix ci template path] --- scripts/quickstart_tooling_dpg/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/quickstart_tooling_dpg/main.py b/scripts/quickstart_tooling_dpg/main.py index 3025447073ad..b3bc603dd0c1 100644 --- a/scripts/quickstart_tooling_dpg/main.py +++ b/scripts/quickstart_tooling_dpg/main.py @@ -27,8 +27,9 @@ def check_parameters( def generate_ci(package_name: str, folder_name: Path) -> None: ci = Path(folder_name, "ci.yml") + ci_template_path = folder_name.parent.parent / 'ci_template.yml' if not ci.exists(): - with open("ci_template.yml", "r") as file_in: + with open(ci_template_path, "r") as file_in: content = file_in.readlines() name = package_name.split('-')[-1] content = [line.replace("MyService", name) for line in content] From 6ad32645fc2f6c665f5c347d320793a41ed3b277 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 22 Jun 2022 16:56:48 +0800 Subject: [PATCH 3/7] update --- scripts/quickstart_tooling_dpg/main.py | 19 +++++++---- .../quickstart_tooling_dpg/template_ci/ci.yml | 33 +++++++++++++++++++ 2 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 scripts/quickstart_tooling_dpg/template_ci/ci.yml diff --git a/scripts/quickstart_tooling_dpg/main.py b/scripts/quickstart_tooling_dpg/main.py index b3bc603dd0c1..961810be4875 100644 --- a/scripts/quickstart_tooling_dpg/main.py +++ b/scripts/quickstart_tooling_dpg/main.py @@ -12,6 +12,7 @@ _TEMPLATE = Path(__file__).resolve().parent / "template" _TEMPLATE_TESTS = Path(__file__).resolve().parent / "template_tests" _TEMPLATE_SAMPLES = Path(__file__).resolve().parent / "template_samples" +_TEMPLATE_CI = Path(__file__).resolve().parent / "template_ci" def check_parameters( @@ -25,16 +26,22 @@ def check_parameters( _LOGGER.info(f'{output} is created') -def generate_ci(package_name: str, folder_name: Path) -> None: - ci = Path(folder_name, "ci.yml") - ci_template_path = folder_name.parent.parent / 'ci_template.yml' +def generate_ci(template_path: Path, folder_path: Path, package_name: str) -> None: + ci = Path(folder_path, "ci.yml") + ci_template_path = template_path / 'ci.yml' + service_name = folder_path.name + name = package_name.split('-')[-1] if not ci.exists(): with open(ci_template_path, "r") as file_in: content = file_in.readlines() - name = package_name.split('-')[-1] - content = [line.replace("MyService", name) for line in content] + content = [line.replace("ServiceName", service_name).replace('PackageName', name) for line in content] with open(str(ci), "w") as file_out: file_out.writelines(content) + else: + with open(str(ci), "r") as file_in: + content = file_in.readlines() + + def generate_test_sample(template_path: Path, target_path: Path, **kwargs: Any) -> None: @@ -84,7 +91,7 @@ def build_package(**kwargs) -> None: check_parameters(output_folder) #generate ci - generate_ci(package_name, Path(output_folder).parent) + generate_ci(_TEMPLATE_CI, Path(output_folder).parent, package_name) # generate swagger readme diff --git a/scripts/quickstart_tooling_dpg/template_ci/ci.yml b/scripts/quickstart_tooling_dpg/template_ci/ci.yml new file mode 100644 index 000000000000..611bc8e7e9c4 --- /dev/null +++ b/scripts/quickstart_tooling_dpg/template_ci/ci.yml @@ -0,0 +1,33 @@ +# DO NOT EDIT THIS FILE +# This file is generated automatically and any changes will be lost. + +trigger: + branches: + include: + - main + - hotfix/* + - release/* + - restapi* + paths: + include: + - sdk/ServiceName/ + +pr: + branches: + include: + - main + - feature/* + - hotfix/* + - release/* + - restapi* + paths: + include: + - sdk/ServiceName/ + +extends: + template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml + parameters: + ServiceDirectory: ServiceName + Artifacts: + - name: azure-mgmt-PackageName + safeName: azuremgmtPackageName From c6413843ab2e0cc30420ff154f2c8d2a4a68be09 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 22 Jun 2022 17:23:46 +0800 Subject: [PATCH 4/7] update --- scripts/quickstart_tooling_dpg/main.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/quickstart_tooling_dpg/main.py b/scripts/quickstart_tooling_dpg/main.py index 961810be4875..983643142320 100644 --- a/scripts/quickstart_tooling_dpg/main.py +++ b/scripts/quickstart_tooling_dpg/main.py @@ -35,13 +35,16 @@ def generate_ci(template_path: Path, folder_path: Path, package_name: str) -> No with open(ci_template_path, "r") as file_in: content = file_in.readlines() content = [line.replace("ServiceName", service_name).replace('PackageName', name) for line in content] - with open(str(ci), "w") as file_out: - file_out.writelines(content) else: with open(str(ci), "r") as file_in: content = file_in.readlines() - - + for line in content: + if f'{package_name}\n' in line: + return + content.append(f' - name: {package_name}\n') + content.append(f' safeName: {package_name.replace("-", "")}\n') + with open(str(ci), "w") as file_out: + file_out.writelines(content) def generate_test_sample(template_path: Path, target_path: Path, **kwargs: Any) -> None: From 38c4a4064ec52e0888c69a3e4cf4c25ea4681c00 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 22 Jun 2022 17:24:41 +0800 Subject: [PATCH 5/7] format --- scripts/quickstart_tooling_dpg/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/quickstart_tooling_dpg/main.py b/scripts/quickstart_tooling_dpg/main.py index 983643142320..e51ca8ff80aa 100644 --- a/scripts/quickstart_tooling_dpg/main.py +++ b/scripts/quickstart_tooling_dpg/main.py @@ -96,7 +96,6 @@ def build_package(**kwargs) -> None: #generate ci generate_ci(_TEMPLATE_CI, Path(output_folder).parent, package_name) - # generate swagger readme env = Environment(loader=FileSystemLoader(_TEMPLATE), keep_trailing_newline=True) swagger_readme = generate_swagger_readme(output_folder, env, **kwargs) From eb5146ed17d4a97279313ccc538148551cc5699d Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Thu, 23 Jun 2022 11:20:13 +0800 Subject: [PATCH 6/7] Update scripts/quickstart_tooling_dpg/main.py --- scripts/quickstart_tooling_dpg/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/quickstart_tooling_dpg/main.py b/scripts/quickstart_tooling_dpg/main.py index e51ca8ff80aa..a5316823c332 100644 --- a/scripts/quickstart_tooling_dpg/main.py +++ b/scripts/quickstart_tooling_dpg/main.py @@ -36,7 +36,7 @@ def generate_ci(template_path: Path, folder_path: Path, package_name: str) -> No content = file_in.readlines() content = [line.replace("ServiceName", service_name).replace('PackageName', name) for line in content] else: - with open(str(ci), "r") as file_in: + with open(ci, "r") as file_in: content = file_in.readlines() for line in content: if f'{package_name}\n' in line: From 7571f0019a5b68560defc1eb0a4fe4a01c69a999 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Thu, 23 Jun 2022 11:23:45 +0800 Subject: [PATCH 7/7] Update scripts/quickstart_tooling_dpg/main.py --- scripts/quickstart_tooling_dpg/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/quickstart_tooling_dpg/main.py b/scripts/quickstart_tooling_dpg/main.py index a5316823c332..bbd407d4d922 100644 --- a/scripts/quickstart_tooling_dpg/main.py +++ b/scripts/quickstart_tooling_dpg/main.py @@ -43,7 +43,7 @@ def generate_ci(template_path: Path, folder_path: Path, package_name: str) -> No return content.append(f' - name: {package_name}\n') content.append(f' safeName: {package_name.replace("-", "")}\n') - with open(str(ci), "w") as file_out: + with open(ci, "w") as file_out: file_out.writelines(content)