Skip to content

fix trailing comma issue #777

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
iscai-msft merged 2 commits into from
Sep 17, 2020
Merged

fix trailing comma issue #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bda715
fix trailing comma issue
iscai-msft Sep 17, 2020
97f3b70
update changelog and package.json
iscai-msft Sep 17, 2020
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
9 changes: 9 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

### 2020-09-17 - 5.3.3
Autorest core version: 3.0.6318

Modelerfour version: 4.15.419

**Bug fixes**

- Fix trailing comma issues in metadata.json (unblocks resource multiapi generation) #777

### 2020-09-14 - 5.3.2
Autorest core version: 3.0.6318

Expand Down
8 changes: 2 additions & 6 deletions autorest/codegen/templates/metadata.json.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@
{% endfor %}
},
"constant": {
{% for gp in code_model.global_parameters.constant %}
{% if gp.serialized_name != "api_version" %}
{% for gp in code_model.global_parameters.constant | rejectattr("serialized_name", "equalto", "api_version") %}
{{ gp.serialized_name | tojson }}: {{ gp.constant_declaration | tojson }}{{ "," if not loop.last else "" }}
{% endif %}
{% endfor %}
},
"call": {{ code_model.global_parameters.method | map(attribute="serialized_name") | join(', ') | tojson }}
Expand All @@ -52,10 +50,8 @@
"credential_key_header_name": {{ code_model.options['credential_key_header_name'] | tojson }}
},
"operation_groups": {
{% for operation_group in code_model.operation_groups %}
{% if not operation_group.is_empty_operation_group %}
{% for operation_group in code_model.operation_groups | rejectattr('is_empty_operation_group') %}
{{ operation_group.name | tojson }}: {{ operation_group.class_name | tojson }}{{ "," if not loop.last else "" }}
{% endif %}
{% endfor %}
},
"operation_mixins": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@autorest/python",
"version": "5.3.2",
"version": "5.3.3",
"description": "The Python extension for generators in AutoRest.",
"scripts": {
"prepare": "node run-python3.js prepare.py",
Expand Down