Skip to content

Commit 7a0ac0f

Browse files
XynoclafeXynoclafe
authored
Merge pull request #2913 from Azure/autogenerate
Autogenerate
2 parents 4478a62 + 9de9f22 commit 7a0ac0f

21 files changed

+6530
-72
lines changed

‎generator/autogenlist.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,13 @@ const disabledProviders: AutoGenConfig[] = [
107107
basePath: 'confidentialLedger/resource-manager',
108108
namespace: 'Microsoft.ConfidentialLedger',
109109
disabledForAutogen: true
110+
},
111+
{
112+
// Disabled temporally due to enum mismatch introduced in this PR: https://github.com/Azure/azure-rest-api-specs/pull/24350
113+
// Once this resource is enabled again, remove the comment from autoGenList to fully enable schema generation
114+
basePath: 'resources/resource-manager',
115+
namespace: 'Microsoft.Resources',
116+
disabledForAutogen: true
110117
}
111118
];
112119

@@ -701,7 +708,7 @@ const autoGenList: AutoGenConfig[] = [
701708
basePath: 'redhatopenshift/resource-manager',
702709
namespace: 'Microsoft.RedHatOpenShift',
703710
},
704-
{
711+
/*{
705712
basePath: 'resources/resource-manager',
706713
namespace: 'Microsoft.Resources',
707714
resourceConfig: [
@@ -715,7 +722,7 @@ const autoGenList: AutoGenConfig[] = [
715722
},
716723
],
717724
postProcessor: resourcesPostProcessor,
718-
},
725+
},*/
719726
{
720727
basePath: 'resources/resource-manager',
721728
namespace: 'Microsoft.Authorization',

‎generator/resources.json‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2134,7 +2134,8 @@
21342134
"2021-06-01",
21352135
"2022-01-01",
21362136
"2022-06-01",
2137-
"2022-10-01"
2137+
"2022-10-01",
2138+
"2023-05-01"
21382139
],
21392140
"Microsoft.Batch/batchAccounts/applications": [
21402141
"2015-12-01",
@@ -2151,7 +2152,8 @@
21512152
"2021-06-01",
21522153
"2022-01-01",
21532154
"2022-06-01",
2154-
"2022-10-01"
2155+
"2022-10-01",
2156+
"2023-05-01"
21552157
],
21562158
"Microsoft.Batch/batchAccounts/applications/versions": [
21572159
"2015-12-01",
@@ -2168,7 +2170,8 @@
21682170
"2021-06-01",
21692171
"2022-01-01",
21702172
"2022-06-01",
2171-
"2022-10-01"
2173+
"2022-10-01",
2174+
"2023-05-01"
21722175
],
21732176
"Microsoft.Batch/batchAccounts/certificates": [
21742177
"2017-09-01",
@@ -2182,7 +2185,8 @@
21822185
"2021-06-01",
21832186
"2022-01-01",
21842187
"2022-06-01",
2185-
"2022-10-01"
2188+
"2022-10-01",
2189+
"2023-05-01"
21862190
],
21872191
"Microsoft.Batch/batchAccounts/pools": [
21882192
"2017-09-01",
@@ -2196,7 +2200,8 @@
21962200
"2021-06-01",
21972201
"2022-01-01",
21982202
"2022-06-01",
2199-
"2022-10-01"
2203+
"2022-10-01",
2204+
"2023-05-01"
22002205
],
22012206
"Microsoft.BatchAI/clusters": [
22022207
"2017-09-01-preview",
@@ -3835,24 +3840,6 @@
38353840
"2022-05-01-preview",
38363841
"2023-03-01-preview"
38373842
],
3838-
"Microsoft.DBforPostgreSQL/serverGroupsv2": [
3839-
"2022-11-08"
3840-
],
3841-
"Microsoft.DBforPostgreSQL/serverGroupsv2/coordinatorConfigurations": [
3842-
"2022-11-08"
3843-
],
3844-
"Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules": [
3845-
"2022-11-08"
3846-
],
3847-
"Microsoft.DBforPostgreSQL/serverGroupsv2/nodeConfigurations": [
3848-
"2022-11-08"
3849-
],
3850-
"Microsoft.DBforPostgreSQL/serverGroupsv2/privateEndpointConnections": [
3851-
"2022-11-08"
3852-
],
3853-
"Microsoft.DBforPostgreSQL/serverGroupsv2/roles": [
3854-
"2022-11-08"
3855-
],
38563843
"Microsoft.DBforPostgreSQL/servers": [
38573844
"2017-12-01",
38583845
"2017-12-01-preview"

‎onboarded-report/result.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,10 @@
145145
},
146146
{
147147
"basePath": "azurestackhci/resource-manager",
148-
"onboardedToAutogen": "yes",
149-
"missing": [],
148+
"onboardedToAutogen": "no",
149+
"missing": [
150+
"Microsoft.AzureStackHCI"
151+
],
150152
"onboarded": []
151153
},
152154
{

‎schemas/2018-05-01/subscriptionDeploymentTemplate.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,9 @@
647647
{
648648
"$ref": "https://schema.management.azure.com/schemas/2022-04-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleEligibilityScheduleRequests"
649649
},
650+
{
651+
"$ref": "https://schema.management.azure.com/schemas/2022-05-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleDefinitions"
652+
},
650653
{
651654
"$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments"
652655
},
@@ -872,6 +875,9 @@
872875
{
873876
"$ref": "https://schema.management.azure.com/schemas/2023-03-01/Microsoft.Consumption.json#/unknown_resourceDefinitions/budgets"
874877
},
878+
{
879+
"$ref": "https://schema.management.azure.com/schemas/2023-05-01/Microsoft.Consumption.json#/unknown_resourceDefinitions/budgets"
880+
},
875881
{
876882
"$ref": "https://schema.management.azure.com/schemas/2018-05-31/Microsoft.CostManagement.json#/subscription_resourceDefinitions/reportconfigs"
877883
},

‎schemas/2018-06-01/Microsoft.DataFactory.json‎

Lines changed: 62 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4965,6 +4965,11 @@
49654965
"AzureMLServiceLinkedServiceTypeProperties": {
49664966
"type": "object",
49674967
"properties": {
4968+
"authentication": {
4969+
"type": "object",
4970+
"properties": {},
4971+
"description": "Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string)."
4972+
},
49684973
"encryptedCredential": {
49694974
"type": "string",
49704975
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string."
@@ -6995,7 +7000,7 @@
69957000
],
69967001
"description": "The folder that this CDC is in. If not specified, CDC will appear at the root level."
69977002
},
6998-
"Policy": {
7003+
"policy": {
69997004
"oneOf": [
70007005
{
70017006
"$ref": "#/definitions/MapperPolicy"
@@ -7006,7 +7011,7 @@
70067011
],
70077012
"description": "CDC Policy."
70087013
},
7009-
"SourceConnectionsInfo": {
7014+
"sourceConnectionsInfo": {
70107015
"oneOf": [
70117016
{
70127017
"type": "array",
@@ -7024,7 +7029,7 @@
70247029
"type": "string",
70257030
"description": "Status of the CDC as to if it is running or stopped."
70267031
},
7027-
"TargetConnectionsInfo": {
7032+
"targetConnectionsInfo": {
70287033
"oneOf": [
70297034
{
70307035
"type": "array",
@@ -7040,9 +7045,9 @@
70407045
}
70417046
},
70427047
"required": [
7043-
"Policy",
7044-
"SourceConnectionsInfo",
7045-
"TargetConnectionsInfo"
7048+
"policy",
7049+
"sourceConnectionsInfo",
7050+
"targetConnectionsInfo"
70467051
],
70477052
"description": "A Azure Data Factory object which automatically detects data changes at the source and then sends the updated data to the destination."
70487053
},
@@ -19701,7 +19706,7 @@
1970119706
"MapperSourceConnectionsInfo": {
1970219707
"type": "object",
1970319708
"properties": {
19704-
"Connection": {
19709+
"connection": {
1970519710
"oneOf": [
1970619711
{
1970719712
"$ref": "#/definitions/MapperConnection"
@@ -19712,7 +19717,7 @@
1971219717
],
1971319718
"description": "Source connection details."
1971419719
},
19715-
"SourceEntities": {
19720+
"sourceEntities": {
1971619721
"oneOf": [
1971719722
{
1971819723
"type": "array",
@@ -19801,7 +19806,7 @@
1980119806
"MapperTargetConnectionsInfo": {
1980219807
"type": "object",
1980319808
"properties": {
19804-
"Connection": {
19809+
"connection": {
1980519810
"oneOf": [
1980619811
{
1980719812
"$ref": "#/definitions/MapperConnection"
@@ -19812,7 +19817,7 @@
1981219817
],
1981319818
"description": "Source connection details."
1981419819
},
19815-
"DataMapperMappings": {
19820+
"dataMapperMappings": {
1981619821
"oneOf": [
1981719822
{
1981819823
"type": "array",
@@ -19826,7 +19831,7 @@
1982619831
],
1982719832
"description": "List of table mappings."
1982819833
},
19829-
"Relationships": {
19834+
"relationships": {
1983019835
"oneOf": [
1983119836
{
1983219837
"type": "array",
@@ -19841,7 +19846,7 @@
1984119846
],
1984219847
"description": "List of relationship info among the tables."
1984319848
},
19844-
"TargetEntities": {
19849+
"targetEntities": {
1984519850
"oneOf": [
1984619851
{
1984719852
"type": "array",
@@ -25174,19 +25179,9 @@
2517425179
"description": "Database query. Type: string (or Expression with resultType string)."
2517525180
},
2517625181
"readBehavior": {
25177-
"oneOf": [
25178-
{
25179-
"type": "string",
25180-
"enum": [
25181-
"Query",
25182-
"QueryAll"
25183-
]
25184-
},
25185-
{
25186-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
25187-
}
25188-
],
25189-
"description": "The read behavior for the operation. Default is Query."
25182+
"type": "object",
25183+
"properties": {},
25184+
"description": "The read behavior for the operation. Default is Query. Allowed values: Query/QueryAll. Type: string (or Expression with resultType string)."
2519025185
},
2519125186
"type": {
2519225187
"type": "string",
@@ -25249,19 +25244,9 @@
2524925244
"description": "Database query. Type: string (or Expression with resultType string)."
2525025245
},
2525125246
"readBehavior": {
25252-
"oneOf": [
25253-
{
25254-
"type": "string",
25255-
"enum": [
25256-
"Query",
25257-
"QueryAll"
25258-
]
25259-
},
25260-
{
25261-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
25262-
}
25263-
],
25264-
"description": "The read behavior for the operation. Default is Query."
25247+
"type": "object",
25248+
"properties": {},
25249+
"description": "The read behavior for the operation. Default is Query. Allowed values: Query/QueryAll. Type: string (or Expression with resultType string)."
2526525250
},
2526625251
"type": {
2526725252
"type": "string",
@@ -26860,6 +26845,34 @@
2686026845
"properties": {},
2686126846
"description": "The base definition of a secret type."
2686226847
},
26848+
"SecureInputOutputPolicy": {
26849+
"type": "object",
26850+
"properties": {
26851+
"secureInput": {
26852+
"oneOf": [
26853+
{
26854+
"type": "boolean"
26855+
},
26856+
{
26857+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
26858+
}
26859+
],
26860+
"description": "When set to true, Input from activity is considered as secure and will not be logged to monitoring."
26861+
},
26862+
"secureOutput": {
26863+
"oneOf": [
26864+
{
26865+
"type": "boolean"
26866+
},
26867+
{
26868+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
26869+
}
26870+
],
26871+
"description": "When set to true, Output from activity is considered as secure and will not be logged to monitoring."
26872+
}
26873+
},
26874+
"description": "Execution policy for an activity that supports secure input and output."
26875+
},
2686326876
"SecureString": {
2686426877
"type": "object",
2686526878
"properties": {
@@ -27124,6 +27137,17 @@
2712427137
"SetVariableActivity": {
2712527138
"type": "object",
2712627139
"properties": {
27140+
"policy": {
27141+
"oneOf": [
27142+
{
27143+
"$ref": "#/definitions/SecureInputOutputPolicy"
27144+
},
27145+
{
27146+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
27147+
}
27148+
],
27149+
"description": "Execution policy for an activity that supports secure input and output."
27150+
},
2712727151
"type": {
2712827152
"type": "string",
2712927153
"enum": [

‎schemas/2019-08-01/managementGroupDeploymentTemplate.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,9 @@
596596
{
597597
"$ref": "https://schema.management.azure.com/schemas/2022-04-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleEligibilityScheduleRequests"
598598
},
599+
{
600+
"$ref": "https://schema.management.azure.com/schemas/2022-05-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleDefinitions"
601+
},
599602
{
600603
"$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments"
601604
},

‎schemas/2019-08-01/tenantDeploymentTemplate.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,9 @@
607607
{
608608
"$ref": "https://schema.management.azure.com/schemas/2022-04-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleEligibilityScheduleRequests"
609609
},
610+
{
611+
"$ref": "https://schema.management.azure.com/schemas/2022-05-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleDefinitions"
612+
},
610613
{
611614
"$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments"
612615
},

0 commit comments

Comments
 (0)