Skip to content

Adding swagger for new api-version consumption 2018-08-31#3766

Merged
hovsepm merged 2 commits intoAzure:masterfrom
ncalagar:master
Sep 5, 2018
Merged

Adding swagger for new api-version consumption 2018-08-31#3766
hovsepm merged 2 commits intoAzure:masterfrom
ncalagar:master

Conversation

@ncalagar
Copy link
Contributor

@ncalagar ncalagar commented Aug 29, 2018

This checklist is used to make sure that common issues in a pull request are addressed. This will expedite the process of getting your pull request merged and avoid extra work on your part to fix issues discovered during the review process.

PR information

  • The title of the PR is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For information on cleaning up the commits in your pull request, see this page.
  • Except for special cases involving multiple contributors, the PR is started from a fork of the main repository, not a branch.
  • If applicable, the PR references the bug/issue that it fixes.
  • Swagger files are correctly named (e.g. the api-version in the path should match the api-version in the spec).

Quality of Swagger

@AutorestCI
Copy link

AutorestCI commented Aug 29, 2018

Automation for azure-sdk-for-python

The initial PR has been merged into your service PR:
Azure/azure-sdk-for-python#2158

@AutorestCI
Copy link

AutorestCI commented Aug 29, 2018

Automation for azure-sdk-for-java

Nothing to generate for azure-sdk-for-java

@AutorestCI
Copy link

AutorestCI commented Aug 29, 2018

Automation for azure-sdk-for-ruby

Nothing to generate for azure-sdk-for-ruby

@AutorestCI
Copy link

AutorestCI commented Aug 30, 2018

Automation for azure-sdk-for-go

Nothing to generate for azure-sdk-for-go

@ms-premp
Copy link
Contributor

@ms-premp fyi

@AutorestCI
Copy link

AutorestCI commented Aug 30, 2018

Automation for azure-sdk-for-node

Nothing to generate for azure-sdk-for-node

@ms-premp
Copy link
Contributor

@ravbhatnagar Please have a look as we will need ARM sign off too.
Here is the summary of changes

  • Adding new property "isRecurringCharge" to MarketplaceProperties.

  • Adding two new properties “usageStart” and “usageEnd” to ManagementGroupAggregatedCostProperties
    and
    adding usageStart and usageEnd filter to ManangmentGroupAggregatedCost and examples

  • Removing CostTags API and its examples.

  • Adding new charges apis and their associated changes and examples

@azuresdkci
Copy link
Contributor

Can one of the admins verify this patch?

@hovsepm
Copy link
Contributor

hovsepm commented Aug 30, 2018

@ncalagar new operation groups are confusing:

"operationId": "ChargesByEnrollmentAccount_List",
"operationId": "ChargesForEnrollmentAccount_ListByBillingPeriod",
"operationId": "ChargesByDepartment_List",
"operationId": "ChargesForDepartment_ListByBillingPeriod",

please revise. I would recommend having it as

"operationId": "EnrollmentAccountCharges_List",
"operationId": "EnrollmentAccountCharges_ListByBillingPeriod",
"operationId": "DepartmentCharges_List",
"operationId": "DepartmentCharges_ListByBillingPeriod",

better solution would be to group everything under Charges e.g.

"operationId": "Charges_ListByEnrollmentAccount",
"operationId": "Charges_ListByEnrollmentAccountForBillingPeriod",
"operationId": "Charges_ListByDepartment",
"operationId": "Charges_ListByDepartmentForBillingPeriod",

you actually have a Marketplace operations here - https://docs.microsoft.com/en-us/rest/api/consumption/marketplaces and according to that naming it should rather be

"operationId": "Charges_ListByEnrollmentAccount",
"operationId": "Charges_ListForBillingPeriodByEnrollmentAccount",
"operationId": "Charges_ListByDepartment",
"operationId": "Charges_ListForBillingPeriodByDepartment",

Copy link
Contributor

@hovsepm hovsepm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please address review comments

@hovsepm
Copy link
Contributor

hovsepm commented Aug 30, 2018

@ravbhatnagar please take a look. This is a new API version.

@hovsepm hovsepm added the WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required label Aug 30, 2018
@ncalagar
Copy link
Contributor Author

@hovsepm Sure, addressed the comment.

@hovsepm
Copy link
Contributor

hovsepm commented Sep 4, 2018

@ncalagar I've signed off. Waiting for @ravbhatnagar to review the new API version.

Copy link
Contributor

@ravbhatnagar ravbhatnagar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one comment. Please fix. Conditional sign off.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are different model names being used in the response? Each one, in the end, refers to the same properties envelope. Same model should be used in the response since the GET is on charges in each case.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ravbhatnagar Addressed the feedback and updated all apis to use same model ChargesListResult

@ravbhatnagar ravbhatnagar added ARMSignedOff <valid label in PR review process>add this label when ARM approve updates after review and removed WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required labels Sep 5, 2018
@ms-premp
Copy link
Contributor

ms-premp commented Sep 5, 2018

Thanks @ravbhatnagar .. we have incorporated the feedback.
@hovsepm please have a look.. and if good then please merge.
On a side note.. I see a bunch of commits and new reviewers added.. possibly because of the merge with latest.
This PR only has following relevant changes

  • Copy of older version
  • Added new changes with new version
  • Incorporated review feedback from Gaurav.

Thanks

@hovsepm
Copy link
Contributor

hovsepm commented Sep 5, 2018

@ncalagar @ms-premp this means that your merge was done wrong. Please rebase your fork/branch with the upstream master branch. You should not have any other teams commits in your PR.

Copy link
Contributor

@hovsepm hovsepm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the current state PR is unmergeable. Please rebase with upstream

@ncalagar
Copy link
Contributor Author

ncalagar commented Sep 5, 2018

@hovsepm rebased with upstream and created two commits (first one copy of older version and second one new version including all feedback ) please let me know if any other change is needed and sorry for the merge issue

@hovsepm hovsepm merged commit 50f17b4 into Azure:master Sep 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ARMSignedOff <valid label in PR review process>add this label when ARM approve updates after review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants