-
Notifications
You must be signed in to change notification settings - Fork 5.6k
Microsoft.Billing and Microsoft.Consumption swagger changes for GTM (DoNotMerge) #4484
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.
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
Changes from all commits
5742b8f
994490b
b822b3a
16233c2
14fe81a
3bb8827
e5ddd11
e16a1a5
28d8d06
607fc99
6a62632
eb84d6d
03fd7f3
c3a339b
0a5aa3e
e01b483
3257ef2
f6575e2
68c62da
2f24998
b8da71c
fd4787e
2a1aa3f
40ca1ee
63f6a23
2d73cd5
6680ff6
293f285
4b98cb6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2018-11-01-preview", | ||
| "billingAccountId": "04e9d123-ae03-5621-6c17-e70da00924ee", | ||
| "billingProfileId": "2291f7a6-e97a-4bb8-83d7-6090beb137e1" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/04e9d123-ae03-5621-6c17-e70da00924ee/billingProfiles/2291f7a6-e97a-4bb8-83d7-6090beb137e1/availableBalance/3f2a7a28-985c-4451-8b77-f83f47c3d2c6", | ||
| "name": "3f2a7a28-985c-4451-8b77-f83f47c3d2c6", | ||
| "type": "Microsoft.Billing/availableBalance", | ||
| "properties": { | ||
| "amount": { | ||
| "currency": "USD", | ||
| "value": 500.00 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2018-11-01-preview", | ||
| "billingAccountId": "2000100" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/2000100", | ||
| "name": "2000100", | ||
| "type": "Microsoft.Billing/billingAccounts", | ||
| "properties": { | ||
| "displayName": "Test Account", | ||
| "company": "Test Account", | ||
| "accountType": "Organization", | ||
| "address": { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. address is being returned as billingAddress in API response |
||
| "AddressLine1": "Test Address", | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. camelCasing everywhere |
||
| "AddressLine2": "Test Address", | ||
| "AddressLine3": "Test Address", | ||
| "City": "City", | ||
| "PostalCode": "00000", | ||
| "Region": "WA", | ||
| "Country": "US", | ||
| "PhoneNumber": "000-000-0000" | ||
| }, | ||
| "country": "United States", | ||
| "agreements": [ | ||
| "wwww.contoso.com/agreements" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2018-11-01-preview", | ||
| "billingAccountId": "2000200", | ||
| "periodStartDate": "2018-01-01", | ||
| "periodEndDate": "2018-06-30", | ||
| "$filter": "invoicePeriodStartDate le 2018-06-01" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345986/invoices/1383723", | ||
| "name": "1383723", | ||
| "type": "Microsoft.Billing/invoices", | ||
| "properties": { | ||
| "dueDate": "2018-01-16", | ||
| "invoiceDate": "2018-01-01", | ||
| "status": "Due", | ||
| "amountDue": { | ||
| "currency": "USD", | ||
| "value": 2000.00 | ||
| }, | ||
| "billedAmount": { | ||
| "currency": "USD", | ||
| "value": 2000.00 | ||
| }, | ||
| "invoicePeriodStartDate": "2018-01-01", | ||
| "invoicePeriodEndDate": "2018-01-15", | ||
| "billingProfile": "345986", | ||
| "billingProfileName": "Contoso Operations Billing", | ||
| "purchaseOrderNumber": "123456", | ||
| "documentUrls": [ | ||
| { | ||
| "kind": "Invoice", | ||
| "url": "https://microsoft.com/invoice.pdf" | ||
| } | ||
| ], | ||
| "payments": [ | ||
| { | ||
| "date": "2018-01-14", | ||
| "paymentType": "credited", | ||
| "amount": { | ||
| "currency": "USD", | ||
| "value": 2000.00 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345987/invoices/1383724", | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's be consistent in whether we prefix the id with a "/". I'm seeing two conventions in this PR. |
||
| "name": "1383724", | ||
| "type": "Microsoft.Billing/invoices", | ||
| "properties": { | ||
| "dueDate": "2018-03-01", | ||
| "invoiceDate": "2018-02-01", | ||
| "status": "PastDue", | ||
| "amountDue": { | ||
| "currency": "USD", | ||
| "value": 2000.00 | ||
| }, | ||
| "billedAmount": { | ||
| "currency": "USD", | ||
| "value": 2000.00 | ||
| }, | ||
| "invoicePeriodStartDate": "2018-02-01", | ||
| "invoicePeriodEndDate": "2018-02-30", | ||
| "billingProfile": "345987", | ||
| "billingProfileName": "Contoso Operations Billing", | ||
| "purchaseOrderNumber": "123456", | ||
| "documentUrls": [ | ||
| { | ||
| "kind": "VoidNote", | ||
| "url": "https://microsoft.com/voidNote.pdf" | ||
| } | ||
| ], | ||
| "payments": [ | ||
| { | ||
| "date": "2018-01-14", | ||
| "paymentType": "credited", | ||
| "amount": { | ||
| "currency": "USD", | ||
| "value": 2000.00 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2018-11-01-preview", | ||
| "billingAccountId": "2000100", | ||
| "$expand": "invoiceSections, billingProfiles" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/2000100", | ||
| "name": "2000100", | ||
| "type": "Microsoft.Billing/billingAccounts", | ||
| "properties": { | ||
| "company": "Test Account", | ||
| "accountType": "Organization", | ||
| "address": { | ||
| "AddressLine1": "Test Address", | ||
| "AddressLine2": "Test Address", | ||
| "AddressLine3": "Test Address", | ||
| "City": "City", | ||
| "PostalCode": "00000", | ||
| "Region": "WA", | ||
| "Country": "US", | ||
| "PhoneNumber": "000-000-0000" | ||
| }, | ||
| "country": "United States", | ||
| "agreements": [ | ||
| "wwww.contoso.com/agreements" | ||
| ], | ||
| "invoiceSections": [ | ||
| { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId1", | ||
| "name": "invoiceSectionId1", | ||
| "type": "Microsoft.Billing/invoiceSections", | ||
| "properties": { | ||
| "displayName": "invoiceSectionName1" | ||
| } | ||
| }, | ||
| { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId2", | ||
| "name": "invoiceSectionId2", | ||
| "type": "Microsoft.Billing/invoiceSections", | ||
| "properties": { | ||
| "displayName": "invoiceSectionName2" | ||
| } | ||
| } | ||
| ], | ||
| "billingProfiles": [ | ||
| { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1", | ||
| "name": "BillingProfileId1", | ||
| "type": "Microsoft.Billing/billingProfiles", | ||
| "properties": { | ||
| "displayName": "BillingProfileName1", | ||
| "poNumber": "ABC12345", | ||
| "billingAddress": { | ||
| "AddressLine1": "Test Address", | ||
| "AddressLine2": "Test Address", | ||
| "AddressLine3": "Test Address", | ||
| "City": "City", | ||
| "PostalCode": "00000", | ||
| "Region": "WA", | ||
| "Country": "US", | ||
| "PhoneNumber": "000-000-0000" | ||
| }, | ||
| "billingContact": "ronald@contoso.com", | ||
| "emailInvoice": true, | ||
| "isClassic": false, | ||
| "invoiceDay": 5, | ||
| "currency": "USD", | ||
| "enabledAzureSKUs": [ | ||
| { | ||
| "skuId": "0001", | ||
| "skuDescription": "Microsoft Azure Dev/Test" | ||
| }, | ||
| { | ||
| "skuId": "0002", | ||
| "skuDescription": "Microsoft Azure Standard" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId2", | ||
| "name": "BillingProfileId2", | ||
| "type": "Microsoft.Billing/billingProfiles", | ||
| "properties": { | ||
| "displayName": "BillingProfileName2", | ||
| "poNumber": "ABC12345", | ||
| "billingAddress": { | ||
| "AddressLine1": "Test Address", | ||
| "AddressLine2": "Test Address", | ||
| "AddressLine3": "Test Address", | ||
| "City": "City", | ||
| "PostalCode": "00000", | ||
| "Region": "WA", | ||
| "Country": "US", | ||
| "PhoneNumber": "000-000-0000" | ||
| }, | ||
| "billingContact": "ronald@contoso.com", | ||
| "emailInvoice": true, | ||
| "isClassic": false, | ||
| "invoiceDay": 5, | ||
| "currency": "USD", | ||
| "enabledAzureSKUs": [ | ||
| { | ||
| "skuId": "0001", | ||
| "skuDescription": "Microsoft Azure Dev/Test" | ||
| }, | ||
| { | ||
| "skuId": "0002", | ||
| "skuDescription": "Microsoft Azure Standard" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2018-11-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/2000100", | ||
| "name": "2000100", | ||
| "type": "Microsoft.Billing/billingAccounts", | ||
| "properties": { | ||
| "displayName": "Test Account", | ||
| "company": "Test Account1", | ||
| "accountType": "Organization", | ||
| "address": { | ||
| "AddressLine1": "Test Address", | ||
| "AddressLine2": "Test Address", | ||
| "AddressLine3": "Test Address", | ||
| "City": "City", | ||
| "PostalCode": "00000", | ||
| "Region": "WA", | ||
| "Country": "US", | ||
| "PhoneNumber": "000-000-0000" | ||
| }, | ||
| "country": "United States", | ||
| "agreements": [ | ||
| "wwww.contoso.com/agreements" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/2000200", | ||
| "name": "2000200", | ||
| "type": "Microsoft.Billing/billingAccounts", | ||
| "properties": { | ||
| "displayName": "Test Account", | ||
| "company": "", | ||
| "accountType": "Organization", | ||
| "address": null, | ||
| "country": "", | ||
| "agreements": [ | ||
| "" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "id": "/providers/Microsoft.Billing/billingAccounts/2000300", | ||
| "name": "2000100", | ||
| "type": "Microsoft.Billing/billingAccounts", | ||
| "properties": { | ||
| "displayName": "Test Account", | ||
| "company": "Test Account3", | ||
| "accountType": "Organization", | ||
| "address": { | ||
| "AddressLine1": "Test Address", | ||
| "AddressLine2": "Test Address", | ||
| "AddressLine3": "Test Address", | ||
| "City": "City", | ||
| "PostalCode": "00000", | ||
| "Region": "WA", | ||
| "Country": "US", | ||
| "PhoneNumber": "000-000-0000" | ||
| }, | ||
| "country": "United States", | ||
| "agreements": [ | ||
| "wwww.contoso.com/agreements" | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
This comment was marked as outdated.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.