Skip to content

Commit 2070420

Browse files
author
Liran Chen
committed
Merge branch 'master' into onPremiseSensor-dev-security-Microsoft.Security-2020-08-06-preview
2 parents 11cd823 + f64d232 commit 2070420

File tree

399 files changed

+49710
-4255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

399 files changed

+49710
-4255
lines changed

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/specification/analysisservices/ @taiwu
2+
/specification/alertsmanagement/ @ofirmanor @olalavi @erangon @orieldar @ilaizi @shakednai1 @khaboasb @orenhor
23
/specification/apimanagement/ @promoisha @solankisamir
34
/specification/applicationinsights/ @alexeldeib
45
/specification/asazure/ @athipp

azure-rest-api-specs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 545a9ad7563fe2858d08aba9ee5b8444375d47a9

cSpell.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,13 @@
713713
"networkrulesets",
714714
"Setget"
715715
]
716+
},
717+
{
718+
"filename": "**/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-05-01-preview/machineLearningServices.json",
719+
"words": [
720+
"mysqldb",
721+
"psqldb"
722+
]
716723
}
717724
]
718725
}

custom-words.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ closedlist
305305
closedlists
306306
Cloudamize
307307
cloudapp
308+
cloudevents
308309
cloudproperties
309310
cloudsimple
310311
clustermonitoring
@@ -394,6 +395,7 @@ Databricks
394395
datacatalog
395396
Datacenter
396397
datacenters
398+
datacontenttype
397399
datadisk
398400
datafactory
399401
datafactoryv
@@ -408,6 +410,7 @@ datamigration
408410
datapoint
409411
Dataset
410412
datasets
413+
dataschema
411414
datasource
412415
Datasources
413416
datastore
@@ -477,6 +480,7 @@ discoverbackup
477480
diskmigrationjobs
478481
diskoperations
479482
Distcp
483+
Distro
480484
DMTS
481485
Dnat
482486
dnsname
@@ -486,6 +490,8 @@ Domainful
486490
domainname
487491
domainservices
488492
DOTALL
493+
dras
494+
DRAs
489495
DRMs
490496
dsmax
491497
DTDL
@@ -1473,6 +1479,7 @@ southindia
14731479
sparkconf
14741480
sparql
14751481
SPDX
1482+
specversion
14761483
SQLAG
14771484
sqldatabase
14781485
SQLDB
@@ -1633,6 +1640,7 @@ Turbonomic
16331640
Txns
16341641
Typeless
16351642
typeperf
1643+
UEFI
16361644
UEBA
16371645
Uint
16381646
uksouth

documentation/code-gen/configure-python-sdk.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ This is not used by Autorest itself.
8686
8787
``` yaml $(swagger-to-sdk)
8888
swagger-to-sdk:
89-
- repo: azure-sdk-for-python
89+
- repo: azure-sdk-for-python // for track1 SDK
90+
- repo: azure-sdk-for-python-track2 // for track2 SDK
9091
- ...
9192
9293
@@ -226,12 +227,13 @@ After configure all the readme files, autorest can be used to generate SDK.
226227
Track1 SDK is based on AutoRest version V2 that's going to be replaced by version V3.
227228

228229
~~~
229-
autorest --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=C:\ZZ\projects\codegen\azure-sdk-for-python\sdk [email protected]/autorest.python@~4.0.71 --version=V2 ..\azure-rest-api-specs\specification\appconfiguration\resource-manager\readme.md
230+
> autorest --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=C:\ZZ\projects\codegen\azure-sdk-for-python\sdk [email protected]/autorest.python@~4.0.71 --version=V2 ..\azure-rest-api-specs\specification\appconfiguration\resource-manager\readme.md
230231
~~~
231232

232233
### Track2 (for latest Autorest)
233234
Track 2 is based on the latest AutoRest code generator
234235

235236
~~~
236-
autorest --python --track2 --use=@autorest/[email protected] --python-sdks-folder=..\azure-sdk-for-python\sdk --multiapi --python-mode=update ..\azure-rest-api-specs\specification\appconfiguration\resource-manager\readme.md
237+
> autorest --reset
238+
> autorest --python --track2 --use=@autorest/[email protected] --python-sdks-folder=..\azure-sdk-for-python\sdk --multiapi --python-mode=update ..\azure-rest-api-specs\specification\appconfiguration\resource-manager\readme.md
237239
~~~

documentation/openapi-authoring-automated-guidelines.md

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ We request OpenAPI(Swagger) spec authoring be assigned to engineers who have an
140140
| [R2007](#r2007) | [LongRunningOperationsWithLongRunningExtension](#r2007) | ARM OpenAPI(swagger) specs |
141141
| [R2029](#r2029) | [PageableOperation](#r2029) | ARM and Data plane OpenAPI(swagger) specs |
142142
| [R4006](#r4006) | [DeprecatedXmsCodeGenerationSetting](#r4006) | ARM and Data plane OpenAPI(swagger) specs |
143+
| [R4024](#r4024) | [PreviewVersionOverOneYear](#r4024) | ARM OpenAPI(swagger) specs |
143144

144145

145146
### RPaaS Violations
@@ -1432,7 +1433,7 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul
14321433

14331434
**Applies to** : ARM OpenAPI(swagger) specs
14341435

1435-
**Output Message**: Top level properties should be one of name, type, id, location, properties, tags, plan, sku, etag, managedBy, identity, systemData. Model definition '{0}' has extra properties ['{1}'].
1436+
**Output Message**: Top level properties should be one of name, type, id, location, properties, tags, plan, sku, etag, managedBy, identity, systemData, extendedlocation. Model definition '{0}' has extra properties ['{1}'].
14361437

14371438
**Description**: Per [ARM guidelines](https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md), top level properties of a resource should be only ones from the allowed set.
14381439

@@ -1690,7 +1691,7 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul
16901691
**Output Message**: Properties of a PATCH request body must not be {0}. PATCH operation: '{1}' Model Definition: '{2}' Property: '{3}'
16911692

16921693
**Description**: A request parameter of the Patch Operation must not have a required/default value.
1693-
But it's allowed when all required properties are marked as discriminator, because the discriminator must be required.
1694+
But it's allowed when the only required properties is marked as discriminator, because the discriminator must be required.
16941695

16951696
**CreatedAt** : N/A
16961697

@@ -1994,7 +1995,7 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul
19941995

19951996
### <a name="r3021" ></a>R3021 PathResourceTypeNameCamelCase
19961997

1997-
**Category** : ARM Warning
1998+
**Category** : ARM Error
19981999

19992000
**Applies to** : ARM and Data Plane OpenAPI(swagger) specs
20002001

@@ -2948,4 +2949,24 @@ The following would be valid:
29482949
}
29492950
...
29502951
```
2951-
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)
2952+
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)
2953+
2954+
### <a name="r4024" ></a>R4024 PreviewVersionOverOneYear
2955+
2956+
**Category** : SDK Warning
2957+
2958+
**Applies to** : ARM OpenAPI(swagger) specs
2959+
2960+
**Output Message** : The API version:{api-version} having been in a preview state over one year , please move to GA or retire.
2961+
2962+
**Description** : Per [Retirement-of-Previews](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37683/Retirement-of-Previews), service, feature, API, and SKU in preview for over one year need to move to GA or retire.
2963+
2964+
**CreatedAt**: Sep 8, 2020
2965+
2966+
**LastModifiedAt**: Sep 8, 2020
2967+
2968+
**How to fix the violation**:
2969+
Consider retiring or moving to GA.
2970+
2971+
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)
2972+

0 commit comments

Comments
 (0)