Skip to content

Commit

Permalink
Add Billing Account resource to Billing RP. (#2517)
Browse files Browse the repository at this point in the history
* Add "Classic Account" ARM resource.

* 1. Change classic account property name from "userPrincipalName" to "principalName"
2. Add examples

* Fix API version in examples.

* Add example links.

* ClassicAccount->BillingAccount

* Removing "uuid" - billing account name may be a concatenation of uuid and additional keys.

* Remove unused parameters.

* 1. Add new version to readme.md
2. Fix validation warnings

* Fix descriptions.

* Fix type mismatch error.

* Adding missing parameter in example.

* Fix ms-examples name.
  • Loading branch information
wilcobmsft authored and jhendrixMSFT committed Feb 28, 2018
1 parent e5a7c40 commit 36fc76c
Show file tree
Hide file tree
Showing 10 changed files with 933 additions and 1 deletion.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"parameters": {
"api-version": "2018-03-01-preview",
"name": "e1bf1c8c-5ac6-44a0-bdcd-aa7c1cf60556"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/billingAccounts/e1bf1c8c-5ac6-44a0-bdcd-aa7c1cf60556",
"name": "e1bf1c8c-5ac6-44a0-bdcd-aa7c1cf60556",
"type": "Microsoft.Billing/billingAccounts",
"properties": {
"principalName": "kathy@contoso.com"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"parameters": {
"api-version": "2018-03-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/billingAccounts/e1bf1c8c-5ac6-44a0-bdcd-aa7c1cf60556",
"name": "e1bf1c8c-5ac6-44a0-bdcd-aa7c1cf60556",
"type": "Microsoft.Billing/billingAccounts",
"properties": {
"principalName": "kathy@contoso.com"
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/edd24053-07cd-4ed4-aa5b-326160a6680d",
"name": "edd24053-07cd-4ed4-aa5b-326160a6680d",
"type": "Microsoft.Billing/billingAccounts",
"properties": {
"principalName": "dan@contoso.com"
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"parameters": {
"api-version": "2018-03-01-preview",
"subscriptionId": "subid",
"billingPeriodName": "201702-1"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702-1",
"name": "201702-1",
"type": "Microsoft.Billing/billingPeriods",
"properties": {
"billingPeriodStartDate": "2017-01-01",
"billingPeriodEndDate": "2017-02-01",
"invoiceIds": [
"/subscriptions/subid/providers/Microsoft.Billing/invoices/2017-02-05-123456789",
"/subscriptions/subid/providers/Microsoft.Billing/invoices/2017-01-05-987654321"
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"parameters": {
"api-version": "2018-03-01-preview",
"subscriptionId": "subid"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702-1",
"name": "201702-1",
"type": "Microsoft.Billing/billingPeriods",
"properties": {
"billingPeriodStartDate": "2017-01-01",
"billingPeriodEndDate": "2017-02-01",
"invoiceIds": [
"/subscriptions/subid/providers/Microsoft.Billing/invoices/2017-02-05-123456789",
"/subscriptions/subid/providers/Microsoft.Billing/invoices/2017-01-05-987654321"
]
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parameters": {
"api-version": "2018-03-01-preview",
"subscriptionId": "subid",
"$top": 1,
"$filter": "invoicePeriodStartDate le 2017-02-01",
"$expand": "downloadUrl"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/subid/providers/Microsoft.Billing/invoices/2017-02-05-123456789",
"name": "2017-02-05-123456789",
"type": "Microsoft.Billing/invoices",
"properties": {
"invoicePeriodStartDate": "2017-01-01",
"invoicePeriodEndDate": "2017-02-01",
"billingPeriodIds": [
"/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702-1",
"/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201701-1"
],
"downloadUrl": {
"expiryTime": "2017-02-13T20:46:30Z",
"url": "https://microsoft.com"
}
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parameters": {
"api-version": "2018-03-01-preview",
"subscriptionId": "subid",
"invoiceName": "2017-02-05-123456789"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/providers/Microsoft.Billing/invoices/2017-02-05-123456789",
"name": "2017-02-05-123456789",
"type": "Microsoft.Billing/invoices",
"properties": {
"invoicePeriodStartDate": "2017-01-01",
"invoicePeriodEndDate": "2017-02-01",
"billingPeriodIds": [
"/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702-1",
"/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201701-1"
],
"downloadUrl": {
"expiryTime": "2017-02-13T20:46:30Z",
"url": "https://microsoft.com"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"parameters": {
"api-version": "2018-03-01-preview",
"subscriptionId": "subid"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/providers/Microsoft.Billing/invoices/2017-02-05-123456789",
"name": "2017-02-05-123456789",
"type": "Microsoft.Billing/invoices",
"properties": {
"invoicePeriodStartDate": "2017-01-01",
"invoicePeriodEndDate": "2017-02-01",
"billingPeriodIds": [
"/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702-1",
"/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201701-1"
],
"downloadUrl": {
"expiryTime": "2017-02-13T20:46:30Z",
"url": "https://microsoft.com"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"parameters": {
"api-version": "2018-03-01-preview",
"subscriptionId": "subid"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/subid/providers/Microsoft.Billing/invoices/2017-02-05-123456789",
"name": "2017-02-05-123456789",
"type": "Microsoft.Billing/invoices",
"properties": {
"invoicePeriodStartDate": "2017-01-01",
"invoicePeriodEndDate": "2017-02-01",
"billingPeriodIds": [
"/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702-1",
"/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201701-1"
]
}
}
]
}
}
}
}
21 changes: 20 additions & 1 deletion specification/billing/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,19 @@ These are the global settings for the Billing API.

``` yaml
openapi-type: arm
tag: package-2017-04-preview
tag: package-2018-03-preview
```
### Tag: package-2018-03-preview
These settings apply only when `--tag=package-2018-03-preview` is specified on the command line.

``` yaml $(tag) == 'package-2018-03-preview'
input-file:
- Microsoft.Billing/preview/2018-03-01-preview/billing.json
```

### Tag: package-2017-04-preview

These settings apply only when `--tag=package-2017-04-preview` is specified on the command line.
Expand Down Expand Up @@ -121,10 +130,20 @@ go:
### Go multi-api
``` yaml $(go) && $(multiapi)
batch:
- tag: package-2018-03-preview
- tag: package-2017-04-preview
- tag: package-2017-02-preview
```

### Tag: package-2018-03-preview and go

These settings apply only when `--tag=package-2018-03-preview --go` is specified on the command line.
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

``` yaml $(tag) == 'package-2018-03-preview' && $(go)
output-folder: $(go-sdk-folder)/services/billing/mgmt/2018-03-01-preview/billing
```

### Tag: package-2017-04-preview and go

These settings apply only when `--tag=package-2017-04-preview --go` is specified on the command line.
Expand Down

0 comments on commit 36fc76c

Please sign in to comment.