Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
PR comments from 9/27
  • Loading branch information
Braden Watkins committed Sep 27, 2023
commit 52266bd76b5143527123a22387d8b2e1168f5adc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"contact": {
"name": "Microsoft.Billing",
"url": "https://learn.microsoft.com/en-us/rest/api/billing/",
"email": "cabbpt@microsoft.com"
"email": "pacebpexphot@microsoft.com"
},
"version": "2023-04-01"
},
Expand Down Expand Up @@ -85,8 +85,8 @@
},
{
"in": "query",
"name": "includeRevoked",
"description": "Can be used to get revoked associated tenants.",
"name": "includeDisabled",
"description": "Can be used to get disabled or revoked associated tenants.",
"type": "boolean",
"default": false
},
Expand Down Expand Up @@ -206,8 +206,8 @@
},
{
"in": "query",
"name": "includeRevoked",
"description": "Can be used to get revoked associated tenants.",
"name": "includeDisabled",
"description": "Can be used to get disabled or revoked associated tenants.",
"type": "boolean",
"default": false
},
Expand Down Expand Up @@ -317,10 +317,9 @@
"billingManagementState": {
"description": "The state determines whether users from the associated tenant can be assigned roles for commerce activities like viewing and downloading invoices, managing payments, and making purchases.",
"enum": [
"Unknown",
"NotAllowed",
"Other",
"Active",
"Revoked"
"Disabled"
],
"type": "string",
"x-ms-enum": {
Expand All @@ -329,15 +328,15 @@
}
},
"provisioningState": {
"description": "The state determines whether subscriptions and licenses can be provisioned in the associated tenant. It can be set as 'Pending' from null, null from 'Pending', or null from 'Active'",
"description": "The state determines whether subscriptions and licenses can be provisioned in the associated tenant. It can be set as 'Pending' from 'Disabled', and 'Disabled' from 'Pending' or 'Active'. Other states are determined based on actions taken by the provisioning tenant's Global Administrator on the related billing request.",
"enum": [
"Unknown",
"NotRequested",
"Other",
"Disabled",
"Active",
"Pending",
"PermissionRequestExpired",
"BillingRequestExpired",
"BillingRequestDeclined",
"Revoked"
"BillingRequestRevoked"
],
"type": "string",
"x-ms-enum": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"contact": {
"name": "Microsoft.Billing",
"url": "https://learn.microsoft.com/en-us/rest/api/billing/",
"email": "cabbpt@microsoft.com"
"email": "pacebpexphot@microsoft.com"
},
"version": "2023-04-01"
},
Expand Down Expand Up @@ -351,7 +351,7 @@
"readOnly": true
},
"billingProfileDisplayName": {
"description": "The name of the billing profile for the invoice section or customer.",
"description": "The name of the billing profile.",
"type": "string",
"readOnly": true
},
Expand Down Expand Up @@ -438,7 +438,7 @@
"status": {
"description": "Status of billing request.",
"enum": [
"Unknown",
"Other",
"Pending",
"Approved",
"Declined",
Expand All @@ -455,7 +455,7 @@
"type": {
"description": "Type of billing request.",
"enum": [
"Unknown",
"Other",
"InvoiceAccess",
"ProvisioningAccess",
"RoleAssignment",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"tenantId": "11111111-1111-1111-1111-111111111111",
"billingManagementState": "Active",
"provisioningState": "Pending",
"provisioningBillingRequestId": "/providers/Microsoft.Billing/permissionRequests/22222222-2222-2222-2222-222222222222"
"provisioningBillingRequestId": "/providers/Microsoft.Billing/billingRequests/22222222-2222-2222-2222-222222222222"
},
"type": "Microsoft.Billing/billingAccounts/associatedTenants"
}
Expand All @@ -36,7 +36,7 @@
"tenantId": "11111111-1111-1111-1111-111111111111",
"billingManagementState": "Active",
"provisioningState": "Pending",
"provisioningBillingRequestId": "/providers/Microsoft.Billing/permissionRequests/22222222-2222-2222-2222-222222222222"
"provisioningBillingRequestId": "/providers/Microsoft.Billing/billingRequests/22222222-2222-2222-2222-222222222222"
},
"type": "Microsoft.Billing/billingAccounts/associatedTenants"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"tenantId": "11111111-1111-1111-1111-111111111111",
"billingManagementState": "Active",
"provisioningState": "Pending",
"provisioningBillingRequestId": "/providers/Microsoft.Billing/permissionRequests/22222222-2222-2222-2222-222222222222"
"provisioningBillingRequestId": "/providers/Microsoft.Billing/billingRequests/22222222-2222-2222-2222-222222222222"
},
"type": "Microsoft.Billing/billingAccounts/associatedTenants"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"displayName": "Contoso Finance",
"tenantId": "11111111-1111-1111-1111-111111111111",
"billingManagementState": "Active",
"provisioningState": "NotRequested"
"provisioningState": "Disabled"
},
"type": "Microsoft.Billing/billingAccounts/associatedTenants"
},
Expand All @@ -24,9 +24,9 @@
"properties": {
"displayName": "Contoso Engineering",
"tenantId": "22222222-2222-2222-2222-222222222222",
"billingManagementState": "NotAllowed",
"billingManagementState": "Disabled",
"provisioningState": "Pending",
"provisioningBillingRequestId": "/providers/Microsoft.Billing/permissionRequests/22222222-2222-2222-2222-222222222222"
"provisioningBillingRequestId": "/providers/Microsoft.Billing/billingRequests/22222222-2222-2222-2222-222222222222"
},
"type": "Microsoft.Billing/billingAccounts/associatedTenants"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"status": "Pending",
"type": "RoleAssignment"
},
"type": "Microsoft.Billing/permissionRequests"
"type": "Microsoft.Billing/billingRequests"
}
},
"responses": {
Expand All @@ -39,7 +39,7 @@
"lastUpdatedBy": "admin@contoso.com",
"lastUpdatedDate": "2023-04-01T17:32:28Z"
},
"type": "Microsoft.Billing/permissionRequests"
"type": "Microsoft.Billing/billingRequests"
}
},
"201": {
Expand All @@ -65,7 +65,7 @@
"lastUpdatedBy": "admin@contoso.com",
"lastUpdatedDate": "2023-04-01T17:32:28Z"
},
"type": "Microsoft.Billing/permissionRequests"
"type": "Microsoft.Billing/billingRequests"
}
},
"202": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"lastUpdatedBy": "admin@contoso.com",
"lastUpdatedDate": "2023-04-01T17:32:28Z"
},
"type": "Microsoft.Billing/permissionRequests"
"type": "Microsoft.Billing/billingRequests"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"lastUpdatedBy": "foo@contoso.com",
"lastUpdatedDate": "2023-04-01T17:32:28Z"
},
"type": "Microsoft.Billing/permissionRequests"
"type": "Microsoft.Billing/billingRequests"
},
{
"id": "/providers/Microsoft.Billing/billingRequests/11111111-1111-1111-1111-111111111111",
Expand All @@ -49,7 +49,7 @@
"lastUpdatedBy": "admin@contosofinance.com",
"lastUpdatedDate": "2023-03-02T17:32:28Z"
},
"type": "Microsoft.Billing/permissionRequests"
"type": "Microsoft.Billing/billingRequests"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"lastUpdatedBy": "foo@contoso.com",
"lastUpdatedDate": "2023-04-01T17:32:28Z"
},
"type": "Microsoft.Billing/permissionRequests"
"type": "Microsoft.Billing/billingRequests"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"lastUpdatedBy": "foo@contoso.com",
"lastUpdatedDate": "2023-04-01T17:32:28Z"
},
"type": "Microsoft.Billing/permissionRequests"
"type": "Microsoft.Billing/billingRequests"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"lastUpdatedBy": "foo@contoso.com",
"lastUpdatedDate": "2023-04-01T17:32:28Z"
},
"type": "Microsoft.Billing/permissionRequests"
"type": "Microsoft.Billing/billingRequests"
},
{
"id": "/providers/Microsoft.Billing/billingRequests/11111111-1111-1111-1111-111111111111",
Expand All @@ -48,7 +48,7 @@
"lastUpdatedBy": "admin@contosofinance.com",
"lastUpdatedDate": "2023-03-02T17:32:28Z"
},
"type": "Microsoft.Billing/permissionRequests"
"type": "Microsoft.Billing/billingRequests"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"lastUpdatedBy": "admin@contosofinance.com",
"lastUpdatedDate": "2023-03-02T17:32:28Z"
},
"type": "Microsoft.Billing/permissionRequests"
"type": "Microsoft.Billing/billingRequests"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"contact": {
"name": "Microsoft.Billing",
"url": "https://learn.microsoft.com/en-us/rest/api/billing/",
"email": "cabbpt@microsoft.com"
"email": "pacebpexphot@microsoft.com"
},
"version": "2023-04-01"
},
Expand Down Expand Up @@ -71,7 +71,7 @@
"type": "object",
"properties": {
"error": {
"description": "The error detail.",
"description": "The error object.",
"allOf": [
{
"$ref": "#/definitions/ArmError"
Expand All @@ -84,11 +84,6 @@
"description": "Common fields that are returned in the response for all Azure Resource Manager resources.",
"type": "object",
"properties": {
"type": {
"description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\".",
"type": "string",
"readOnly": true
},
"id": {
"description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.",
"type": "string",
Expand All @@ -99,6 +94,11 @@
"type": "string",
"readOnly": true
},
"type": {
"description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\".",
"type": "string",
"readOnly": true
},
"systemData": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData"
}
Expand Down Expand Up @@ -196,6 +196,24 @@
"description": "Common fields that are in the patch method request body of all Azure Resource Manager patch resources.",
"type": "object"
},
"IndirectRelationshipInfo": {
"description": "Identifies the billing profile that is linked to another billing profile in indirect purchase motion.",
"type": "object",
"properties": {
"billingAccountName": {
"description": "The billing account name of the partner or the customer for an indirect motion.",
"type": "string"
},
"billingProfileName": {
"description": "The billing profile name of the partner or the customer for an indirect motion. This field is not populated for Enterprise Agreement billing accounts.",
"type": "string"
},
"displayName": {
"description": "The display name of the partner or customer for an indirect motion.",
"type": "string"
}
}
},
"AzurePlan": {
"description": "Details of the Azure plan.",
"type": "object",
Expand Down Expand Up @@ -327,6 +345,15 @@
"pattern": "^[a-zA-Z\\d-_]{1,128}$",
"x-ms-parameter-location": "method"
},
"departmentName": {
"in": "path",
"name": "departmentName",
"description": "The name of the department.",
"required": true,
"type": "string",
"pattern": "^[a-zA-Z\\d-_]{1,128}$",
"x-ms-parameter-location": "method"
},
"subscriptionId": {
"in": "path",
"name": "subscriptionId",
Expand All @@ -345,31 +372,22 @@
"pattern": "^[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}$",
"x-ms-parameter-location": "method"
},
"billingSubscriptionName": {
"in": "path",
"name": "billingSubscriptionName",
"description": "The ID that uniquely identifies a billing subscription.",
"required": true,
"type": "string",
"pattern": "^[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}$",
"x-ms-parameter-location": "method"
},
"enrollmentAccountName": {
"in": "path",
"name": "enrollmentAccountName",
"description": "The ID that uniquely identifies an enrollment account.",
"description": "The name of the enrollment account.",
"required": true,
"type": "string",
"pattern": "^[a-zA-Z\\d-_]{1,128}$",
"x-ms-parameter-location": "method"
},
"departmentName": {
"billingSubscriptionName": {
"in": "path",
"name": "departmentName",
"description": "The ID that uniquely identifies the department.",
"name": "billingSubscriptionName",
"description": "The ID that uniquely identifies a billing subscription.",
"required": true,
"type": "string",
"pattern": "^[a-zA-Z\\d-_]{1,128}$",
"pattern": "^[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}$",
"x-ms-parameter-location": "method"
},
"invoiceName": {
Expand Down