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.

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

Billing subscription changes for GA 2021-10-01 #4

Merged
merged 37 commits into from
Oct 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
dc589b1
Billing subscription changes for GA 2021-10-01
jbuls Sep 2, 2021
3d21d05
avocado fixes
jbuls Sep 2, 2021
7c8f7f6
avocado fix
jbuls Sep 2, 2021
8755209
AutoRest fix: Added systemData back to "Resource" type
jbuls Sep 2, 2021
aba3f17
Merged 2021-10-01 swagger files into billing.json
jbuls Sep 2, 2021
5e9fac9
Revert "Merged 2021-10-01 swagger files into billing.json"
jbuls Sep 2, 2021
0905f24
Updated Basic Information in readme.cmd
jbuls Sep 2, 2021
0e5d378
Updated productCategory example values
jbuls Sep 2, 2021
2ad54d3
Fixed description typos
jbuls Sep 2, 2021
a2008b0
Merge branch 'master' into jbuls/ga20211001
jbuls Oct 6, 2021
db9ec06
Updated BillingSubscriptionProperties
jbuls Oct 7, 2021
e1c1674
Updated move types, BillingSubscriptionMergeRequest, EnrollmentAccoun…
jbuls Oct 11, 2021
4f89461
Removed transferBillingSubscriptions action
jbuls Oct 11, 2021
7bef209
Added readOnly to BillingSubscriptionProperties.invoiceSectionName
jbuls Oct 11, 2021
c506a73
Moved BillingSubscriptionAlias definitions to BillingSubscription.json
jbuls Oct 11, 2021
66dc025
Removed customers scope and PATCH action
jbuls Oct 11, 2021
f886fa1
Fixed api-version in examples; Removed dead examples
jbuls Oct 13, 2021
119137f
Updated readme.cmd
jbuls Oct 13, 2021
eb36354
Updated examples
jbuls Oct 13, 2021
1df68e8
Update validate move examples
jbuls Oct 13, 2021
7b943a6
Updated ValidateMoveEligibility; Removed operations
jbuls Oct 13, 2021
5f47912
Updated billingSubscription.json CreateOrUpdate
jbuls Oct 13, 2021
afc1726
Updated api-version in example 202 location headers
jbuls Oct 13, 2021
2f9a479
Added PATCH
jbuls Oct 14, 2021
8a8c7e0
AutoRest error fixes
jbuls Oct 14, 2021
f23dde9
Updated productType in examples; BillingSubscriptionSplitRequest; titles
jbuls Oct 20, 2021
8f564a4
Updated billingSubscriptionAliasNameParameter
jbuls Oct 20, 2021
d78350f
Removed ignored readOnly's; Updated descriptions
jbuls Oct 20, 2021
836f215
Updated descriptions
jbuls Oct 20, 2021
980c46a
Removed unnecessary destinationBillingProfileId from Move request par…
jbuls Oct 20, 2021
2738952
PR feedback - descriptions
jbuls Oct 25, 2021
1f31efc
PR feedback - descriptions
jbuls Oct 25, 2021
7f24d38
Fixed typo
jbuls Oct 25, 2021
8fa92d5
PR feedback - productCategory description
jbuls Oct 25, 2021
5164607
Added billingPolicies, removed billingProfileSpendingLimitDetails
jbuls Oct 27, 2021
cd0b8a9
Updated billingPolicies description
jbuls Oct 27, 2021
6091b9b
Reverted current tag change in readme.cmd
jbuls Oct 27, 2021
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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
{
"parameters": {
"api-version": "2020-05-01",
"api-version": "2021-10-01",
"billingAccountName": "{billingAccountName}",
"subscriptionId": "{subscriptionId}"
"billingSubscriptionName": "418b0e9c-5dc3-4260-918f-30b90619fe07"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/{subscriptionId}",
"name": "{subscriptionId}",
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/418b0e9c-5dc3-4260-918f-30b90619fe07",
"name": "418b0e9c-5dc3-4260-918f-30b90619fe07",
"type": "Microsoft.Billing/billingAccounts/billingSubscriptions",
"properties": {
"displayName": "My Subscription",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3",
"subscriptionBillingStatus": "Active",
"autoRenew": "Off",
"billingFrequency": "P1M",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingProfileDisplayName": "Contoso operations billing profile",
"billingProfileName": "2b72f936-0166-47d6-91a3-ef9f84f36664",
"displayName": "Subscription 1",
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664/invoiceSections/5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"invoiceSectionDisplayName": "Contoso operations invoice section",
"invoiceSectionName": "5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"lastMonthCharges": {
"currency": "USD",
"value": 5000.00
Expand All @@ -22,15 +28,17 @@
"currency": "USD",
"value": 600
},
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoiceSections/22000000-0000-0000-0000-000000000000",
"invoiceSectionDisplayName": "Contoso operations invoiceSection",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
"billingProfileDisplayName": "Contoso operations billing",
"costCenter": "ABC1234",
"productCategory": "UsageBased",
"productType": "Usage based",
"productTypeId": "DZH318Z0BPS6",
"purchaseDate": "2021-10-01T00:00:00Z",
"quantity": 1,
"skuId": "0001",
"skuDescription": "Microsoft Azure Plan"
"skuDescription": "Microsoft Azure Plan",
"status": "Active",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parameters": {
"api-version": "2021-10-01",
"billingAccountName": "{billingAccountName}",
"billingSubscriptionAliasName": "c356b7c7-7545-4686-b843-c1a49cf853fc"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/aliases/c356b7c7-7545-4686-b843-c1a49cf853fc",
"name": "c356b7c7-7545-4686-b843-c1a49cf853fc",
"type": "Microsoft.Billing/billingAccounts/billingSubscriptions/aliases",
"properties": {
"autoRenew": "Off",
"billingFrequency": "P1M",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingProfileDisplayName": "Contoso operations billing profile",
"billingProfileName": "2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingSubscriptionId": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/418b0e9c-5dc3-4260-918f-30b90619fe07",
"displayName": "Subscription 1",
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664/invoiceSections/5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"invoiceSectionDisplayName": "Contoso operations invoice section",
"invoiceSectionName": "5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"lastMonthCharges": {
"currency": "USD",
"value": 5000.00
},
"monthToDateCharges": {
"currency": "USD",
"value": 600
},
"productCategory": "UsageBased",
"productType": "Usage based",
"productTypeId": "DZH318Z0BPS6",
"purchaseDate": "2021-10-01T00:00:00Z",
"quantity": 1,
"skuId": "0001",
"skuDescription": "Microsoft Azure Plan",
"status": "Active",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
{
"parameters": {
"api-version": "2021-10-01",
"billingAccountName": "{billingAccountName}"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/aliases/c356b7c7-7545-4686-b843-c1a49cf853fc",
"name": "c356b7c7-7545-4686-b843-c1a49cf853fc",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections/billingSubscriptions/aliases",
"properties": {
"autoRenew": "Off",
"billingFrequency": "P1M",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingProfileDisplayName": "Contoso operations billing profile",
"billingProfileName": "2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingSubscriptionId": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/418b0e9c-5dc3-4260-918f-30b90619fe07",
"displayName": "Subscription 1",
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664/invoiceSections/5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"invoiceSectionDisplayName": "Contoso operations invoice section",
"invoiceSectionName": "5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"lastMonthCharges": {
"currency": "USD",
"value": 5000.00
},
"monthToDateCharges": {
"currency": "USD",
"value": 600
},
"productCategory": "UsageBased",
"productType": "Usage Based",
"productTypeId": "DZH318Z0BPS6",
"purchaseDate": "2021-10-01T00:00:00Z",
"quantity": 1,
"skuId": "0001",
"skuDescription": "Microsoft Azure Plan",
"status": "Active",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3"
}
},
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/aliases/ec16a54e-e8ad-4c14-8e87-e30e75fa800e",
"name": "ec16a54e-e8ad-4c14-8e87-e30e75fa800e",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections/billingSubscriptions/aliases",
"properties": {
"autoRenew": "Off",
"billingFrequency": "P1M",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingProfileDisplayName": "Contoso operations billing profile",
"billingProfileName": "2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingSubscriptionId": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/9e030ae5-51ed-4e02-8e17-d51b3aa55980",
"displayName": "Subscription 2",
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664/invoiceSections/5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"invoiceSectionDisplayName": "Contoso operations invoice section",
"invoiceSectionName": "5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"lastMonthCharges": {
"currency": "USD",
"value": 1000.00
},
"monthToDateCharges": {
"currency": "USD",
"value": 400
},
"productCategory": "UsageBased",
"productType": "Usage based",
"productTypeId": "DZH318Z0BPS6",
"purchaseDate": "2021-10-01T00:00:00Z",
"quantity": 1,
"skuId": "0001",
"skuDescription": "Microsoft Azure Plan",
"status": "Active",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2"
}
},
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/aliases/2ee97fe0-efca-4960-a9af-98a30c2c497c",
"name": "2ee97fe0-efca-4960-a9af-98a30c2c497c",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections/billingSubscriptions/aliases",
"properties": {
"autoRenew": "Off",
"billingFrequency": "P1M",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingProfileDisplayName": "Contoso operations billing profile",
"billingProfileName": "2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingSubscriptionId": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/7f271b5e-a89e-45cc-8fa5-cd5c643f8b5e",
"displayName": "Subscription 3",
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664/invoiceSections/5c562559-e31b-4bfe-b608-f8b5b3fbd0730",
"invoiceSectionDisplayName": "Contoso operations invoice section",
"invoiceSectionName": "5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"lastMonthCharges": {
"currency": "USD",
"value": 6000.00
},
"monthToDateCharges": {
"currency": "USD",
"value": 900
},
"productCategory": "SeatBased",
"productType": "Microsoft 365 Business Standard",
"productTypeId": "CFQ7TTC0LDPB",
"purchaseDate": "2021-08-01T00:12:49.7261677+00:00",
"quantity": 4,
"skuId": "0001",
"skuDescription": "Microsoft 365 Business Standard",
"status": "Active",
"termDuration": "P1Y",
"termStartDate": "2021-10-01T00:00:00Z",
"termEndDate": "2022-09-30T00:00:00Z"
}
}
]
}
}
}
}
Loading