Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
…into fix_kv_python_readme

* 'master' of https://github.com/Azure/azure-rest-api-specs: (22 commits)
  Update DeletionRecovery Level (Azure#9895)
  Updating operations API to enable metrics via public metrics REST API. (Azure#9918)
  Xynoclafe/2020 06 version (Azure#9888)
  update java md (Azure#9923)
  Compute 2020-06-01 API version (Azure#9167)
  Merge Dev containerservice microsoft.container service 2020 06 01 (Azure#9914)
  new Batch Document Translation API Preview 1.0 (Azure#9218)
  1. Add a property as required (Azure#9899)
  Operational insights delete wrong lines data export (Azure#9849)
  [SRP]Adding allowBlobPublicAccess and minimumTlsVersion property for June19 and April19 (Azure#9831)
  [Hub Generated] Review request for Microsoft.ContainerInstance to add version stable/2019-12-01 (Azure#9838)
  add Java to AVS (Azure#9855)
  LaMigrationDate (Azure#9882)
  change vmware client name to AVSClient (Azure#9863)
  Fix typo in common private links definition for actionsRequired (Azure#9727)
  Microsoft.Support RP documentation updates (Azure#9880)
  BUG FIX: Fixed HopLink properties: context should be a dictionary, uint32 from… (Azure#9868)
  Update ci-fix.md (Azure#9881)
  Update Attestation control plane swagger to include 2 new defaultprovider API (Azure#9819)
  update java readme digitaltwins (Azure#9878)
  ...
  • Loading branch information
iscai-msft committed Jun 23, 2020
2 parents 18d6f07 + f9caf92 commit 6511824
Show file tree
Hide file tree
Showing 229 changed files with 36,406 additions and 334 deletions.
7 changes: 7 additions & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ BCDR
BCWG
beider
Bfor
bfqt
bigint
Bigram
bigrams
Expand Down Expand Up @@ -762,6 +763,7 @@ jumpbox
jwts
kafkarest
Kaliningrad
kbid
Kbps
KECA
kernelspec
Expand Down Expand Up @@ -1026,6 +1028,7 @@ octokit
Odata
odatatype
ODBC
officedocument
OLTP
onboarded
Onboarding
Expand All @@ -1042,6 +1045,7 @@ openapi
opencode
opencontainers
openid
openxmlformats
operationalinsights
Operationalization
operationresults
Expand Down Expand Up @@ -1320,6 +1324,7 @@ runcounts
runid
runsource
runtimes
rwdlacup
rwxrw
Saas
salesforcetables
Expand Down Expand Up @@ -1459,6 +1464,7 @@ storageaccount
storageaccounts
storagedatalake
storageimportexport
storagesources
storagesync
storagetarget
storageuri
Expand Down Expand Up @@ -1744,6 +1750,7 @@ Widevine
windowsazuremediaservices
windowsesu
wlmengg
wordprocessingml
workbooktemplates
Workernode
workloadmonitor
Expand Down
3 changes: 3 additions & 0 deletions documentation/ci-fix.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,6 @@ Note: When running in Swagger PR pipeline, Avocado only report errors with file

Refer to [Avocado Readme](https://github.com/Azure/avocado/blob/master/README.md) for detailed description of validations and how-to-fix guidance.

## Suppression Process

In case there are validation errors reported against your service that you believe do not apply, we have a suppression process you can follow to permanently remove these reported errors for your specs. Refer to [Swagger Suppression Process](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/85/Swagger-Suppression-Process) for detailed guidance.
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,12 @@
"type": "string",
"description": "ResourceId of the log analytics workspace which the data will be ingested to."
},
"LaMigrationDate": {
"type": "string",
"readOnly": true,
"description": "The date which the component got migrated to LA, in ISO 8601 format.",
"format": "date-time"
},
"PrivateLinkScopedResources": {
"readOnly": true,
"type": "array",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,86 @@
}
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.Attestation/defaultProviders": {
"get": {
"tags": [
"AttestationProviders"
],
"operationId": "AttestationProviders_ListDefault",
"description": "Get the default provider",
"x-ms-examples": {
"AttestationProviders_GetDefault": {
"$ref": "./examples/Get_DefaultProviders.json"
}
},
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "Retrieved information about the default provider.",
"schema": {
"$ref": "#/definitions/AttestationProviderListResult"
}
},
"default": {
"description": "Attestation service error result",
"schema": {
"$ref": "#/definitions/CloudError"
}
}
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.Attestation/locations/{location}/defaultProvider": {
"get": {
"tags": [
"AttestationProviders"
],
"operationId": "AttestationProviders_GetDefaultByLocation",
"description": "Get the default provider by location.",
"x-ms-examples": {
"AttestationProviders_GetDefaultWithLocation": {
"$ref": "./examples/Get_DefaultProviderByLocation.json"
}
},
"parameters": [
{
"name": "location",
"in": "path",
"required": true,
"type": "string",
"minLength": 1,
"description": "The location of the default provider."
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "Retrieved information about the default provider.",
"schema": {
"$ref": "#/definitions/AttestationProvider"
}
},
"default": {
"description": "Attestation service error result",
"schema": {
"$ref": "#/definitions/CloudError"
}
}
}
}
}
},
"definitions": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parameters": {
"subscriptionId": "6c96b33e-f5b8-40a6-9011-5cb1c58b0915",
"api-version": "2018-09-01-preview",
"location": "Central US"
},
"responses": {
"200": {
"body": {
"id": "providers/Microsoft.Attestation/attestationProviders/sharedcus",
"name": "sharedcus",
"type": "Microsoft.Attestation/attestationProviders",
"location": "Central US",
"properties": {
"trustModel": "AAD",
"status": "Ready",
"attestUri": "https://sharedcus.cus.attest.azure.net"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parameters": {
"subscriptionId": "6c96b33e-f5b8-40a6-9011-5cb1c58b0915",
"api-version": "2018-09-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "providers/Microsoft.Attestation/attestationProviders/sharedcus",
"name": "sharedcus",
"type": "Microsoft.Attestation/attestationProviders",
"location": "Central US",
"properties": {
"trustModel": "AAD",
"status": "Ready",
"attestUri": "https://sharedcus.cus.attest.azure.net"
}
},
{
"id": "providers/Microsoft.Attestation/attestationProviders/shareduks",
"name": "shareduks",
"type": "Microsoft.Attestation/attestationProviders",
"location": "UK South",
"properties": {
"trustModel": "AAD",
"status": "Ready",
"attestUri": "https://shareduks.uks.attest.azure.net"
}
}
]
}
}
}
}
Loading

0 comments on commit 6511824

Please sign in to comment.