Skip to content

Commit

Permalink
Merge pull request #2913 from Azure/autogenerate
Browse files Browse the repository at this point in the history
Autogenerate
  • Loading branch information
Xynoclafe authored Jun 23, 2023
2 parents 4478a62 + 9de9f22 commit 7a0ac0f
Show file tree
Hide file tree
Showing 21 changed files with 6,530 additions and 72 deletions.
11 changes: 9 additions & 2 deletions generator/autogenlist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ const disabledProviders: AutoGenConfig[] = [
basePath: 'confidentialLedger/resource-manager',
namespace: 'Microsoft.ConfidentialLedger',
disabledForAutogen: true
},
{
// Disabled temporally due to enum mismatch introduced in this PR: https://github.com/Azure/azure-rest-api-specs/pull/24350
// Once this resource is enabled again, remove the comment from autoGenList to fully enable schema generation
basePath: 'resources/resource-manager',
namespace: 'Microsoft.Resources',
disabledForAutogen: true
}
];

Expand Down Expand Up @@ -701,7 +708,7 @@ const autoGenList: AutoGenConfig[] = [
basePath: 'redhatopenshift/resource-manager',
namespace: 'Microsoft.RedHatOpenShift',
},
{
/*{
basePath: 'resources/resource-manager',
namespace: 'Microsoft.Resources',
resourceConfig: [
Expand All @@ -715,7 +722,7 @@ const autoGenList: AutoGenConfig[] = [
},
],
postProcessor: resourcesPostProcessor,
},
},*/
{
basePath: 'resources/resource-manager',
namespace: 'Microsoft.Authorization',
Expand Down
33 changes: 10 additions & 23 deletions generator/resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -2134,7 +2134,8 @@
"2021-06-01",
"2022-01-01",
"2022-06-01",
"2022-10-01"
"2022-10-01",
"2023-05-01"
],
"Microsoft.Batch/batchAccounts/applications": [
"2015-12-01",
Expand All @@ -2151,7 +2152,8 @@
"2021-06-01",
"2022-01-01",
"2022-06-01",
"2022-10-01"
"2022-10-01",
"2023-05-01"
],
"Microsoft.Batch/batchAccounts/applications/versions": [
"2015-12-01",
Expand All @@ -2168,7 +2170,8 @@
"2021-06-01",
"2022-01-01",
"2022-06-01",
"2022-10-01"
"2022-10-01",
"2023-05-01"
],
"Microsoft.Batch/batchAccounts/certificates": [
"2017-09-01",
Expand All @@ -2182,7 +2185,8 @@
"2021-06-01",
"2022-01-01",
"2022-06-01",
"2022-10-01"
"2022-10-01",
"2023-05-01"
],
"Microsoft.Batch/batchAccounts/pools": [
"2017-09-01",
Expand All @@ -2196,7 +2200,8 @@
"2021-06-01",
"2022-01-01",
"2022-06-01",
"2022-10-01"
"2022-10-01",
"2023-05-01"
],
"Microsoft.BatchAI/clusters": [
"2017-09-01-preview",
Expand Down Expand Up @@ -3835,24 +3840,6 @@
"2022-05-01-preview",
"2023-03-01-preview"
],
"Microsoft.DBforPostgreSQL/serverGroupsv2": [
"2022-11-08"
],
"Microsoft.DBforPostgreSQL/serverGroupsv2/coordinatorConfigurations": [
"2022-11-08"
],
"Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules": [
"2022-11-08"
],
"Microsoft.DBforPostgreSQL/serverGroupsv2/nodeConfigurations": [
"2022-11-08"
],
"Microsoft.DBforPostgreSQL/serverGroupsv2/privateEndpointConnections": [
"2022-11-08"
],
"Microsoft.DBforPostgreSQL/serverGroupsv2/roles": [
"2022-11-08"
],
"Microsoft.DBforPostgreSQL/servers": [
"2017-12-01",
"2017-12-01-preview"
Expand Down
6 changes: 4 additions & 2 deletions onboarded-report/result.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,10 @@
},
{
"basePath": "azurestackhci/resource-manager",
"onboardedToAutogen": "yes",
"missing": [],
"onboardedToAutogen": "no",
"missing": [
"Microsoft.AzureStackHCI"
],
"onboarded": []
},
{
Expand Down
6 changes: 6 additions & 0 deletions schemas/2018-05-01/subscriptionDeploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,9 @@
{
"$ref": "https://schema.management.azure.com/schemas/2022-04-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleEligibilityScheduleRequests"
},
{
"$ref": "https://schema.management.azure.com/schemas/2022-05-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleDefinitions"
},
{
"$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments"
},
Expand Down Expand Up @@ -872,6 +875,9 @@
{
"$ref": "https://schema.management.azure.com/schemas/2023-03-01/Microsoft.Consumption.json#/unknown_resourceDefinitions/budgets"
},
{
"$ref": "https://schema.management.azure.com/schemas/2023-05-01/Microsoft.Consumption.json#/unknown_resourceDefinitions/budgets"
},
{
"$ref": "https://schema.management.azure.com/schemas/2018-05-31/Microsoft.CostManagement.json#/subscription_resourceDefinitions/reportconfigs"
},
Expand Down
100 changes: 62 additions & 38 deletions schemas/2018-06-01/Microsoft.DataFactory.json
Original file line number Diff line number Diff line change
Expand Up @@ -4965,6 +4965,11 @@
"AzureMLServiceLinkedServiceTypeProperties": {
"type": "object",
"properties": {
"authentication": {
"type": "object",
"properties": {},
"description": "Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string)."
},
"encryptedCredential": {
"type": "string",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string."
Expand Down Expand Up @@ -6995,7 +7000,7 @@
],
"description": "The folder that this CDC is in. If not specified, CDC will appear at the root level."
},
"Policy": {
"policy": {
"oneOf": [
{
"$ref": "#/definitions/MapperPolicy"
Expand All @@ -7006,7 +7011,7 @@
],
"description": "CDC Policy."
},
"SourceConnectionsInfo": {
"sourceConnectionsInfo": {
"oneOf": [
{
"type": "array",
Expand All @@ -7024,7 +7029,7 @@
"type": "string",
"description": "Status of the CDC as to if it is running or stopped."
},
"TargetConnectionsInfo": {
"targetConnectionsInfo": {
"oneOf": [
{
"type": "array",
Expand All @@ -7040,9 +7045,9 @@
}
},
"required": [
"Policy",
"SourceConnectionsInfo",
"TargetConnectionsInfo"
"policy",
"sourceConnectionsInfo",
"targetConnectionsInfo"
],
"description": "A Azure Data Factory object which automatically detects data changes at the source and then sends the updated data to the destination."
},
Expand Down Expand Up @@ -19701,7 +19706,7 @@
"MapperSourceConnectionsInfo": {
"type": "object",
"properties": {
"Connection": {
"connection": {
"oneOf": [
{
"$ref": "#/definitions/MapperConnection"
Expand All @@ -19712,7 +19717,7 @@
],
"description": "Source connection details."
},
"SourceEntities": {
"sourceEntities": {
"oneOf": [
{
"type": "array",
Expand Down Expand Up @@ -19801,7 +19806,7 @@
"MapperTargetConnectionsInfo": {
"type": "object",
"properties": {
"Connection": {
"connection": {
"oneOf": [
{
"$ref": "#/definitions/MapperConnection"
Expand All @@ -19812,7 +19817,7 @@
],
"description": "Source connection details."
},
"DataMapperMappings": {
"dataMapperMappings": {
"oneOf": [
{
"type": "array",
Expand All @@ -19826,7 +19831,7 @@
],
"description": "List of table mappings."
},
"Relationships": {
"relationships": {
"oneOf": [
{
"type": "array",
Expand All @@ -19841,7 +19846,7 @@
],
"description": "List of relationship info among the tables."
},
"TargetEntities": {
"targetEntities": {
"oneOf": [
{
"type": "array",
Expand Down Expand Up @@ -25174,19 +25179,9 @@
"description": "Database query. Type: string (or Expression with resultType string)."
},
"readBehavior": {
"oneOf": [
{
"type": "string",
"enum": [
"Query",
"QueryAll"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The read behavior for the operation. Default is Query."
"type": "object",
"properties": {},
"description": "The read behavior for the operation. Default is Query. Allowed values: Query/QueryAll. Type: string (or Expression with resultType string)."
},
"type": {
"type": "string",
Expand Down Expand Up @@ -25249,19 +25244,9 @@
"description": "Database query. Type: string (or Expression with resultType string)."
},
"readBehavior": {
"oneOf": [
{
"type": "string",
"enum": [
"Query",
"QueryAll"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The read behavior for the operation. Default is Query."
"type": "object",
"properties": {},
"description": "The read behavior for the operation. Default is Query. Allowed values: Query/QueryAll. Type: string (or Expression with resultType string)."
},
"type": {
"type": "string",
Expand Down Expand Up @@ -26860,6 +26845,34 @@
"properties": {},
"description": "The base definition of a secret type."
},
"SecureInputOutputPolicy": {
"type": "object",
"properties": {
"secureInput": {
"oneOf": [
{
"type": "boolean"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "When set to true, Input from activity is considered as secure and will not be logged to monitoring."
},
"secureOutput": {
"oneOf": [
{
"type": "boolean"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "When set to true, Output from activity is considered as secure and will not be logged to monitoring."
}
},
"description": "Execution policy for an activity that supports secure input and output."
},
"SecureString": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -27124,6 +27137,17 @@
"SetVariableActivity": {
"type": "object",
"properties": {
"policy": {
"oneOf": [
{
"$ref": "#/definitions/SecureInputOutputPolicy"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Execution policy for an activity that supports secure input and output."
},
"type": {
"type": "string",
"enum": [
Expand Down
3 changes: 3 additions & 0 deletions schemas/2019-08-01/managementGroupDeploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,9 @@
{
"$ref": "https://schema.management.azure.com/schemas/2022-04-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleEligibilityScheduleRequests"
},
{
"$ref": "https://schema.management.azure.com/schemas/2022-05-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleDefinitions"
},
{
"$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments"
},
Expand Down
3 changes: 3 additions & 0 deletions schemas/2019-08-01/tenantDeploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,9 @@
{
"$ref": "https://schema.management.azure.com/schemas/2022-04-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleEligibilityScheduleRequests"
},
{
"$ref": "https://schema.management.azure.com/schemas/2022-05-01-preview/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleDefinitions"
},
{
"$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments"
},
Expand Down
Loading

0 comments on commit 7a0ac0f

Please sign in to comment.