Merge remote-tracking branch 'upstream/master' into ansar/ga-review2

.azure-pipelines/NetworkValidation.yml

@@ -18,7 +18,7 @@ jobs:
     displayName: Install Node.js
   - script: npm install autorest -g
     displayName: Install autorest
-  - script: git clone --depth 1 -- https://dev.azure.com/v-anevse/BuildScripts/_git/BuildScripts ..\BuildScripts
+  - script: git clone --depth 1 -- https://dev.azure.com/nrp-swagger/swagger-stack/_git/automation-scripts ..\BuildScripts
     displayName: Clone build tools
   - powershell: |
       $swgrPath = (Get-Item ".\").FullName

CODEOWNERS

@@ -12,7 +12,7 @@
 /specification/cognitiveservices/ @felixwa @yangyuan
 /specification/compute/ @hyonholee @mabhard @danielli90 @smotwani @ppatwa @vikramd-ms @savyasachisamal @yunusm @ZhidongPeng @nkuchta @maheshnemichand @najams @changov
 /specification/consumption/ @kjeur @panda-wang
-/specification/containerinstance/ @samkreter
+/specification/containerinstance/ @novinc
 /specification/containerregistry/ @djyou
 /specification/containerservice/ @yangl900
 /specification/cosmos-db/ @dmakwana
@@ -76,5 +76,3 @@
 /specification/trafficmanager/ @allencal @hrkulkarmsft
 /specification/web/ @lukaszstem @naveedaz @nking92
 /profile/ @shahabhijeet
-/.github/computeReviewLabeler.yml @grizzlytheodore
-/.github/workflows/computeReviewLabeler.yml @grizzlytheodore

custom-words.txt

@@ -585,6 +585,7 @@ GC'd
 GCMAES
 gdpr
 genderless
+generatelivetoken
 generateverificationcode
 generatevpnclientpackage
 generatevpnprofile
@@ -923,6 +924,7 @@ modelmanagement
 MODIFYACLENTRIES
 monitoringconfiguration
 monitoringconfigurations
+Monospace
 MPNS
 MSAZR
 MSAZRDE
@@ -1159,6 +1161,7 @@ pullrequest
 Purgeable
 pushdown
 pushsettings
+pwsh
 Pyspark
 pytorch
 QFEs
@@ -1167,6 +1170,7 @@ qloguniform
 qnamaker
 qnas
 qnormal
+Qssw
 querylogs
 querypool
 querystring
@@ -1753,6 +1757,7 @@ XBing
 Xeon
 Xero
 XSMB
+XVCJ
 Yucatec
 Ywhk
 YYMMDD
@@ -1785,6 +1790,17 @@ userprincipalname
 sessionstate
 sessionhosts
 hostpool
+securitydomain
+securitydomaindownloadpost
+securitydomaintransferkey
+securitydomainuploadoperation
+securitydomainoperationstatus
+transferkey
+Alexa
+regeneratekeys
+Directline
+Keyschannel
+azureADMetrics
 sparkr
 ambari
 dotnetspark

documentation/samplefiles/Microsoft.YourServiceName/stable/YYYY-MM-DD/YourServiceName.json

@@ -43,6 +43,9 @@
           },
           {
             "$ref": "#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {

specification/alertsmanagement/resource-manager/readme.trenton.md

@@ -6,7 +6,7 @@ overrides:
   - where:
       resource: "*"
     set:
-      - NeedSeparated: false
+      - NeedSeparated: true
   - where:
       resource: "ActionRules"
       property: "properties"
@@ -18,6 +18,10 @@ overrides:
       property: "properties"
     set:
       - GoFieldName: "PatchProperties"
+  - where:
+      property: "status"
+    set:
+      - Hidden: false
   - where:
       property: "type"
     set:
@@ -33,6 +37,7 @@ overrides:
     set:
       - EnumValues/0/GoEnumMemberName: "ScopeTypeResourceGroup"
       - EnumValues/1/GoEnumMemberName: "ScopeTypeResource"
+      - EnumValues/2/GoEnumMemberName: "ScopeTypeSubscription"
 ```
 ## trenton
 

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/apimquotas.json

@@ -108,7 +108,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "./definitions.json#/definitions/QuotaCounterValueContractProperties"
+              "$ref": "./definitions.json#/definitions/QuotaCounterValueUpdateContract"
             },
             "description": "The value of the quota counter to be applied to all quota counter periods."
           },
@@ -212,7 +212,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "./definitions.json#/definitions/QuotaCounterValueContractProperties"
+              "$ref": "./definitions.json#/definitions/QuotaCounterValueUpdateContract"
             },
             "description": "The value of the Quota counter to be applied on the specified period."
           },

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/definitions.json

@@ -3847,6 +3847,16 @@
       },
       "description": "Quota counter value details."
     },
+    "QuotaCounterValueUpdateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/QuotaCounterValueContractProperties",
+          "description": "Quota counter value details."
+        }
+      },
+      "description": "Quota counter value details."
+    },
     "RecipientEmailCollection": {
       "properties": {
         "value": {

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementUpdateQuotaCounterKey.json

@@ -6,8 +6,10 @@
     "subscriptionId": "subid",
     "quotaCounterKey": "ba",
     "parameters": {
-      "callsCount": 0,
-      "kbTransferred": 2.5630078125
+      "properties": {
+        "callsCount": 0,
+        "kbTransferred": 2.5630078125
+      }
     }
   },
   "responses": {

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/examples/ApiManagementUpdateQuotaCounterKeyByQuotaPeriod.json

@@ -7,8 +7,10 @@
     "quotaCounterKey": "ba",
     "quotaPeriodKey": "0_P3Y6M4DT12H30M5S",
     "parameters": {
-      "callsCount": 0,
-      "kbTransferred": 0
+      "properties": {
+        "callsCount": 0,
+        "kbTransferred": 0
+      }
     }
   },
   "responses": {

specification/appconfiguration/resource-manager/readme.md

@@ -68,6 +68,7 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-python-track2
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-net
   - repo: azure-sdk-for-js

specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/examples/LiveTokenGet.json

@@ -0,0 +1,13 @@
+{
+  "parameters": {
+    "resourceUri": "subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/FabrikamFiberApp/providers/microsoft.insights/components/CustomAvailabilityTest/providers/microsoft.insights/generatelivetoken",
+    "api-version": "2020-06-02-preview"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "liveToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
+      }
+    }
+  }
+}

specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/examples/Operations_List.json

@@ -0,0 +1,23 @@
+{
+  "parameters": {
+    "api-version": "2020-06-02-preview"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "microsoft.insights/generatelivetoken",
+            "display": {
+              "provider": "Microsoft Container Instance",
+              "resource": "generatelivetoken",
+              "operation": "Gets an access token for live metrics stream data",
+              "description": "Gets an access token for live metrics stream data"
+            },
+            "origin": "User"
+          }
+        ]
+      }
+    }
+  }
+}