Skip to content

Commit 4ecc38d

Browse files
authored
Update dpg quick start tool (Azure#26501)
* optimize ci.yml * update
1 parent ae0d35f commit 4ecc38d

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

scripts/quickstart_tooling_dpg/main.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,20 @@ def check_parameters(
2929

3030
def generate_ci(template_path: Path, folder_path: Path, package_name: str) -> None:
3131
ci = Path(folder_path, "ci.yml")
32-
ci_template_path = template_path / 'ci.yml'
3332
service_name = folder_path.name
34-
name = package_name.split('-')[-1]
33+
safe_name = package_name.replace("-", "")
3534
if not ci.exists():
36-
with open(ci_template_path, "r") as file_in:
37-
content = file_in.readlines()
38-
content = [line.replace("ServiceName", service_name).replace('PackageName', name) for line in content]
35+
env = Environment(loader=FileSystemLoader(template_path), keep_trailing_newline=True)
36+
template = env.get_template('ci.yml')
37+
content = template.render(package_name=package_name, service_name=service_name, safe_name=safe_name)
3938
else:
4039
with open(ci, "r") as file_in:
4140
content = file_in.readlines()
4241
for line in content:
43-
if f'{package_name}' in line:
42+
if package_name in line:
4443
return
4544
content.append(f' - name: {package_name}\n')
46-
content.append(f' safeName: {package_name.replace("-", "")}\n')
45+
content.append(f' safeName: {safe_name}\n')
4746
with open(ci, "w") as file_out:
4847
file_out.writelines(content)
4948

@@ -69,7 +68,8 @@ def generate_swagger_readme(work_path: str, env: Environment, **kwargs: Any) ->
6968

7069
# render file
7170
template = env.get_template('README.md')
72-
result = template.render(**kwargs)
71+
input_file = kwargs.pop("input_file", "").split(",")
72+
result = template.render(input_file=input_file, **kwargs)
7373
swagger_readme = swagger_path / Path('README.md')
7474
with open(swagger_readme, 'w') as fd:
7575
fd.write(result)

scripts/quickstart_tooling_dpg/template/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
### Settings
22

33
```yaml
4-
input-file: {{ input_file }}
4+
input-file:
5+
{%- for file in input_file %}
6+
- {{ file }}
7+
{%- endfor %}
58
output-folder: ../
69
namespace: {{ namespace }}
710
package-name: {{ package_name }}

scripts/quickstart_tooling_dpg/template_ci/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ trigger:
1010
- restapi*
1111
paths:
1212
include:
13-
- sdk/ServiceName/
13+
- sdk/{{ service_name }}/
1414

1515
pr:
1616
branches:
@@ -22,12 +22,12 @@ pr:
2222
- restapi*
2323
paths:
2424
include:
25-
- sdk/ServiceName/
25+
- sdk/{{ service_name }}/
2626

2727
extends:
2828
template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
2929
parameters:
30-
ServiceDirectory: ServiceName
30+
ServiceDirectory: {{ service_name }}
3131
Artifacts:
32-
- name: azure-mgmt-PackageName
33-
safeName: azuremgmtPackageName
32+
- name: {{ package_name }}
33+
safeName: {{ safe_name }}

0 commit comments

Comments
 (0)