diff --git a/.azure-pipelines/Avocado.yml b/.azure-pipelines/Avocado.yml
deleted file mode 100644
index fbf717fd5160..000000000000
--- a/.azure-pipelines/Avocado.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-jobs:
-- job: "Avocado"
- pool:
- vmImage: 'Ubuntu 16.04'
- steps:
- - task: Npm@1
- displayName: 'npm install'
- inputs:
- verbose: false
- - script: './node_modules/.bin/avocado'
- displayName: 'Avocado'
- condition: ne(variables['Build.SourceBranch'], 'refs/heads/master')
diff --git a/.azure-pipelines/LintDiff.yml b/.azure-pipelines/LintDiff.yml
deleted file mode 100644
index c2937cfe7899..000000000000
--- a/.azure-pipelines/LintDiff.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-jobs:
-- job: "LintDiff"
- variables:
- NODE_OPTIONS: '--max-old-space-size=8192'
- pool:
- vmImage: 'Ubuntu 16.04'
- steps:
- - task: Npm@1
- displayName: 'npm install'
- inputs:
- verbose: false
- - script: 'scripts/install-dotnet.sh'
- displayName: 'install .Net'
- - script: 'npm run tsc && node scripts/momentOfTruth.js && node scripts/momentOfTruthPostProcessing.js'
- displayName: 'LintDiff'
\ No newline at end of file
diff --git a/.azure-pipelines/ModelValidation.yml b/.azure-pipelines/ModelValidation.yml
deleted file mode 100644
index 7906dab0c5b1..000000000000
--- a/.azure-pipelines/ModelValidation.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-jobs:
-- job: "ModelValidation"
- pool:
- vmImage: 'Ubuntu 16.04'
- steps:
- - task: Npm@1
- displayName: 'npm ci'
- inputs:
- command: custom
- verbose: false
- customCommand: ci
- - script: 'npm run tsc && node scripts/modelValidation.js'
- displayName: 'Model Validation'
diff --git a/.azure-pipelines/Semantic.yml b/.azure-pipelines/Semantic.yml
deleted file mode 100644
index 5607478dc9db..000000000000
--- a/.azure-pipelines/Semantic.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-jobs:
-- job: "Semantic"
- pool:
- vmImage: 'Ubuntu 16.04'
- steps:
- - task: Npm@1
- displayName: 'npm ci'
- inputs:
- command: custom
- verbose: false
- customCommand: ci
- - script: 'npm run tsc && node scripts/semanticValidation.js'
- displayName: 'Semantic Validation'
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b2ab132453a0..bc357b1ef0f5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -48,6 +48,6 @@ If there are following updates in the PR, ensure to request an approval from API
- [ ] Updating API in stable version with Breaking Change Validation errors
- [ ] Updating API(s) in preview over 1 year
-To initiate an evaluation of the breaking change, create a new intake using the [template for breaking changes](https://msazure.visualstudio.com/One/_workitems/create/Scenario?templateId=d1c215ec-5d6a-4cb3-a193-95ddd0a1ba96&ownerId=85bb92fb-21fe-41ca-9309-47f2c5f57515). Addition details on the process and office hours are on the [Breaking change Wiki](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37684/Breaking-Changes).
+**Action**: to initiate an evaluation of the breaking change, create a new intake using the [template for breaking changes](https://msazure.visualstudio.com/One/_workitems/create/Scenario?templateId=d1c215ec-5d6a-4cb3-a193-95ddd0a1ba96&ownerId=85bb92fb-21fe-41ca-9309-47f2c5f57515). Addition details on the process and office hours are on the [Breaking change Wiki](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37684/Breaking-Changes).
Please follow the link to find more details on [PR review process](https://aka.ms/SwaggerPRReview).
\ No newline at end of file
diff --git a/.github/comment.yml b/.github/comment.yml
index 5f9fd6eb7f1a..3c8434b57c77 100644
--- a/.github/comment.yml
+++ b/.github/comment.yml
@@ -23,3 +23,8 @@
type: label
label: Approved-OkToMerge
onLabeledComments: "Hi @${PRAuthor},Your PR is approved. Congratulations.
If your PR is in public repo (azure-rest-api-specs), PR assignee will merge all updates in the PR shortly afterwards; or pause the PR merge, you need to put on a label DoNotMerge to PR as soon as possible. If your PR is in private repo (azure-rest-api-specs-pr), there won’t be PR merge. Please refer to this [wiki](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/205/RP-Scenarios-to-Contribute-to-Swagger?anchor=**public-repository-vs.-private-repository**) for further guidance on how to proceed. "
+
+- rule:
+ type: label
+ label: NewApiVersionRequired
+ onLabeledComments: "NewApiVersionRequired reason: A service’s API is a contract with customers and is represented by using the api-version query parameter. Changes such as adding an optional property to a request/response or introducing a new operation is a change to the service’s contract and therefore requires a new api-version value. This is critically important for documentation, client libraries, and customer support. EXAMPLE: if a customer calls a service in the public cloud using api-version=2020-07-27, the new property or operation may exist but if they call the service in a government cloud, air-gapped cloud, or Azure Stack Hub cloud using the same api-version, the property or operation may not exist. Because there is no clear relationship between the service api-version and the new property/operation, customers can’t trust the documentation and Azure customer have difficulty helping customers diagnose issues. In addition, each client library version documents the service version it supports. When an optional property or new operation is added to a service and its Swagger, new client libraries must be produced to expose this functionality to customers. Without updating the api-version, it is unclear to customers which version of a client library supports these new features. "
diff --git a/.github/pull_request_assignment.yml b/.github/pull_request_assignment.yml
index 1190278ba9e8..52eaf5422220 100644
--- a/.github/pull_request_assignment.yml
+++ b/.github/pull_request_assignment.yml
@@ -38,10 +38,24 @@
- kairu-ms
- rule:
- paths: "specification/@(resources|powerplatform)/**"
+ paths: "specification/@(resources|powerplatform|appplatform)/**"
reviewers:
- raych1
+
+- rule:
+ paths: "specification/sql/**"
+ reviewers:
+ - akning-ms
+- rule:
+ paths: "specification/signalr/**"
+ reviewers:
+ - leni-msft
+
+- rule:
+ paths: "specification/eventhub/**"
+ reviewers:
+ - ruowan
- rule:
paths: "specification/compute/**"
reviewers:
@@ -57,7 +71,7 @@
- rule:
paths:
- - "specification/@(azureactivedirectory|appplatform)/**"
+ - "specification/azureactivedirectory/**"
reviewers:
- njuCZ
@@ -136,33 +150,23 @@
- rule:
paths:
- - "**/package.json"
- - ".github/**"
- - "**/azure-pipelines.yml"
- - ".azure-pipelines/**"
- - ".azure-pipelines-preproduction/**"
+ - "documentation/**"
reviewers:
+ - josefree
- akning-ms
- - PhoenixHe-msft
-
-- rule:
- paths:
- - "documentation/**"
- reviewers:
- - josefree
- - akning-ms
-- rule:
- paths:
+- rule:
+ paths:
- "**/package.json"
- ".github/**"
- "**/azure-pipelines.yml"
- ".azure-pipelines/**"
- ".azure-pipelines-preproduction/**"
- reviewers:
- - akning-ms
- - PhoenixHe-msft
+ reviewers:
+ - akning-ms
+ - PhoenixHe-msft
- raych1
+ - zhenglaizhang
- rule:
# manager-plane PR
@@ -185,3 +189,5 @@
- qianwens
- ruowan
- jianyexi
+ - zhenglaizhang
+ - chunyu3
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index aeec700c1f96..4a4db2fa538b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,10 +20,6 @@ variables:
jobs:
- template: .azure-pipelines/BranchProtectionForPrivateRepo.yml
- template: .azure-pipelines/Syntax.yml
-- template: .azure-pipelines/Semantic.yml
-- template: .azure-pipelines/Avocado.yml
-- template: .azure-pipelines/ModelValidation.yml
-- template: .azure-pipelines/LintDiff.yml
- template: .azure-pipelines/NetworkValidation.yml
- template: .azure-pipelines/Spellcheck.yml
- template: .azure-pipelines/PrettierCheck.yml
diff --git a/cSpell.json b/cSpell.json
index 6d8c0045d327..97e014ad9928 100644
--- a/cSpell.json
+++ b/cSpell.json
@@ -319,6 +319,12 @@
"Regenerte"
]
},
+ {
+ "filename": "**/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/storage.json",
+ "words": [
+ "Regenerte"
+ ]
+ },
{
"filename": "**/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json",
"words": [
@@ -748,6 +754,14 @@
"pstn",
"unconfiguring"
]
+ },
+ {
+ "filename": "**/specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/saas.json",
+ "words": [
+ "checkmoderneligibility",
+ "saasresources",
+ "Moderneligibility"
+ ]
}
]
}
\ No newline at end of file
diff --git a/custom-words.txt b/custom-words.txt
index c0419ec13b8f..243b06a39ee1 100644
--- a/custom-words.txt
+++ b/custom-words.txt
@@ -7,6 +7,7 @@ AADP
AATP
abcxyz
ABFS
+ABGRABGR
Accel
ACCELCONTAINER
acceptors
@@ -16,9 +17,10 @@ accountid
accountname
ACLs
aclspec
-actionplans
acquisitionid
acrapi
+ACSSMS
+actionplans
activityruns
actualcost
actuser
@@ -33,6 +35,7 @@ adhybridhealthservice
adla
adls
adminmanagement
+ADSIs
ADTO
adultscore
affinitized
@@ -48,9 +51,11 @@ alertrule
alertrules
alertsmanagement
alertstate
+Alexa
allowlist
Alon
amazonservices
+ambari
amlcompute
amortizedcost
analysisservices
@@ -58,6 +63,7 @@ AND'ed
Annotatable
anomalydetector
anomalyfinder
+Antimalware
antimeridian
APAC
APACHEAVRO
@@ -78,6 +84,7 @@ apimgroups
apimidentityprovider
apimissues
apimloggers
+apimmsi
apimnetworkstatus
apimnotifications
apimopenidconnectproviders
@@ -95,6 +102,7 @@ apimtags
apimtenant
apimusers
apimversionsets
+apiserver
apitoken
APNIC
APNS
@@ -105,9 +113,10 @@ applynetworkconfigurationupdates
appservice
appsettings
appteststorage
-ARIN
-ABGRABGR
+appxmanifest
+Appxmanifest
ARGBARGB
+ARIN
Arjun
armtemplates
arpa
@@ -145,6 +154,7 @@ autogenerate
autogenerated
Autogrow
autokey
+Automanage
automations
autopatching
autopool
@@ -162,6 +172,8 @@ azpkg
azpodpolicy
azureaccounts
azureactivedirectory
+AzureAD
+azureADMetrics
azureblob
azurecli
azurecr
@@ -193,9 +205,9 @@ backupengine
backupstorageconfig
bacpac
badpassword
+Bahasa
Baidu
bangla
-Bahasa
baremetal
baremetalinfrastructure
BATCHAI
@@ -241,8 +253,8 @@ BMCI
BMCIP
BMSPO
BMSRP
-Bokmål
Bokmaal
+Bokmål
Bootstrappers
bot's
botservice
@@ -252,6 +264,7 @@ brazilsouth
browsable
bruceper
Bsaling
+bsls
Burstable
BYOC
BYOK
@@ -313,13 +326,14 @@ closedlists
Cloudamize
cloudapp
cloudevents
+cloudManifestFiles
cloudproperties
cloudsimple
clustermonitoring
clustername
+CMAF
Cmdkey
cmdlet
-CMAF
CMMI
CNAME
cntk
@@ -341,6 +355,8 @@ CONCURRENTAPPEND
Conda
configreferences
connectionstrings
+conntrack
+Conntrack
consumergroups
containerid
containerinstance
@@ -370,11 +386,14 @@ cpim
CPIM
Cran
creatable
+createbsl
createconsumergroup
createorupdate
createpreview
credativ
+Creds
crossdomain
+cscfg
csname
CSRP
csrs
@@ -419,10 +438,10 @@ datalakestore
Datamasking
datamigration
datapoint
+dataschema
Dataset
datasetid
datasets
-dataschema
datasource
Datasources
datastore
@@ -448,9 +467,12 @@ Decompounder
dedicatedhsm
deduping
deduplication
+defrag
+Defrag
Deinterlace
deinterlacing
deletable
+deletebsl
deleteconsumergroup
deletedcertificates
deletedkeys
@@ -476,8 +498,11 @@ deserializing
destinationshares
deterministically
devicecredentials
+devicegroups
deviceprovisioningservices
devicetemplates
+Devops
+devops
devspaces
devtestlab
devtestlabs
@@ -487,15 +512,18 @@ diagnosticcontext
diarization
digitaltwins
DIMM
+Directline
disableautoscale
disablescheduling
disambiguated
Disambiguations
+disconnectactivesessions
discoverbackup
diskmigrationjobs
diskoperations
Distcp
Distro
+dllpath
DMTS
Dnat
dnsname
@@ -505,10 +533,14 @@ Domainful
domainname
domainservices
DOTALL
+dotnetspark
dras
DRAs
DRMs
+dscp
+Dscp
dsmax
+Dsms
DTDL
Dtus
duration'PT
@@ -538,9 +570,9 @@ endpointname
endswith
endtime
endTime
+endzone
Enein
engagementfabric
-endzone
enquoted
entitydocument
entitysearch
@@ -556,8 +588,8 @@ estaba
Etag
etags
Ethereum
-evalue
evaluateautoscale
+evalue
eventcategories
eventgrid
Eventhub
@@ -592,6 +624,8 @@ Fanout
fatherable
faultable
fconfig
+FDID
+FDID
fearthecowboy
featurecapabilities
Featurization
@@ -651,7 +685,9 @@ georeplication
geospatial
GETACLSTATUS
getactivationkey
+getactivesessions
getavailablebillingfeatures
+getbsl
getcertificate
getconsumergroup
GETCONTENTSUMMARY
@@ -709,20 +745,23 @@ HCRP
HDFS
hdinsight
Headnode
+healthbot
healthcareapis
Heatbeat
heatmap
HHMM
HHMMS
HHMMSS
-hierarchicals
hierarchicalentities
+hierarchicals
hierarchyid
+highestcriticalimpact
hivevar
HKEY
homepagetest
Horovod
hostnames
+hostpool
Hotfix
hotfixes
HSLA
@@ -735,6 +774,7 @@ Hyperdrive
Hypernet
Hyperscale
hyperv
+hypervcollectors
Iaas
iaasvmcontainer
IANA
@@ -742,6 +782,7 @@ iata
ICANN
icao
ICMP
+Idempotence
IDNS
IDPs
IKEV
@@ -766,12 +807,16 @@ inkrecognizer
inlinecount
inlines
innererror
+inotify
+Inotify
Inprogress
integrationaccount
Intelli
intervaled
intset
intune
+intvl
+Intvl
INVALIDARG
IOPS
IOSMAM
@@ -782,14 +827,14 @@ iothubprovisioningservices
iotspaces
iotspacesservice
ipam
+IPAM
ipconfig
ipconfiguration
ipconfigurations
ipfilterrules
+ipgroups
Ipsec
ipssl
-ipgroups
-IPAM
iscloneable
Iscsi
iscsiservers
@@ -831,6 +876,7 @@ Kbps
KECA
kernelspec
keyname
+Keyschannel
keyspace
keyspaces
Keyvault
@@ -851,8 +897,11 @@ Kraaij
Ksettings
kstem
kube
+kubeadmin
kubeconfig
kubeconfigs
+kubelet
+Kubelet
kubenet
kubernetes
kusto
@@ -978,6 +1027,7 @@ metricnames
metricnamespace
metrictype
mgmt
+Mibps
microservices
microsofttranslator
migratemysql
@@ -1005,9 +1055,15 @@ mrenclave
mrsigner
MSAZR
MSAZRDE
+MSAZRUSGO
MSCONCAT
MSGETACLSTATUS
MSGETFILESTATUS
+msix
+MSIX
+msixpackage
+msixpackages
+MSIXpackages
MSLISTSTATUS
MSMCAZR
mucho
@@ -1022,8 +1078,8 @@ Multiset
multistep
multivalued
muxed
-MUXes
muxer
+MUXes
muxing
mware
myanalytics
@@ -1057,8 +1113,13 @@ nchar
ndjson
Neighbourhood
netapp
+netdev
+Netdev
netezza
+netfilter
+Netfilter
networkruleset
+networkrulesets
networkstatus
networkwatcher
newpassword
@@ -1101,6 +1162,7 @@ nsdname
nsku
nsxt
ntext
+ntfs
ntlm
numrecords
nvarchar
@@ -1128,6 +1190,7 @@ openapi
opencode
opencontainers
openid
+openlr
openxmlformats
operationalinsights
Operationalization
@@ -1135,11 +1198,12 @@ operationresults
operationsmanagement
operationstatuses
opid
-openlr
oplog
Optimised
Optimiser
Optimisers
+optmem
+Optmem
originpath
osdisk
osdiskforlinuxsimple
@@ -1239,6 +1303,9 @@ pricesheets
pricings
primarybytes
privatedns
+PrivateLink
+privateLinkForAzureAd
+privatelinkhub
privatelinks
privatepreview
projectable
@@ -1269,12 +1336,13 @@ qloguniform
qnamaker
qnas
qnormal
+qos
Qssw
+Queretaro
querylogs
querypool
querystring
querytriggers
-Queretaro
queueservices
QueueStatus
quickbooks
@@ -1322,6 +1390,7 @@ Reenabled
Refid
regen
regeneratekey
+regeneratekeys
regexentities
regexes
regionalized
@@ -1396,6 +1465,8 @@ RGBRGB
rgname
rhel
RIRs
+rmem
+Rmem
Rolledback
Rollforward
rollouts
@@ -1410,7 +1481,6 @@ RPKI
rpns
RSAES
RSASSA
-rstrnt
rscc
rscd
rsce
@@ -1419,8 +1489,10 @@ rscript
rsct
Rslp
RSNULL
+rstrnt
RTMP
RTSP
+Ruleproperties
runbook
Runbooks
runcounts
@@ -1443,6 +1515,7 @@ Scaleset
scalesets
Scame
scanability
+ScheduleType
SCMS
SCOM
scopemap
@@ -1458,6 +1531,11 @@ secondarybytes
SECP
secureobject
securestring
+securitydomain
+securitydomaindownloadpost
+securitydomainoperationstatus
+securitydomaintransferkey
+securitydomainuploadoperation
securityinsight
seealso
serialconsole
@@ -1476,12 +1554,16 @@ servicemembers
serviceprincipal
servicerunners
servicestats
-servicetopology
servicetopologies
+servicetopology
serviceunit
serviceunits
+sessionhosts
+sessionids
+sessionstate
SETACL
SETEXPIRY
+Setget
setissuers
SETOWNER
SETPERMISSION
@@ -1489,6 +1571,7 @@ setsas
setvpnclientipsecparameters
sfhealthid
sfpkg
+shamir_share
sharded
sharedkey
sharename
@@ -1525,10 +1608,13 @@ SMBIOS
snapshotrun
snapshotsdr
SNAT
+SNMP
softwareplan
SOHSV
solaris
solr
+somaxconn
+Somaxconn
someuser
sorani
sortorder
@@ -1538,6 +1624,7 @@ southcentralus
southeastasia
southindia
sparkconf
+sparkr
sparql
SPDX
specversion
@@ -1547,12 +1634,14 @@ SQLDB
SQLDW
SQLMI
sqlpool
+Sqlpools
SQLRDS
sqlvirtualmachine
sqlvm
Sqoop
SSIS
SSISDB
+ssoadfs
SSTP
ssword
standardasciifolding
@@ -1571,8 +1660,10 @@ statetile
staticsite
statusdir
stderror
-stoppacketcapture
stdev
+Stix
+STIX
+stoppacketcapture
stopresize
stopword
stopwords
@@ -1630,11 +1721,18 @@ supportedvpndevices
supporttickets
susbcriptionid
svpn
+swappable
+swappiness
+Swappiness
switchprotection
Sybase
syncfunctiontriggers
synonymmaps
syntheticmonitorlocations
+sysctl
+Sysctl
+sysctls
+Sysctls
Syslog
sysname
sysprep
@@ -1654,6 +1752,7 @@ taskcounts
taskfailure
tasksuccess
Taxii
+Tcpkeepalive
templated
templatelink
templeton
@@ -1701,9 +1800,10 @@ trafficmanageranalytics
trafficmanagerprofiles
trafficmodelid
tráfico
-transcoding
transcodes
+transcoding
transcriptmoderationresult
+transferkey
translatortext
trendingtopics
triggeredwebjobs
@@ -1716,13 +1816,15 @@ Typeless
typeperf
udid
udids
-UEFI
UEBA
+UEFI
Uint
uksouth
ukwest
Ulaanbaatar
unallocated
+unarchive
+unarchiving
unattend
unbilled
Unclaim
@@ -1769,13 +1871,13 @@ Unregistering
Unregisters
unrestorable
unsubstituted
-Unsynced
untagged
Untracked
unvalidated
unwrapkey
updatecertificate
updatehostname
+updatepolicy
updateprivateendpointconnection
updateproperties
upgradeos
@@ -1790,9 +1892,10 @@ userargs
usererror
userflows
userid
+usermanaged
userpreference
+userprincipalname
usersetting
-usermanaged
usertime
USQL
uturn
@@ -1843,6 +1946,7 @@ VMSS
VMSSVM
vmuuid
vmware
+vmwarecollectors
vmwaretools
VMXNET
vnet
@@ -1865,6 +1969,10 @@ waitingforstarttask
WANAs
WANs
WASB
+watchlist
+Watchlist
+watchlists
+Watchlists
waypoint
waypoints
WDATP
@@ -1901,6 +2009,8 @@ windingness
windowsazuremediaservices
windowsesu
wlmengg
+wmem
+Wmem
wordprocessingml
workbooktemplates
Workernode
@@ -1914,6 +2024,7 @@ WWKZ
XBing
Xeon
Xero
+xml
XSMB
Xstr
XVCJ
@@ -1928,76 +2039,7 @@ ziplist
Zoho
zoneinfo
zset
-MSAZRUSGO
-hypervcollectors
-vmwarecollectors
-updatepolicy
-createbsl
-deletebsl
-getbsl
-getactivesessions
-disconnectactivesessions
-bsls
-sessionids
-Dsms
-cloudManifestFiles
-highestcriticalimpact
-apiserver
-kubeadmin
-AzureAD
-PrivateLink
-privateLinkForAzureAd
-userprincipalname
-sessionstate
-sessionhosts
-hostpool
-securitydomain
-securitydomaindownloadpost
-securitydomaintransferkey
-securitydomainuploadoperation
-securitydomainoperationstatus
-transferkey
-Alexa
-regeneratekeys
-Directline
-Keyschannel
-azureADMetrics
-sparkr
-ambari
-dotnetspark
-FDID
-Automanage
-Antimalware
-dscp
-Dscp
-qos
-FDID
-watchlists
-Watchlists
-watchlist
-Watchlist
-Stix
-STIX
-ACSSMS
-Mibps
-ntfs
-networkrulesets
-Setget
-Ruleproperties
-shamir_share
-dllpath
-MSIX
-msix
-MSIXpackages
-msixpackages
-appxmanifest
-Appxmanifest
-msixpackage
-xml
-Creds
-unarchive
-unarchiving
-ssoadfs
-Idempotence
-Sqlpools
-privatelinkhub
\ No newline at end of file
+tpgs
+ProviderHub
+checkin
+regionality
diff --git a/documentation/ci-fix.md b/documentation/ci-fix.md
index ec5dc0e5625c..0b7f19f04051 100644
--- a/documentation/ci-fix.md
+++ b/documentation/ci-fix.md
@@ -63,9 +63,9 @@ Refer to [Oad Docs](https://github.com/Azure/openapi-diff/tree/master/docs) for
Run linter locally:
```
npm install -g autorest
-autorest --validation --azure-validator --input-file=
+autorest --validation --azure-validator --use=@microsoft.azure/classic-openapi-validator@latest --use=@microsoft.azure/openapi-validator@latest --input-file=
or
-autorest --validation --azure-validator
+autorest --validation --azure-validator --use=@microsoft.azure/classic-openapi-validator@latest --use=@microsoft.azure/openapi-validator@latest [--tag=]
```
Please see [readme](https://github.com/Azure/azure-openapi-validator/blob/master/README.md) for how to install or run tool in details.
diff --git a/documentation/openapi-authoring-automated-guidelines.md b/documentation/openapi-authoring-automated-guidelines.md
index 32866c30d025..14e5c37b964d 100644
--- a/documentation/openapi-authoring-automated-guidelines.md
+++ b/documentation/openapi-authoring-automated-guidelines.md
@@ -20,7 +20,7 @@ We request OpenAPI(Swagger) spec authoring be assigned to engineers who have an
* [Rule Descriptions](#rule-descriptions)
## Error vs Warning
-- Rules with severity "Error" have to be addressed for the OpenAPI(swagger) spec to be approved by the reviewers. If there is a strong reason for why the rule cannot be addressed in an OpenAPI(swagger) spec it will be a permanent exception, then [suppression process](https://github.com/Azure/adx-documentation-pr/wiki/Swagger-Validation-Errors-Suppression) must be followed.
+- Rules with severity "Error" have to be addressed for the OpenAPI(swagger) spec to be approved by the reviewers. If there is a strong reason for why the rule cannot be addressed in an OpenAPI(swagger) spec it will be a permanent exception, then [suppression process](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/85/Swagger-Suppression-Process) must be followed.
- Rules with severity "Warning" are either strong recommendations made by Azure developer experience team for better SDK/Documentation experience or they point out something to evaluate, for example, the warning for booleans asks the user to evaluate whether the property should be a boolean or not.
@@ -109,6 +109,8 @@ We request OpenAPI(Swagger) spec authoring be assigned to engineers who have an
| [R4008](#r4008) | [AvoidEmptyResponseSchema](#r4008) | ARM OpenAPI(swagger) specs |
| [R4012](#r4012) | [XmsPageableMustHaveCorrespondingResponse](#r4012) | ARM OpenAPI(swagger) specs |
| [R4013](#r4013) | [IntegerTypeMustHaveFormat](#r4013) | ARM OpenAPI(swagger) specs |
+| [R4028](#r4028) | [ValidResponseCodeRequired](#r4028) | ARM OpenAPI(swagger) specs |
+| [R4029](#r4029) | [UniqueClientParameterName](#r4029) | ARM OpenAPI(swagger) specs |
#### SDK Warnings
@@ -141,6 +143,7 @@ We request OpenAPI(Swagger) spec authoring be assigned to engineers who have an
| [R2029](#r2029) | [PageableOperation](#r2029) | ARM and Data plane OpenAPI(swagger) specs |
| [R4006](#r4006) | [DeprecatedXmsCodeGenerationSetting](#r4006) | ARM and Data plane OpenAPI(swagger) specs |
| [R4024](#r4024) | [PreviewVersionOverOneYear](#r4024) | ARM OpenAPI(swagger) specs |
+| [R4030](#r4030) | [UniqueXmsExample](#r4030) | ARM OpenAPI(swagger) specs |
### RPaaS Violations
@@ -150,6 +153,8 @@ We request OpenAPI(Swagger) spec authoring be assigned to engineers who have an
| Id | Rule Name | Applies to |
| --- | --- | --- |
| [R4023](#r4023) | [RPaasPutLongRunningOperation201Only](#r4023) | ARM OpenAPI(swagger) specs |
+| [R4025](#r4025) | [RPaasDeleteLongRunningOperation202Only](#r4025) | ARM OpenAPI(swagger) specs |
+| [R4026](#r4026) | [RPaasPostLongRunningOperation202Only](#r4026) | ARM OpenAPI(swagger) specs |
### Documentation
@@ -2349,35 +2354,55 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul
**LastModifiedAt**: April 2, 2020
**How to fix the violation**: Following the ARM specification to modify the schema in the swagger file.
+It's recommended to refer to the 'ErrorResponse' in [v2/types.json](https://github.com/Azure/azure-rest-api-specs/blob/master/specification/common-types/resource-management/v2/types.json#L273) which is provided for fixing the error.
The following would be invalid:
```json
- "response":{
- "default": {
- "schema":{
- "error":"error msg",
- "code": 404,
- "message":"some details"
+"definitions": {
+ "ErrorResponse": {
+ "properties": {
+ "code": {
+ "readOnly": true,
+ "type": "string",
+ "description": "The error code."
+ },
+ "message": {
+ "readOnly": true,
+ "type": "string",
+ "description": "The error message."
+ }
+ ...
}
}
- }
-
+}
```
the correct schema:
```json
- "response":{
- "default": {
- "error":
- {
- "code": 404,
- "message":"some details"
- ...
+"definitions": {
+ "ErrorResponse": {
+ "properties": {
+ "error": {
+ "type": "object",
+ "description": "The error object.",
+ "properties": {
+ "code": {
+ "readOnly": true,
+ "type": "string",
+ "description": "The error code."
+ },
+ "message": {
+ "readOnly": true,
+ "type": "string",
+ "description": "The error message."
+ }
+ ...
+ }
}
}
- }
+}
```
@@ -2758,7 +2783,7 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul
**Output Message** : The response schema of operations API "{0}" does not match the ARM specification. Please standardize the schema.
-**Description** : The operations API should have a response body schema consistent with the [contract spec](https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/proxy-api-reference.md#exposing-available-operations). The required properties such as `isDataAction`,`display.description` or `display.resource`,must be included.
+**Description** : The operations API should have a response body schema consistent with the [contract spec](https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/proxy-api-reference.md#exposing-available-operations). The required properties such as `isDataAction`,`display.description` and `display.resource`,must be included.
**CreatedAt**: July 13, 2020
@@ -2909,13 +2934,13 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul
**Output Message** : [RPaaS] Only 201 is the supported response code for PUT async response
-**Description** : An async PUT operation response include status code 201 with Azure-async-operation header. Must also support status code 200, for simple updates that can be completed synchronously (ex: tags). Operation must also add "x-ms-long-running-operation and x-ms-long-running-operation-options" to describe how the long running operation is tracked.
+**Description** : An async PUT operation response include status code 201 with 'Azure-async-operation' header. Must also support status code 200, for simple updates that can be completed synchronously (ex: tags). Operation must also add "x-ms-long-running-operation and x-ms-long-running-operation-options" to mark that it is a long running operation (in case of 201) and how it is tracked (Azure-async-operation header).
**CreatedAt**: August 10, 2020
**LastModifiedAt**: August 10, 2020
-**Why this rule is important**: RPaaS only supports 201 for async operations. This is enforced at runtime via swagger validation.
+**Why this rule is important**: RPaaS only supports 201 for async PUT operations. This is enforced at runtime via swagger validation.
**How to fix the violation**: Add the following for async PUT operations.
@@ -2970,3 +2995,213 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul
Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
+### R4025 RPaasDeleteLongRunningOperation202Only
+
+**Category** : RPaaS Error
+
+**Applies to** : ARM OpenAPI(swagger) specs
+
+**Output Message** : [RPaaS] DELETE async supports
+
+**Description** : An async DELETE operation response include status code 202 with 'Location' header. Must support status code 200 if operation can be completed synchronously. Must support 204 (resource doesn't exists). Operation must also add "x-ms-long-running-operation and x-ms-long-running-operation-options" to mark that it is a long running operation (in case of 202) and how it is tracked (Location header).
+
+**CreatedAt**: November 12, 2020
+
+**LastModifiedAt**: November 12, 2020
+
+**Why this rule is important**: RPaaS only supports 202 for async DELETE operations. This is enforced at runtime via swagger validation.
+
+**How to fix the violation**: Add the following for async DELETE operations.
+
+The following would be valid:
+
+```json
+...
+ "responses": {
+ "202": {
+ "description": "Delete operation accepted",
+ },
+ "200": {
+ "description": "Delete operation succeeded"
+ },
+ "204": {
+ "description": "Resource doesn't exist. Delete operation completed."
+ },
+ "default": {
+ "description": "Error response describing why the operation failed.",
+ "schema": {
+ "$ref": "#/definitions/ErrorResponse"
+ }
+ }
+ },
+ "x-ms-long-running-operation": true,
+ "x-ms-long-running-operation-options": {
+ "final-state-via": "location"
+ }
+...
+```
+Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
+
+### R4026 RPaasPostLongRunningOperation202Only
+
+**Category** : RPaaS Error
+
+**Applies to** : ARM OpenAPI(swagger) specs
+
+**Output Message** : [RPaaS] POST async supports
+
+**Description** : An async POST operation response include status code 202 with 'Location' header. Must support status code 200 if operation can be completed synchronously. Operation must also add "x-ms-long-running-operation and x-ms-long-running-operation-options" to mark that it is a long running operation (in case of 202) and how it is tracked (Location header).
+
+**CreatedAt**: November 12, 2020
+
+**LastModifiedAt**: November 12, 2020
+
+**Why this rule is important**: RPaaS only supports 202 for async POST operations. This is enforced at runtime via swagger validation.
+
+**How to fix the violation**: Add the following for async POST operations.
+
+The following would be valid:
+
+```json
+...
+ "responses": {
+ "202": {
+ "description": "Operation accepted",
+ },
+ "200": {
+ "description": "Operation completed"
+ },
+ "default": {
+ "description": "Error response describing why the operation failed.",
+ "schema": {
+ "$ref": "#/definitions/ErrorResponse"
+ }
+ }
+ },
+ "x-ms-long-running-operation": true,
+ "x-ms-long-running-operation-options": {
+ "final-state-via": "location"
+ }
+...
+```
+Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
+
+### R4028 ValidResponseCodeRequired
+
+**Category** : SDK Error
+
+**Applies to** : ARM OpenAPI(swagger) specs
+
+**Output Message** : There is no declared valid status code.
+
+**Description** : Every operation response must contain a valid code like "200","201","202" or "204" which indicates the operation is succeed and it's not allowed that a response schema just contains a "default" code.
+
+**Why this rule is important**: If a Swagger just contains "default" status code, this actually means "everything is an error". All track2 SDK will systematically raise an exception at runtime, if there is no declared valid status code.
+
+**CreatedAt**: November 23, 2020
+
+**LastModifiedAt**: November 23, 2020
+
+**How to fix the violation**: Add a valid response code .
+The following would be valid:
+
+```json
+...
+ "responses": {
+ "200": {
+ "description": "Succeeded",
+ "schema": {
+ "$ref": "#/definitions/MySimpleResource"
+ }
+ },
+ "default": {
+ "description": "Error response describing why the operation failed.",
+ "schema": {
+ "$ref": "#/definitions/ErrorResponse"
+ }
+ }
+ }
+ }
+...
+```
+Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
+
+### R4029 UniqueClientParameterName
+
+**Category** : SDK Error
+
+**Applies to** : ARM OpenAPI(swagger) specs
+
+**Output Message** : Do not have duplicate name of client parameter name, make sure every client parameter name unique.
+
+**Description** : This may cause a problem when different swagger files come together. If two APIs with different client name have the same client parameter subscriptionId, but with different reference name in swaggers, the generated model will also have two clients with two client parameters subscriptionId and subscriptionId1 (the latter one has been renamed to avoid collision). We should ensure that the client parameters are all unique in the same API version.
+
+**Why this rule is important**: Make sure no conflict in SDK generation.
+
+**CreatedAt**: November 30, 2020
+
+**LastModifiedAt**: November 30, 2020
+
+**How to fix the violation**: Remove duplicate client parameter, ref to the same one.
+The following would be valid:
+
+```json
+...
+ "/api": {
+ "get": {
+ "parameters": [
+ {
+ "$ref": "#/parameters/ApiVersionParameter"
+ },
+ {
+ // ref to the same subcriptionId
+ "$ref": "#/parameters/subscriptionIdParameter"
+ },
+ ],
+ },
+ "patch": [
+ {
+ "$ref": "#/parameters/ApiVersionParameter"
+ },
+ {
+ "$ref": "#/parameters/subscriptionIdParameter"
+ },
+ ]
+ }
+...
+```
+Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
+
+### R4030 UniqueXmsExample
+
+**Category** : SDK Warning
+
+**Applies to** : ARM OpenAPI(swagger) specs
+
+**Output Message** : Do not have duplicate name of x-ms-example, make sure every x-ms-example name unique. Duplicate x-ms-example: {ExampleName}
+
+**Description** : x-ms-example name should be unique in the same API version.
+
+**Why this rule is important**: Duplicate example name will bring trouble for test codegen. For example: hard to config used example.
+
+**CreatedAt**: November 30, 2020
+
+**LastModifiedAt**: November 30, 2020
+
+**How to fix the violation**: Rename duplicate x-ms-example name
+The following would be valid:
+
+```json
+...
+"x-ms-examples": {
+ "Create resource": {
+ "$ref": "./examples/createResource"
+ },
+ "Update resource":{
+ "$ref": "./examples/updateResource"
+ }
+
+ }
+...
+```
+Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
\ No newline at end of file
diff --git a/documentation/samplefiles/samplereadme.md b/documentation/samplefiles/samplereadme.md
index bb885caab276..4466ea737419 100644
--- a/documentation/samplefiles/samplereadme.md
+++ b/documentation/samplefiles/samplereadme.md
@@ -62,20 +62,20 @@ swagger-to-sdk:
## Go
-See configuration in [readme.go.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.go.md)
+See configuration in [readme.go.md](./readme.go.md)
## Python
-See configuration in [readme.python.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.python.md)
+See configuration in [readme.python.md](./readme.python.md)
## TypeScript
-See configuration in [readme.typescript.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.typescript.md)
+See configuration in [readme.typescript.md](./readme.typescript.md)
## CSharp
-See configuration in [readme.csharp.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.chsarp.md)
+See configuration in [readme.csharp.md](./readme.csharp.md)
## AzureResourceSchema
-See configuration in [readme.azureresourceschema.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.azureresourceschema.md)
+See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md)
diff --git a/documentation/sdkautomation/GenerateInputSchema.json b/documentation/sdkautomation/GenerateInputSchema.json
new file mode 100644
index 000000000000..ccfebd87b568
--- /dev/null
+++ b/documentation/sdkautomation/GenerateInputSchema.json
@@ -0,0 +1,51 @@
+{
+ "type": "object",
+ "properties": {
+ "dryRun": {
+ // If dryRun is true, generateScript is expected to parse readme.md
+ // and output the package list with package name and related readme.md.
+ // Should not run codegen at this time.
+ // ** Not supported yet **
+ "type": "boolean"
+ },
+ "specFolder": {
+ // Path to local spec folder.
+ "type": "string"
+ },
+ "headSha": {
+ // Git head sha.
+ "type": "string"
+ },
+ "headRef": {
+ // Git head ref.
+ // Format will be "refs/pull//merge" or "refs/heads/".
+ "type": "string"
+ },
+ "repoHttpsUrl": {
+ // Spec repo url in https without auth.
+ "type": "string"
+ },
+ "trigger": {
+ "$ref": "TriggerType#"
+ },
+ "changedFiles": {
+ // Changed file list in spec PR.
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "relatedReadmeMdFiles": {
+ // Related readme.md files that pending generation.
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "installInstructionInput": {
+ // See #InstallInstructionScriptInput
+ "$ref": "InstallInstructionScriptInput#"
+ }
+ },
+ "required": ["specFolder", "headSha", "headRef", "repoHttpsUrl", "trigger", "changedFiles", "relatedReadmeMdFiles"]
+}
diff --git a/documentation/sdkautomation/GenerateOutputSchema.json b/documentation/sdkautomation/GenerateOutputSchema.json
new file mode 100644
index 000000000000..017685af2950
--- /dev/null
+++ b/documentation/sdkautomation/GenerateOutputSchema.json
@@ -0,0 +1,71 @@
+{
+ "type": "object",
+ "properties": {
+ "packages": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/PackageResult"
+ }
+ }
+ },
+ "required": ["packages"],
+ "definitions": {
+ "PackageResult": {
+ "properties": {
+ "packageName": {
+ // Name of package. Will be used in branch name and PR title.
+ // By default it's folder name of first entry in path.
+ "type": "string"
+ },
+ "result": {
+ // Status of package. By default it's succeeded.
+ "type": "string",
+ "enum": ["failed", "succeeded", "warning"],
+ "default": "succeeded"
+ },
+ "path": {
+ // List of package content paths.
+ // If the path points to a folder then
+ // all the content under the folder will be included.
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "readmeMd": {
+ // List of related readmeMd of this package.
+ // Must provide this field if dryRun is true.
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "changelog": {
+ "type": "object",
+ "properties": {
+ "content": {
+ // Content of changelog in markdown
+ "type": "string"
+ },
+ "hasBreakingChange": {
+ // Does the new package has breaking change
+ "type": "boolean"
+ }
+ },
+ "required": ["content"]
+ },
+ "artifacts": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "installInstructions": {
+ // See #InstallInstructionScriptOutput
+ "$ref": "InstallInstructionScriptOutput"
+ }
+ },
+ "required": ["path"]
+ }
+ }
+}
diff --git a/documentation/sdkautomation/InitOutputSchema.json b/documentation/sdkautomation/InitOutputSchema.json
new file mode 100644
index 000000000000..a2353494ccbd
--- /dev/null
+++ b/documentation/sdkautomation/InitOutputSchema.json
@@ -0,0 +1,11 @@
+{
+ "type": "object",
+ "properties": {
+ "envs": {
+ // Environment variable to be set in following scripts.
+ "additionalProperties": {
+ "type": "string"
+ }
+ }
+ }
+}
diff --git a/documentation/sdkautomation/InstallInstructionScriptInputSchema.json b/documentation/sdkautomation/InstallInstructionScriptInputSchema.json
new file mode 100644
index 000000000000..c2dea969537c
--- /dev/null
+++ b/documentation/sdkautomation/InstallInstructionScriptInputSchema.json
@@ -0,0 +1,35 @@
+{
+ "$id": "InstallInstructionScriptInput",
+ "type": "object",
+ "properties": {
+ "packageName": {
+ // The package name. May be skipped if sdk automation don't know the info yet.
+ "type": "string"
+ },
+ "artifacts": {
+ // List of artifact's path. May be skipped if sdk automation don't know the info yet.
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "isPublic": {
+ // Is the download url public accessible.
+ // If it's false, the download command template will be
+ // az rest --resource -u "{URL}" --output-file {FILENAME}
+ "type": "boolean"
+ },
+ "downloadUrlPrefix": {
+ // All the artifacts will be uploaded and user could access the artifact via
+ // a link composed by this prefix and artifact filename.
+ "type": "string"
+ },
+ "downloadCommandTemplate": {
+ // Download command template. Replace {URL} and {FILENAME} to get the real command.
+ "type": "string"
+ },
+ "trigger": {
+ "$ref": "TriggerType#"
+ }
+ }
+}
diff --git a/documentation/sdkautomation/InstallInstructionScriptOutputSchema.json b/documentation/sdkautomation/InstallInstructionScriptOutputSchema.json
new file mode 100644
index 000000000000..1c4671b891ad
--- /dev/null
+++ b/documentation/sdkautomation/InstallInstructionScriptOutputSchema.json
@@ -0,0 +1,17 @@
+{
+ "$id": "InstallInstructionScriptOutput",
+ "type": "object",
+ "properties": {
+ "full": {
+ // Full version of install instruction will be shown in generated SDK PR.
+ // Should be in markdown format.
+ "type": "string"
+ },
+ "lite": {
+ // Lite version of install instruction will be shown in generated SDK PR.
+ // Should be in markdown format.
+ "type": "string"
+ }
+ },
+ "required": ["full"]
+}
diff --git a/documentation/sdkautomation/SpecConfigSchema.json b/documentation/sdkautomation/SpecConfigSchema.json
new file mode 100644
index 000000000000..3245cf222fef
--- /dev/null
+++ b/documentation/sdkautomation/SpecConfigSchema.json
@@ -0,0 +1,82 @@
+{
+ "type": "object",
+ "properties": {
+ "sdkRepositoryMappings": {
+ // A mapping of SDK repository names to the names of the SDK repositories
+ // that all interaction should go to instead.
+ "type": "object",
+ "additionalProperties": {
+ "oneOf": [
+ {
+ "$ref": "#/definitions/SdkRepositoryConfig"
+ },
+ {
+ "type": "string"
+ }
+ ]
+ },
+ "propertyNames": {
+ // The property name is the sdk name identifier.
+ "type": "string"
+ }
+ },
+ "overrides": {
+ // Override config for specific repository.
+ "type": "object",
+ "additionalProperties": {
+ "$ref": "#/"
+ },
+ "propertyNames": {
+ // The property name is the sdk repo ref.
+ "$ref": "#/definitions/RepositoryName"
+ }
+ }
+ },
+ "required": ["sdkRepositoryMappings"],
+ "definitions": {
+ "RepositoryName": {
+ // Reference to a repository on github. Could be or /.
+ // By default the is the same as the owner of the spec repo.
+ "type": "string"
+ },
+ "SdkRepositoryConfig": {
+ "type": "object",
+ "properties": {
+ "mainRepository": {
+ // The repository that the final release PR will targeting.
+ "$ref": "#/definitions/RepositoryName"
+ },
+ "mainBranch": {
+ // Base branch of codegen branches
+ "default": "master",
+ "type": "string"
+ },
+ "integrationRepository": {
+ // The repository that hold generation branch, generation PR and integration branch.
+ // By default it's the same as mainRepository
+ "$ref": "#/definitions/RepositoryName"
+ },
+ "secondaryRepository": {
+ // Codegen runs on this repository.
+ // By default it's the same as 'mainRepository' but it could be different.
+ "$ref": "#/definitions/RepositoryName"
+ },
+ "secondaryBranch": {
+ // Codegen runs on this branch on secondaryRepository.
+ // By default it's the same as 'mainBranch' but it could be different.
+ "type": "string"
+ },
+ "integrationBranchPrefix": {
+ // The prefix that will be applied to the beginning of integration branches
+ "type": "string",
+ "default": "sdkAutomation"
+ },
+ "configFilePath": {
+ // Path to swagger-to-sdk config in sdk repo
+ "default": "swagger_to_sdk_config.json"
+ }
+ },
+ "required": ["mainRepository"]
+ }
+ }
+}
diff --git a/documentation/sdkautomation/SwaggerToSdkConfigSchema.json b/documentation/sdkautomation/SwaggerToSdkConfigSchema.json
new file mode 100644
index 000000000000..7b5034e5f0ba
--- /dev/null
+++ b/documentation/sdkautomation/SwaggerToSdkConfigSchema.json
@@ -0,0 +1,286 @@
+{
+ "type": "object",
+ "properties": {
+ "advancedOptions": {
+ // To keep backward compatibility, but will not list schema for old config options.
+ "properties": {
+ "createSdkPullRequests": {
+ // Should SDK Automation create PR or not.
+ "type": "boolean",
+ "default": true
+ },
+ "closeIntegrationPR": {
+ // Should SDK Automation close integrationPR to reduce noise.
+ "type": "boolean",
+ "default": true
+ },
+ "draftIntegrationPR": {
+ // Should SDK Automation create draft integrationPR to reduce noise.
+ "type": "boolean",
+ "default": true
+ },
+ "generationCallMode": {
+ // If we have multiple related readme.md, should we call generation once with
+ // all the readme.md or should we call generation multiple times and one per readme.md.
+ "type": "string",
+ "enum": ["one-per-config", "one-for-all-configs"],
+ "default": "one-for-all-configs"
+ },
+ "cloneDir": {
+ // SDK clone directory. By default it's name of sdk repo
+ "type": "string"
+ }
+ },
+ "default": {
+ "createSdkPullRequests": true,
+ "closeIntegrationPR": true,
+ "draftIntegrationPR": true
+ }
+ },
+ "initOptions": {
+ // Init the environment. Install dependencies.
+ "type": "object",
+ "properties": {
+ "initScript": {
+ // Script to init dependencies.
+ // Param:
+ // initInput.json: Not implemented. Placeholder for input arguments.
+ // initOutput.json: See #initOutput.
+ "$ref": "#/definitions/RunOptions"
+ }
+ },
+ "default": {}
+ },
+ "generateOptions": {
+ // Generate the SDK code.
+ "type": "object",
+ "properties": {
+ "generateScript": {
+ // Script to generate the SDK code.
+ // Param:
+ // generateInput.json: See #GenerateInput
+ // generateOutput.json: See #GenerateOutput
+ "$ref": "#/definitions/RunOptions"
+ },
+ "preprocessDryRunGetPackageName": {
+ // If this options is set to true, generateScript will first run with
+ // "dryRun": true to get package name and related readme.md,
+ // then for each package, checkout the expected branch and launch generateScript.
+ "type": "boolean",
+ "default": false
+ },
+ "parseGenerateOutput": {
+ // Will this script output to generateOutput.json.
+ // If not, default behavior will be applied that outcome will be
+ // detected automatically based on filename regex search.
+ "type": "boolean",
+ "default": true
+ }
+ },
+ "default": {
+ "preprocessDryRunGetPackageName": false,
+ "parseGenerateOutput": false
+ }
+ },
+ "packageOptions": {
+ // Get package folder and build / get changelog
+ "type": "object",
+ "properties": {
+ "packageFolderFromFileSearch": {
+ "oneOf": [
+ {
+ // If this option is set to object, then package folder will be detected automatically.
+ // based on filename regex search.
+ // This options must be set to object if parseGenerateOutput is false.
+ "type": "object",
+ "properties": {
+ "searchRegex": {
+ // Search algorithm:
+ // For each changed file detected after generation
+ // PotentialPackageFolder = folder of changed file
+ // While PotentialPackageFolder is not root folder of sdk repo:
+ // If PotentialPackageFolder contains a file that matches the searchRegex:
+ // PackageFolder found, break
+ // Else:
+ // PotentialPackageFolder = parent folder of PotentialPackageFolder
+ "type": "string",
+ "format": "regex"
+ },
+ "packageNamePrefix": {
+ // Prefix to be appended to packageName.
+ // By default packageName will be the folder name of packageFolder
+ "type": "string"
+ }
+ },
+ "required": ["searchRegex"]
+ },
+ {
+ // If this option is set to false, then package folder will be from generateOutput.json.
+ "const": false
+ }
+ ]
+ },
+ "buildScript": {
+ // Build the generated sdk.
+ // Param:
+ // Package folder could be a list separated by space if it's from generateOutput.json.
+ "$ref": "#/definitions/RunOptions"
+ },
+ "changelogScript": {
+ // Changelog generation and breaking-change detection.
+ // Param:
+ // Package folder could be a list separated by space if it's from generateOutput.json.
+ // Expected output from stdout/stderr: Changelog in markdown
+ "allOf": [
+ {
+ "$ref": "#/definitions/RunOptions"
+ }
+ ],
+ "properties": {
+ "breakingChangeDetect": {
+ // If stdout or stderr matches this in output of changelog tool
+ // then we assume this SDK has breaking change.
+ "$ref": "#/definitions/RunLogFilterOptions"
+ }
+ }
+ },
+ "breakingChangeLabel": {
+ // Label to be added in spec PR if breaking change is found
+ "type": "string"
+ }
+ },
+ "default": {}
+ },
+ "artifactOptions": {
+ "properties": {
+ "artifactPathFromFileSearch": {
+ "oneOf": [
+ {
+ // If this option is set to object, then artifacts will be detected automatically
+ // based on filename regex search.
+ // This options must be set to object if parseGenerateOutput is false.
+ "type": "object",
+ "properties": {
+ "searchRegex": {
+ // Any file under package folder matching the searchRegex is package artifact.
+ "type": "string",
+ "format": "regex"
+ }
+ },
+ "required": ["searchRegex"]
+ },
+ {
+ // If this option is set to false, then package folder will be from generateOutput.json
+ "const": false
+ }
+ ]
+ },
+ "installInstructionScript": {
+ // Generate install instruction that could be shown in spec PR comment (lite version)
+ // or in generated SDK PR (full version).
+ // If generateOutput.json contains installInstruction then this could be skipped.
+ // Param:
+ // installInstructionInput.json: See #InstallInstructionScriptInput .
+ // installInstructionOutput.json: See #InstallInstructionScriptInput .
+ "$ref": "#/definitions/RunOptions"
+ }
+ },
+ "default": {}
+ }
+ },
+ "definitions": {
+ "RunOptions": {
+ // Options to run a script and collect log.
+ "type": "object",
+ "properties": {
+ "path": {
+ // Script path related to repo root
+ "type": "string"
+ },
+ "envs": {
+ // Extra environment variable to be passed to the script.
+ // By default the following envs will be passed:
+ // USER, HOME, PATH, SHELL, PWD (current directory), TMPDIR (dedicated temp folder)
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "default": []
+ },
+ "logPrefix": {
+ // Prefix to be added to SDK Automation log. By default it would be filename of the script.
+ "type": "string"
+ },
+ "stdout": {
+ // How should SDK Automation handle the script stdout stream
+ "allOf": [
+ {
+ "$ref": "#/definitions/RunLogOptions"
+ }
+ ]
+ },
+ "stderr": {
+ // How should SDK Automation handle the script stderr stream
+ "allOf": [
+ {
+ "$ref": "#/definitions/RunLogOptions"
+ }
+ ],
+ "default": {
+ "scriptWarning": true
+ }
+ },
+ "exitCode": {
+ "properties": {
+ // How should SDK Automation handle non-zero exitCode.
+ "showInComment": {
+ // Should we show this error in comment.
+ "type": "boolean",
+ "default": true
+ },
+ "result": {
+ // If script has non-error exitCode how should we mark the script's result.
+ "type": "string",
+ "enum": ["error", "warning", "ignore"],
+ "default": "error"
+ }
+ },
+ "default": {
+ "showInComment": true,
+ "result": "error"
+ }
+ }
+ },
+ "required": ["path"]
+ },
+ "RunLogOptions": {
+ // How should SDK Automation handle the log stream.
+ "showInComment": {
+ // Should we show this stream in comment.
+ "$ref": "#/definitions/RunLogFilterOptions"
+ },
+ "scriptError": {
+ // If any line match, assume the script fails.
+ "$ref": "#/definitions/RunLogFilterOptions"
+ },
+ "scriptWarning": {
+ // If any line match, assume the script warns.
+ "$ref": "#/definitions/RunLogFilterOptions"
+ }
+ },
+ "RunLogFilterOptions": {
+ "oneOf": [
+ {
+ // If line of log match this regex then hit
+ "type": "string",
+ "format": "regex"
+ },
+ {
+ // If set to true, any line of log will hit
+ "type": "boolean"
+ }
+ ],
+ "default": false
+ }
+ }
+}
diff --git a/documentation/sdkautomation/sdk_customization.md b/documentation/sdkautomation/sdk_customization.md
index 620ed6edfe57..a425d04862c5 100644
--- a/documentation/sdkautomation/sdk_customization.md
+++ b/documentation/sdkautomation/sdk_customization.md
@@ -109,87 +109,8 @@ This is type of file `./specificationRepositoryConfiguration.json` in swagger sp
```
#### SpecRepoConfig Schema
-``` jsonc
-{
- "type": "object",
- "properties": {
- "sdkRepositoryMappings": {
- // A mapping of SDK repository names to the names of the SDK repositories
- // that all interaction should go to instead.
- "type": "object",
- "additionalProperties": {
- "$ref": "#/definitions/SdkRepositoryConfig"
- },
- "propertyNames": {
- // The property name is the sdk name identifier.
- "type": "string"
- }
- },
- "overrides": {
- // Override config for specific repository.
- "type": "object",
- "additionalProperties": {
- "$ref": "#/"
- },
- "propertyNames": {
- // The property name is the sdk repo ref.
- "$ref": "#/definitions/RepositoryName"
- }
- },
- "required": [
- "sdkRepositoryMappings"
- ]
- },
- "definitions": {
- "RepositoryName": {
- // Reference to a repository on github. Could be or /.
- // By default the is the same as the owner of the spec repo.
- "type": "string"
- },
- "SdkRepositoryConfig": {
- "type": "object",
- "properties": {
- "mainRepository": {
- // The repository that the final release PR will targeting.
- "$ref": "#/definitions/RepositoryName"
- },
- "mainBranch": {
- // Base branch of codegen branches
- "default": "master",
- "type": "string"
- },
- "integrationRepository": {
- // The repository that hold generation branch, generation PR and integration branch.
- // By default it's the same as mainRepository
- "$ref": "#/definitions/RepositoryName"
- },
- "secondaryRepository": {
- // Codegen runs on this repository.
- // By default it's the same as 'mainRepository' but it could be different.
- "$ref": "#/definitions/RepositoryName"
- },
- "secondaryBranch": {
- // Codegen runs on this branch on secondaryRepository.
- // By default it's the same as 'mainBranch' but it could be different.
- "type": "string"
- },
- "integrationBranchPrefix": {
- // The prefix that will be applied to the beginning of integration branches
- "type": "string",
- "default": "sdkAutomation"
- },
- "configFilePath": {
- // Path to swagger-to-sdk config in sdk repo
- "default": "swagger_to_sdk_config.json"
- }
- },
- "required": [
- "mainRepository"
- ]
- }
- }
-}
-```
+
+See [./SpecConfigSchema.json](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/sdkautomation/SpecConfigSchema.json)
### SwaggerToSdkConfig
This is type of file `./swagger_to_sdk_config.json` in sdk repo.
@@ -205,6 +126,10 @@ The working folder of all the scripts is the __root folder of sdk repo__.
},
"initOptions": {
"initScript": {
+ // Script to init dependencies.
+ // Param:
+ // initInput.json: Not implemented. Placeholder for input arguments.
+ // initOutput.json: See #initOutput.
"path": "./eng/tools/sdk_init"
}
},
@@ -244,7 +169,9 @@ The working folder of all the scripts is the __root folder of sdk repo__.
"changelogScript": {
"path": "./eng/tools/sdk_breaking_change",
"breakingChangeDetect": "Breaking Change"
- }
+ },
+
+ "breakingChangeLabel": "CI-BreakingChange-DotNet"
},
"artifactOptions": {
// Param:
@@ -258,252 +185,8 @@ The working folder of all the scripts is the __root folder of sdk repo__.
```
#### SwaggerToSdkConfig Schema
-``` jsonc
-{
- "type": "object",
- "properties": {
- "advancedOptions": {
- // To keep backward compatibility, but will not list schema for old config options.
- "properties": {
- "createSdkPullRequests": {
- // Should SDK Automation create PR or not.
- "type": "boolean",
- "default": true
- },
- "closeIntegrationPR": {
- // Should SDK Automation close integrationPR to reduce noise.
- "type": "boolean",
- "default": true
- },
- "generationCallMode": {
- // If we have multiple related readme.md, should we call generation once with
- // all the readme.md or should we call generation multiple times and one per readme.md.
- "type": "string",
- "enum": [
- "one-per-config",
- "one-for-all-configs"
- ],
- "default": "one-for-all-configs"
- }
- }
- },
- "initOptions": {
- // Init the environment. Install dependencies.
- "type": "object",
- "properties": {
- "initScript": {
- // Script to init.
- "$ref": "#/definitions/RunOptions"
- }
- },
- "required": [
- "initScript"
- ]
- },
- "generateOptions": {
- // Generate the SDK code.
- "type": "object",
- "properties": {
- "generateScript": {
- // Script to generate the SDK code.
- // Param:
- // generateInput.json: See #GenerateInput
- // generateOutput.json: See #GenerateOutput
- "$ref": "#/definitions/RunOptions"
- },
- "preprocessDryRunGetPackageName": {
- // If this options is set to true, generateScript will first run with
- // "dryRun": true to get package name and related readme.md,
- // then for each package, checkout the expected branch and launch generateScript.
- "type": "boolean",
- "default": false
- },
- "parseGenerateOutput": {
- // Will this script output to generateOutput.json.
- // If not, default behavior will be applied that outcome will be
- // detected automatically based on filename regex search.
- "type": "boolean",
- "default": true
- }
- },
- "required": [
- "generateScript"
- ]
- },
- "packageOptions": {
- // Get package folder and build / get changelog
- "type": "object",
- "properties": {
- "packageFolderFromFileSearch": {
- "oneOf": [
- {
- // If this option is set to object, then package folder will be detected automatically.
- // based on filename regex search.
- // This options must be set to object if parseGenerateOutput is false.
- "type": "object",
- "properties": {
- "searchRegex": {
- // Search algorithm:
- // For each changed file detected after generation
- // PotentialPackageFolder = folder of changed file
- // While PotentialPackageFolder is not root folder of sdk repo:
- // If PotentialPackageFolder contains a file that matches the searchRegex:
- // PackageFolder found, break
- // Else:
- // PotentialPackageFolder = parent folder of PotentialPackageFolder
- "type": "string",
- "format": "regex"
- },
- "pageNamePrefix": {
- // Prefix to be appended to packageName. By default packageName will be the folder name of packageFolder
- "type": "string"
- }
- },
- "required": [
- "searchRegex"
- ]
- },
- {
- // If this option is set to false, then package folder will be from generateOutput.json.
- "const": false
- }
- ],
- "default": false,
- },
- "buildScript": {
- // Build the generated sdk.
- // Param:
- // Package folder could be a list separated by space if it's from generateOutput.json.
- "$ref": "#/definitions/RunOptions"
- },
- "changelogScript": {
- // Changelog generation and breaking-change detection.
- // Param:
- // Package folder could be a list separated by space if it's from generateOutput.json.
- // Expected output from stdout/stderr: Changelog in markdown
- "allOf": {
- "$ref": "#/definitions/RunOptions"
- },
- "properties": {
- "breakingChangeDetect": {
- // If stdout or stderr matches this in output of changelog tool
- // then we assume this SDK has breaking change.
- "$ref": "#/definitions/RunLogFilterOptions"
- }
- }
- }
- }
- },
- "artifactOptions": {
- "artifactPathFromFileSearch": {
- "oneOf": [
- {
- // If this option is set to object, then artifacts will be detected automatically
- // based on filename regex search.
- // This options must be set to object if parseGenerateOutput is false.
- "type": "object",
- "properties": {
- "searchRegex": {
- // Any file under package folder matching the searchRegex is package artifact.
- "type": "string",
- "format": "regex",
- }
- }
- },
- {
- // If this option is set to false, then package folder will be from generateOutput.json
- "const": false
- }
- ],
- "default": false
- },
- "installInstructionScript": {
- // Generate install instruction that could be shown in spec PR comment (lite version)
- // or in generated SDK PR (full version).
- // If generateOutput.json contains installInstruction then this could be skipped.
- // Param:
- // installInstructionInput.json: See #InstallInstructionScriptInput .
- // installInstructionOutput.json: See #InstallInstructionScriptInput .
- "allOf": {
- "$ref": "#/definitions/RunOptions"
- }
- }
- }
- },
- "definitions": {
- "RunOptions": {
- // Options to run a script and collect log.
- "type": "object",
- "properties": {
- "path": {
- // Script path related to repo root
- "type": "string"
- },
- "logPrefix": {
- // Prefix to be added to SDK Automation log. By default it would be filename of the script.
- "type": "string"
- },
- "stdout": {
- // How should SDK Automation handle the script stdout stream
- "$ref": "#/definitions/RunLogOptions"
- },
- "stderr": {
- // How should SDK Automation handle the script stderr stream
- "$ref": "#/definitions/RunLogOptions"
- },
- "exitCode": {
- // How should SDK Automation handle non-zero exitCode.
- "showInComment": {
- // Should we show this error in comment.
- "type": "boolean",
- "default": true
- },
- "result": {
- // If script has non-error exitCode how should we mark the script's result.
- "type": "string",
- "enum": [
- "error", "warning", "ignore"
- ],
- "default": "error"
- }
- },
- "required": [
- "path"
- ]
- }
- },
- "RunLogOptions": {
- // How should SDK Automation handle the log stream.
- "showInComment": {
- // Should we show this stream in comment.
- "$ref": "#/definitions/RunLogFilterOptions"
- },
- "scriptError": {
- // If any line match, assume the script fails.
- "$ref": "#/definitions/RunLogFilterOptions"
- },
- "scriptWarning": {
- // If any line match, assume the script warns.
- "$ref": "#/definitions/RunLogFilterOptions"
- }
- },
- "RunLogFilterOptions": {
- "oneOf": [
- {
- // If line of log match this regex then hit
- "type": "string",
- "format": "regex"
- },
- {
- // If set to true, any line of log will hit
- "type": "boolean"
- }
- ],
- "default": false
- }
- }
-}
-```
+
+See [./SwaggerToSdkConfigSchema.json](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/sdkautomation/SwaggerToSdkConfigSchema.json)
### GenerateInput
@@ -524,72 +207,19 @@ Input file for generate script.
],
"relatedReadmeMdFiles": [
"specification/cdn/something/readme.md"
- ]
+ ],
+ "installInstructionInput": {
+ "isPublic": false,
+ "downloadUrlPrefix": "https://openapihub.test.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/1234/azure-sdk-for-net/",
+ "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}",
+ "trigger": "pullRequest"
+ }
}
```
#### GenerateInput Schema
-```jsonc
-{
- "type": "object",
- "properties": {
- "dryRun": {
- // If dryRun is true, generateScript is expected to parse readme.md
- // and output the package list with package name and related readme.md.
- // Should not run codegen at this time.
- "type": "boolean"
- },
- "specFolder": {
- // Path to local spec folder.
- "type": "string"
- },
- "headSha": {
- // Git head sha.
- "type": "string"
- },
- "headRef": {
- // Git head ref.
- // Format will be "refs/pull//merge" or "refs/heads/".
- "type": "string"
- },
- "repoHttpsUrl": {
- // Spec repo url in https without auth.
- "type": "string"
- },
- "trigger": {
- // How this generation is triggered.
- "type": "string",
- "enum": [
- "pullRequest",
- "continuousIntegration"
- ]
- },
- "changedFiles": {
- // Changed file list in spec PR.
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "relatedReadmeMdFiles": {
- // Related readme.md files that pending generation.
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "installInstructionInput": {
- // See #InstallInstructionScriptInput
- "$ref": "#/definitions/InstallInstructionScriptInput"
- }
- },
- "required": [
- "specFolder", "headSha", "headRef", "repoHttpsUrl",
- "trigger", "changedFiles", "relatedReadmeMdFiles"
- ]
-}
-```
+See [./GenerateInputSchema.json](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/sdkautomation/GenerateInputSchema.json)
### GenerateOutput
@@ -628,79 +258,7 @@ Output file for generate script.
#### GenerateOutput Schema
-```jsonc
-{
- "type": "object",
- "properties": {
- "packages": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/PackageResult"
- }
- }
- },
- "required": [
- "packages"
- ],
- "definitions": {
- "PackageResult": {
- "properties": {
- "packageName": {
- // Name of package. Will be used in branch name and PR title.
- // By default it's folder name of first entry in path.
- "type": "string",
- },
- "path": {
- // List of package content paths.
- // If the path points to a folder then
- // all the content under the folder will be included.
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "readmeMd": {
- // List of related readmeMd of this package.
- // Must provide this field if dryRun is true.
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "changelog": {
- "type": "object",
- "properties": {
- "content": {
- // Content of changelog in markdown
- "type": "string"
- },
- "hasBreakingChange": {
- // Does the new package has breaking change
- "type": "boolean"
- }
- },
- "required": [
- "content"
- ]
- },
- "artifacts": {
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "installInstructions": {
- // See #InstallInstructionScriptOutput
- "$ref": "#/definitions/InstallInstructionScriptOutput"
- },
- },
- "required": [
- "path"
- ]
- }
- }
-}
-```
+See [./GenerateOutputSchema.json](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/sdkautomation/GenerateOutputSchema.json)
### InstallInstructionScriptInput
@@ -724,46 +282,7 @@ Input of install instruction script.
#### InstallInstructionScriptInput Schema
-```jsonc
-{
- "type": "object",
- "properties": {
- "packageName": {
- // The package name. May be skipped if sdk automation don't know the info yet.
- "type": "string"
- },
- "artifacts": {
- // List of artifact's path. May be skipped if sdk automation don't know the info yet.
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "isPublic": {
- // Is the download url public accessible.
- // If it's false, the download command template will be
- // az rest --resource -u "{URL}" --output-file {FILENAME}
- "type": "boolean",
- },
- "downloadUrlPrefix": {
- // All the artifacts will be uploaded and user could access the artifact via
- // a link composed by this prefix and artifact filename.
- "type": "string"
- },
- "downloadCommandTemplate": {
- // Download command template. Replace {URL} and {FILENAME} to get the real command.
- "type": "string"
- },
- "trigger": {
- "type": "string",
- "enum": [
- "pullRequest",
- "continuousIntegration"
- ]
- }
- }
-}
-```
+See [./InstallInstructionScriptInput.json](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/sdkautomation/InstallInstructionScriptInput.json)
### InstallInstructionScriptOutput
@@ -779,23 +298,35 @@ Output of install instruction script.
#### InstallInstructionScriptOutput Schema
+See [./InstallInstructionScriptOutput.json](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/sdkautomation/InstallInstructionScriptOutput.json)
+
+### TriggerType
+
+#### TriggerType Schema
+
+```jsonc
+{
+ // How this generation is triggered.
+ "$id": "TriggerType",
+ "type": "string",
+ "enum": ["pullRequest", "continuousIntegration"]
+}
+```
+
+### InitOutput
+
+#### InitOutput Schema
+
```jsonc
{
"type": "object",
"properties": {
- "full": {
- // Full version of install instruction will be shown in generated SDK PR.
- // Should be in markdown format.
- "type": "string"
- },
- "lite": {
- // Lite version of install instruction will be shown in generated SDK PR.
- // Should be in markdown format.
- "type": "string"
+ "envs": {
+ // Environment variable to be set in following scripts.
+ "additionalProperties": {
+ "type": "string"
+ }
}
- },
- "required": [
- "full"
- ]
+ }
}
-```
+```
\ No newline at end of file
diff --git a/preproduction-azure-pipelines.yml b/preproduction-azure-pipelines.yml
deleted file mode 100644
index 6b0e571283a1..000000000000
--- a/preproduction-azure-pipelines.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: "Preproduction CI for Azure Rest API specifications"
-
-trigger: none
-
-pr:
- autoCancel: false
-
-variables:
- TRAVIS: "true"
- TRAVIS_BRANCH: $(System.PullRequest.TargetBranch)
- TRAVIS_PULL_REQUEST: $(System.PullRequest.PullRequestNumber)
- TRAVIS_REPO_SLUG: $(Build.Repository.Name)
- TRAVIS_PULL_REQUEST_SLUG: $(Build.Repository.Name)
- TRAVIS_PULL_REQUEST_SHA: $(Build.SourceVersion)
- PR_ONLY: "true"
- PREPRODUCTION_PIPELINE: "true"
-
-jobs:
- - template: .azure-pipelines/ModelValidation.yml
- - template: .azure-pipelines/LintDiff.yml
- - template: .azure-pipelines/Avocado.yml
diff --git a/scripts/modelValidation.ts b/scripts/modelValidation.ts
deleted file mode 100644
index 5fbebe6cfb99..000000000000
--- a/scripts/modelValidation.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License in the project root for license information.
-
-import { modelValidation } from '@azure/rest-api-specs-scripts'
-
-modelValidation.main().catch(e => { console.log(e); process.exit(1); })
diff --git a/scripts/momentOfTruth.ts b/scripts/momentOfTruth.ts
deleted file mode 100644
index e866dce04166..000000000000
--- a/scripts/momentOfTruth.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-import * as scripts from '@azure/rest-api-specs-scripts'
-
-// magic starts here
-scripts.momentOfTruth().then(() => {
- process.exit(0);
-}).catch(() => {
- process.exit(1);
-})
\ No newline at end of file
diff --git a/scripts/momentOfTruthPostProcessing.ts b/scripts/momentOfTruthPostProcessing.ts
deleted file mode 100644
index 932bf87d5614..000000000000
--- a/scripts/momentOfTruthPostProcessing.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-import { momentOfTruthPostProcessing } from '@azure/rest-api-specs-scripts'
-
-momentOfTruthPostProcessing.postProcessing();
diff --git a/scripts/semanticValidation.ts b/scripts/semanticValidation.ts
deleted file mode 100644
index e657bc580e99..000000000000
--- a/scripts/semanticValidation.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License in the project root for license information.
-
-import { semanticValidation } from '@azure/rest-api-specs-scripts'
-
-semanticValidation.main().catch(e => { console.log(e); process.exit(1); })
diff --git a/specification/adhybridhealthservice/resource-manager/readme.md b/specification/adhybridhealthservice/resource-manager/readme.md
index 33c75ef311d4..3fc780ac369b 100644
--- a/specification/adhybridhealthservice/resource-manager/readme.md
+++ b/specification/adhybridhealthservice/resource-manager/readme.md
@@ -36,7 +36,7 @@ These settings apply only when `--tag=package-2014-01` is specified on the comma
``` yaml $(tag) == 'package-2014-01'
input-file:
-- Microsoft.ADHybridHealthService\stable\2014-01-01\ADHybridHealthService.json
+- Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json
```
---
diff --git a/specification/adp/resource-manager/readme.md b/specification/adp/resource-manager/readme.md
index 743ddf7e0100..64fa366eb591 100644
--- a/specification/adp/resource-manager/readme.md
+++ b/specification/adp/resource-manager/readme.md
@@ -27,6 +27,7 @@ These are the global settings for the adp.
```yaml
title: AdpManagementClient
openapi-type: arm
+openapi-subtype: rpaas
tag: package-2020-07-01-preview
```
diff --git a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json
index b23e5c9cde79..d0072c3f6c55 100644
--- a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json
+++ b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json
@@ -541,6 +541,12 @@
"schema": {
"$ref": "#/definitions/SuppressionContract"
}
+ },
+ "404": {
+ "description": "Suppression name is not specified or Suppression Id not found.",
+ "schema": {
+ "$ref": "#/definitions/ARMErrorResponseBody"
+ }
}
},
"deprecated": false,
@@ -1189,6 +1195,12 @@
"ttl": {
"description": "The duration for which the suppression is valid.",
"type": "string"
+ },
+ "expirationTimeStamp": {
+ "readOnly": true,
+ "format": "date-time",
+ "description": "Gets or sets the expiration time stamp.",
+ "type": "string"
}
}
},
diff --git a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GetSuppressionDetail.json b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GetSuppressionDetail.json
index 3d24f3ce31ce..a98db919f2cd 100644
--- a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GetSuppressionDetail.json
+++ b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GetSuppressionDetail.json
@@ -13,9 +13,16 @@
"type": "Microsoft.Advisor/suppressions",
"properties": {
"suppressionId": "suppressionId1",
- "ttl": "7.00:00:00"
+ "ttl": "7.00:00:00",
+ "expirationTimeStamp": "2020-10-25T22:24:43.3216408Z"
}
}
+ },
+ "404": {
+ "body": {
+ "code": "NotFound",
+ "message": "Suppression name is not specified or Suppression Id not found"
+ }
}
}
}
diff --git a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListSuppressions.json b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListSuppressions.json
index 159b0d143abd..8e8de9794f49 100644
--- a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListSuppressions.json
+++ b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListSuppressions.json
@@ -14,7 +14,8 @@
"type": "Microsoft.Advisor/suppressions",
"properties": {
"suppressionId": "suppressionId1",
- "ttl": "7.00:00:00"
+ "ttl": "7.00:00:00",
+ "expirationTimeStamp": "2020-10-24T22:24:43.3216408Z"
}
},
{
@@ -23,7 +24,8 @@
"type": "Microsoft.Advisor/suppressions",
"properties": {
"suppressionId": "suppressionId2",
- "ttl": "7.00:00:00"
+ "ttl": "7.00:00:00",
+ "expirationTimeStamp": "2020-10-25T22:24:43.3216408Z"
}
}
]
diff --git a/specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2016-05-16/analysisservices.json b/specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2016-05-16/analysisservices.json
index b2a71a5ff758..b2d670d39ea3 100644
--- a/specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2016-05-16/analysisservices.json
+++ b/specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2016-05-16/analysisservices.json
@@ -550,9 +550,103 @@
}
}
}
+ },
+ "/providers/Microsoft.AnalysisServices/operations": {
+ "get": {
+ "tags": [
+ "Operations"
+ ],
+ "operationId": "Operations_List",
+ "description": "Lists all of the available consumption REST API operations.",
+ "parameters": [
+ {
+ "$ref": "#/parameters/ApiVersionParameter"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK. The request has succeeded.",
+ "schema": {
+ "$ref": "#/definitions/OperationListResult"
+ }
+ },
+ "default": {
+ "description": "Error response describing why the operation failed.",
+ "schema": {
+ "$ref": "#/definitions/OperationsErrorResponse"
+ }
+ }
+ },
+ "x-ms-pageable": {
+ "nextLinkName": "nextLink"
+ }
+ }
}
},
"definitions": {
+ "OperationDisplay": {
+ "description": "The object that represents the operation.",
+ "type": "object",
+ "properties": {
+ "provider": {
+ "description": "Service provider: Microsoft.Consumption.",
+ "type": "string",
+ "readOnly": true
+ },
+ "resource": {
+ "description": "Resource on which the operation is performed: UsageDetail, etc.",
+ "type": "string",
+ "readOnly": true
+ },
+ "operation": {
+ "description": "Operation type: Read, write, delete, etc.",
+ "type": "string",
+ "readOnly": true
+ },
+ "description": {
+ "description": "Description for the operation",
+ "type": "string"
+ }
+ }
+ },
+ "OperationDetail": {
+ "description": "A Consumption REST API operation.",
+ "type": "object",
+ "properties": {
+ "name": {
+ "description": "Operation name: {provider}/{resource}/{operation}.",
+ "type": "string",
+ "readOnly": true
+ },
+ "isDataAction": {
+ "description": "Indicates whether the operation is a data action",
+ "type": "boolean"
+ },
+ "display": {
+ "$ref": "#/definitions/OperationDisplay",
+ "description": "Display of the operation"
+ }
+ }
+ },
+ "OperationListResult": {
+ "description": "Result of listing consumption operations. It contains a list of operations and a URL link to get the next set of results.",
+ "type": "object",
+ "properties": {
+ "value": {
+ "description": "List of analysis services operations supported by the Microsoft.AnalysisServices resource provider.",
+ "type": "array",
+ "readOnly": true,
+ "items": {
+ "$ref": "#/definitions/OperationDetail"
+ }
+ },
+ "nextLink": {
+ "description": "URL to get the next set of operation list results if there are any.",
+ "type": "string",
+ "readOnly": true
+ }
+ }
+ },
"Resource": {
"description": "Represents an instance of an Analysis Services resource.",
"type": "object",
@@ -867,7 +961,18 @@
}
}
},
+ "OperationsErrorResponse": {
+ "properties": {
+ "error": {
+ "$ref": "#/definitions/ErrorResponse",
+ "title": "OperationsErrorResponse",
+ "description": "Error message from Operations."
+ }
+ },
+ "description": "An error response from Operations."
+ },
"ErrorResponse": {
+ "title": "ErrorResponse",
"description": "Describes the format of Error response.",
"type": "object",
"properties": {
diff --git a/specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2017-07-14/analysisservices.json b/specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2017-07-14/analysisservices.json
index 3da01dddbff3..c5fbdea3bcf2 100644
--- a/specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2017-07-14/analysisservices.json
+++ b/specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2017-07-14/analysisservices.json
@@ -639,9 +639,103 @@
}
}
}
+ },
+ "/providers/Microsoft.AnalysisServices/operations": {
+ "get": {
+ "tags": [
+ "Operations"
+ ],
+ "operationId": "Operations_List",
+ "description": "Lists all of the available consumption REST API operations.",
+ "parameters": [
+ {
+ "$ref": "#/parameters/ApiVersionParameter"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK. The request has succeeded.",
+ "schema": {
+ "$ref": "#/definitions/OperationListResult"
+ }
+ },
+ "default": {
+ "description": "Error response describing why the operation failed.",
+ "schema": {
+ "$ref": "#/definitions/OperationsErrorResponse"
+ }
+ }
+ },
+ "x-ms-pageable": {
+ "nextLinkName": "nextLink"
+ }
+ }
}
},
"definitions": {
+ "OperationDisplay": {
+ "description": "The object that represents the operation.",
+ "type": "object",
+ "properties": {
+ "provider": {
+ "description": "Service provider: Microsoft.Consumption.",
+ "type": "string",
+ "readOnly": true
+ },
+ "resource": {
+ "description": "Resource on which the operation is performed: UsageDetail, etc.",
+ "type": "string",
+ "readOnly": true
+ },
+ "operation": {
+ "description": "Operation type: Read, write, delete, etc.",
+ "type": "string",
+ "readOnly": true
+ },
+ "description": {
+ "description": "Description for the operation",
+ "type": "string"
+ }
+ }
+ },
+ "OperationDetail": {
+ "description": "A Consumption REST API operation.",
+ "type": "object",
+ "properties": {
+ "name": {
+ "description": "Operation name: {provider}/{resource}/{operation}.",
+ "type": "string",
+ "readOnly": true
+ },
+ "isDataAction": {
+ "description": "Indicates whether the operation is a data action",
+ "type": "boolean"
+ },
+ "display": {
+ "$ref": "#/definitions/OperationDisplay",
+ "description": "Display of the operation"
+ }
+ }
+ },
+ "OperationListResult": {
+ "description": "Result of listing consumption operations. It contains a list of operations and a URL link to get the next set of results.",
+ "type": "object",
+ "properties": {
+ "value": {
+ "description": "List of analysis services operations supported by the Microsoft.AnalysisServices resource provider.",
+ "type": "array",
+ "readOnly": true,
+ "items": {
+ "$ref": "#/definitions/OperationDetail"
+ }
+ },
+ "nextLink": {
+ "description": "URL to get the next set of operation list results if there are any.",
+ "type": "string",
+ "readOnly": true
+ }
+ }
+ },
"Resource": {
"description": "Represents an instance of an Analysis Services resource.",
"type": "object",
@@ -1021,7 +1115,18 @@
}
}
},
+ "OperationsErrorResponse": {
+ "properties": {
+ "error": {
+ "$ref": "#/definitions/ErrorResponse",
+ "title": "OperationsErrorResponse",
+ "description": "Error message from Operations."
+ }
+ },
+ "description": "An error response from Operations."
+ },
"ErrorResponse": {
+ "title": "ErrorResponse",
"description": "Describes the format of Error response.",
"type": "object",
"properties": {
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetIdentityProviders.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetIdentityProviders.json
index d984727f8140..dad1d43093a3 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetIdentityProviders.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetIdentityProviders.json
@@ -10,7 +10,7 @@
"body": {
"id": "/identityProviders/Google",
"clientId": "FOLBTMWPUI",
- "clientSecret": "GVGOUEEPZYUHRDIATOXM",
+ "clientSecret": "",
"type": "google"
}
}
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetPortalSettingsDelegation.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetPortalSettingsDelegation.json
index 206cfdbab386..ed48bf781390 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetPortalSettingsDelegation.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetPortalSettingsDelegation.json
@@ -7,7 +7,7 @@
"200": {
"body": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetSubscriptions.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetSubscriptions.json
index 50b94e8cc52b..3dec97cbeb92 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetSubscriptions.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetSubscriptions.json
@@ -15,8 +15,8 @@
"state": "active",
"createdDate": "2018-01-12T13:41:12.18Z",
"startDate": "2018-01-12T00:00:00Z",
- "primaryKey": "2ce7fde4e2df43a39331f0bc5798e77f",
- "secondaryKey": "3ddb12a0c41f4eb58540c8903aff3306"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetTenant.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetTenant.json
index 3bef86094792..d0c34f05647e 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetTenant.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementGetTenant.json
@@ -9,8 +9,8 @@
"200": {
"body": {
"id": "integration",
- "primaryKey": "paeTVcmdbU9XxH6fPcPlq8Y9D9G3Cdo5Eh2nMSgKj/DWqeSFFXDdmpz5Trv+L2hQNM+nGa704Rf8Z22W9O1jdQ==",
- "secondaryKey": "z2LSNJ2QMjZcArjlvPWLy+N2dTviiHHTcPljiQTwr9NnFgIi5R7xjKj/UVOL7xW+Te+bNkS7pDv3G3h1D3HfVg==",
+ "primaryKey": "",
+ "secondaryKey": "",
"enabled": true
}
}
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListProductsSubscriptions.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListProductsSubscriptions.json
index b950f12df71e..27f6800199ec 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListProductsSubscriptions.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListProductsSubscriptions.json
@@ -16,8 +16,8 @@
"state": "active",
"createdDate": "2018-01-12T13:43:01.113Z",
"startDate": "2018-01-12T00:00:00Z",
- "primaryKey": "2f3af2e4d2e64691bc221f8c4b93d7fd",
- "secondaryKey": "e48feb2c5e9045228cd4edca4ad49bfe"
+ "primaryKey": "",
+ "secondaryKey": ""
}
],
"count": 1
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListSubscriptions.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListSubscriptions.json
index 95a8d9bfef9f..d8b3afd79235 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListSubscriptions.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListSubscriptions.json
@@ -16,8 +16,8 @@
"productId": "/products/starter",
"state": "active",
"createdDate": "2018-01-12T13:39:28.57Z",
- "primaryKey": "2D9B138F40C1244CB6B48D0378865469",
- "secondaryKey": "5163734D7AF0CC4AB5A59345E1B6BF6D"
+ "primaryKey": "",
+ "secondaryKey": ""
}
],
"count": 1
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListTenantGit.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListTenantGit.json
index 1b1e9f05abec..56c579cb4f80 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListTenantGit.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListTenantGit.json
@@ -8,8 +8,8 @@
"200": {
"body": {
"id": "5600b59375ff190048030003",
- "primaryKey": "qr5nbjNoZkgtLojXgU+OA/ntYMgko3XPSVyt+ObwR1sqp2ZkM9tGhwxkeEz7bfAuPS5ss61b2S3ZrZmqa9v3Mw==",
- "secondaryKey": "2dCJv1CasJl286SZiKxyBFDiIYCUdbwM1YrFNDcFMXCjCKbFzomrGkv+exAbnV5E3DEk91VP4jbeJ2eV/qtejA==",
+ "primaryKey": "",
+ "secondaryKey": "",
"enabled": true
}
}
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListUsersSubscriptions.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListUsersSubscriptions.json
index 68476d41fa29..327fe7757e85 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListUsersSubscriptions.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementListUsersSubscriptions.json
@@ -17,8 +17,8 @@
"productId": "/products/starter",
"state": "active",
"createdDate": "2018-01-12T13:39:28.57Z",
- "primaryKey": "2D9B138F40C1244CB6B48D0378865469",
- "secondaryKey": "5163734D7AF0CC4AB5A59345E1B6BF6D"
+ "primaryKey": "",
+ "secondaryKey": ""
}
],
"count": 1
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPatchIdentityProviders.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPatchIdentityProviders.json
index b5ebc286094c..eaee75a7ca5c 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPatchIdentityProviders.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPatchIdentityProviders.json
@@ -6,7 +6,7 @@
"If-Match": "*",
"parameters": {
"clientId": "BDNYXUKKLB",
- "clientSecret": "QNFYIDJQVSGXDCXYLECG"
+ "clientSecret": ""
}
},
"responses": {
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPatchPortalSettingsDelegation.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPatchPortalSettingsDelegation.json
index 68f5fe00ab8a..2cdc02ece155 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPatchPortalSettingsDelegation.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPatchPortalSettingsDelegation.json
@@ -5,7 +5,7 @@
"If-Match": "*",
"parameters": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutCertificates.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutCertificates.json
index 185324d88a33..397eea00cb2a 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutCertificates.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutCertificates.json
@@ -5,7 +5,7 @@
"api-version": "2017-03-01",
"parameters": {
"data": "Based 64 Encoded Certificate string",
- "password": "whatever"
+ "password": ""
}
},
"responses": {
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutIdentityProviders.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutIdentityProviders.json
index cee9cf2f4694..bbc7ca1aede5 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutIdentityProviders.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutIdentityProviders.json
@@ -5,7 +5,7 @@
"api-version": "2017-03-01",
"parameters": {
"clientId": "BDNYXUKKLB",
- "clientSecret": "QNFYIDJQVSGXDCXYLECG",
+ "clientSecret": "",
"type": "facebook"
}
},
@@ -14,7 +14,7 @@
"body": {
"id": "/identityProviders/Facebook",
"clientId": "BDNYXUKKLB",
- "clientSecret": "QNFYIDJQVSGXDCXYLECG",
+ "clientSecret": "",
"type": "facebook"
}
},
@@ -22,7 +22,7 @@
"body": {
"id": "/identityProviders/Facebook",
"clientId": "BDNYXUKKLB",
- "clientSecret": "QNFYIDJQVSGXDCXYLECG",
+ "clientSecret": "",
"type": "facebook"
}
}
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutPortalSettingsDelegation.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutPortalSettingsDelegation.json
index 68f5fe00ab8a..2cdc02ece155 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutPortalSettingsDelegation.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutPortalSettingsDelegation.json
@@ -5,7 +5,7 @@
"If-Match": "*",
"parameters": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutSubscriptions.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutSubscriptions.json
index c17e271ff59d..b6dc2f1a7954 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutSubscriptions.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutSubscriptions.json
@@ -19,8 +19,8 @@
"state": "active",
"createdDate": "2018-01-12T13:40:48.276514Z",
"startDate": "2018-01-12T00:00:00Z",
- "primaryKey": "84269e1cb0634af796bcf60e366a03bd",
- "secondaryKey": "b5225c62265f44088aaaae1ac7185e93"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
"200": {
@@ -32,8 +32,8 @@
"state": "active",
"createdDate": "2018-01-12T13:40:48.276514Z",
"startDate": "2018-01-12T00:00:00Z",
- "primaryKey": "84269e1cb0634af796bcf60e366a03bd",
- "secondaryKey": "b5225c62265f44088aaaae1ac7185e93"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutUsers.json b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutUsers.json
index eb27d0cd874e..608455de2199 100644
--- a/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutUsers.json
+++ b/specification/apimanagement/control-plane/Microsoft.ApiManagement/preview/2017-03-01/examples/ApiManagementPutUsers.json
@@ -5,7 +5,7 @@
"api-version": "2017-03-01",
"parameters": {
"email": "5a58bac2a40f7ef2e05bc7d1@contoso.com",
- "password": "5a58bac2a40f7ef2e05bc7d4",
+ "password": "",
"firstName": "5a58bac2a40f7ef2e05bc7d2",
"lastName": "5a58bac2a40f7ef2e05bc7d3"
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementCreateBackendProxyBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementCreateBackendProxyBackend.json
index f5a2b9f4f581..460427d6f2da 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementCreateBackendProxyBackend.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementCreateBackendProxyBackend.json
@@ -17,7 +17,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"credentials": {
"query": {
@@ -73,7 +73,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
@@ -113,7 +113,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementCreateSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementCreateSubscription.json
index aca7e1d87bb6..f021963a8211 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementCreateSubscription.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementCreateSubscription.json
@@ -25,8 +25,8 @@
"displayName": "testsub",
"state": "submitted",
"createdDate": "2017-06-02T23:34:03.1055076Z",
- "primaryKey": "06c34e1a9d394412b292e0611e73d417",
- "secondaryKey": "1e756a7705364c529e8d1760190f47b3"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
},
@@ -41,8 +41,8 @@
"displayName": "testsub",
"state": "submitted",
"createdDate": "2017-06-02T23:34:03.1055076Z",
- "primaryKey": "06c34e1a9d394412b292e0611e73d417",
- "secondaryKey": "1e756a7705364c529e8d1760190f47b3"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetIdentityProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetIdentityProvider.json
index 29733f37590a..a6008884b0c2 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetIdentityProvider.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetIdentityProvider.json
@@ -14,7 +14,7 @@
"name": "aadB2C",
"properties": {
"clientId": "315c8e2b-29fc-413d-822f-4efab7f43c42",
- "clientSecret": "SnE4laLjmxc2QKWTPoRxOiwvSnnwMCFN+jLYDpBCUXw=",
+ "clientSecret": "",
"type": "aadB2C",
"allowedTenants": [
"samirtestbc.onmicrosoft.com"
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetSubscription.json
index 9d5b62a4adfa..34297fec2037 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetSubscription.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetSubscription.json
@@ -18,8 +18,8 @@
"displayName": "Unlimited",
"state": "submitted",
"createdDate": "2017-06-02T17:59:06.223Z",
- "primaryKey": "6de0a3b2da204e459148d2f6785873f0",
- "secondaryKey": "c6de00b451f64ea780db1eb8dcf30b62"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetTenantAccess.json
index 31ad65009cd4..8de79124a707 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetTenantAccess.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementGetTenantAccess.json
@@ -10,8 +10,8 @@
"200": {
"body": {
"id": "5600b59375ff190048030003",
- "primaryKey": "qr5nbjNoZkgtLojXgU+OA/ntYMgko3XPSVyt+ObwR1sqp2ZkM9tGhwxkeEz7bfAuPS5ss61b2S3ZrZmqa9v3Mw==",
- "secondaryKey": "2dCJv1CasJl286SZiKxyBFDiIYCUdbwM1YrFNDcFMXCjCKbFzomrGkv+exAbnV5E3DEk91VP4jbeJ2eV/qtejA==",
+ "primaryKey": "",
+ "secondaryKey": "",
"enabled": true
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListBackends.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListBackends.json
index 41fa4e95900c..a418a76ae2e9 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListBackends.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListBackends.json
@@ -39,7 +39,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListProductSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListProductSubscriptions.json
index 7f7f3ad62302..8e74888af823 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListProductSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListProductSubscriptions.json
@@ -19,8 +19,8 @@
"scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b57e7e8880006a060002",
"state": "active",
"createdDate": "2015-09-22T01:57:18.723Z",
- "primaryKey": "ba95768e868648848e215f0290eec023",
- "secondaryKey": "140f866def81419b9bb9732d05d24535"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListSubscriptions.json
index ea1c482da643..41d4604afdf4 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListSubscriptions.json
@@ -18,8 +18,8 @@
"scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060001",
"state": "active",
"createdDate": "2015-09-22T01:57:40.3Z",
- "primaryKey": "a24782fc06f648cbb1c3406c41dc9a3a",
- "secondaryKey": "b366198986614a7497a5a68fae19119d"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -35,8 +35,8 @@
"startDate": "2016-03-17T00:00:00Z",
"expirationDate": "2016-04-01T00:00:00Z",
"notificationDate": "2016-03-20T00:00:00Z",
- "primaryKey": "77708695e79a495bb99b95f32adfa1f0",
- "secondaryKey": "12e2e4ba857e420b88450dc8fe2a6cf9"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -49,8 +49,8 @@
"displayName": "Unlimited",
"state": "submitted",
"createdDate": "2017-06-02T17:59:06.223Z",
- "primaryKey": "6de0a3b2da204e459148d2f6785873f0",
- "secondaryKey": "c6de00b451f64ea780db1eb8dcf30b62"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListUserSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListUserSubscriptions.json
index 946c4f7b605d..4543ba6e9f8f 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListUserSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementListUserSubscriptions.json
@@ -21,8 +21,8 @@
"state": "active",
"createdDate": "2016-06-20T16:22:39.547Z",
"startDate": "2016-06-20T00:00:00Z",
- "primaryKey": "57681850a40f7eb6c49f6ae4",
- "secondaryKey": "bbd884a96b3c41b49f34422dac74b345"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -36,8 +36,8 @@
"state": "active",
"createdDate": "2016-06-20T16:22:41.103Z",
"startDate": "2016-06-20T00:00:00Z",
- "primaryKey": "57681850a40f7eb6c49f6b2c",
- "secondaryKey": "125f565d276647dc825d7f25ea40ee57"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsGetDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsGetDelegation.json
index 1c245fd3a072..54aacc730328 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsGetDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsGetDelegation.json
@@ -13,7 +13,7 @@
"name": "delegation",
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
index 591dce8c8aef..11b5dea39d28 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
@@ -27,7 +27,7 @@
"name": "delegation",
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json
index 0e3a6e51b14c..469a9ee8d986 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateBackendProxyBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateBackendProxyBackend.json
index ab590416f16f..cc491a3050e6 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateBackendProxyBackend.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateBackendProxyBackend.json
@@ -17,7 +17,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"credentials": {
"query": {
@@ -73,7 +73,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
@@ -113,7 +113,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListBackends.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListBackends.json
index 8a4364a87e8e..0693ece55399 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListBackends.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListBackends.json
@@ -39,7 +39,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
index 425030ae6837..8981aee22f40 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
@@ -8,7 +8,7 @@
"responses": {
"200": {
"body": {
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q=="
+ "validationKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsSubscription.json
index 63213a32d493..ad01d39415c9 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsSubscription.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsSubscription.json
@@ -9,8 +9,8 @@
"responses": {
"200": {
"body": {
- "primaryKey": "6de0a3b2da204e459148d2f6785873f0",
- "secondaryKey": "c6de00b451f64ea780db1eb8dcf30b62"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsTenantAccess.json
index 2d4c685a094c..487899a94424 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsTenantAccess.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsTenantAccess.json
@@ -10,8 +10,8 @@
"200": {
"body": {
"id": "5600b59375ff190048030003",
- "primaryKey": "qr5nbjNoZkgtLojXgU+OA/ntYMgko3XPSVyt+ObwR1sqp2ZkM9tGhwxkeEz7bfAuPS5ss61b2S3ZrZmqa9v3Mw==",
- "secondaryKey": "2dCJv1CasJl286SZiKxyBFDiIYCUdbwM1YrFNDcFMXCjCKbFzomrGkv+exAbnV5E3DEk91VP4jbeJ2eV/qtejA==",
+ "primaryKey": "",
+ "secondaryKey": "",
"enabled": true
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
index 60d4fd41b926..36761776eb8c 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json
index 434918be8e9f..17c2a533bd3b 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimanagement.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimanagement.json
index dbe76ee7c35b..f7b18b21346b 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimanagement.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimanagement.json
@@ -547,6 +547,16 @@
},
"x-ms-parameter-location": "method"
},
+ "PortalRevisionIdParameter": {
+ "name": "portalRevisionId",
+ "in": "path",
+ "required": true,
+ "type": "string",
+ "description": "Portal revision identifier. Must be unique in the current API Management service instance.",
+ "minLength": 1,
+ "maxLength": 256,
+ "x-ms-parameter-location": "method"
+ },
"ProductIdParameter": {
"name": "productId",
"in": "path",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimapis.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimapis.json
index 4db90a55a476..00d996773ed7 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimapis.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimapis.json
@@ -4445,7 +4445,7 @@
"values": [
{
"value": "swagger-link",
- "description": "Export the Api Definition in OpenApi Specification 2.0 format to the Storage Blob.",
+ "description": "Export the Api Definition in OpenAPI 2.0 Specification as JSON document to the Storage Blob.",
"name": "Swagger"
},
{
@@ -4460,12 +4460,12 @@
},
{
"value": "openapi-link",
- "description": "Export the Api Definition in OpenApi Specification 3.0 to Storage Blob.",
+ "description": "Export the Api Definition in OpenAPI 3.0 Specification as YAML document 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.",
+ "description": "Export the Api Definition in OpenAPI 3.0 Specification as JSON document to Storage Blob.",
"name": "OpenapiJson"
}
]
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeletedservices.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeletedservices.json
index 4a9f7b9f3a3f..bc575d423508 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeletedservices.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeletedservices.json
@@ -42,7 +42,7 @@
"operationId": "DeletedServices_ListBySubscription",
"description": "Lists all soft-deleted services available for undelete for the given subscription.",
"x-ms-examples": {
- "ApiManagementListRegions": {
+ "ApiManagementDeletedServicesListBySubscription": {
"$ref": "./examples/ApiManagementDeletedServicesListBySubscription.json"
}
},
@@ -81,7 +81,7 @@
"operationId": "DeletedServices_GetByName",
"description": "Get soft-deleted Api Management Service by name.",
"x-ms-examples": {
- "ApiManagementListRegions": {
+ "ApiManagementGetDeletedServiceByName": {
"$ref": "./examples/ApiManagementGetDeletedServiceByName.json"
}
},
@@ -125,7 +125,7 @@
"operationId": "DeletedServices_Purge",
"description": "Purges Api Management Service (deletes it with no option to undelete).",
"x-ms-examples": {
- "ApiManagementListRegions": {
+ "ApiManagementDeletedServicesPurge": {
"$ref": "./examples/ApiManagementDeletedServicesPurge.json"
}
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeployment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeployment.json
index 48547abde3df..bc4aed719518 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeployment.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeployment.json
@@ -897,7 +897,7 @@
},
"keyVaultId": {
"type": "string",
- "description": "Url to the KeyVault Secret containing the Ssl Certificate. If absolute Url containing version is provided, auto-update of ssl certificate will not work. This requires Api Management service to be configured with MSI. The secret should be of type *application/x-pkcs12*"
+ "description": "Url to the KeyVault Secret containing the Ssl Certificate. If absolute Url containing version is provided, auto-update of ssl certificate will not work. This requires Api Management service to be configured with aka.ms/apimmsi. The secret should be of type *application/x-pkcs12*"
},
"identityClientId": {
"type": "string",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimportalrevisions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimportalrevisions.json
new file mode 100644
index 000000000000..d29101d859d8
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimportalrevisions.json
@@ -0,0 +1,326 @@
+{
+ "swagger": "2.0",
+ "info": {
+ "title": "ApiManagementClient",
+ "description": "Use these REST APIs for performing operations in Azure API Management deployment.",
+ "version": "2020-06-01-preview"
+ },
+ "host": "management.azure.com",
+ "schemes": [
+ "https"
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "security": [
+ {
+ "azure_auth": [
+ "user_impersonation"
+ ]
+ }
+ ],
+ "securityDefinitions": {
+ "azure_auth": {
+ "type": "oauth2",
+ "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+ "flow": "implicit",
+ "description": "Azure Active Directory OAuth2 Flow.",
+ "scopes": {
+ "user_impersonation": "impersonate your user account"
+ }
+ }
+ },
+ "paths": {
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalRevisions": {
+ "get": {
+ "tags": [
+ "PortalRevision"
+ ],
+ "operationId": "PortalRevision_ListByService",
+ "description": "Lists a collection of developer portal revision entities.",
+ "x-ms-examples": {
+ "ApiManagementListPortalRevisions": {
+ "$ref": "./examples/ApiManagementListPortalRevisions.json"
+ }
+ },
+ "parameters": [
+ {
+ "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+ },
+ {
+ "name": "$filter",
+ "in": "query",
+ "required": false,
+ "type": "string",
+ "description": "| Field | Supported operators | Supported functions |\n|-------------|------------------------|-----------------------------------|\n\r\n|name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|\n|description | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|\n|isCurrent | eq, ne | |\n"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "Lists a collection of developer portal revision entities.",
+ "schema": {
+ "$ref": "./definitions.json#/definitions/PortalRevisionCollection"
+ }
+ },
+ "default": {
+ "description": "Error response describing why the operation failed.",
+ "schema": {
+ "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+ }
+ }
+ },
+ "x-ms-pageable": {
+ "nextLinkName": "nextLink"
+ }
+ }
+ },
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalRevisions/{portalRevisionId}": {
+ "head": {
+ "tags": [
+ "PortalRevision"
+ ],
+ "operationId": "PortalRevision_GetEntityTag",
+ "description": "Gets developer portal revision specified by its identifier.",
+ "x-ms-examples": {
+ "ApiManagementHeadPortalRevision": {
+ "$ref": "./examples/ApiManagementHeadPortalRevision.json"
+ }
+ },
+ "parameters": [
+ {
+ "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/PortalRevisionIdParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "Specified Portal revision entity exists and current entity state version is present in the ETag header.",
+ "headers": {
+ "ETag": {
+ "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+ "type": "string"
+ }
+ }
+ },
+ "default": {
+ "description": "Error response describing why the operation failed.",
+ "schema": {
+ "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+ }
+ }
+ }
+ },
+ "get": {
+ "tags": [
+ "PortalRevision"
+ ],
+ "operationId": "PortalRevision_Get",
+ "description": "Gets developer portal revision specified by its identifier.",
+ "x-ms-examples": {
+ "ApiManagementGetPortalRevision": {
+ "$ref": "./examples/ApiManagementGetPortalRevision.json"
+ }
+ },
+ "parameters": [
+ {
+ "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/PortalRevisionIdParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "Gets the specified developer portal revision entity.",
+ "schema": {
+ "$ref": "./definitions.json#/definitions/PortalRevisionContract"
+ },
+ "headers": {
+ "ETag": {
+ "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+ "type": "string"
+ }
+ }
+ },
+ "default": {
+ "description": "Error response describing why the operation failed.",
+ "schema": {
+ "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+ }
+ }
+ }
+ },
+ "put": {
+ "tags": [
+ "PortalRevision"
+ ],
+ "operationId": "PortalRevision_CreateOrUpdate",
+ "description": "Creates a new developer portal revision.",
+ "x-ms-examples": {
+ "ApiManagementCreatePortalRevision": {
+ "$ref": "./examples/ApiManagementCreatePortalRevision.json"
+ }
+ },
+ "parameters": [
+ {
+ "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/PortalRevisionIdParameter"
+ },
+ {
+ "name": "parameters",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "./definitions.json#/definitions/PortalRevisionContract"
+ }
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+ }
+ ],
+ "responses": {
+ "202": {
+ "description": "Request to create developer portal revision was accepted."
+ },
+ "201": {
+ "description": "Developer portal revision was successfully created.",
+ "schema": {
+ "$ref": "./definitions.json#/definitions/PortalRevisionContract"
+ },
+ "headers": {
+ "ETag": {
+ "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+ "type": "string"
+ }
+ }
+ },
+ "default": {
+ "description": "Error response describing why the operation failed.",
+ "schema": {
+ "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+ }
+ }
+ },
+ "x-ms-long-running-operation": true,
+ "x-ms-long-running-operation-options": {
+ "final-state-via": "location"
+ }
+ },
+ "patch": {
+ "tags": [
+ "PortalRevision"
+ ],
+ "operationId": "PortalRevision_Update",
+ "description": "Updates the description of specified portal revision or makes it current.",
+ "x-ms-examples": {
+ "ApiManagementUpdatePortalRevision": {
+ "$ref": "./examples/ApiManagementUpdatePortalRevision.json"
+ }
+ },
+ "parameters": [
+ {
+ "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/PortalRevisionIdParameter"
+ },
+ {
+ "name": "parameters",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "./definitions.json#/definitions/PortalRevisionContract"
+ }
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+ },
+ {
+ "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+ }
+ ],
+ "responses": {
+ "202": {
+ "description": "Request to update developer portal revision was accepted."
+ },
+ "200": {
+ "description": "Developer portal revision was successfully updated.",
+ "schema": {
+ "$ref": "./definitions.json#/definitions/PortalRevisionContract"
+ },
+ "headers": {
+ "ETag": {
+ "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+ "type": "string"
+ }
+ }
+ },
+ "default": {
+ "description": "Error response describing why the operation failed.",
+ "schema": {
+ "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+ }
+ }
+ },
+ "x-ms-long-running-operation": true,
+ "x-ms-long-running-operation-options": {
+ "final-state-via": "location"
+ }
+ }
+ }
+ },
+ "definitions": {},
+ "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
index 5e8dd300c1d9..776c411609f3 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
@@ -207,11 +207,11 @@
},
{
"value": "swagger-json",
- "description": "The contents are inline and Content Type is a OpenApi 2.0 Document."
+ "description": "The contents are inline and Content Type is a OpenAPI 2.0 JSON Document."
},
{
"value": "swagger-link-json",
- "description": "The Open Api 2.0 document is hosted on a publicly accessible internet address."
+ "description": "The OpenAPI 2.0 JSON document is hosted on a publicly accessible internet address."
},
{
"value": "wsdl",
@@ -223,19 +223,19 @@
},
{
"value": "openapi",
- "description": "The contents are inline and Content Type is a OpenApi 3.0 Document in YAML format."
+ "description": "The contents are inline and Content Type is a OpenAPI 3.0 YAML Document."
},
{
"value": "openapi+json",
- "description": "The contents are inline and Content Type is a OpenApi 3.0 Document in JSON format."
+ "description": "The contents are inline and Content Type is a OpenAPI 3.0 JSON Document."
},
{
"value": "openapi-link",
- "description": "The Open Api 3.0 document is hosted on a publicly accessible internet address."
+ "description": "The OpenAPI 3.0 YAML document is hosted on a publicly accessible internet address."
},
{
"value": "openapi+json-link",
- "description": "The Open Api 3.0 Json document is hosted on a publicly accessible internet address."
+ "description": "The OpenAPI 3.0 JSON document is hosted on a publicly accessible internet address."
}
]
}
@@ -2747,7 +2747,7 @@
"properties": {
"secretIdentifier": {
"type": "string",
- "description": "Key vault secret identifier for fetching secret."
+ "description": "Key vault secret identifier for fetching secret. Providing a versioned secret will prevent auto-refresh. This requires Api Management service to be configured with aka.ms/apimmsi"
},
"identityClientId": {
"type": "string",
@@ -5901,6 +5901,103 @@
"description": "UTC Timestamp when the service was soft-deleted. The date conforms to the following format: yyyy-MM-ddTHH:mm:ssZ as specified by the ISO 8601 standard."
}
}
+ },
+ "PortalRevisionCollection": {
+ "properties": {
+ "value": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/PortalRevisionContract"
+ },
+ "description": "Collection of portal revisions.",
+ "readOnly": true
+ },
+ "nextLink": {
+ "type": "string",
+ "description": "Next page link, if any.",
+ "readOnly": true
+ }
+ },
+ "description": "Paged list of portal revisions."
+ },
+ "PortalRevisionContract": {
+ "properties": {
+ "properties": {
+ "x-ms-client-flatten": true,
+ "$ref": "#/definitions/PortalRevisionContractProperties",
+ "description": "Properties of the portal revisions."
+ }
+ },
+ "allOf": [
+ {
+ "$ref": "./apimanagement.json#/definitions/Resource"
+ }
+ ],
+ "description": "Portal revisions contract details."
+ },
+ "PortalRevisionContractProperties": {
+ "properties": {
+ "description": {
+ "type": "string",
+ "description": "Portal revision description.",
+ "maxLength": 2000
+ },
+ "statusDetails": {
+ "type": "string",
+ "description": "Portal revision publishing status details.",
+ "maxLength": 2000,
+ "readOnly": true
+ },
+ "status": {
+ "type": "string",
+ "description": "Portal revision publishing status",
+ "enum": [
+ "pending",
+ "publishing",
+ "completed",
+ "failed"
+ ],
+ "x-ms-enum": {
+ "modelAsString": true,
+ "name": "portalRevisionStatus",
+ "values": [
+ {
+ "value": "pending",
+ "description": "Portal revision publishing is pending"
+ },
+ {
+ "value": "publishing",
+ "description": "Portal revision is publishing"
+ },
+ {
+ "value": "completed",
+ "description": "Portal revision publishing completed"
+ },
+ {
+ "value": "failed",
+ "description": "Portal revision publishing failed"
+ }
+ ]
+ },
+ "readOnly": true
+ },
+ "isCurrent": {
+ "type": "boolean",
+ "description": "Indicates if the Portal Revision is public."
+ },
+ "createdDateTime": {
+ "type": "string",
+ "readOnly": true,
+ "format": "date-time",
+ "description": "Portal revision creation date and time."
+ },
+ "updatedDateTime": {
+ "type": "string",
+ "readOnly": true,
+ "format": "date-time",
+ "description": "Last updated date and time."
+ }
+ }
}
},
"parameters": {}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateBackendProxyBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateBackendProxyBackend.json
index 9c110306f328..3049da4d07c3 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateBackendProxyBackend.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateBackendProxyBackend.json
@@ -17,7 +17,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"credentials": {
"query": {
@@ -73,7 +73,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
@@ -113,7 +113,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json
index c02c34c81364..a1037ee05972 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json
@@ -10,7 +10,7 @@
"displayName": "prop6namekv",
"keyVault": {
"identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
- "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert"
+ "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret"
},
"tags": [
"foo",
@@ -34,7 +34,7 @@
"properties": {
"displayName": "prop6namekv",
"keyVault": {
- "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+ "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
"identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
"lastStatus": {
"code": "Success",
@@ -57,7 +57,7 @@
"properties": {
"displayName": "prop6namekv",
"keyVault": {
- "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+ "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
"identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
"lastStatus": {
"code": "Success",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreatePortalRevision.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreatePortalRevision.json
new file mode 100644
index 000000000000..e44ba23426f7
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreatePortalRevision.json
@@ -0,0 +1,37 @@
+{
+ "parameters": {
+ "serviceName": "apimService1",
+ "resourceGroupName": "rg1",
+ "api-version": "2020-06-01-preview",
+ "subscriptionId": "subid",
+ "portalRevisionId": "20201112101010",
+ "parameters": {
+ "properties": {
+ "description": "portal revision 1",
+ "isCurrent": true
+ }
+ }
+ },
+ "responses": {
+ "202": {
+ "headers": {
+ "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112101010?api-version=2020-06-01-preview&asyncId=5faf089b1d9a026694220e0c&asyncCode=201"
+ }
+ },
+ "201": {
+ "body": {
+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112101010",
+ "type": "Microsoft.ApiManagement/service/portalRevisions",
+ "name": "20201112101010",
+ "properties": {
+ "description": "portal revision 1",
+ "statusDetails": null,
+ "status": "completed",
+ "isCurrent": true,
+ "createdDateTime": "2020-11-13T22:28:43.657Z",
+ "updatedDateTime": "2020-11-13T22:29:22.68Z"
+ }
+ }
+ }
+ }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementGetPortalRevision.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementGetPortalRevision.json
new file mode 100644
index 000000000000..2efc5973e0b8
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementGetPortalRevision.json
@@ -0,0 +1,26 @@
+{
+ "parameters": {
+ "serviceName": "apimService1",
+ "resourceGroupName": "rg1",
+ "api-version": "2020-06-01-preview",
+ "subscriptionId": "subid",
+ "portalRevisionId": "20201112101010"
+ },
+ "responses": {
+ "200": {
+ "body": {
+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112101010",
+ "type": "Microsoft.ApiManagement/service/portalRevisions",
+ "name": "20201112101010",
+ "properties": {
+ "description": "portal revision 1",
+ "statusDetails": null,
+ "status": "completed",
+ "isCurrent": true,
+ "createdDateTime": "2020-11-12T22:51:36.47Z",
+ "updatedDateTime": "2020-11-12T22:52:00.097Z"
+ }
+ }
+ }
+ }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementHeadPortalRevision.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementHeadPortalRevision.json
new file mode 100644
index 000000000000..86e3785d6e6f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementHeadPortalRevision.json
@@ -0,0 +1,16 @@
+{
+ "parameters": {
+ "serviceName": "apimService1",
+ "resourceGroupName": "rg1",
+ "api-version": "2020-06-01-preview",
+ "subscriptionId": "subid",
+ "portalRevisionId": "20201112101010"
+ },
+ "responses": {
+ "200": {
+ "headers": {
+ "etag": "AAAAAAAAAAa="
+ }
+ }
+ }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListBackends.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListBackends.json
index 524eca3e55cc..fc642e27349f 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListBackends.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListBackends.json
@@ -39,7 +39,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListNamedValues.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListNamedValues.json
index eb5c84ef99f0..f596259e1b04 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListNamedValues.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListNamedValues.json
@@ -26,7 +26,7 @@
"properties": {
"displayName": "prop6namekv",
"keyVault": {
- "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+ "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
"identityClientId": "2d2df842-44d8-4885-8dec-77cc1a984a31",
"lastStatus": {
"code": "Success",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListPortalRevisions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListPortalRevisions.json
new file mode 100644
index 000000000000..b8eaf5250c4a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListPortalRevisions.json
@@ -0,0 +1,42 @@
+{
+ "parameters": {
+ "serviceName": "apimService1",
+ "resourceGroupName": "rg1",
+ "api-version": "2020-06-01-preview",
+ "subscriptionId": "subid"
+ },
+ "responses": {
+ "200": {
+ "body": {
+ "value": [
+ {
+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112000000",
+ "type": "Microsoft.ApiManagement/service/portalRevisions",
+ "name": "20201112000000",
+ "properties": {
+ "description": "portal revision",
+ "statusDetails": null,
+ "status": "completed",
+ "isCurrent": false,
+ "createdDateTime": "2020-11-12T22:10:09.673Z",
+ "updatedDateTime": "2020-11-12T22:12:41.46Z"
+ }
+ },
+ {
+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112101010",
+ "type": "Microsoft.ApiManagement/service/portalRevisions",
+ "name": "20201112101010",
+ "properties": {
+ "description": "portal revision 1",
+ "statusDetails": null,
+ "status": "completed",
+ "isCurrent": true,
+ "createdDateTime": "2020-11-12T22:51:36.47Z",
+ "updatedDateTime": "2020-11-12T22:52:00.097Z"
+ }
+ }
+ ]
+ }
+ }
+ }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
index b7a67c34de9b..ef95518c3b42 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
@@ -8,7 +8,7 @@
"responses": {
"200": {
"body": {
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q=="
+ "validationKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListSecretsTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListSecretsTenantAccess.json
index 0d36f2e5bf5d..0a0aafca3e9d 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListSecretsTenantAccess.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListSecretsTenantAccess.json
@@ -10,8 +10,8 @@
"200": {
"body": {
"id": "5600b59375ff190048030003",
- "primaryKey": "qr5nbjNoZkgtLojXgU+OA/ntYMgko3XPSVyt+ObwR1sqp2ZkM9tGhwxkeEz7bfAuPS5ss61b2S3ZrZmqa9v3Mw==",
- "secondaryKey": "2dCJv1CasJl286SZiKxyBFDiIYCUdbwM1YrFNDcFMXCjCKbFzomrGkv+exAbnV5E3DEk91VP4jbeJ2eV/qtejA==",
+ "primaryKey": "",
+ "secondaryKey": "",
"enabled": true
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
index 8bb69e9d27db..0831a5c8c356 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json
index 0d101b20a8f2..abef7b47902d 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementServiceGetNetworkStatus.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementServiceGetNetworkStatus.json
index af76a259d10e..ae56b27b6049 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementServiceGetNetworkStatus.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementServiceGetNetworkStatus.json
@@ -9,110 +9,137 @@
"200": {
"body": [
{
- "location": "West Europe",
+ "location": "West US",
"networkStatus": {
"dnsServers": [
- "100.78.90.70"
+ "10.82.98.10"
],
"connectivityStatus": [
{
- "name": "apimgmtsttgzqxxxxxcrsc.blob.core.windows.net",
+ "name": "apimgmtst6xxxxxxxxxxx.blob.core.windows.net",
"status": "success",
"error": "",
- "lastUpdated": "2019-12-18T12:04:43.6997938Z",
- "lastStatusChange": "2019-01-24T21:47:53.851895Z",
+ "lastUpdated": "2020-11-24T22:55:14.7035899Z",
+ "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
"resourceType": "BlobStorage",
"isOptional": false
},
{
- "name": "apimgmtsttgzqxxxxxcrsc.file.core.windows.net",
+ "name": "apimgmtst6xxxxxxxxxxx.file.core.windows.net",
"status": "success",
"error": "",
- "lastUpdated": "2019-12-18T12:04:44.0439771Z",
- "lastStatusChange": "2019-05-02T21:22:50.6835366Z",
+ "lastUpdated": "2020-11-24T22:55:41.5322463Z",
+ "lastStatusChange": "2020-11-20T07:54:55.9265938Z",
"resourceType": "FileStorage",
"isOptional": true
},
{
- "name": "apimgmtsttgzqxxxxxcrsc.queue.core.windows.net",
+ "name": "apimgmtst6xxxxxxxxxxx.queue.core.windows.net",
"status": "success",
"error": "",
- "lastUpdated": "2019-12-18T12:04:44.8564232Z",
- "lastStatusChange": "2019-05-02T20:53:26.6260794Z",
+ "lastUpdated": "2020-11-24T22:55:30.645994Z",
+ "lastStatusChange": "2020-11-20T07:54:55.8410477Z",
"resourceType": "Queue",
"isOptional": true
},
{
- "name": "apimgmtsttgzqxxxxxcrsc.table.core.windows.net",
+ "name": "apimgmtst6xxxxxxxxxxx.table.core.windows.net",
"status": "success",
"error": "",
- "lastUpdated": "2019-12-18T12:04:44.0439771Z",
- "lastStatusChange": "2019-05-02T20:53:21.6729263Z",
+ "lastUpdated": "2020-11-24T22:55:23.8789171Z",
+ "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
"resourceType": "TableStorage",
- "isOptional": true
+ "isOptional": false
},
{
- "name": "ftmrcxxx.database.windows.net",
+ "name": "gcs.prod.monitoring.core.windows.net",
"status": "success",
"error": "",
- "lastUpdated": "2019-12-18T12:04:44.1845483Z",
- "lastStatusChange": "2019-05-02T21:02:00.9466899Z",
- "resourceType": "SQLDatabase",
- "isOptional": false
+ "lastUpdated": "2020-11-24T22:57:34.8666833Z",
+ "lastStatusChange": "2020-11-20T08:07:37.5486932Z",
+ "resourceType": "Monitoring",
+ "isOptional": true
},
{
- "name": "https://prod3.metrics.nsatc.net:1886/RecoveryService",
- "status": "failure",
- "error": "Failed to connect to https://prod3.metrics.nsatc.net:1886/RecoveryService with error Unable to connect to the remote server",
- "lastUpdated": "2019-12-18T12:04:30.1214083Z",
- "lastStatusChange": "2019-01-24T22:00:04.2450462Z",
- "resourceType": "Metrics",
- "isOptional": false
+ "name": "https://gcs.ppe.warm.ingestion.monitoring.azure.com",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:56:26.1870188Z",
+ "lastStatusChange": "2020-11-20T07:54:56.1060523Z",
+ "resourceType": "Monitoring",
+ "isOptional": true
},
{
- "name": "https://westeurope.prod.warm.ingestion.msftcloudes.com",
+ "name": "https://global.metrics.nsatc.net/",
"status": "success",
"error": "",
- "lastUpdated": "2019-12-18T12:04:43.8251399Z",
- "lastStatusChange": "2019-12-18T11:14:43.3860126Z",
+ "lastUpdated": "2020-11-24T22:56:35.9620612Z",
+ "lastStatusChange": "2020-11-20T07:54:56.0510519Z",
"resourceType": "Monitoring",
"isOptional": true
},
+ {
+ "name": "https://login.windows.net",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:56:30.8047708Z",
+ "lastStatusChange": "2020-11-20T07:54:56.1060523Z",
+ "resourceType": "AzureActiveDirectory",
+ "isOptional": true
+ },
+ {
+ "name": "https://prod2.metrics.nsatc.net:1886/RecoveryService",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:56:45.2095302Z",
+ "lastStatusChange": "2020-11-20T07:54:56.2796235Z",
+ "resourceType": "Metrics",
+ "isOptional": true
+ },
{
"name": "LocalGatewayRedis",
"status": "success",
"error": "",
- "lastUpdated": "2019-12-18T12:04:50.6376685Z",
- "lastStatusChange": "2019-12-18T11:14:44.4966742Z",
+ "lastUpdated": "2020-11-24T22:55:15.1345836Z",
+ "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
"resourceType": "InternalCache",
- "isOptional": false
+ "isOptional": true
},
{
"name": "prod.warmpath.msftcloudes.com",
"status": "success",
"error": "",
- "lastUpdated": "2019-12-18T12:04:44.4345454Z",
- "lastStatusChange": "2019-05-08T00:09:58.031766Z",
+ "lastUpdated": "2020-11-24T22:55:57.8992141Z",
+ "lastStatusChange": "2020-11-20T07:54:55.8410477Z",
"resourceType": "Monitoring",
- "isOptional": true
+ "isOptional": false
},
{
"name": "Scm",
"status": "success",
"error": "",
- "lastUpdated": "2019-12-18T12:04:58.4815899Z",
- "lastStatusChange": "2019-12-18T11:24:48.4795085Z",
+ "lastUpdated": "2020-11-24T23:01:24.0553684Z",
+ "lastStatusChange": "2019-07-20T02:25:48.7066996Z",
"resourceType": "SourceControl",
"isOptional": true
},
{
- "name": "smtpi-db3.msn.com:25028",
- "status": "failure",
- "error": "Connection smtpi-db3.msn.com:25028 failed with Error Unable to connect to the remote server",
- "lastUpdated": "2019-12-18T12:04:30.1526431Z",
- "lastStatusChange": "2019-12-18T11:23:05.7709057Z",
+ "name": "smtpi-ch1.msn.com:25028",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:58:22.2430074Z",
+ "lastStatusChange": "2020-11-20T07:54:56.3510577Z",
"resourceType": "Email",
"isOptional": true
+ },
+ {
+ "name": "zwcvuxxxx.database.windows.net",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:55:44.3582171Z",
+ "lastStatusChange": "2020-11-20T07:54:56.0410467Z",
+ "resourceType": "SQLDatabase",
+ "isOptional": false
}
]
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementServiceGetNetworkStatusByLocation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementServiceGetNetworkStatusByLocation.json
index ef8f5ba53087..2ec629c41b07 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementServiceGetNetworkStatusByLocation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementServiceGetNetworkStatusByLocation.json
@@ -10,62 +10,134 @@
"200": {
"body": {
"dnsServers": [
- "100.78.90.70"
+ "10.82.98.10"
],
"connectivityStatus": [
{
- "name": "apimgmtst6mtxxxxxxxx.blob.core.windows.net",
+ "name": "apimgmtst6tnxxxxxxxxxxx.blob.core.windows.net",
"status": "success",
"error": "",
- "lastUpdated": "2018-06-13T22:41:07.3844516Z",
- "lastStatusChange": "2018-06-13T20:31:06.6590782Z",
+ "lastUpdated": "2020-11-24T22:55:14.7035899Z",
+ "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
"resourceType": "BlobStorage",
"isOptional": false
},
{
- "name": "apimgmtst6mtxxxxxxxx.file.core.windows.net",
+ "name": "apimgmtst6tnxxxxxxxxxxx.file.core.windows.net",
"status": "success",
"error": "",
- "lastUpdated": "2018-06-13T22:41:08.6657305Z",
- "lastStatusChange": "2018-06-13T20:31:06.8934611Z",
+ "lastUpdated": "2020-11-24T22:55:41.5322463Z",
+ "lastStatusChange": "2020-11-20T07:54:55.9265938Z",
"resourceType": "FileStorage",
"isOptional": true
},
{
- "name": "apimgmtst6mtxxxxxxxx.table.core.windows.net",
+ "name": "apimgmtst6tnxxxxxxxxxxx.queue.core.windows.net",
"status": "success",
"error": "",
- "lastUpdated": "2018-06-13T22:41:08.7594708Z",
- "lastStatusChange": "2018-06-13T20:31:06.7529128Z",
+ "lastUpdated": "2020-11-24T22:55:30.645994Z",
+ "lastStatusChange": "2020-11-20T07:54:55.8410477Z",
+ "resourceType": "Queue",
+ "isOptional": true
+ },
+ {
+ "name": "apimgmtst6tnxxxxxxxxxxx.table.core.windows.net",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:55:23.8789171Z",
+ "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
"resourceType": "TableStorage",
+ "isOptional": false
+ },
+ {
+ "name": "gcs.prod.monitoring.core.windows.net",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:57:34.8666833Z",
+ "lastStatusChange": "2020-11-20T08:07:37.5486932Z",
+ "resourceType": "Monitoring",
+ "isOptional": true
+ },
+ {
+ "name": "https://gcs.ppe.warm.ingestion.monitoring.azure.com",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:56:26.1870188Z",
+ "lastStatusChange": "2020-11-20T07:54:56.1060523Z",
+ "resourceType": "Monitoring",
+ "isOptional": true
+ },
+ {
+ "name": "https://global.metrics.nsatc.net/",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:56:35.9620612Z",
+ "lastStatusChange": "2020-11-20T07:54:56.0510519Z",
+ "resourceType": "Monitoring",
+ "isOptional": true
+ },
+ {
+ "name": "https://login.windows.net",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:56:30.8047708Z",
+ "lastStatusChange": "2020-11-20T07:54:56.1060523Z",
+ "resourceType": "AzureActiveDirectory",
"isOptional": true
},
{
- "name": "https://prod3.metrics.nsatc.net:1886/RecoveryService",
+ "name": "https://prod2.metrics.nsatc.net:1886/RecoveryService",
"status": "success",
"error": "",
- "lastUpdated": "2018-06-13T22:41:08.6969746Z",
- "lastStatusChange": "2018-06-13T20:31:07.1125257Z",
+ "lastUpdated": "2020-11-24T22:56:45.2095302Z",
+ "lastStatusChange": "2020-11-20T07:54:56.2796235Z",
"resourceType": "Metrics",
- "isOptional": false
+ "isOptional": true
},
{
- "name": "n20fxxx.database.windows.net",
+ "name": "LocalGatewayRedis",
"status": "success",
"error": "",
- "lastUpdated": "2018-06-13T22:41:09.5094848Z",
- "lastStatusChange": "2018-06-13T20:31:07.0968711Z",
- "resourceType": "SQLDatabase",
+ "lastUpdated": "2020-11-24T22:55:15.1345836Z",
+ "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
+ "resourceType": "InternalCache",
+ "isOptional": true
+ },
+ {
+ "name": "prod.warmpath.msftcloudes.com",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:55:57.8992141Z",
+ "lastStatusChange": "2020-11-20T07:54:55.8410477Z",
+ "resourceType": "Monitoring",
"isOptional": false
},
{
"name": "Scm",
"status": "success",
"error": "",
- "lastUpdated": "2018-06-13T22:41:29.4358865Z",
- "lastStatusChange": "2018-06-13T20:41:09.8627827Z",
+ "lastUpdated": "2020-11-24T23:03:57.6187917Z",
+ "lastStatusChange": "2020-11-20T07:54:57.325384Z",
"resourceType": "SourceControl",
"isOptional": true
+ },
+ {
+ "name": "smtpi-xxx.msn.com:25028",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:58:22.2430074Z",
+ "lastStatusChange": "2020-11-20T07:54:56.3510577Z",
+ "resourceType": "Email",
+ "isOptional": true
+ },
+ {
+ "name": "zwcvuxxxx.database.windows.net",
+ "status": "success",
+ "error": "",
+ "lastUpdated": "2020-11-24T22:55:44.3582171Z",
+ "lastStatusChange": "2020-11-20T07:54:56.0410467Z",
+ "resourceType": "SQLDatabase",
+ "isOptional": false
}
]
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementSubscriptionListSecrets.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementSubscriptionListSecrets.json
index 7dbc11ad3cce..167983ba6e4a 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementSubscriptionListSecrets.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementSubscriptionListSecrets.json
@@ -9,8 +9,8 @@
"responses": {
"200": {
"body": {
- "primaryKey": "6de0a3b2da204e459148d2f6785873f0",
- "secondaryKey": "c6de00b451f64ea780db1eb8dcf30b62"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementUpdateBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementUpdateBackend.json
index ecb94af38949..4b9ea82aa57c 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementUpdateBackend.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementUpdateBackend.json
@@ -48,7 +48,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementUpdatePortalRevision.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementUpdatePortalRevision.json
new file mode 100644
index 000000000000..c7a33472360f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementUpdatePortalRevision.json
@@ -0,0 +1,38 @@
+{
+ "parameters": {
+ "serviceName": "apimService1",
+ "resourceGroupName": "rg1",
+ "api-version": "2020-06-01-preview",
+ "subscriptionId": "subid",
+ "portalRevisionId": "20201112101010",
+ "If-Match": "*",
+ "parameters": {
+ "properties": {
+ "description": "portal revision update",
+ "isCurrent": true
+ }
+ }
+ },
+ "responses": {
+ "202": {
+ "headers": {
+ "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112101010?api-version=2020-06-01-preview&asyncId=5faf16b81d9a028970d0bfbb&asyncCode=200"
+ }
+ },
+ "200": {
+ "body": {
+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop2",
+ "type": "Microsoft.ApiManagement/service/portalRevisions",
+ "name": "20201112101010",
+ "properties": {
+ "description": "portal revision update",
+ "statusDetails": null,
+ "status": "completed",
+ "isCurrent": true,
+ "createdDateTime": "2020-11-13T22:47:13.397Z",
+ "updatedDateTime": "2020-11-13T23:29:25.34Z"
+ }
+ }
+ }
+ }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementCreateBackendProxyBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementCreateBackendProxyBackend.json
index 300b778f5698..2546f18853b8 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementCreateBackendProxyBackend.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementCreateBackendProxyBackend.json
@@ -17,7 +17,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"credentials": {
"query": {
@@ -73,7 +73,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
@@ -113,7 +113,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementCreateSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementCreateSubscription.json
index 186703821787..879106a805fa 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementCreateSubscription.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementCreateSubscription.json
@@ -25,8 +25,8 @@
"displayName": "testsub",
"state": "submitted",
"createdDate": "2017-06-02T23:34:03.1055076Z",
- "primaryKey": "06c34e1a9d394412b292e0611e73d417",
- "secondaryKey": "1e756a7705364c529e8d1760190f47b3"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
},
@@ -41,8 +41,8 @@
"displayName": "testsub",
"state": "submitted",
"createdDate": "2017-06-02T23:34:03.1055076Z",
- "primaryKey": "06c34e1a9d394412b292e0611e73d417",
- "secondaryKey": "1e756a7705364c529e8d1760190f47b3"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetIdentityProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetIdentityProvider.json
index 3463562444ca..e386fd2dbdba 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetIdentityProvider.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetIdentityProvider.json
@@ -14,7 +14,7 @@
"name": "aadB2C",
"properties": {
"clientId": "315c8e2b-29fc-413d-822f-4efab7f43c42",
- "clientSecret": "SnE4laLjmxc2QKWTPoRxOiwvSnnwMCFN+jLYDpBCUXw=",
+ "clientSecret": "",
"type": "aadB2C",
"allowedTenants": [
"samirtestbc.onmicrosoft.com"
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetSubscription.json
index 676beede3db6..1dc59e3afce9 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetSubscription.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetSubscription.json
@@ -18,8 +18,8 @@
"displayName": "Unlimited",
"state": "submitted",
"createdDate": "2017-06-02T17:59:06.223Z",
- "primaryKey": "6de0a3b2da204e459148d2f6785873f0",
- "secondaryKey": "c6de00b451f64ea780db1eb8dcf30b62"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetTenantAccess.json
index f45fbf9d24fe..e97f00eb29c3 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetTenantAccess.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementGetTenantAccess.json
@@ -10,8 +10,8 @@
"200": {
"body": {
"id": "5600b59375ff190048030003",
- "primaryKey": "qr5nbjNoZkgtLojXgU+OA/ntYMgko3XPSVyt+ObwR1sqp2ZkM9tGhwxkeEz7bfAuPS5ss61b2S3ZrZmqa9v3Mw==",
- "secondaryKey": "2dCJv1CasJl286SZiKxyBFDiIYCUdbwM1YrFNDcFMXCjCKbFzomrGkv+exAbnV5E3DEk91VP4jbeJ2eV/qtejA==",
+ "primaryKey": "",
+ "secondaryKey": "",
"enabled": true
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListBackends.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListBackends.json
index b01de30a677a..8b2e8ba6191d 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListBackends.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListBackends.json
@@ -39,7 +39,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListProductSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListProductSubscriptions.json
index 1817289512cf..1243289779dd 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListProductSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListProductSubscriptions.json
@@ -19,8 +19,8 @@
"productId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b57e7e8880006a060002",
"state": "active",
"createdDate": "2015-09-22T01:57:18.723Z",
- "primaryKey": "ba95768e868648848e215f0290eec023",
- "secondaryKey": "140f866def81419b9bb9732d05d24535"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListSubscriptions.json
index 7a41d1795555..8127c50fc321 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListSubscriptions.json
@@ -18,8 +18,8 @@
"productId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060001",
"state": "active",
"createdDate": "2015-09-22T01:57:40.3Z",
- "primaryKey": "a24782fc06f648cbb1c3406c41dc9a3a",
- "secondaryKey": "b366198986614a7497a5a68fae19119d"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -35,8 +35,8 @@
"startDate": "2016-03-17T00:00:00Z",
"expirationDate": "2016-04-01T00:00:00Z",
"notificationDate": "2016-03-20T00:00:00Z",
- "primaryKey": "77708695e79a495bb99b95f32adfa1f0",
- "secondaryKey": "12e2e4ba857e420b88450dc8fe2a6cf9"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -49,8 +49,8 @@
"displayName": "Unlimited",
"state": "submitted",
"createdDate": "2017-06-02T17:59:06.223Z",
- "primaryKey": "6de0a3b2da204e459148d2f6785873f0",
- "secondaryKey": "c6de00b451f64ea780db1eb8dcf30b62"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListUserSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListUserSubscriptions.json
index 4b9fdffa8c1b..036ca4ff182f 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListUserSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementListUserSubscriptions.json
@@ -21,8 +21,8 @@
"state": "active",
"createdDate": "2016-06-20T16:22:39.547Z",
"startDate": "2016-06-20T00:00:00Z",
- "primaryKey": "57681850a40f7eb6c49f6ae4",
- "secondaryKey": "bbd884a96b3c41b49f34422dac74b345"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -36,8 +36,8 @@
"state": "active",
"createdDate": "2016-06-20T16:22:41.103Z",
"startDate": "2016-06-20T00:00:00Z",
- "primaryKey": "57681850a40f7eb6c49f6b2c",
- "secondaryKey": "125f565d276647dc825d7f25ea40ee57"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementPortalSettingsGetDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementPortalSettingsGetDelegation.json
index f7fcfd2b3bef..f6cb26d74f14 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementPortalSettingsGetDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementPortalSettingsGetDelegation.json
@@ -10,7 +10,7 @@
"body": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementPortalSettingsUpdateDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
index dce4adc88a66..b3aae2ac64b9 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementCreateBackendProxyBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementCreateBackendProxyBackend.json
index 7e814653dfc0..d3d78d47bc3f 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementCreateBackendProxyBackend.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementCreateBackendProxyBackend.json
@@ -17,7 +17,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"credentials": {
"query": {
@@ -73,7 +73,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
@@ -113,7 +113,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementCreateSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementCreateSubscription.json
index 6c01278b1ab9..a3c74d3520d1 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementCreateSubscription.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementCreateSubscription.json
@@ -25,8 +25,8 @@
"displayName": "testsub",
"state": "submitted",
"createdDate": "2017-06-02T23:34:03.1055076Z",
- "primaryKey": "06c34e1a9d394412b292e0611e73d417",
- "secondaryKey": "1e756a7705364c529e8d1760190f47b3"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
},
@@ -41,8 +41,8 @@
"displayName": "testsub",
"state": "submitted",
"createdDate": "2017-06-02T23:34:03.1055076Z",
- "primaryKey": "06c34e1a9d394412b292e0611e73d417",
- "secondaryKey": "1e756a7705364c529e8d1760190f47b3"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetIdentityProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetIdentityProvider.json
index e451106918d3..aac8712e40dc 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetIdentityProvider.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetIdentityProvider.json
@@ -14,7 +14,7 @@
"name": "aadB2C",
"properties": {
"clientId": "315c8e2b-29fc-413d-822f-4efab7f43c42",
- "clientSecret": "SnE4laLjmxc2QKWTPoRxOiwvSnnwMCFN+jLYDpBCUXw=",
+ "clientSecret": "",
"type": "aadB2C",
"allowedTenants": [
"samirtestbc.onmicrosoft.com"
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetSubscription.json
index b72d039ad4dc..5300501558b1 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetSubscription.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetSubscription.json
@@ -18,8 +18,8 @@
"displayName": "Unlimited",
"state": "submitted",
"createdDate": "2017-06-02T17:59:06.223Z",
- "primaryKey": "6de0a3b2da204e459148d2f6785873f0",
- "secondaryKey": "c6de00b451f64ea780db1eb8dcf30b62"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetTenantAccess.json
index 2a0bbbdf0650..147fe461e824 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetTenantAccess.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementGetTenantAccess.json
@@ -10,8 +10,8 @@
"200": {
"body": {
"id": "5600b59375ff190048030003",
- "primaryKey": "qr5nbjNoZkgtLojXgU+OA/ntYMgko3XPSVyt+ObwR1sqp2ZkM9tGhwxkeEz7bfAuPS5ss61b2S3ZrZmqa9v3Mw==",
- "secondaryKey": "2dCJv1CasJl286SZiKxyBFDiIYCUdbwM1YrFNDcFMXCjCKbFzomrGkv+exAbnV5E3DEk91VP4jbeJ2eV/qtejA==",
+ "primaryKey": "",
+ "secondaryKey": "",
"enabled": true
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListBackends.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListBackends.json
index b9fe280c34ea..47c128b8b76e 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListBackends.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListBackends.json
@@ -39,7 +39,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListProductSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListProductSubscriptions.json
index a65ae61feca5..54ea8325bc00 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListProductSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListProductSubscriptions.json
@@ -19,8 +19,8 @@
"productId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b57e7e8880006a060002",
"state": "active",
"createdDate": "2015-09-22T01:57:18.723Z",
- "primaryKey": "ba95768e868648848e215f0290eec023",
- "secondaryKey": "140f866def81419b9bb9732d05d24535"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListSubscriptions.json
index 0d0251b06bf6..4b5e2c184790 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListSubscriptions.json
@@ -18,8 +18,8 @@
"productId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060001",
"state": "active",
"createdDate": "2015-09-22T01:57:40.3Z",
- "primaryKey": "a24782fc06f648cbb1c3406c41dc9a3a",
- "secondaryKey": "b366198986614a7497a5a68fae19119d"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -35,8 +35,8 @@
"startDate": "2016-03-17T00:00:00Z",
"expirationDate": "2016-04-01T00:00:00Z",
"notificationDate": "2016-03-20T00:00:00Z",
- "primaryKey": "77708695e79a495bb99b95f32adfa1f0",
- "secondaryKey": "12e2e4ba857e420b88450dc8fe2a6cf9"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -49,8 +49,8 @@
"displayName": "Unlimited",
"state": "submitted",
"createdDate": "2017-06-02T17:59:06.223Z",
- "primaryKey": "6de0a3b2da204e459148d2f6785873f0",
- "secondaryKey": "c6de00b451f64ea780db1eb8dcf30b62"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListUserSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListUserSubscriptions.json
index 8a247ed0c036..786deba4b932 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListUserSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementListUserSubscriptions.json
@@ -21,8 +21,8 @@
"state": "active",
"createdDate": "2016-06-20T16:22:39.547Z",
"startDate": "2016-06-20T00:00:00Z",
- "primaryKey": "57681850a40f7eb6c49f6ae4",
- "secondaryKey": "bbd884a96b3c41b49f34422dac74b345"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -36,8 +36,8 @@
"state": "active",
"createdDate": "2016-06-20T16:22:41.103Z",
"startDate": "2016-06-20T00:00:00Z",
- "primaryKey": "57681850a40f7eb6c49f6b2c",
- "secondaryKey": "125f565d276647dc825d7f25ea40ee57"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsGetDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsGetDelegation.json
index eb0bdb9cc608..ef3a78fdda89 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsGetDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsGetDelegation.json
@@ -13,7 +13,7 @@
"name": "delegation",
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsPutDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsPutDelegation.json
index 41c1f28ff22e..a9f66a1cec76 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsPutDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsPutDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
@@ -27,7 +27,7 @@
"name": "delegation",
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsUpdateDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
index a80f1bacdc0d..780a07b78ca4 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2018-01-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateBackendProxyBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateBackendProxyBackend.json
index f8667932acc1..c91799937341 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateBackendProxyBackend.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateBackendProxyBackend.json
@@ -17,7 +17,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"credentials": {
"query": {
@@ -73,7 +73,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
@@ -113,7 +113,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateSubscription.json
index e32f3dac7bd1..1a1e527e2517 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateSubscription.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateSubscription.json
@@ -25,8 +25,8 @@
"displayName": "testsub",
"state": "submitted",
"createdDate": "2017-06-02T23:34:03.1055076Z",
- "primaryKey": "06c34e1a9d394412b292e0611e73d417",
- "secondaryKey": "1e756a7705364c529e8d1760190f47b3"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
},
@@ -41,8 +41,8 @@
"displayName": "testsub",
"state": "submitted",
"createdDate": "2017-06-02T23:34:03.1055076Z",
- "primaryKey": "06c34e1a9d394412b292e0611e73d417",
- "secondaryKey": "1e756a7705364c529e8d1760190f47b3"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetSubscription.json
index 63f0ff61a314..ec141c5a9149 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetSubscription.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetSubscription.json
@@ -18,8 +18,8 @@
"displayName": "Unlimited",
"state": "submitted",
"createdDate": "2017-06-02T17:59:06.223Z",
- "primaryKey": "6de0a3b2da204e459148d2f6785873f0",
- "secondaryKey": "c6de00b451f64ea780db1eb8dcf30b62"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetTenantAccess.json
index 29dd54f841ed..5a85e9f1085d 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetTenantAccess.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetTenantAccess.json
@@ -10,8 +10,8 @@
"200": {
"body": {
"id": "5600b59375ff190048030003",
- "primaryKey": "qr5nbjNoZkgtLojXgU+OA/ntYMgko3XPSVyt+ObwR1sqp2ZkM9tGhwxkeEz7bfAuPS5ss61b2S3ZrZmqa9v3Mw==",
- "secondaryKey": "2dCJv1CasJl286SZiKxyBFDiIYCUdbwM1YrFNDcFMXCjCKbFzomrGkv+exAbnV5E3DEk91VP4jbeJ2eV/qtejA==",
+ "primaryKey": "",
+ "secondaryKey": "",
"enabled": true
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListBackends.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListBackends.json
index d452fd02b81c..33cca61aa7b9 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListBackends.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListBackends.json
@@ -39,7 +39,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListProductSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListProductSubscriptions.json
index a3364181e6d8..6ba884d021c2 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListProductSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListProductSubscriptions.json
@@ -19,8 +19,8 @@
"scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b57e7e8880006a060002",
"state": "active",
"createdDate": "2015-09-22T01:57:18.723Z",
- "primaryKey": "ba95768e868648848e215f0290eec023",
- "secondaryKey": "140f866def81419b9bb9732d05d24535"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListSubscriptions.json
index a3e2d9804384..e704c9caa153 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListSubscriptions.json
@@ -18,8 +18,8 @@
"scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060001",
"state": "active",
"createdDate": "2015-09-22T01:57:40.3Z",
- "primaryKey": "a24782fc06f648cbb1c3406c41dc9a3a",
- "secondaryKey": "b366198986614a7497a5a68fae19119d"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -35,8 +35,8 @@
"startDate": "2016-03-17T00:00:00Z",
"expirationDate": "2016-04-01T00:00:00Z",
"notificationDate": "2016-03-20T00:00:00Z",
- "primaryKey": "77708695e79a495bb99b95f32adfa1f0",
- "secondaryKey": "12e2e4ba857e420b88450dc8fe2a6cf9"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -49,8 +49,8 @@
"displayName": "Unlimited",
"state": "submitted",
"createdDate": "2017-06-02T17:59:06.223Z",
- "primaryKey": "6de0a3b2da204e459148d2f6785873f0",
- "secondaryKey": "c6de00b451f64ea780db1eb8dcf30b62"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListUserSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListUserSubscriptions.json
index cd83b5c8b0f1..2eeaefbd4f18 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListUserSubscriptions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementListUserSubscriptions.json
@@ -21,8 +21,8 @@
"state": "active",
"createdDate": "2016-06-20T16:22:39.547Z",
"startDate": "2016-06-20T00:00:00Z",
- "primaryKey": "57681850a40f7eb6c49f6ae4",
- "secondaryKey": "bbd884a96b3c41b49f34422dac74b345"
+ "primaryKey": "",
+ "secondaryKey": ""
}
},
{
@@ -36,8 +36,8 @@
"state": "active",
"createdDate": "2016-06-20T16:22:41.103Z",
"startDate": "2016-06-20T00:00:00Z",
- "primaryKey": "57681850a40f7eb6c49f6b2c",
- "secondaryKey": "125f565d276647dc825d7f25ea40ee57"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsGetDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsGetDelegation.json
index ec36bd0a51e2..58878fc4bf09 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsGetDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsGetDelegation.json
@@ -13,7 +13,7 @@
"name": "delegation",
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsPutDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsPutDelegation.json
index 2d479f6ff32a..2b92600bf04f 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsPutDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsPutDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
@@ -27,7 +27,7 @@
"name": "delegation",
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsUpdateDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
index a11b16bb50cc..89055305b09a 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/apimapis.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/apimapis.json
index 9a765712e354..e6af20bb7b4c 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/apimapis.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/apimapis.json
@@ -4400,7 +4400,7 @@
"values": [
{
"value": "swagger-link",
- "description": "Export the Api Definition in OpenApi Specification 2.0 format to the Storage Blob.",
+ "description": "Export the Api Definition in OpenAPI 2.0 Specification as JSON document to the Storage Blob.",
"name": "Swagger"
},
{
@@ -4415,12 +4415,12 @@
},
{
"value": "openapi-link",
- "description": "Export the Api Definition in OpenApi Specification 3.0 to Storage Blob.",
+ "description": "Export the Api Definition in OpenAPI 3.0 Specification as YAML document 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.",
+ "description": "Export the Api Definition in OpenAPI 3.0 Specification as JSON document to Storage Blob.",
"name": "OpenapiJson"
}
]
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/definitions.json
index f4361ca41aab..86770c69be59 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/definitions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/definitions.json
@@ -207,11 +207,11 @@
},
{
"value": "swagger-json",
- "description": "The contents are inline and Content Type is a OpenApi 2.0 Document."
+ "description": "The contents are inline and Content Type is a OpenAPI 2.0 JSON Document."
},
{
"value": "swagger-link-json",
- "description": "The Open Api 2.0 document is hosted on a publicly accessible internet address."
+ "description": "The OpenAPI 2.0 JSON document is hosted on a publicly accessible internet address."
},
{
"value": "wsdl",
@@ -223,19 +223,19 @@
},
{
"value": "openapi",
- "description": "The contents are inline and Content Type is a OpenApi 3.0 Document in YAML format."
+ "description": "The contents are inline and Content Type is a OpenAPI 3.0 YAML Document."
},
{
"value": "openapi+json",
- "description": "The contents are inline and Content Type is a OpenApi 3.0 Document in JSON format."
+ "description": "The contents are inline and Content Type is a OpenAPI 3.0 JSON Document."
},
{
"value": "openapi-link",
- "description": "The Open Api 3.0 document is hosted on a publicly accessible internet address."
+ "description": "The OpenAPI 3.0 YAML document is hosted on a publicly accessible internet address."
},
{
"value": "openapi+json-link",
- "description": "The Open Api 3.0 Json document is hosted on a publicly accessible internet address."
+ "description": "The OpenAPI 3.0 JSON document is hosted on a publicly accessible internet address."
}
]
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementCreateBackendProxyBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementCreateBackendProxyBackend.json
index 101062eb227b..fc5c6696fd9e 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementCreateBackendProxyBackend.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementCreateBackendProxyBackend.json
@@ -17,7 +17,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"credentials": {
"query": {
@@ -73,7 +73,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
@@ -113,7 +113,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListBackends.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListBackends.json
index 2ff24b60f824..58560dfb7074 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListBackends.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListBackends.json
@@ -39,7 +39,7 @@
"proxy": {
"url": "http://192.168.1.1:8080",
"username": "Contoso\\admin",
- "password": "opensesame"
+ "password": ""
},
"tls": {
"validateCertificateChain": false,
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsPortalSettingsValidationKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
index a35a30f8d338..8d193eca96b3 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
@@ -8,7 +8,7 @@
"responses": {
"200": {
"body": {
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q=="
+ "validationKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsSubscription.json
index 382995492868..fb896fba3153 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsSubscription.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsSubscription.json
@@ -9,8 +9,8 @@
"responses": {
"200": {
"body": {
- "primaryKey": "6de0a3b2da204e459148d2f6785873f0",
- "secondaryKey": "c6de00b451f64ea780db1eb8dcf30b62"
+ "primaryKey": "",
+ "secondaryKey": ""
}
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsTenantAccess.json
index 330d498ca16d..733c7bdf3195 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsTenantAccess.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementListSecretsTenantAccess.json
@@ -10,8 +10,8 @@
"200": {
"body": {
"id": "5600b59375ff190048030003",
- "primaryKey": "qr5nbjNoZkgtLojXgU+OA/ntYMgko3XPSVyt+ObwR1sqp2ZkM9tGhwxkeEz7bfAuPS5ss61b2S3ZrZmqa9v3Mw==",
- "secondaryKey": "2dCJv1CasJl286SZiKxyBFDiIYCUdbwM1YrFNDcFMXCjCKbFzomrGkv+exAbnV5E3DEk91VP4jbeJ2eV/qtejA==",
+ "primaryKey": "",
+ "secondaryKey": "",
"enabled": true
}
}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementPortalSettingsPutDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementPortalSettingsPutDelegation.json
index c055028f1af6..dd4a92668185 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementPortalSettingsPutDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementPortalSettingsPutDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementPortalSettingsUpdateDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
index 79de717780ff..d9d98f18f7e0 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementPortalSettingsUpdateDelegation.json
@@ -9,7 +9,7 @@
"parameters": {
"properties": {
"url": "http://contoso.com/delegation",
- "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
+ "validationKey": "",
"subscriptions": {
"enabled": true
},
diff --git a/specification/apimanagement/resource-manager/readme.md b/specification/apimanagement/resource-manager/readme.md
index 38edc5918a9e..d5e0e3ce6c1f 100644
--- a/specification/apimanagement/resource-manager/readme.md
+++ b/specification/apimanagement/resource-manager/readme.md
@@ -62,6 +62,7 @@ input-file:
- Microsoft.ApiManagement/preview/2020-06-01-preview/apimopenidconnectproviders.json
- Microsoft.ApiManagement/preview/2020-06-01-preview/apimpolicies.json
- Microsoft.ApiManagement/preview/2020-06-01-preview/apimpolicydescriptions.json
+ - Microsoft.ApiManagement/preview/2020-06-01-preview/apimportalrevisions.json
- Microsoft.ApiManagement/preview/2020-06-01-preview/apimportalsettings.json
- Microsoft.ApiManagement/preview/2020-06-01-preview/apimproducts.json
- Microsoft.ApiManagement/preview/2020-06-01-preview/apimproductsByTags.json
diff --git a/specification/appconfiguration/resource-manager/Microsoft.AppConfiguration/preview/2020-07-01-preview/appconfiguration.json b/specification/appconfiguration/resource-manager/Microsoft.AppConfiguration/preview/2020-07-01-preview/appconfiguration.json
index e8822e146841..1ac5977c5f1d 100644
--- a/specification/appconfiguration/resource-manager/Microsoft.AppConfiguration/preview/2020-07-01-preview/appconfiguration.json
+++ b/specification/appconfiguration/resource-manager/Microsoft.AppConfiguration/preview/2020-07-01-preview/appconfiguration.json
@@ -1656,6 +1656,14 @@
"description": "Error message indicating why the operation failed.",
"type": "string",
"readOnly": true
+ },
+ "additionalInfo": {
+ "readOnly": true,
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/ErrorAdditionalInfo"
+ },
+ "description": "The error additional info."
}
}
},
@@ -1669,6 +1677,21 @@
}
}
},
+ "ErrorAdditionalInfo": {
+ "properties": {
+ "type": {
+ "readOnly": true,
+ "type": "string",
+ "description": "The additional info type."
+ },
+ "info": {
+ "readOnly": true,
+ "type": "object",
+ "description": "The additional info."
+ }
+ },
+ "description": "The resource management error additional info."
+ },
"Resource": {
"description": "An Azure resource.",
"required": [
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json
index 8787229ed864..a114e155c3b2 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json
@@ -1587,6 +1587,12 @@
"$ref": "#/definitions/DeploymentResource"
}
},
+ "202": {
+ "description": "Accepted. The response describes the create or update Deployment request is accepted.",
+ "schema": {
+ "$ref": "#/definitions/DeploymentResource"
+ }
+ },
"200": {
"description": "Success. The response describes the updated Deployment.",
"schema": {
@@ -2740,7 +2746,8 @@
"Succeeded",
"Failed",
"Creating",
- "Updating"
+ "Updating",
+ "Deleting"
],
"type": "string",
"readOnly": true,
@@ -3156,6 +3163,10 @@
"$ref": "#/definitions/DeploymentResourceProperties",
"description": "Properties of the Deployment resource",
"x-ms-client-flatten": false
+ },
+ "sku": {
+ "$ref": "#/definitions/Sku",
+ "description": "Sku of the Deployment resource"
}
}
},
@@ -3182,7 +3193,8 @@
"Creating",
"Updating",
"Succeeded",
- "Failed"
+ "Failed",
+ "Deleting"
],
"type": "string",
"readOnly": true,
@@ -3579,6 +3591,10 @@
"displayName": {
"description": "Localized friendly display name of the dimension",
"type": "string"
+ },
+ "toBeExportedForShoebox": {
+ "description": "Whether this dimension should be included for the Shoebox export scenario",
+ "type": "boolean"
}
}
},
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_CreateOrUpdate.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_CreateOrUpdate.json
index c29a033df194..d28fe2682385 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_CreateOrUpdate.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_CreateOrUpdate.json
@@ -19,6 +19,11 @@
"runtimeVersion": "Java_8"
},
"instances": null
+ },
+ "sku": {
+ "name": "S0",
+ "tier": "Standard",
+ "capacity": 1
}
},
"api-version": "2019-05-01-preview",
@@ -61,6 +66,52 @@
}
]
},
+ "sku": {
+ "name": "S0",
+ "tier": "Standard",
+ "capacity": 1
+ },
+ "type": "Microsoft.AppPlatform/Spring/apps/deployments",
+ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment",
+ "name": "mydeployment"
+ }
+ },
+ "202": {
+ "body": {
+ "properties": {
+ "source": {
+ "type": "Source",
+ "relativePath": "resources/a172cedcae47474b615c54d510a5d84a8dea3032e958587430b413538be3f333-2019082605-e3095339-1723-44b7-8b5e-31b1003978bc",
+ "version": "1.0",
+ "artifactSelector": "sub-module-1"
+ },
+ "appName": "myapp",
+ "deploymentSettings": {
+ "cpu": 1,
+ "memoryInGB": 3,
+ "jvmOptions": "-Xms1G -Xmx3G",
+ "instanceCount": 1,
+ "environmentVariables": {
+ "env": "test"
+ },
+ "runtimeVersion": "Java_8"
+ },
+ "provisioningState": "Creating",
+ "status": "Starting",
+ "active": false,
+ "instances": [
+ {
+ "name": "instance1",
+ "status": "Starting",
+ "discoveryStatus": "pending"
+ }
+ ]
+ },
+ "sku": {
+ "name": "S0",
+ "tier": "Standard",
+ "capacity": 1
+ },
"type": "Microsoft.AppPlatform/Spring/apps/deployments",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment",
"name": "mydeployment"
@@ -98,6 +149,11 @@
}
]
},
+ "sku": {
+ "name": "S0",
+ "tier": "Standard",
+ "capacity": 1
+ },
"type": "Microsoft.AppPlatform/Spring/apps/deployments",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment",
"name": "mydeployment"
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Get.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Get.json
index 19cf2196418a..4ce5b4b15915 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Get.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Get.json
@@ -40,6 +40,11 @@
}
]
},
+ "sku": {
+ "name": "S0",
+ "tier": "Standard",
+ "capacity": 1
+ },
"type": "Microsoft.AppPlatform/Spring/apps/deployments",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment",
"name": "mydeployment"
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_List.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_List.json
index 287ffdd7381e..ec7146bf5480 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_List.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_List.json
@@ -41,6 +41,11 @@
}
]
},
+ "sku": {
+ "name": "S0",
+ "tier": "Standard",
+ "capacity": 1
+ },
"type": "Microsoft.AppPlatform/Spring/apps/deployments",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment",
"name": "mydeployment"
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_ListClusterAllDeployments.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_ListClusterAllDeployments.json
index 287ffdd7381e..ec7146bf5480 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_ListClusterAllDeployments.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_ListClusterAllDeployments.json
@@ -41,6 +41,11 @@
}
]
},
+ "sku": {
+ "name": "S0",
+ "tier": "Standard",
+ "capacity": 1
+ },
"type": "Microsoft.AppPlatform/Spring/apps/deployments",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment",
"name": "mydeployment"
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Update.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Update.json
index b0e5592ad49d..79191f16883c 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Update.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Update.json
@@ -51,6 +51,11 @@
}
]
},
+ "sku": {
+ "name": "S0",
+ "tier": "Standard",
+ "capacity": 1
+ },
"type": "Microsoft.AppPlatform/Spring/apps/deployments",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment",
"name": "mydeployment"
@@ -88,6 +93,11 @@
}
]
},
+ "sku": {
+ "name": "S0",
+ "tier": "Standard",
+ "capacity": 1
+ },
"type": "Microsoft.AppPlatform/Spring/apps/deployments",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment",
"name": "mydeployment"
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_EnableTestEndpoint.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_EnableTestEndpoint.json
index 8973c1920084..215f1a0db65c 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_EnableTestEndpoint.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_EnableTestEndpoint.json
@@ -8,8 +8,8 @@
"responses": {
"200": {
"body": {
- "primaryKey": "key1",
- "secondaryKey": "key2",
+ "primaryKey": "",
+ "secondaryKey": "",
"primaryTestEndpoint": "key1@TestEndpoint",
"secondaryTestEndpoint": "key2@TestEndpoint",
"enabled": true
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_ListTestKeys.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_ListTestKeys.json
index 8973c1920084..215f1a0db65c 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_ListTestKeys.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_ListTestKeys.json
@@ -8,8 +8,8 @@
"responses": {
"200": {
"body": {
- "primaryKey": "key1",
- "secondaryKey": "key2",
+ "primaryKey": "",
+ "secondaryKey": "",
"primaryTestEndpoint": "key1@TestEndpoint",
"secondaryTestEndpoint": "key2@TestEndpoint",
"enabled": true
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_RegenerateTestKey.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_RegenerateTestKey.json
index 9c80e65703d5..e6f71f89f208 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_RegenerateTestKey.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_RegenerateTestKey.json
@@ -11,8 +11,8 @@
"responses": {
"200": {
"body": {
- "primaryKey": "key1",
- "secondaryKey": "key2",
+ "primaryKey": "",
+ "secondaryKey": "",
"primaryTestEndpoint": "key1@TestEndpoint",
"secondaryTestEndpoint": "key2@TestEndpoint",
"enabled": true
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/appplatform.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/appplatform.json
index 5d0e7e8f056c..91c2af4fb726 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/appplatform.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/appplatform.json
@@ -563,6 +563,67 @@
}
}
},
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AppPlatform/Spring/{serviceName}/configServers/validate": {
+ "post": {
+ "tags": [
+ "AppPlatform"
+ ],
+ "description": "Check if the config server settings are valid.",
+ "operationId": "ConfigServers_Validate",
+ "parameters": [
+ {
+ "$ref": "#/parameters/ApiVersionParameter"
+ },
+ {
+ "$ref": "#/parameters/SubscriptionIdParameter"
+ },
+ {
+ "$ref": "#/parameters/ResourceGroupNameParameter"
+ },
+ {
+ "$ref": "#/parameters/ServiceNameParameter"
+ },
+ {
+ "name": "configServerSettings",
+ "in": "body",
+ "description": "Config server settings to be validated",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/ConfigServerSettings"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "Success. The response describes the validation result of Config Server.",
+ "schema": {
+ "$ref": "#/definitions/ConfigServerSettingsValidateResult"
+ }
+ },
+ "202": {
+ "description": "Accepted. The response indicates the ConfigServerSetting is validating.",
+ "schema": {
+ "$ref": "#/definitions/ConfigServerSettingsValidateResult"
+ }
+ },
+ "default": {
+ "description": "Error response describing why the operation failed.",
+ "schema": {
+ "$ref": "#/definitions/CloudError"
+ }
+ }
+ },
+ "x-ms-long-running-operation": true,
+ "x-ms-long-running-operation-options": {
+ "final-state-via": "location"
+ },
+ "x-ms-examples": {
+ "ConfigServers_Validate": {
+ "$ref": "./examples/ConfigServers_Validate.json"
+ }
+ }
+ }
+ },
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AppPlatform/Spring/{serviceName}/monitoringSettings/default": {
"get": {
"tags": [
@@ -2833,6 +2894,44 @@
}
}
},
+ "ConfigServerSettingsValidateResult": {
+ "description": "Validation result for config server settings",
+ "type": "object",
+ "properties": {
+ "isValid": {
+ "description": "Indicate if the config server settings are valid",
+ "type": "boolean"
+ },
+ "details": {
+ "description": "The detail validation results",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/ConfigServerSettingsErrorRecord"
+ }
+ }
+ }
+ },
+ "ConfigServerSettingsErrorRecord": {
+ "description": "Error record of the config server settings",
+ "type": "object",
+ "properties": {
+ "name": {
+ "description": "The name of the config server settings error record",
+ "type": "string"
+ },
+ "uri": {
+ "description": "The uri of the config server settings error record",
+ "type": "string"
+ },
+ "messages": {
+ "description": "The detail error messages of the record",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ }
+ }
+ },
"ConfigServerResource": {
"description": "Config Server resource",
"type": "object",
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/ConfigServers_Validate.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/ConfigServers_Validate.json
new file mode 100644
index 000000000000..c4b517bf09b1
--- /dev/null
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/ConfigServers_Validate.json
@@ -0,0 +1,27 @@
+{
+ "parameters": {
+ "configServerSettings": {
+ "gitProperty": {
+ "uri": "https://github.com/fake-user/fake-repository.git",
+ "label": "master",
+ "searchPaths": [
+ "/"
+ ]
+ }
+ },
+ "api-version": "2020-07-01",
+ "subscriptionId": "00000000-0000-0000-0000-000000000000",
+ "resourceGroupName": "myResourceGroup",
+ "serviceName": "myservice"
+ },
+ "responses": {
+ "200": {
+ "body": {
+ "isValid": true
+ }
+ },
+ "202": {
+ "body": {}
+ }
+ }
+}
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_EnableTestEndpoint.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_EnableTestEndpoint.json
index 9836b1d2ae6f..0a11c106121e 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_EnableTestEndpoint.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_EnableTestEndpoint.json
@@ -8,8 +8,8 @@
"responses": {
"200": {
"body": {
- "primaryKey": "key1",
- "secondaryKey": "key2",
+ "primaryKey": "",
+ "secondaryKey": "",
"primaryTestEndpoint": "key1@TestEndpoint",
"secondaryTestEndpoint": "key2@TestEndpoint",
"enabled": true
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_ListTestKeys.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_ListTestKeys.json
index 9836b1d2ae6f..0a11c106121e 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_ListTestKeys.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_ListTestKeys.json
@@ -8,8 +8,8 @@
"responses": {
"200": {
"body": {
- "primaryKey": "key1",
- "secondaryKey": "key2",
+ "primaryKey": "",
+ "secondaryKey": "",
"primaryTestEndpoint": "key1@TestEndpoint",
"secondaryTestEndpoint": "key2@TestEndpoint",
"enabled": true
diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_RegenerateTestKey.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_RegenerateTestKey.json
index 36ce27ed48c3..68190f5ba1b7 100644
--- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_RegenerateTestKey.json
+++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Services_RegenerateTestKey.json
@@ -11,8 +11,8 @@
"responses": {
"200": {
"body": {
- "primaryKey": "key1",
- "secondaryKey": "key2",
+ "primaryKey": "",
+ "secondaryKey": "",
"primaryTestEndpoint": "key1@TestEndpoint",
"secondaryTestEndpoint": "key2@TestEndpoint",
"enabled": true
diff --git a/specification/appplatform/resource-manager/readme.python.md b/specification/appplatform/resource-manager/readme.python.md
index ddb776efd495..ad993c74d154 100644
--- a/specification/appplatform/resource-manager/readme.python.md
+++ b/specification/appplatform/resource-manager/readme.python.md
@@ -4,7 +4,7 @@ These settings apply only when `--python` is specified on the command line.
Please also specify `--python-sdks-folder=`.
Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.
-``` yaml $(python)
+``` yaml $(python) && !$(track2)
python-mode: create
python:
azure-arm: true
@@ -14,36 +14,66 @@ python:
clear-output-folder: true
no-namespace-folders: true
```
+``` yaml $(python) && $(track2)
+python-mode: create
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+package-name: azure-mgmt-appplatform
+clear-output-folder: true
+no-namespace-folders: true
+```
### Python multi-api
Generate all API versions currently shipped for this package
-```yaml $(python) && $(multiapi)
+```yaml $(python) && $(multiapi) && !$(track2)
batch:
- tag: package-2020-07
- tag: package-2019-05-01-preview
```
+```yaml $(python) && $(multiapi) && $(track2)
+clear-output-folder: true
+batch:
+ - tag: package-2020-07
+ - tag: package-2019-05-01-preview
+ - multiapiscript: true
+```
+
+``` yaml $(multiapiscript)
+output-folder: $(python-sdks-folder)/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/
+clear-output-folder: false
+perform-load: false
+```
+
### Tag: package-2020-07 and python
These settings apply only when `--tag=package-2020-07 --python` is specified on the command line.
Please also specify `--python-sdks-folder=`.
-``` yaml $(tag) == 'package-2020-07' && $(python)
+``` yaml $(tag) == 'package-2020-07' && $(python) && !$(track2)
python:
namespace: azure.mgmt.appplatform.v2020_07_01
output-folder: $(python-sdks-folder)/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01
```
+``` yaml $(tag) == 'package-2020-07' && $(python) && $(track2)
+namespace: azure.mgmt.appplatform.v2020_07_01
+output-folder: $(python-sdks-folder)/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01
+```
### Tag: package-2019-05-01-preview and python
These settings apply only when `--tag=package-2019-05-01-preview --python` is specified on the command line.
Please also specify `--python-sdks-folder=`.
-``` yaml $(tag) == 'package-2019-05-01-preview' && $(python)
+``` yaml $(tag) == 'package-2019-05-01-preview' && $(python) && !$(track2)
python:
namespace: azure.mgmt.appplatform.v2019_05_01_preview
output-folder: $(python-sdks-folder)/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview
```
+``` yaml $(tag) == 'package-2019-05-01-preview' && $(python) && $(track2)
+namespace: azure.mgmt.appplatform.v2019_05_01_preview
+output-folder: $(python-sdks-folder)/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview
+```
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/attestation.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
similarity index 99%
rename from specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/attestation.json
rename to specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
index 111f26c59183..d3fb1ff922ae 100644
--- a/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/attestation.json
+++ b/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
@@ -3,7 +3,7 @@
"info": {
"title": "AttestationClient",
"description": "Describes the interface for the per-tenant enclave service.",
- "version": "2018-09-01"
+ "version": "2018-09-01-preview"
},
"x-ms-parameterized-host": {
"hostTemplate": "{tenantBaseUrl}",
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Add_PolicyCertificate.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Add_PolicyCertificate.json
similarity index 100%
rename from specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Add_PolicyCertificate.json
rename to specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Add_PolicyCertificate.json
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Get_Certs.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_Certs.json
similarity index 100%
rename from specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Get_Certs.json
rename to specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_Certs.json
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Get_MetadataConfiguration.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_MetadataConfiguration.json
similarity index 100%
rename from specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Get_MetadataConfiguration.json
rename to specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_MetadataConfiguration.json
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Get_Policy.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_Policy.json
similarity index 100%
rename from specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Get_Policy.json
rename to specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_Policy.json
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Get_PolicyCertificates.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_PolicyCertificates.json
similarity index 100%
rename from specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Get_PolicyCertificates.json
rename to specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_PolicyCertificates.json
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Remove_PolicyCertificate.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Remove_PolicyCertificate.json
similarity index 100%
rename from specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Remove_PolicyCertificate.json
rename to specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Remove_PolicyCertificate.json
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Reset_Policy.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Reset_Policy.json
similarity index 100%
rename from specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Reset_Policy.json
rename to specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Reset_Policy.json
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Set_Policy.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Set_Policy.json
similarity index 100%
rename from specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/Set_Policy.json
rename to specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/Set_Policy.json
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/UpdatePolicy.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/UpdatePolicy.json
similarity index 100%
rename from specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01/examples/UpdatePolicy.json
rename to specification/attestation/data-plane/Microsoft.Attestation/stable/2018-09-01-preview/examples/UpdatePolicy.json
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json
index 9d97af18a55d..e82086d63342 100644
--- a/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json
+++ b/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json
@@ -419,49 +419,6 @@
}
}
},
- "/attest/SevSnpVm": {
- "post": {
- "tags": [
- "attestation"
- ],
- "summary": "Attest to an SEV SNP Virtual Machine.",
- "description": "Processes a SEV SNP Boot chain. The type of artifact produced is dependent upon attestation policy.",
- "operationId": "Attestation_AttestSevSnpVm",
- "parameters": [
- {
- "$ref": "#/parameters/ApiVersionParameter"
- },
- {
- "name": "request",
- "in": "body",
- "description": "Request object containing the quote",
- "required": true,
- "schema": {
- "$ref": "#/definitions/AttestSevSnpVmRequest"
- }
- }
- ],
- "responses": {
- "200": {
- "description": "Success",
- "schema": {
- "$ref": "#/definitions/AttestationResponse"
- }
- },
- "default": {
- "description": "Error response describing why the operation failed",
- "schema": {
- "$ref": "#/definitions/CloudError"
- }
- }
- },
- "x-ms-examples": {
- "Attest SevSnpVm": {
- "$ref": "./examples/AttestSevSnpVm.json"
- }
- }
- }
- },
"/certs": {
"get": {
"tags": [
@@ -823,6 +780,12 @@
"type": "string",
"format": "base64url"
},
+ "maa-ehd": {
+ "description": "DEPRECATED: Private Preview version of x-ms-sgx-ehd claim.",
+ "x-ms-client-name": "DeprecatedEnclaveHeldData2",
+ "type": "string",
+ "format": "base64url"
+ },
"product-id": {
"description": "DEPRECATED: Private Preview version of x-ms-sgx-product-id",
"x-ms-client-name": "DeprecatedProductId",
@@ -995,45 +958,6 @@
"format": "base64url"
}
}
- },
- "AttestSevSnpVmRequest": {
- "type": "object",
- "description": "Attestation request for AMD SEV SNP Virtual Machine",
- "properties": {
- "reportType": {
- "description": "Type of the report payload",
- "type": "string",
- "x-ms-enum": {
- "name": "SevSnpReportType",
- "modelAsString": true,
- "values": [
- {
- "value": "HclHyperV",
- "description": "SEV SNP report generated by HCL running on HyperV platform"
- }
- ]
- },
- "enum": [
- "HclHyperV"
- ]
- },
- "report": {
- "description": "Hardware rooted report of the virtual machine being attested",
- "type": "string"
- },
- "runtimeData": {
- "description": "Runtime data provided by the enclave at the time of report generation. The MAA will verify that the run time data is known to the attestation target.",
- "$ref": "#/definitions/RuntimeData"
- },
- "initTimeData": {
- "description": "Initialization data provided by the enclave at the time of report generation. The MAA will verify that the init time data is known to the attestation target.",
- "$ref": "#/definitions/InitTimeData"
- },
- "draftPolicyForAttestation": {
- "description": "Attest against the provided draft policy. Note that the resulting token cannot be validated.",
- "type": "string"
- }
- }
}
},
"parameters": {
@@ -1063,10 +987,6 @@
"value": "OpenEnclave",
"description": "OpenEnclave extensions to SGX"
},
- {
- "value": "SevSnpVm",
- "description": "AMD SEV SNP Virtual Machine"
- },
{
"value": "Tpm",
"description": "Edge TPM Virtualization Based Security"
@@ -1076,7 +996,6 @@
"enum": [
"SgxEnclave",
"OpenEnclave",
- "SevSnpVm",
"Tpm"
]
}
diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/examples/AttestSevSnpVm.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/examples/AttestSevSnpVm.json
deleted file mode 100644
index 7582bcafb214..000000000000
--- a/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/examples/AttestSevSnpVm.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "parameters": {
- "instanceUrl": "https://instance.attest.azure.net",
- "api-version": "2020-10-01",
- "request": {
- "reportType": "HclHyperV",
- "report": "SENMQQEAAADRBgAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAB8ACwAAAAAAAQAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAzAAAAAAAAAAAAAAAAAAAAAEnvia-3paqOjvL4Y8aHoLAoSwEYpvlScPVCZ8gW6rLhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADnP2W0CtgI1rBtW9JGy-oWJ1wXGdWBxSZvfByn3I_q0TR15ClWSygU8tWs55Qb5OkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKZM6OS5EHwe7c8bQDMX4yFEux95df07UvWho7e2LsAGAHZ5VUxQWAfFADYFwDOU0gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKYGr2SRklnMdzWWfDQhDg0RrDYfRLzSTD1SZLj-k7uupgavZJGSWcx3NZZ8NCEODRGsNh9EvNJMPVJkuP6Tu64AAAAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAObIZ5bNRLC8a3wNT9qzPigH4UtfxFOLN1CSEWnZe89ER8fTqyp8JfdMFkHiiFwQEdAlzFNvXJolBHExNseHf0gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADG5UE56fX8Q_HgNzxrY52-G-PsQoUChtkbV96GP6uzquM6_WxbKD3zjIcmfNicJZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACj4bYIjBRCfhwXJrdUM_Bs0inzeDO-7goW6YTn5KluomcH_WE-87XS0-Lf2XfsAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABECAAABAAAAAgAAAAEAAAD9AQAAeyJza3ItdHJhbnNmZXIta2V5Ijp7ImtleXMiOlt7ImtpZCI6IkhDTFRyYW5zZmVyS2V5Iiwia2V5X29wcyI6WyJlbmNyeXB0Il0sImt0eSI6IlJTQSIsImUiOiJBUUFCIiwibiI6InhXODF1VFdQQlpiLVNjbklTbFF5U2dTTm9aVjhjSVNQS0FWVnhza1VXVGV2cGpTTzdrNmNURUhpUW1QRWdsNTVwOHJnb0ZuRkdCWlJtOFRYUVgwNzJ1TGZUUnBQTkFkOGFnbnZsM0dfMDAxd09vdXd0NnV3RzhWWHhCSENLVWZWMlBWVlRVSzJtRHFBRUl5R3g1QUJsQ3hQc19jV085emtMX0JrVEhBZEhrdURfUzM2ZE1FRURhVFp2Z1N4elRDNDJBbWtYem9oSFZaVThGYmNDTzJDOTZ2WnoxSWcxMHNFSHN1aU11aDVPSE43c1k1RHdNMU9EUnlTaGpMbVF4NEhVTzRuOUMtOGZYWGJaVXBMRTVESHBSMlNzajdMTFRpMi1BVW1rZDVicldQVHE0QjVJYXBqWm1ZSlRSeUhaVHEzUlQ2NTZVc1dxWnJOX2VwdHJHRFVMUSJ9XX0sInNlY3VyaXR5LXByb2ZpbGUiOnsidHBtLWVuYWJsZWQiOnRydWUsInNlY3VyZS1ib290Ijp0cnVlfX0"
- }
- },
- "responses": {
- "200": {
- "body": {
- "token": "eyJhbGciOiAiUlMyNTYiLCAiamt1IjogImh0dHBzOi8vdGVuYW50dGVzdHMudXMvY2VydHMiLCAia2lkIjogImU4VHpCeEJ0VnFIdnRxOUdVbTFEd2Y0VkRoMGRubk1uS1BhemdOOXBUUGM9IiwgInR5cCI6ICJKV1QifQ.eyJhdXRob3JrZXlkaWdlc3QiOiAiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwIiwgImV4cCI6IDE2MDE0MzAyODksICJmYW1pbHlJZCI6ICIwMTAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCIsICJndWVzdHN2biI6IDEsICJob3N0ZGF0YSI6ICIwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwIiwgImlhdCI6IDE2MDE0MDE0ODksICJpZGtleWRpZ2VzdCI6ICJhNjRjZThlNGI5MTA3YzFlZWRjZjFiNDAzMzE3ZTMyMTQ0YmIxZjc5NzVmZDNiNTJmNWExYTNiN2I2MmVjMDA2MDA3Njc5NTU0YzUwNTgwN2M1MDAzNjA1YzAzMzk0ZDIiLCAiaW1hZ2VJZCI6ICIwMjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCIsICJpc3MiOiAiaHR0cHM6Ly90ZW5hbnR0ZXN0cy51cyIsICJsYXVuY2htZWFzdXJlbWVudCI6ICJlNzNmNjViNDBhZDgwOGQ2YjA2ZDViZDI0NmNiZWExNjI3NWMxNzE5ZDU4MWM1MjY2ZjdjMWNhN2RjOGZlYWQxMzQ3NWU0Mjk1NjRiMjgxNGYyZDVhY2U3OTQxYmU0ZTkiLCAibWFhLWVoZCI6ICJleUpyWlhseklqb2dXM3NpWlNJNklDSkJVVUZDSWl3Z0ltdGxlVjl2Y0hNaU9pQmJJbVZ1WTNKNWNIUWlYU3dnSW10cFpDSTZJQ0pJUTB4VWNtRnVjMlpsY2t0bGVTSXNJQ0pyZEhraU9pQWlVbE5CSWl3Z0ltNGlPaUFpZUZjNE1YVlVWMUJDV21JdFUyTnVTVk5zVVhsVFoxTk9iMXBXT0dOSlUxQkxRVlpXZUhOclZWZFVaWFp3YWxOUE4yczJZMVJGU0dsUmJWQkZaMncxTlhBNGNtZHZSbTVHUjBKYVVtMDRWRmhSV0RBM01uVk1abFJTY0ZCT1FXUTRZV2R1ZG13elIxOHdNREYzVDI5MWQzUTJkWGRIT0ZaWWVFSklRMHRWWmxZeVVGWldWRlZMTW0xRWNVRkZTWGxIZURWQlFteERlRkJ6WDJOWFR6bDZhMHhmUW10VVNFRmtTR3QxUkY5VE16WmtUVVZGUkdGVVduWm5VM2g2VkVNME1rRnRhMWg2YjJoSVZscFZPRVppWTBOUE1rTTVOblphZWpGSlp6RXdjMFZJYzNWcFRYVm9OVTlJVGpkeldUVkVkMDB4VDBSU2VWTm9ha3h0VVhnMFNGVlBORzQ1UXkwNFpsaFlZbHBWY0V4Rk5VUkljRkl5VTNOcU4weE1WR2t5TFVGVmJXdGtOV0p5VjFCVWNUUkNOVWxoY0dwYWJWbEtWRko1U0ZwVWNUTlNWRFkxTmxWelYzRmFjazVmWlhCMGNrZEVWVXhSSW4xZGZRIiwgIm5iZiI6IDE2MDE0MDE0ODksICJwbGF0Zm9ybWluZm8iOiAiMHgwMDAwMDAwMDAwMDAwMDAwIiwgInBvbGljeSI6ICIweDAwMDAwMDAwMDAwYjAwMWYiLCAicmVwb3J0ZGF0YSI6ICI0OWVmODlhZmI3YTVhYThlOGVmMmY4NjNjNjg3YTBiMDI4NGIwMTE4YTZmOTUyNzBmNTQyNjdjODE2ZWFiMmUxMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCIsICJyZXBvcnRpZCI6ICJhNjA2YWY2NDkxOTI1OWNjNzczNTk2N2MzNDIxMGUwZDExYWMzNjFmNDRiY2QyNGMzZDUyNjRiOGZlOTNiYmFlIiwgInRjYnZlcnNpb24iOiAiMHgzMzAwMDAwMDAwMDAwMDAwIiwgInRlZSI6ICJzZXZzbnB2bSIsICJ2bXBsIjogMCwgIngtbXMtcG9saWN5LWhhc2giOiAiOVBMb2kzQlpyZmxoVXBucWdmS0FsZ0lmei04NEVzdzVQNHdrM1RURUJVQSIsICJ4LW1zLXZlciI6ICIxLjAifQ.CwrtL3IjpJw2cB22wlzipS2sjNyTQVJLYvBHnXeQvn5yP4hAF9w8zuxegewgL4CR25BPsx3sjSO7yle0_jlNmu05smWohEiY4cVxm38XoM5p1fct0q1AUjTC-dXNuPN33QfFWByD1huYJVEz1TxUiFj6emKKgX968O-2z0RvE7rMHV0eSIJHJjM5Sp2u8VW16-oJdM84PqvshW2WJq1RcKEW0uvhipXXIIZj1fZPywz4aIh6LyV0S02lM40KY1rfg8AhTvzZ3Gefmq7zWxwF1uc1TDMEkWWQcyXiEoaDk1iwHitEty81ufJ5iMH5IIEenhux3EH_H9lb-fgchR4uEw"
- }
- }
- }
-}
diff --git a/specification/attestation/data-plane/readme.go.md b/specification/attestation/data-plane/readme.go.md
index ff6d9f8158b5..b349ef5c93ef 100644
--- a/specification/attestation/data-plane/readme.go.md
+++ b/specification/attestation/data-plane/readme.go.md
@@ -23,7 +23,7 @@ These settings apply only when `--tag=package-2018-09-01 --go` is specified on t
Please also specify `--go-sdk-folder=`.
``` yaml $(tag) == 'package-2018-09-01' && $(go)
-output-folder: $(go-sdk-folder)/services/stable/$(namespace)/2018-09-01/$(namespace)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2018-09-01/$(namespace)
```
### Tag: package-2020-10-01 and go
@@ -32,5 +32,5 @@ These settings apply only when `--tag=package-2020-10-01 --go` is specified on t
Please also specify `--go-sdk-folder=`.
``` yaml $(tag) == 'package-2020-10-01' && $(go)
-output-folder: $(go-sdk-folder)/services/stable/$(namespace)/2020-10-01/$(namespace)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2020-10-01/$(namespace)
```
diff --git a/specification/attestation/data-plane/readme.md b/specification/attestation/data-plane/readme.md
index 04bbc57467bc..bea2cdf7952f 100644
--- a/specification/attestation/data-plane/readme.md
+++ b/specification/attestation/data-plane/readme.md
@@ -34,7 +34,7 @@ These settings apply only when `--tag=package-2018-09-01` is specified on the co
``` yaml $(tag) == 'package-2018-09-01'
input-file:
-- Microsoft.Attestation/stable/2018-09-01/attestation.json
+- Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
```
### Tag: package-2020-10-01
@@ -96,7 +96,7 @@ require: $(this-folder)/../../../profiles/readme.md
# all the input files across all versions
input-file:
- - $(this-folder)/Microsoft.Attestation/stable/2018-09-01/attestation.json
+ - $(this-folder)/Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
- $(this-folder)/Microsoft.Attestation/stable/2020-10-01/attestation.json
```
diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
similarity index 99%
rename from specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/attestation.json
rename to specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
index 8fb100b1cad8..cf2fa31d9945 100644
--- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/attestation.json
+++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
@@ -3,7 +3,7 @@
"info": {
"title": "AttestationManagementClient",
"description": "Various APIs for managing resources in attestation service. This primarily encompasses per-tenant instance management.",
- "version": "2018-09-01"
+ "version": "2018-09-01-preview"
},
"host": "management.azure.com",
"schemes": [
diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Create_AttestationProvider.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Create_AttestationProvider.json
similarity index 100%
rename from specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Create_AttestationProvider.json
rename to specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Create_AttestationProvider.json
diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Delete_AttestationProvider.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Delete_AttestationProvider.json
similarity index 100%
rename from specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Delete_AttestationProvider.json
rename to specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Delete_AttestationProvider.json
diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Get_AttestationProvider.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_AttestationProvider.json
similarity index 100%
rename from specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Get_AttestationProvider.json
rename to specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_AttestationProvider.json
diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Get_AttestationProvidersList.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_AttestationProvidersList.json
similarity index 100%
rename from specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Get_AttestationProvidersList.json
rename to specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_AttestationProvidersList.json
diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Get_AttestationProvidersListByResourceGroup.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_AttestationProvidersListByResourceGroup.json
similarity index 100%
rename from specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Get_AttestationProvidersListByResourceGroup.json
rename to specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_AttestationProvidersListByResourceGroup.json
diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Get_DefaultProviderByLocation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_DefaultProviderByLocation.json
similarity index 100%
rename from specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Get_DefaultProviderByLocation.json
rename to specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_DefaultProviderByLocation.json
diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Get_DefaultProviders.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_DefaultProviders.json
similarity index 100%
rename from specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Get_DefaultProviders.json
rename to specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Get_DefaultProviders.json
diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Operations_List.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Operations_List.json
similarity index 100%
rename from specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Operations_List.json
rename to specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Operations_List.json
diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Update_AttestationProvider.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Update_AttestationProvider.json
similarity index 100%
rename from specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01/examples/Update_AttestationProvider.json
rename to specification/attestation/resource-manager/Microsoft.Attestation/stable/2018-09-01-preview/examples/Update_AttestationProvider.json
diff --git a/specification/attestation/resource-manager/readme.azureresourceschema.md b/specification/attestation/resource-manager/readme.azureresourceschema.md
index 2a2df1ab405a..17a7d1312379 100644
--- a/specification/attestation/resource-manager/readme.azureresourceschema.md
+++ b/specification/attestation/resource-manager/readme.azureresourceschema.md
@@ -19,7 +19,7 @@ output-folder: $(azureresourceschema-folder)/schemas
# all the input files in this apiVersion
input-file:
- - Microsoft.Attestation/stable/2018-09-01/attestation.json
+ - Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
- Microsoft.Attestation/stable/2020-10-01/attestation.json
```
diff --git a/specification/attestation/resource-manager/readme.go.md b/specification/attestation/resource-manager/readme.go.md
index 005679be9021..df9014b877d0 100644
--- a/specification/attestation/resource-manager/readme.go.md
+++ b/specification/attestation/resource-manager/readme.go.md
@@ -23,12 +23,12 @@ These settings apply only when `--tag=package-2018-09-01 --go` is specified on t
Please also specify `--go-sdk-folder=`.
``` yaml $(tag) == 'package-2018-09-01' && $(go)
-output-folder: $(go-sdk-folder)/services/stable/$(namespace)/mgmt/2018-09-01/$(namespace)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-09-01/$(namespace)
```
These settings apply only when `--tag=package-2020-10-01 --go` is specified on the command line.
Please also specify `--go-sdk-folder=`.
``` yaml $(tag) == 'package-2020-10-01' && $(go)
-output-folder: $(go-sdk-folder)/services/stable/$(namespace)/mgmt/2020-10-01/$(namespace)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2020-10-01/$(namespace)
```
diff --git a/specification/attestation/resource-manager/readme.java.md b/specification/attestation/resource-manager/readme.java.md
new file mode 100644
index 000000000000..8529321082f5
--- /dev/null
+++ b/specification/attestation/resource-manager/readme.java.md
@@ -0,0 +1,33 @@
+## Java
+
+These settings apply only when `--java` is specified on the command line.
+Please also specify `--azure-libraries-for-java-folder=`.
+
+``` yaml $(java)
+azure-arm: true
+fluent: true
+namespace: com.microsoft.azure.management.attestation
+license-header: MICROSOFT_MIT_NO_CODEGEN
+payload-flattening-threshold: 1
+output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-attestation
+```
+
+### Java multi-api
+
+```yaml $(java) && $(multiapi)
+batch:
+ - tag: package-2020-10-01
+```
+
+### Tag: package-2020-10-01 and java
+
+These settings apply only when `--tag=package-2020-10-01 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java-folder=`.
+
+``` yaml $(tag) == 'package-2020-10-01' && $(java) && $(multiapi)
+java:
+ namespace: com.microsoft.azure.management.attestation.v2020_10_01
+ output-folder: $(azure-libraries-for-java-folder)/sdk/attestation/mgmt-v2020_10_01
+regenerate-manager: true
+generate-interface: true
+```
diff --git a/specification/attestation/resource-manager/readme.md b/specification/attestation/resource-manager/readme.md
index 681eae848d28..4bbefc59fcd5 100644
--- a/specification/attestation/resource-manager/readme.md
+++ b/specification/attestation/resource-manager/readme.md
@@ -35,7 +35,7 @@ These settings apply only when `--tag=package-2018-09-01` is specified on the co
``` yaml $(tag) == 'package-2018-09-01'
input-file:
-- Microsoft.Attestation/stable/2018-09-01/attestation.json
+- Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
```
### Tag: package-2020-10-01
@@ -61,6 +61,8 @@ swagger-to-sdk:
- repo: azure-sdk-for-net
- repo: azure-sdk-for-python
- repo: azure-sdk-for-go
+ - repo: azure-sdk-for-js
+ - repo: azure-sdk-for-java
- repo: azure-resource-manager-schemas
after_scripts:
- node sdkauto_afterscript.js attestation/resource-manager
diff --git a/specification/attestation/resource-manager/readme.python.md b/specification/attestation/resource-manager/readme.python.md
index 9e387739adc7..30daafcd83eb 100644
--- a/specification/attestation/resource-manager/readme.python.md
+++ b/specification/attestation/resource-manager/readme.python.md
@@ -4,7 +4,7 @@ These settings apply only when `--python` is specified on the command line.
Please also specify `--python-sdks-folder=`.
Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.
-``` yaml $(python)
+``` yaml $(python) && !$(track2)
python-mode: create
python:
azure-arm: true
@@ -15,13 +15,30 @@ python:
package-version: 0.1.0
clear-output-folder: true
```
-``` yaml $(python) && $(python-mode) == 'update'
+``` yaml $(python) && $(track2)
+python-mode: create
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+namespace: azure.mgmt.attestation
+package-name: azure-mgmt-attestation
+package-version: 0.1.0
+clear-output-folder: true
+```
+``` yaml $(python) && $(python-mode) == 'update' && !$(track2)
python:
no-namespace-folders: true
output-folder: $(python-sdks-folder)/attestation/azure-mgmt-attestation/azure/mgmt/attestation
```
-``` yaml $(python) && $(python-mode) == 'create'
+``` yaml $(python) && $(python-mode) == 'create' && $(track2)
python:
basic-setup-py: true
output-folder: $(python-sdks-folder)/attestation/azure-mgmt-attestation
```
+``` yaml $(python) && $(python-mode) == 'update' && $(track2)
+no-namespace-folders: true
+output-folder: $(python-sdks-folder)/attestation/azure-mgmt-attestation/azure/mgmt/attestation
+```
+``` yaml $(python) && $(python-mode) == 'create' && $(track2)
+basic-setup-py: true
+output-folder: $(python-sdks-folder)/attestation/azure-mgmt-attestation
+```
diff --git a/specification/attestation/resource-manager/readme.typescript.md b/specification/attestation/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..e513241625ce
--- /dev/null
+++ b/specification/attestation/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=`.
+
+``` yaml $(typescript)
+typescript:
+ azure-arm: true
+ package-name: "@azure/arm-attestation"
+ output-folder: "$(typescript-sdks-folder)/sdk/attestation/arm-attestation"
+ clear-output-folder: true
+ generate-metadata: true
+```
diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-ProviderOperationsCalls.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-ProviderOperationsCalls.json
index 0759f1bfc3e4..b60a2c09d9c5 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-ProviderOperationsCalls.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-ProviderOperationsCalls.json
@@ -112,6 +112,24 @@
}
},
"definitions": {
+ "Error": {
+ "properties": {
+ "error": {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "string",
+ "description": "Brief error code"
+ },
+ "message": {
+ "type": "string",
+ "description": "Longer message explaining the details of the error"
+ }
+ }
+ }
+ },
+ "description": "Object to be thrown in case of an unsuccessful response"
+ },
"ResourceType": {
"properties": {
"name": {
diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleAssignmentsCalls.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleAssignmentsCalls.json
index 80bab7549988..af1a969098c1 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleAssignmentsCalls.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleAssignmentsCalls.json
@@ -478,6 +478,24 @@
}
},
"definitions": {
+ "Error": {
+ "properties": {
+ "error": {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "string",
+ "description": "Brief error code"
+ },
+ "message": {
+ "type": "string",
+ "description": "Longer message explaining the details of the error"
+ }
+ }
+ }
+ },
+ "description": "Object to be thrown in case of an unsuccessful response"
+ },
"RoleAssignmentFilter": {
"properties": {
"principalId": {
diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleDefinitionsCalls.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleDefinitionsCalls.json
index 809db9dfe1ed..da9941390854 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleDefinitionsCalls.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleDefinitionsCalls.json
@@ -348,6 +348,24 @@
}
},
"definitions": {
+ "Error": {
+ "properties": {
+ "error": {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "string",
+ "description": "Brief error code"
+ },
+ "message": {
+ "type": "string",
+ "description": "Longer message explaining the details of the error"
+ }
+ }
+ }
+ },
+ "description": "Object to be thrown in case of an unsuccessful response"
+ },
"RoleDefinitionFilter": {
"properties": {
"roleName": {
diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-07-01-preview/authorization-DenyAssignmentGetCalls.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-07-01-preview/authorization-DenyAssignmentGetCalls.json
index 80ead33f9cf7..eeae3cec7c6b 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-07-01-preview/authorization-DenyAssignmentGetCalls.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-07-01-preview/authorization-DenyAssignmentGetCalls.json
@@ -298,6 +298,25 @@
}
},
"definitions": {
+ "Error": {
+ "properties": {
+ "error": {
+ "description": "Object to be thrown in case of an unsuccessful response",
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "string",
+ "description": "Brief error code"
+ },
+ "message": {
+ "type": "string",
+ "description": "Longer message explaining the details of the error"
+ }
+ }
+ }
+ },
+ "description": "Object to be thrown in case of an unsuccessful response"
+ },
"DenyAssignmentFilter": {
"properties": {
"denyAssignmentName": {
diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/authorization-RoleAssignmentsCalls.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/authorization-RoleAssignmentsCalls.json
index 478c98bc5686..1d9c91998c74 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/authorization-RoleAssignmentsCalls.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/authorization-RoleAssignmentsCalls.json
@@ -135,6 +135,12 @@
"schema": {
"$ref": "#/definitions/RoleAssignmentListResult"
}
+ },
+ "400": {
+ "description": "Bad Request - Indicates the request has missing information and can not be completed",
+ "schema": {
+ "$ref": "#/definitions/Error"
+ }
}
},
"x-ms-pageable": {
@@ -181,6 +187,12 @@
"schema": {
"$ref": "#/definitions/RoleAssignment"
}
+ },
+ "204": {
+ "description": "Deleted - Indicates correct deletion without returning additional info"
+ },
+ "412": {
+ "description": "Precondition Failed"
}
},
"x-ms-examples": {
@@ -230,6 +242,18 @@
"schema": {
"$ref": "#/definitions/RoleAssignment"
}
+ },
+ "400": {
+ "description": "Bad Request - Indicates the request has missing information and can not be completed",
+ "schema": {
+ "$ref": "#/definitions/Error"
+ }
+ },
+ "409": {
+ "description": "Conflict - indicates that the request could not be completed due to a conflict with the current state of the target resource",
+ "schema": {
+ "$ref": "#/definitions/Error"
+ }
}
},
"x-ms-examples": {
@@ -270,6 +294,15 @@
"schema": {
"$ref": "#/definitions/RoleAssignment"
}
+ },
+ "400": {
+ "description": "Bad Request - Indicates the request has missing information and can not be completed",
+ "schema": {
+ "$ref": "#/definitions/Error"
+ }
+ },
+ "404": {
+ "description": "Not Found - Indicates the specified role has not been found"
}
},
"x-ms-examples": {
@@ -417,6 +450,12 @@
"schema": {
"$ref": "#/definitions/RoleAssignmentListResult"
}
+ },
+ "400": {
+ "description": "Bad Request - Indicates the request has missing information and can not be completed",
+ "schema": {
+ "$ref": "#/definitions/Error"
+ }
}
},
"x-ms-pageable": {
@@ -463,6 +502,12 @@
"schema": {
"$ref": "#/definitions/RoleAssignmentListResult"
}
+ },
+ "400": {
+ "description": "Bad Request - Indicates the request has missing information and can not be completed",
+ "schema": {
+ "$ref": "#/definitions/Error"
+ }
}
},
"x-ms-pageable": {
@@ -540,6 +585,28 @@
"conditionVersion": {
"type": "string",
"description": "Version of the condition. Currently accepted value is '2.0'"
+ },
+ "createdOn": {
+ "type": "string",
+ "description": "Time it was created",
+ "format": "date-time"
+ },
+ "updatedOn": {
+ "type": "string",
+ "description": "Time it was updated",
+ "format": "date-time"
+ },
+ "createdBy": {
+ "type": "string",
+ "description": "Id of the user who created the assignment"
+ },
+ "updatedBy": {
+ "type": "string",
+ "description": "Id of the user who updated the assignment"
+ },
+ "delegatedManagedIdentityResourceId": {
+ "type": "string",
+ "description": "Id of the delegated managed identity resource"
}
},
"description": "Role assignment properties with scope."
@@ -650,6 +717,25 @@
"properties"
],
"description": "Role assignment create parameters."
+ },
+ "Error": {
+ "properties": {
+ "error": {
+ "description": "Object to be thrown in case of an unsuccessful response",
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "string",
+ "description": "Brief error code"
+ },
+ "message": {
+ "type": "string",
+ "description": "Longer message explaining the details of the error"
+ }
+ }
+ }
+ },
+ "description": "Object to be thrown in case of an unsuccessful response"
}
},
"parameters": {
diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/DeleteRoleAssignmentByName.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/DeleteRoleAssignmentByName.json
index bf403661e286..87c254355e4a 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/DeleteRoleAssignmentByName.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/DeleteRoleAssignmentByName.json
@@ -21,6 +21,8 @@
"type": "Microsoft.Authorization/roleAssignments",
"name": "roleassignmentId"
}
- }
+ },
+ "204": {},
+ "412": {}
}
}
diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetAllRoleAssignments.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetAllRoleAssignments.json
index f2f280fce64a..dcae92c5700c 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetAllRoleAssignments.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetAllRoleAssignments.json
@@ -24,6 +24,14 @@
}
]
}
+ },
+ "400": {
+ "body": {
+ "error": {
+ "code": "BadRequest",
+ "message": "Your request was badly formed please correct it and try again"
+ }
+ }
}
}
}
diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByName.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByName.json
index 202df15a909d..30efe999c929 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByName.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByName.json
@@ -22,6 +22,15 @@
"type": "Microsoft.Authorization/roleAssignments",
"name": "raId"
}
- }
+ },
+ "400": {
+ "body": {
+ "error": {
+ "code": "BadRequest",
+ "message": "Your request was badly formed please correct it and try again"
+ }
+ }
+ },
+ "404": {}
}
}
diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByScope.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByScope.json
index 5fe6140ed25c..a098f8523d3e 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByScope.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByScope.json
@@ -24,6 +24,14 @@
}
]
}
+ },
+ "400": {
+ "body": {
+ "error": {
+ "code": "BadRequest",
+ "message": "Your request was badly formed please correct it and try again"
+ }
+ }
}
}
}
diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentsForResourceGroup.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentsForResourceGroup.json
index df3eb34a02cb..b1f4e4c28e5d 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentsForResourceGroup.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentsForResourceGroup.json
@@ -25,6 +25,14 @@
}
]
}
+ },
+ "400": {
+ "body": {
+ "error": {
+ "code": "BadRequest",
+ "message": "Your request was badly formed please correct it and try again"
+ }
+ }
}
}
}
diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/PutRoleAssignment.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/PutRoleAssignment.json
index c87cfe4307e7..c1445c370284 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/PutRoleAssignment.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2020-04-01-preview/examples/PutRoleAssignment.json
@@ -32,6 +32,22 @@
"type": "Microsoft.Authorization/roleAssignments",
"name": "roleassignmentId"
}
+ },
+ "400": {
+ "body": {
+ "error": {
+ "code": "BadRequest",
+ "message": "Your request was badly formed please correct it and try again"
+ }
+ }
+ },
+ "409": {
+ "body": {
+ "error": {
+ "code": "ConflictError",
+ "message": "the request could not be completed due to a conflict with the current state of the target resource"
+ }
+ }
}
}
}
diff --git a/specification/authorization/resource-manager/readme.md b/specification/authorization/resource-manager/readme.md
index 8e52bc8d5fd6..91ed1ee3668a 100644
--- a/specification/authorization/resource-manager/readme.md
+++ b/specification/authorization/resource-manager/readme.md
@@ -26,7 +26,7 @@ These are the global settings for the Authorization API.
``` yaml
openapi-type: arm
-tag: package-2020-04-01-preview-only
+tag: package-2020-04-preview
```
## Suppression
@@ -71,13 +71,27 @@ directive:
### Tag: package-2020-04-01-preview-only
-These settings apply only when `--tag=package-2020-04-preview` is specified on the command line.
+These settings apply only when `--tag=package-2020-04-01-preview-only` is specified on the command line.
``` yaml $(tag) == 'package-2020-04-01-preview-only'
input-file:
- Microsoft.Authorization/preview/2020-04-01-preview/authorization-RoleAssignmentsCalls.json
```
+### Tag: package-2020-04-preview
+
+These settings apply only when `--tag=package-2020-04-preview` is specified on the command line.
+
+``` yaml $(tag) == 'package-2020-04-preview'
+input-file:
+- Microsoft.Authorization/preview/2015-06-01/authorization-ClassicAdminCalls.json
+- Microsoft.Authorization/stable/2015-07-01/authorization-ElevateAccessCalls.json
+- Microsoft.Authorization/preview/2018-01-01-preview/authorization-ProviderOperationsCalls.json
+- Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleDefinitionsCalls.json
+- Microsoft.Authorization/preview/2018-07-01-preview/authorization-DenyAssignmentGetCalls.json
+- Microsoft.Authorization/preview/2020-04-01-preview/authorization-RoleAssignmentsCalls.json
+```
+
### Tag: package-2015-07-01
These settings apply only when `--tag=package-2015-07-01` is specified on the command line.
diff --git a/specification/authorization/resource-manager/readme.typescript.md b/specification/authorization/resource-manager/readme.typescript.md
index 5074d3ab3c63..83a6872c020c 100644
--- a/specification/authorization/resource-manager/readme.typescript.md
+++ b/specification/authorization/resource-manager/readme.typescript.md
@@ -31,3 +31,16 @@ typescript:
batch:
- tag: profile-hybrid-2019-03-01
```
+
+### Profile: profile-hybrid-2020-09-01
+
+These settings apply only when `--profile=profile-hybrid-2020-09-01` is specified on the command line.
+
+``` yaml $(profile)=='profile-hybrid-2020-09-01'
+typescript:
+ package-name: "@azure/arm-authorization-profile-2020-09-01-hybrid"
+ output-folder: "$(typescript-sdks-folder)/sdk/authorization/arm-authorization-profile-2020-09-01-hybrid"
+ clear-output-folder: true
+ batch:
+ - tag: profile-hybrid-2020-09-01
+```
diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateCredential.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateCredential.json
index 0e236ea82c5a..70c987990fb3 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateCredential.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateCredential.json
@@ -9,7 +9,7 @@
"name": "myCredential",
"properties": {
"userName": "mylingaiah",
- "password": "myPassw0rd",
+ "password": "",
"description": "my description goes here"
}
}
diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateWebhook.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateWebhook.json
index 58dee5f41609..48360dd9c931 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateWebhook.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateWebhook.json
@@ -9,7 +9,7 @@
"name": "TestWebhook",
"properties": {
"isEnabled": true,
- "uri": "https://s1events.azure-automation.net/webhooks?token=7u3KfQvM1vUPWaDMFRv2%2fAA4Jqx8QwS8aBuyO6Xsdcw%3d",
+ "uri": "",
"expiryTime": "2018-03-29T22:18:13.7002872Z",
"runbook": {
"name": "TestRunbook"
diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/updateCredential_createOrUpdate.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/updateCredential_createOrUpdate.json
index ac154fe3a342..0fd6cc54e12e 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/updateCredential_createOrUpdate.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/updateCredential_createOrUpdate.json
@@ -8,7 +8,7 @@
"name": "myCredential",
"properties": {
"userName": "mylingaiah",
- "password": "myPassw0rd2",
+ "password": "",
"description": "my description goes here"
}
}
diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/updateCredential_patch.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/updateCredential_patch.json
index 5408b259348d..890c951618cf 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/updateCredential_patch.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/updateCredential_patch.json
@@ -9,7 +9,7 @@
"name": "myCredential",
"properties": {
"userName": "mylingaiah",
- "password": "myPassw0rd3",
+ "password": "",
"description": "my description goes here"
}
}
diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/webhookGenerateUri.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/webhookGenerateUri.json
index b95d8f53fcec..b32de15af137 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/webhookGenerateUri.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/webhookGenerateUri.json
@@ -8,7 +8,7 @@
"responses": {
"200": {
"headers": {},
- "body": "https://s13events.azure-automation.net/webhooks?token=O6n03K%2b1%2bSLPH50m4x9%2fcbcqtAu2tJDTvr8QHnbJ1kw%3d"
+ "body": ""
}
}
}
diff --git a/specification/azsadmin/resource-manager/azurebridge/Microsoft.AzureBridge.Admin/preview/2016-01-01/examples/DownloadedProduct/Put.json b/specification/azsadmin/resource-manager/azurebridge/Microsoft.AzureBridge.Admin/preview/2016-01-01/examples/DownloadedProduct/Put.json
index 64863fc9b9d6..ea1c63ffba97 100644
--- a/specification/azsadmin/resource-manager/azurebridge/Microsoft.AzureBridge.Admin/preview/2016-01-01/examples/DownloadedProduct/Put.json
+++ b/specification/azsadmin/resource-manager/azurebridge/Microsoft.AzureBridge.Admin/preview/2016-01-01/examples/DownloadedProduct/Put.json
@@ -11,7 +11,7 @@
"name": "default/Canonical.UbuntuServer1710-ARM.1.0.6",
"type": "Microsoft.AzureBridge.Admin/activations/downloadedProducts",
"properties": {
- "galleryPackageBlobSasUri": "https://azstrptestwcu001.blob.core.windows.net/packages/Canonical.UbuntuServer1710.ARM.1.0.6/gallery/package.azpkg?sv=2015-04-05&sr=b&sig=mnzKeDrSMWoDilUrfrETb7n%2BG0Shme6f3AYzl3uzkYA%3D&se=2018-02-13T10%3A46%3A24Z&sp=r",
+ "galleryPackageBlobSasUri": "",
"productKind": "virtualMachineExtension",
"productDetailsProperties": {
"version": "1.0.6",
@@ -34,7 +34,7 @@
"name": "default/Canonical.UbuntuServer1710-ARM.1.0.6",
"type": "Microsoft.AzureBridge.Admin/activations/downloadedProducts",
"properties": {
- "galleryPackageBlobSasUri": "https://azstrptestwcu001.blob.core.windows.net/packages/Canonical.UbuntuServer1710.ARM.1.0.6/gallery/package.azpkg?sv=2015-04-05&sr=b&sig=mnzKeDrSMWoDilUrfrETb7n%2BG0Shme6f3AYzl3uzkYA%3D&se=2018-02-13T10%3A46%3A24Z&sp=r",
+ "galleryPackageBlobSasUri": "",
"productKind": "virtualMachineExtension",
"productDetailsProperties": {
"version": "1.0.6",
@@ -56,7 +56,7 @@
"name": "default/Canonical.UbuntuServer1710-ARM.1.0.6",
"type": "Microsoft.AzureBridge.Admin/activations/downloadedProducts",
"properties": {
- "galleryPackageBlobSasUri": "https://azstrptestwcu001.blob.core.windows.net/packages/Canonical.UbuntuServer1710.ARM.1.0.6/gallery/package.azpkg?sv=2015-04-05&sr=b&sig=mnzKeDrSMWoDilUrfrETb7n%2BG0Shme6f3AYzl3uzkYA%3D&se=2018-02-13T10%3A46%3A24Z&sp=r",
+ "galleryPackageBlobSasUri": "",
"productKind": "virtualMachineExtension",
"productDetailsProperties": {
"version": "1.0.6",
diff --git a/specification/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/Backup.json b/specification/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/Backup.json
index 578460a3f5cd..65c6538d3f6e 100644
--- a/specification/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/Backup.json
+++ b/specification/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/Backup.json
@@ -39,6 +39,9 @@
"schema": {
"$ref": "#/definitions/OperationList"
}
+ },
+ "default": {
+ "description": "Error response."
}
},
"x-ms-pageable": {
diff --git a/specification/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/BackupLocations.json b/specification/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/BackupLocations.json
index 2b28908cb974..3ca194698eb6 100644
--- a/specification/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/BackupLocations.json
+++ b/specification/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/BackupLocations.json
@@ -186,6 +186,55 @@
}
}
}
+ },
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/pruneExternalStore": {
+ "post": {
+ "x-ms-examples": {
+ "Prune the external backup store": {
+ "$ref": "./examples/BackupLocations/Prune.json"
+ }
+ },
+ "x-ms-long-running-operation": true,
+ "x-ms-long-running-operation-options": {
+ "final-state-via": "location"
+ },
+ "description": "Prune the external backup store.",
+ "tags": [
+ "BackupLocations"
+ ],
+ "operationId": "BackupLocations_PruneExternalStore",
+ "parameters": [
+ {
+ "$ref": "Backup.json#/parameters/SubscriptionIdParameter"
+ },
+ {
+ "$ref": "Backup.json#/parameters/ResourceGroupParameter"
+ },
+ {
+ "$ref": "#/parameters/BackupLocationParameter"
+ },
+ {
+ "$ref": "#/parameters/PruneBackupStoreOptionParameter"
+ },
+ {
+ "$ref": "Backup.json#/parameters/ApiVersionParameter"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/PruneList"
+ }
+ },
+ "202": {
+ "description": "ACCEPTED"
+ },
+ "default": {
+ "description": "Error response."
+ }
+ }
+ }
}
},
"definitions": {
@@ -288,6 +337,52 @@
"type": "string"
}
}
+ },
+ "PruneBackupStoreOperationType": {
+ "description": "Prune backup store operation type.",
+ "type": "string",
+ "enum": [
+ "Default",
+ "DryRun"
+ ],
+ "x-ms-enum": {
+ "name": "PruneBackupStoreOperationType",
+ "modelAsString": false
+ }
+ },
+ "PruneBackupStoreOperationOptionModel": {
+ "type": "object",
+ "description": "Prune backup store operation model.",
+ "properties": {
+ "operationType": {
+ "description": "Operation type.",
+ "$ref": "#/definitions/PruneBackupStoreOperationType"
+ }
+ }
+ },
+ "PruneModel": {
+ "description": "Properties for a prune list.",
+ "properties": {
+ "pathsToDelete": {
+ "description": "Garbage file list.",
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "x-ms-client-flatten": true
+ }
+ }
+ },
+ "PruneList": {
+ "type": "object",
+ "description": "List of files to delete.",
+ "properties": {
+ "properties": {
+ "description": "Holds information for a backup.",
+ "$ref": "#/definitions/PruneModel",
+ "x-ms-client-flatten": true
+ }
+ }
}
},
"parameters": {
@@ -308,6 +403,16 @@
"$ref": "#/definitions/BackupLocation"
},
"x-ms-parameter-location": "method"
+ },
+ "PruneBackupStoreOptionParameter": {
+ "name": "option",
+ "in": "body",
+ "description": "Prune operation option.",
+ "required": false,
+ "schema": {
+ "$ref": "#/definitions/PruneBackupStoreOperationOptionModel"
+ },
+ "x-ms-parameter-location": "method"
}
},
"securityDefinitions": {
diff --git a/specification/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/examples/BackupLocations/Prune.json b/specification/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/examples/BackupLocations/Prune.json
new file mode 100644
index 000000000000..b36228ea30d7
--- /dev/null
+++ b/specification/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/examples/BackupLocations/Prune.json
@@ -0,0 +1,22 @@
+{
+ "parameters": {
+ "subscriptionId": "8742f75d-84ae-4f1b-b22e-0e63dde0d6f4",
+ "resourceGroupName": "System.redmond",
+ "location": "redmond",
+ "api-version": "2018-09-01",
+ "OperationType": "DryRun"
+ },
+ "responses": {
+ "200": {
+ "body": {
+ "properties": {
+ "pathsToDelete": [
+ "masbackup/progressivebackup/1.2011.0.23/BackupEncryptionCert.cer",
+ "masbackup/progressivebackup/1.2011.0.23/BackupEncryptionCert.pfx"
+ ]
+ }
+ }
+ },
+ "202": {}
+ }
+}
diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json
index faf14789152a..87a7500bdcc5 100644
--- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json
+++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json
@@ -11,7 +11,7 @@
"newOffer": {
"properties": {
"password": "password",
- "data": "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"
+ "data": ""
}
}
},
diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json
index 5c6252cd8143..5c90329dc7ea 100644
--- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json
+++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json
@@ -12,7 +12,7 @@
"newOffer": {
"properties": {
"password": "password",
- "data": "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"
+ "data": ""
}
}
},
diff --git a/specification/azuredata/resource-manager/readme.go.md b/specification/azuredata/resource-manager/readme.go.md
index 154eac206330..844b0ee468c8 100644
--- a/specification/azuredata/resource-manager/readme.go.md
+++ b/specification/azuredata/resource-manager/readme.go.md
@@ -13,9 +13,19 @@ go:
``` yaml $(go) && $(multiapi)
batch:
+ - tag: package-2017-03-01-preview
- tag: package-preview-2019-07
```
+### Tag: package-2017-03-01-preview and go
+
+These settings apply only when `--tag=package-2017-03-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=`.
+
+```yaml $(tag) == 'package-2017-03-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-03-01-preview/$(namespace)
+```
+
### Tag: package-preview-2019-07 and go
These settings apply only when `--tag=package-preview-2019-07 --go` is specified on the command line.
diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/Post.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/Post.json
index efd223b6ac7c..1e75d609cd74 100644
--- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/Post.json
+++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/Post.json
@@ -9,7 +9,7 @@
"responses": {
"200": {
"body": {
- "galleryPackageBlobSasUri": "https://azstrptestwcu001.blob.core.windows.net/packages/Microsoft.OSTCExtensions.VMAccessForLinux.1.4.7.1/gallery/package.azpkg?sv=2015-04-05&sr=b&sig=mnzKeDrSMWoDilUrfrETb7n%2BG0Shme6f3AYzl3uzkYA%3D&se=2018-02-13T10%3A46%3A24Z&sp=r",
+ "galleryPackageBlobSasUri": "",
"productKind": "virtualMachineExtension",
"properties": {
"version": "1.4.7",
diff --git a/specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2020-10-01/azurestackhci.json b/specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2020-10-01/azurestackhci.json
index bdb7c992b8de..17800e196037 100644
--- a/specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2020-10-01/azurestackhci.json
+++ b/specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2020-10-01/azurestackhci.json
@@ -69,7 +69,7 @@
],
"operationId": "Clusters_ListBySubscription",
"x-ms-examples": {
- "ListClusters": {
+ "List clusters in a given subscription": {
"$ref": "./examples/ListClustersBySubscription.json"
}
},
@@ -108,7 +108,7 @@
],
"operationId": "Clusters_ListByResourceGroup",
"x-ms-examples": {
- "ListClusters": {
+ "List clusters in a given resource group": {
"$ref": "./examples/ListClustersByResourceGroup.json"
}
},
@@ -150,7 +150,7 @@
],
"operationId": "Clusters_Get",
"x-ms-examples": {
- "GetClusters": {
+ "Get cluster": {
"$ref": "./examples/GetCluster.json"
}
},
@@ -190,7 +190,7 @@
],
"operationId": "Clusters_Create",
"x-ms-examples": {
- "GetClusters": {
+ "Create cluster": {
"$ref": "./examples/CreateCluster.json"
}
},
@@ -239,7 +239,7 @@
],
"operationId": "Clusters_Update",
"x-ms-examples": {
- "GetClusters": {
+ "Update cluster": {
"$ref": "./examples/UpdateCluster.json"
}
},
@@ -288,7 +288,7 @@
],
"operationId": "Clusters_Delete",
"x-ms-examples": {
- "GetClusters": {
+ "Delete cluster": {
"$ref": "./examples/DeleteCluster.json"
}
},
diff --git a/specification/azurestackhci/resource-manager/readme.md b/specification/azurestackhci/resource-manager/readme.md
index 64b34d2f9f98..a11a60730b25 100644
--- a/specification/azurestackhci/resource-manager/readme.md
+++ b/specification/azurestackhci/resource-manager/readme.md
@@ -28,6 +28,7 @@ These are the global settings for the azurestackhci.
title: AzureStackHCIClient
description: Azure Stack HCI management service
openapi-type: arm
+openapi-subtype: rpaas
tag: package-2020-10
```
diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateCreate_Full.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateCreate_Full.json
index a541545442c6..75fe05813274 100644
--- a/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateCreate_Full.json
+++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateCreate_Full.json
@@ -10,7 +10,7 @@
"thumbprintAlgorithm": "SHA1",
"thumbprint": "0A0E4F50D51BEADEAC1D35AFC5116098E7902E6E",
"data": "MIIJsgIBAzCCCW4GCSqGSIb3DQE...",
- "password": "KG0UY40e...",
+ "password": "",
"format": "Pfx"
}
}
diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateCreate_Minimal.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateCreate_Minimal.json
index 644603f7f333..52ec5c3422a7 100644
--- a/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateCreate_Minimal.json
+++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateCreate_Minimal.json
@@ -8,7 +8,7 @@
"parameters": {
"properties": {
"data": "MIIJsgIBAzCCCW4GCSqGSIb3DQE...",
- "password": "KG0UY40e..."
+ "password": ""
}
}
},
diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateUpdate.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateUpdate.json
index 644603f7f333..52ec5c3422a7 100644
--- a/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateUpdate.json
+++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/CertificateUpdate.json
@@ -8,7 +8,7 @@
"parameters": {
"properties": {
"data": "MIIJsgIBAzCCCW4GCSqGSIb3DQE...",
- "password": "KG0UY40e..."
+ "password": ""
}
}
},
diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateCreate_Full.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateCreate_Full.json
index cb090fdb6233..328bf29c2588 100644
--- a/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateCreate_Full.json
+++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateCreate_Full.json
@@ -10,7 +10,7 @@
"thumbprintAlgorithm": "SHA1",
"thumbprint": "0A0E4F50D51BEADEAC1D35AFC5116098E7902E6E",
"data": "MIIJsgIBAzCCCW4GCSqGSIb3DQE...",
- "password": "KG0UY40e...",
+ "password": "",
"format": "Pfx"
}
}
diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateCreate_Minimal.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateCreate_Minimal.json
index fe91a8a843e1..f31f820ca8b1 100644
--- a/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateCreate_Minimal.json
+++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateCreate_Minimal.json
@@ -8,7 +8,7 @@
"parameters": {
"properties": {
"data": "MIIJsgIBAzCCCW4GCSqGSIb3DQE...",
- "password": "KG0UY40e..."
+ "password": ""
}
}
},
diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateUpdate.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateUpdate.json
index fe91a8a843e1..f31f820ca8b1 100644
--- a/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateUpdate.json
+++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/CertificateUpdate.json
@@ -8,7 +8,7 @@
"parameters": {
"properties": {
"data": "MIIJsgIBAzCCCW4GCSqGSIb3DQE...",
- "password": "KG0UY40e..."
+ "password": ""
}
}
},
diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateCreate_Full.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateCreate_Full.json
index 7799e0ffb12b..dffb4c758ceb 100644
--- a/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateCreate_Full.json
+++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateCreate_Full.json
@@ -10,7 +10,7 @@
"thumbprintAlgorithm": "SHA1",
"thumbprint": "0A0E4F50D51BEADEAC1D35AFC5116098E7902E6E",
"data": "MIIJsgIBAzCCCW4GCSqGSIb3DQE...",
- "password": "KG0UY40e...",
+ "password": "",
"format": "Pfx"
}
}
diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateCreate_Minimal.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateCreate_Minimal.json
index c14a4815b336..afed978f3b37 100644
--- a/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateCreate_Minimal.json
+++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateCreate_Minimal.json
@@ -8,7 +8,7 @@
"parameters": {
"properties": {
"data": "MIIJsgIBAzCCCW4GCSqGSIb3DQE...",
- "password": "KG0UY40e..."
+ "password": ""
}
}
},
diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateUpdate.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateUpdate.json
index c14a4815b336..afed978f3b37 100644
--- a/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateUpdate.json
+++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2019-04-01/examples/CertificateUpdate.json
@@ -8,7 +8,7 @@
"parameters": {
"properties": {
"data": "MIIJsgIBAzCCCW4GCSqGSIb3DQE...",
- "password": "KG0UY40e..."
+ "password": ""
}
}
},
diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2019-08-01/examples/CertificateCreate_Full.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2019-08-01/examples/CertificateCreate_Full.json
index 82aed5204af6..b2847206f1e5 100644
--- a/specification/batch/resource-manager/Microsoft.Batch/stable/2019-08-01/examples/CertificateCreate_Full.json
+++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2019-08-01/examples/CertificateCreate_Full.json
@@ -10,7 +10,7 @@
"thumbprintAlgorithm": "sha1",
"thumbprint": "0a0e4f50d51beadeac1d35afc5116098e7902e6e",
"data": "MIIJsgIBAzCCCW4GCSqGSIb3DQE...",
- "password": "KG0UY40e...",
+ "password": "