Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
e6b503a
Updated swagger docs in stable and track1\preview with changes to Ima…
jennifermarsman Feb 5, 2020
a20b17f
[Hub Generated] Review request for Microsoft.Maps to add version prev…
Feb 6, 2020
9b43c4d
regenerated all-api-versions
Feb 6, 2020
8552a31
Microsoft.insights Remove PrivateLinkScope API from AppInsights (move…
arolshan Feb 6, 2020
52ab22b
Microsoft.insights PrivateLinkScope API for Azure Monitor (Moved from…
arolshan Feb 6, 2020
d166055
regenerated all-api-versions
Feb 6, 2020
97f9215
Add trigger evalation API to swagger (#8312)
calecarter Feb 6, 2020
be96412
Document stable ATP settings API (#8264)
yoavfr Feb 6, 2020
e076a1d
regenerated all-api-versions
Feb 6, 2020
f1e9e42
Add PGSQL to AzurePGSQL swagger changes (#7583)
ash1625 Feb 7, 2020
911f41b
export open api as json document (#8155)
solankisamir Feb 7, 2020
3957ce4
Reverted changes in the track1 directory
jennifermarsman Feb 7, 2020
44407a0
Allow 204 response during deletion of key vaults (#8284)
iscai-msft Feb 7, 2020
5ccef25
Add startFromFailure for create run with recovery mode (#8302)
LijuanZ Feb 8, 2020
6daf2ac
Add new api version of apimanagement for go SDK (#8291)
ArcturusZhang Feb 8, 2020
bc47ebd
Add parameter for minimum TLS version while enabling https on a custo…
rrahulms Feb 9, 2020
396a218
[DataFactory] modify apis for rerunTrigger (#6903)
spagarwa Feb 10, 2020
d1df903
[BillingRP] New API to list transactions by invoice (#8319)
asarkar84 Feb 10, 2020
f49b103
Fix SDK Automation auto cancel issue (#8333)
Feb 10, 2020
0b92e30
[Peering Service] apiVersion:2020-01-01-preview (#8140)
rileymckenna Feb 10, 2020
d9d6031
Swagger changes for adding a new API version in Backup (#7483)
gaalla Feb 10, 2020
f9374a2
regenerated all-api-versions
Feb 10, 2020
3a88167
Updated swagger docs in stable and track1\preview with changes to Ima…
jennifermarsman Feb 5, 2020
231ddd1
Reverted changes in the track1 directory
jennifermarsman Feb 7, 2020
75c38f7
Merge branch 'master' of https://github.com/jennifermarsman/azure-res…
jennifermarsman Feb 10, 2020
d3a0184
[Security Center] Add support for verified partners in assessments (#…
chlahav Feb 11, 2020
a4bc312
HanaOnAzure: Update Swagger with SKUs for SD-Flex (#8326)
lagalbra Feb 11, 2020
fb17c68
regenerated all-api-versions
Feb 11, 2020
26bdb0c
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
Feb 11, 2020
91dc58f
add cli.md and fix clusterCodeVersion (#8354)
00Kai0 Feb 11, 2020
e34f6d0
Updated swagger docs in stable and track1\preview with changes to Ima…
jennifermarsman Feb 5, 2020
a16bb58
Reverted changes in the track1 directory
jennifermarsman Feb 7, 2020
f6fe5e8
Updated swagger docs in stable and track1\preview with changes to Ima…
jennifermarsman Feb 5, 2020
1299942
Reverted changes in the track1 directory
jennifermarsman Feb 7, 2020
e7df546
Merge branch 'master' of https://github.com/jennifermarsman/azure-res…
jennifermarsman Feb 11, 2020
ffc5d5b
Fixed prettier code style issue (I believe a whitespace change)
jennifermarsman Feb 11, 2020
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
5 changes: 4 additions & 1 deletion .azure-pipelines/SDKAutomation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ trigger:
batch: false
branches:
include:
- "*"
- master

pr:
autoCancel: false

jobs:
- job: "SDKAutomation"
Expand Down
1 change: 1 addition & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
/specification/notificationhubs/ @amolr @smithab
/specification/operationalinsights/ @sw47
/specification/operationsmanagement/ @dashimi16
/specification/peering/ @rileymckenna
/specification/policyinsights/ @bulentelmaci
/specification/postgresql/ @qingqingyuan
/specification/powerbidedicated/ @tarostok
Expand Down
3 changes: 3 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ trigger:
include:
- master

pr:
autoCancel: false

variables:
TRAVIS: 'true'
TRAVIS_BRANCH: $(System.PullRequest.TargetBranch)
Expand Down
5 changes: 5 additions & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,7 @@ poolusagemetrics
portalsettings
postbackup
Postgre
Postgres
postgresql
postrestore
powerbi
Expand Down Expand Up @@ -1118,6 +1119,7 @@ qnormal
querylogs
querypool
querystring
querytriggers
Queretaro
queueservices
quickbooks
Expand Down Expand Up @@ -1364,7 +1366,9 @@ sparql
SPDX
SQLAG
SQLDB
SQLDW
SQLMI
SQLRDS
sqlvirtualmachine
sqlvm
Sqoop
Expand Down Expand Up @@ -1509,6 +1513,7 @@ ukwest
Ulaanbaatar
unallocated
unattend
unbilled
Unclaim
Undelete
undeleted
Expand Down
3 changes: 3 additions & 0 deletions preproduction-azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: "Preproduction CI for Azure Rest API specifications"

trigger: none

pr:
autoCancel: false

variables:
TRAVIS: 'true'
TRAVIS_BRANCH: $(System.PullRequest.TargetBranch)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4381,7 +4381,8 @@
"swagger-link",
"wadl-link",
"wsdl-link",
"openapi-link"
"openapi-link",
"openapi+json-link"
],
"x-ms-enum": {
"name": "ExportFormat",
Expand All @@ -4406,6 +4407,11 @@
"value": "openapi-link",
"description": "Export the Api Definition in OpenApi Specification 3.0 to Storage Blob.",
"name": "Openapi"
},
{
"value": "openapi+json-link",
"description": "Export the Api Definition in OpenApi Specification 3.0 as JSON document to Storage Blob.",
"name": "OpenapiJson"
}
]
},
Expand Down
10 changes: 10 additions & 0 deletions specification/apimanagement/resource-manager/readme.go.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ go:

``` yaml $(go) && $(multiapi)
batch:
- tag: package-preview-2019-12
- tag: package-2019-01
- tag: package-2018-06-preview
- tag: package-2018-01
Expand All @@ -21,6 +22,15 @@ batch:
- tag: package-2016-07
```

### Tag: package-preview-2019-12 and go

These settings apply only when `--tag=package-preview-2019-12 --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-preview-2019-12' && $(go)
output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2019-12-01-preview/$(namespace)
```

### Tag: package-2019-01 and go

These settings apply only when `--tag=package-2019-01 --go` is specified on the command line.
Expand Down
2 changes: 0 additions & 2 deletions specification/applicationinsights/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@ These settings apply only when `--tag=package-2019-10-17-preview` is specified o
```yaml $(tag) == 'package-2019-10-17-preview'
input-file:
- Microsoft.Insights/preview/2019-10-17-preview/workbookTemplates_API.json
- Microsoft.Insights/preview/2019-10-17-preview/privateLinkScopes_API.json
```

### Tag: package-2018-05-01-preview
Expand Down Expand Up @@ -416,7 +415,6 @@ input-file:
- $(this-folder)/Microsoft.Insights/preview/2017-10-01/componentFeaturesAndPricing_API.json
- $(this-folder)/Microsoft.Insights/preview/2018-06-17-preview/workbooks_API.json
- $(this-folder)/Microsoft.Insights/preview/2019-10-17-preview/workbookTemplates_API.json
- $(this-folder)/Microsoft.Insights/preview/2019-10-17-preview/privateLinkScopes_API.json
- $(this-folder)/Microsoft.Insights/preview/2018-05-01/componentProactiveDetection_API.json
- $(this-folder)/Microsoft.Insights/preview/2019-09-01-preview/QueryPackQueries_API.json
- $(this-folder)/Microsoft.Insights/preview/2019-09-01-preview/QueryPacks_API.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1312,7 +1312,7 @@
"Transactions"
],
"operationId": "Transactions_ListByCustomer",
"description": "Lists the transactions by customer id for given start date and end date.",
"description": "Lists the billed and unbilled transactions by customer id for given start date and end date. Transactions include purchases, refunds and Azure usage charges. Unbilled transactions are listed under pending invoice Id and do not include tax. Tax is added to the amount once an invoice is generated.",
"externalDocs": {
"url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
},
Expand Down Expand Up @@ -2528,7 +2528,7 @@
"Transactions"
],
"operationId": "Transactions_ListByBillingAccount",
"description": "Lists the transactions by billing account name for given start and end date.",
"description": "Lists the billed and unbilled transactions by billing account name for given start and end date. Transactions include purchases, refunds and Azure usage charges. Unbilled transactions are listed under pending invoice ID and do not include tax. Tax is added to the amount once an invoice is generated.",
"externalDocs": {
"url": "https://docs.microsoft.com/en-us/rest/api/billing/"
},
Expand Down Expand Up @@ -2594,7 +2594,7 @@
"Transactions"
],
"operationId": "Transactions_ListByBillingProfile",
"description": "Lists the transactions by billing profile name for given start date and end date.",
"description": "Lists the billed and unbilled transactions by billing profile name for given start date and end date. Transactions include purchases, refunds and Azure usage charges. Unbilled transactions are listed under pending invoice Id and do not include tax. Tax is added to the amount once an invoice is generated.",
"externalDocs": {
"url": "https://docs.microsoft.com/en-us/rest/api/billing/"
},
Expand Down Expand Up @@ -2660,7 +2660,7 @@
"Transactions"
],
"operationId": "Transactions_ListByInvoiceSection",
"description": "Lists the transactions by invoice section name for given start date and end date.",
"description": "Lists the billed and unbilled transactions by invoice section name for given start date and end date. Transactions include purchases, refunds and Azure usage charges. Unbilled transactions are listed under pending invoice Id and do not include tax. Tax is added to the amount once an invoice is generated.",
"externalDocs": {
"url": "https://docs.microsoft.com/en-us/rest/api/billing/"
},
Expand Down Expand Up @@ -2723,6 +2723,54 @@
}
}
},
"/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoices/{invoiceName}/transactions": {
"get": {
"tags": [
"Transactions"
],
"operationId": "Transactions_ListByInvoice",
"description": "Lists the transactions by invoice. Transactions include purchases, refunds and Azure usage charges.",
"externalDocs": {
"url": "https://docs.microsoft.com/en-us/rest/api/billing/"
},
"x-ms-examples": {
"TransactionsListByInvoice": {
"$ref": "./examples/TransactionsListByInvoice.json"
}
},
"parameters": [
{
"$ref": "#/parameters/billingAccountNameParameter"
},
{
"$ref": "#/parameters/billingProfileNameParameter"
},
{
"$ref": "#/parameters/invoiceNameParameter"
},
{
"$ref": "#/parameters/apiVersionParameter"
}
],
"responses": {
"200": {
"description": "OK. The request has succeeded.",
"schema": {
"$ref": "#/definitions/TransactionListResult"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
}
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
}
}
},
"/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/transactions/{transactionName}": {
"get": {
"tags": [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"parameters": {
"api-version": "2019-10-01-preview",
"billingAccountName": "{billingAccountName}",
"billingProfileName": "{billingProfileName}",
"invoiceName": "{invoiceName}"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/{billingProfileName}/transactions/41000000-0000-0000-0000-000000000000",
"name": "41000000-0000-0000-0000-000000000000",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/transactions",
"properties": {
"kind": "all",
"date": "2018-05-01T00:00:00Z",
"invoice": "2344233",
"productFamily": "Storage",
"productTypeId": "A12345",
"productType": "VM Instance",
"productDescription": "Standard D1, US West 3",
"transactionType": "Purchase",
"transactionAmount": {
"currency": "USD",
"value": 5000.00
},
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/22000000-0000-0000-0000-000000000000",
"invoiceSectionDisplayName": "Contoso operations invoiceSection",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
"billingProfileDisplayName": "Contoso operations billing",
"azureCreditApplied": {
"currency": "USD",
"value": 2000.00
},
"billingCurrency": "USD",
"discount": 0.1,
"effectivePrice": {
"currency": "USD",
"value": 10.00
},
"exchangeRate": 1,
"marketPrice": {
"currency": "USD",
"value": 20.00
},
"pricingCurrency": "USD",
"quantity": 1,
"servicePeriodStartDate": "2018-05-01T00:00:00Z",
"servicePeriodEndDate": "2018-09-30T00:00:00Z",
"subTotal": {
"currency": "USD",
"value": 4500.00
},
"tax": {
"currency": "USD",
"value": 500.00
},
"unitOfMeasure": "1 Minute",
"units": 11.25,
"unitType": "1 Runtime Minute"
}
},
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/{billingProfileName}/transactions/51000000-0000-0000-0000-000000000000",
"name": "51000000-0000-0000-0000-000000000000",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/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
},
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/22000000-0000-0000-0000-000000000000",
"invoiceSectionDisplayName": "Contoso operations invoiceSection",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
"billingProfileDisplayName": "Contoso operations billing",
"azureCreditApplied": {
"currency": "USD",
"value": 20.00
},
"billingCurrency": "USD",
"discount": 0.1,
"effectivePrice": {
"currency": "USD",
"value": 10.00
},
"exchangeRate": 1,
"marketPrice": {
"currency": "USD",
"value": 20.00
},
"pricingCurrency": "USD",
"quantity": 1,
"servicePeriodStartDate": "2018-05-01T00:00:00Z",
"servicePeriodEndDate": "2018-09-30T00:00:00Z",
"subTotal": {
"currency": "USD",
"value": 45.00
},
"tax": {
"currency": "USD",
"value": 5.00
},
"unitOfMeasure": "1 Minute",
"units": 1.25,
"unitType": "1 Runtime Minute"
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"endpointName": "endpoint1",
"customDomainName": "www-someDomain-net",
"customHttpsParameters": {
"minimumTlsVersion": "TLS12",
"certificateSource": "AzureKeyVault",
"protocolType": "ServerNameIndication",
"certificateSourceParameters": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"endpointName": "endpoint1",
"customDomainName": "www-someDomain-net",
"customHttpsParameters": {
"minimumTlsVersion": "TLS12",
"certificateSource": "Cdn",
"protocolType": "ServerNameIndication",
"certificateSourceParameters": {
Expand Down
Loading