Skip to content

Commit 72d2795

Browse files
Merge pull request #1505 from Azure/autogenerate
Merge Autogenerate
2 parents 5cce369 + a53a56f commit 72d2795

File tree

4 files changed

+61
-48
lines changed

4 files changed

+61
-48
lines changed

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20382,6 +20382,17 @@
2038220382
],
2038320383
"description": "Definition of all parameters for an entity."
2038420384
},
20385+
"policy": {
20386+
"oneOf": [
20387+
{
20388+
"$ref": "#/definitions/PipelinePolicy"
20389+
},
20390+
{
20391+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
20392+
}
20393+
],
20394+
"description": "Pipeline Policy."
20395+
},
2038520396
"runDimensions": {
2038620397
"oneOf": [
2038720398
{
@@ -20416,6 +20427,17 @@
2041620427
},
2041720428
"description": "A data factory pipeline."
2041820429
},
20430+
"PipelineElapsedTimeMetricPolicy": {
20431+
"type": "object",
20432+
"properties": {
20433+
"duration": {
20434+
"type": "object",
20435+
"properties": {},
20436+
"description": "TimeSpan value, after which an Azure Monitoring Metric is fired."
20437+
}
20438+
},
20439+
"description": "Pipeline ElapsedTime Metric Policy."
20440+
},
2041920441
"PipelineFolder": {
2042020442
"type": "object",
2042120443
"properties": {
@@ -20426,6 +20448,23 @@
2042620448
},
2042720449
"description": "The folder that this Pipeline is in. If not specified, Pipeline will appear at the root level."
2042820450
},
20451+
"PipelinePolicy": {
20452+
"type": "object",
20453+
"properties": {
20454+
"elapsedTimeMetric": {
20455+
"oneOf": [
20456+
{
20457+
"$ref": "#/definitions/PipelineElapsedTimeMetricPolicy"
20458+
},
20459+
{
20460+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
20461+
}
20462+
],
20463+
"description": "Pipeline ElapsedTime Metric Policy."
20464+
}
20465+
},
20466+
"description": "Pipeline Policy."
20467+
},
2042920468
"PipelineReference": {
2043020469
"type": "object",
2043120470
"properties": {

schemas/2019-12-01-preview/Microsoft.ContainerRegistry.json

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,17 +1521,6 @@
15211521
}
15221522
],
15231523
"description": "Whether or not public network access is allowed for the container registry."
1524-
},
1525-
"storageAccount": {
1526-
"oneOf": [
1527-
{
1528-
"$ref": "#/definitions/StorageAccountProperties"
1529-
},
1530-
{
1531-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1532-
}
1533-
],
1534-
"description": "The properties of a storage account for a container registry. Only applicable to Classic SKU."
15351524
}
15361525
},
15371526
"description": "The properties of a container registry."
@@ -1613,19 +1602,6 @@
16131602
],
16141603
"description": "The SKU of a container registry."
16151604
},
1616-
"StorageAccountProperties": {
1617-
"type": "object",
1618-
"properties": {
1619-
"id": {
1620-
"type": "string",
1621-
"description": "The resource ID of the storage account."
1622-
}
1623-
},
1624-
"required": [
1625-
"id"
1626-
],
1627-
"description": "The properties of a storage account for a container registry. Only applicable to Classic SKU."
1628-
},
16291605
"TrustPolicy": {
16301606
"type": "object",
16311607
"properties": {

schemas/2020-01-13-preview/Microsoft.Automation.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -925,6 +925,17 @@
925925
],
926926
"description": "The encryption settings for automation account"
927927
},
928+
"publicNetworkAccess": {
929+
"oneOf": [
930+
{
931+
"type": "boolean"
932+
},
933+
{
934+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
935+
}
936+
],
937+
"description": "Indicates whether traffic on the non-ARM endpoint (Webhook/Agent) is allowed from the public internet"
938+
},
928939
"sku": {
929940
"oneOf": [
930941
{

schemas/2020-11-01-preview/Microsoft.ContainerRegistry.json

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1892,6 +1892,17 @@
18921892
],
18931893
"description": "The value that indicates whether the admin user is enabled."
18941894
},
1895+
"anonymousPullEnabled": {
1896+
"oneOf": [
1897+
{
1898+
"type": "boolean"
1899+
},
1900+
{
1901+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1902+
}
1903+
],
1904+
"description": "Enables registry-wide pull from unauthenticated clients."
1905+
},
18951906
"dataEndpointEnabled": {
18961907
"oneOf": [
18971908
{
@@ -1965,17 +1976,6 @@
19651976
],
19661977
"description": "Whether or not public network access is allowed for the container registry."
19671978
},
1968-
"storageAccount": {
1969-
"oneOf": [
1970-
{
1971-
"$ref": "#/definitions/StorageAccountProperties"
1972-
},
1973-
{
1974-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1975-
}
1976-
],
1977-
"description": "The properties of a storage account for a container registry. Only applicable to Classic SKU."
1978-
},
19791979
"zoneRedundancy": {
19801980
"oneOf": [
19811981
{
@@ -2113,19 +2113,6 @@
21132113
],
21142114
"description": "The SKU of a container registry."
21152115
},
2116-
"StorageAccountProperties": {
2117-
"type": "object",
2118-
"properties": {
2119-
"id": {
2120-
"type": "string",
2121-
"description": "The resource ID of the storage account."
2122-
}
2123-
},
2124-
"required": [
2125-
"id"
2126-
],
2127-
"description": "The properties of a storage account for a container registry. Only applicable to Classic SKU."
2128-
},
21292116
"SyncProperties": {
21302117
"type": "object",
21312118
"properties": {

0 commit comments

Comments
 (0)