Skip to content
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

[Microsoft.Billing] Customers resource for partner-channel #6299

Merged
merged 22 commits into from
Aug 14, 2019
Merged

[Microsoft.Billing] Customers resource for partner-channel #6299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d7c70c9
Add customers resource type.
wilcobmsft May 7, 2019
527126d
Add /billingPermissions API for the customer scope.
wilcobmsft May 7, 2019
5054b4d
Add support for listing billing subscriptions by customer.
wilcobmsft May 7, 2019
fe036db
Remove billingProfileId - not supported for partner-led.
wilcobmsft May 7, 2019
842d9a2
Add billinAccounts/customers/transactions API.
wilcobmsft May 14, 2019
36a8330
fix example
wilcobmsft May 22, 2019
027f221
Merge branch 'master' into wilcob/customers
wilcobmsft Jun 10, 2019
c56d277
Address PR comment.
wilcobmsft Jun 10, 2019
9959caa
merge fix
wilcobmsft Jun 12, 2019
e813433
Add missing properties.
wilcobmsft Jun 12, 2019
ce6c40a
Add x-ms-pageable to APIs which may have large result sets.
wilcobmsft Jun 18, 2019
363df9b
Merge remote-tracking branch 'upstream/master' into wilcob/customers
wilcobmsft Jun 20, 2019
533f1ab
Merge remote-tracking branch 'upstream/master' into wilcob/customers
wilcobmsft Jun 26, 2019
fdc5d0a
fix
wilcobmsft Jun 26, 2019
d109944
Rename ServiceProvider->Reseller.
wilcobmsft Jul 11, 2019
7f7f0f2
Update examples.
wilcobmsft Jul 25, 2019
9676327
Fix reseller property on billingSubscription.
wilcobmsft Jul 26, 2019
e5b822f
Merge branch 'master' into wilcob/customers
wilcobmsft Aug 12, 2019
03cc097
fix example
wilcobmsft Aug 12, 2019
8994ed9
Copy 2018 customer APIs into 2019 API version.
wilcobmsft Aug 12, 2019
57a1d14
Address PR feedback.
wilcobmsft Aug 13, 2019
fa34de2
Merge branch 'master' into wilcob/customers
wilcobmsft Aug 14, 2019
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
461 changes: 454 additions & 7 deletions ...cation/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions ...ce-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"api-version": "2018-11-01-preview",
"billingAccountName": "{billingAccountName}",
"invoiceSectionName": "{invoiceSectionName}",
"billingSubscriptionName": "{billingSubscriptionName}",
"$expand": "billingProfile"
"billingSubscriptionName": "{billingSubscriptionName}"
},
"responses": {
"200": {
Expand Down
38 changes: 38 additions & 0 deletions ...rosoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionByCustomerName.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountName": "{billingAccountName}",
"customerName": "{customerName}",
"billingSubscriptionName": "{billingSubscriptionName}"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/customers/{customerName}/billingSubscriptions/{billingSubscriptionName}",
"name": "{billingSubscriptionName}",
"type": "Microsoft.Billing/billingSubscriptions",
"properties": {
"displayName": "My Subscription",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3",
"subscriptionBillingStatus": "Active",
"lastMonthCharges": {
"currency": "USD",
"value": 5000.00
},
"monthToDateCharges": {
"currency": "USD",
"value": 600
},
"customerId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}",
"customerDisplayName": "Customer1",
"reseller": {
"resellerId": "3b65b5a8-bd4f-4084-90e9-e1bd667a2b19",
"description": "Reseller2"
},
"skuId": "0002",
"skuDescription": "Microsoft Azure Standard"
}
}
}
}
}
67 changes: 67 additions & 0 deletions ...osoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByCustomer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountName": "{billingAccountName}",
"customerName": "{customerName}"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/customers/{customerName}/billingSubscriptions/billinSubscriptionId1",
"name": "billingSubscriptionId1",
"type": "Microsoft.Billing/billingSubscriptions",
"properties": {
"displayName": "My subscription",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3",
"subscriptionBillingStatus": "Active",
"lastMonthCharges": {
"currency": "USD",
"value": 5000.00
},
"monthToDateCharges": {
"currency": "USD",
"value": 600
wilcobmsft marked this conversation as resolved.
Show resolved Hide resolved
},
"customerId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}",
"customerDisplayName": "Customer1",
"reseller": {
"resellerId": "89e87bdf-a2a2-4687-925f-4c18b27bccfd",
"description": "Reseller1"
},
"skuId": "0002",
"skuDescription": "Microsoft Azure Standard"
}
},
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/customers/{customerName}/billingSubscriptions/billinSubscriptionId2",
"name": "billingSubscriptionId2",
"type": "Microsoft.Billing/billingSubscriptions",
"properties": {
"displayName": "Test subscription",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2",
"subscriptionBillingStatus": "Active",
"lastMonthCharges": {
"currency": "USD",
"value": 1000.00
},
"monthToDateCharges": {
"currency": "USD",
"value": 400
},
"customerId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}",
"customerDisplayName": "Customer1",
"reseller": {
"resellerId": "3b65b5a8-bd4f-4084-90e9-e1bd667a2b19",
"description": "Reseller3"
},
"skuId": "0002",
"skuDescription": "Microsoft Azure Standard"
}
}
]
}
}
}
}
19 changes: 19 additions & 0 deletions ...ling/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Customer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountName": "{billingAccountName}",
"customerName": "{customerName}"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}",
"name": "{customerName}",
"type": "Microsoft.Billing/customers",
"properties": {
"displayName": "customer1"
}
}
}
}
}
27 changes: 27 additions & 0 deletions ...anager/Microsoft.Billing/preview/2018-11-01-preview/examples/CustomerPermissionsList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountName": "{billingAccountName}",
"customerName": "{customerName}"
},
"responses": {
"200": {
"body": {
"value": [
{
"actions": [
"30000000-aaaa-bbbb-cccc-200000000007",
"30000000-aaaa-bbbb-cccc-200000000004",
"30000000-aaaa-bbbb-cccc-200000000015",
"30000000-aaaa-bbbb-cccc-200000000009",
"30000000-aaaa-bbbb-cccc-200000000000",
"30000000-aaaa-bbbb-cccc-200000000010",
"30000000-aaaa-bbbb-cccc-200000000001"
],
"notActions": [ ]
}
]
}
}
}
}
36 changes: 36 additions & 0 deletions ...rce-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CustomerWithExpand.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountName": "{billingAccountName}",
"customerName": "{customerName}",
"$expand": "enabledAzureSkus,resellers"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}",
"name": "{customerName}",
"type": "Microsoft.Billing/customers",
"properties": {
"displayName": "customerName1",
"enabledAzureSKUs": [
{
"skuId": "0002",
"skuDescription": "Microsoft Azure Standard"
}
],
"resellers": [
{
"resellerId": "89e87bdf-a2a2-4687-925f-4c18b27bccfd",
"description": "Reseller1"
},
{
"resellerId": "3b65b5a8-bd4f-4084-90e9-e1bd667a2b19",
"description": "Reseller2"
}
]
}
}
}
}
}
30 changes: 30 additions & 0 deletions ...rosoft.Billing/preview/2018-11-01-preview/examples/CustomersListByBillingAccountName.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountName": "{billingAccountName}"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/22000000-0000-0000-0000-000000000000",
"name": "22000000-0000-0000-0000-000000000000",
"type": "Microsoft.Billing/customers",
"properties": {
"displayName": "customer1"
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/22000000-0000-0000-0000-000000000011",
"name": "22000000-0000-0000-0000-000000000011",
"type": "Microsoft.Billing/customers",
"properties": {
"displayName": "customer2"
}
}
]
}
}
}
}
2 changes: 1 addition & 1 deletion ...osoft.Billing/preview/2018-11-01-preview/examples/PaymentMethodsListByBillingAccount.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"properties": {
"currency": "USD",
"details": "Credits",
"expiration": "4/2020",
"expiration": "2014-03-18T18:25:43.511Z",
"paymentMethodType": "Credits"
}
},
Expand Down
2 changes: 1 addition & 1 deletion ...osoft.Billing/preview/2018-11-01-preview/examples/PaymentMethodsListByBillingProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"properties": {
"currency": "USD",
"details": "Credits",
"expiration": "4/2020",
"expiration": "2014-03-18T18:25:43.511Z",
"paymentMethodType": "Credits"
}
},
Expand Down
64 changes: 64 additions & 0 deletions ...ft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByCustomer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountName": "{billingAccountName}",
"customerName": "{customerName}",
"startDate": "2018-04-01",
"endDate": "2018-05-30",
"$filter": "properties/kind eq 'Reservation'"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/customers/{customerName}/transactions/41000000-0000-0000-0000-000000000000",
"name": "41000000-0000-0000-0000-000000000000",
"type": "Microsoft.Billing/transactions",
"properties": {
"kind": "reservation",
"date": "2018-04-23T00:00:00Z",
"invoice": "2344233",
"orderName": "Contoso Reserved",
"orderId": "6d8e7ed9-d3be-48b0-8c7a-e19246a6d30c",
"productDescription": "Standard D1, US West 3",
"transactionType": "Cancel",
"transactionAmount": {
"currency": "USD",
"value": 5000.00
},
"quantity": 4,
"customerId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}",
"customerDisplayName": "Contoso operations customer",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"subscriptionName": "Contoso operations billing"
}
},
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/customers/{customerName}/transactions/82000000-0000-0000-0000-000000000000",
"name": "82000000-0000-0000-0000-000000000000",
"type": "Microsoft.Billing/transactions",
"properties": {
"kind": "reservation",
"date": "2018-05-05T00:00:00Z",
"invoice": "Pending",
"orderName": "Test Reserved",
"orderId": "1c24006f-8350-4315-ad8f-6d11180448f9",
"productDescription": "Standard D1, US West 3",
"transactionType": "Purchase",
"transactionAmount": {
"currency": "USD",
"value": 6000.00
},
"quantity": 5,
"customerId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}",
"customerDisplayName": "Contoso operations customer",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"subscriptionName": "Contoso operations billing"
}
}
]
}
}
}
}
59 changes: 59 additions & 0 deletions ...ger/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByCustomer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountName": "{billingAccountName}",
"customerName": "{customerName}",
"startDate": "2018-04-01",
"endDate": "2018-05-30"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/customers/{customerName}/transactions/41000000-0000-0000-0000-000000000000",
"name": "41000000-0000-0000-0000-000000000000",
"type": "Microsoft.Billing/transactions",
"properties": {
"kind": "all",
"date": "2018-05-01T00:00:00Z",
"invoice": "2344233",
"productFamily": "Storage",
"productTypeId": "A12345",
"productType": "Reserved VM Instance",
"productDescription": "Standard D1, US West 3",
"transactionType": "Purchase",
"transactionAmount": {
"currency": "USD",
"value": 5000.00
},
"customerId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}",
"customerDisplayName": "Contoso operations customer"
}
},
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/customers/{customerName}/transactions/51000000-0000-0000-0000-000000000000",
"name": "51000000-0000-0000-0000-000000000000",
"type": "Microsoft.Billing/transactions",
"properties": {
"kind": "all",
"date": "2018-04-01T00:00:00Z",
"invoice": "pending",
"productFamily": "Storage",
"productTypeId": "A12345",
"productType": "VM Instance",
"productDescription": "Standard Support",
"transactionType": "Cancel",
"transactionAmount": {
"currency": "USD",
"value": 50.00
},
"customerId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}",
"customerDisplayName": "Contoso operations customer"
}
}
]
}
}
}
}
Loading