From 76ece5203ccec44ca6307e3283fafa2fa0c1f957 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 12 Dec 2018 11:16:36 -0800 Subject: [PATCH] Generated from 7dae521fce44544031c25d3fcde7938dce5109c8 (#821) Add x-ms-client-name --- .../arm-containerregistry/lib/models/index.ts | 53 ++++++++++++++++--- .../lib/models/mappers.ts | 45 +++++++++++++++- .../lib/models/registriesMappers.ts | 1 + .../lib/models/replicationsMappers.ts | 1 + .../lib/models/runsMappers.ts | 1 + .../lib/models/tasksMappers.ts | 1 + .../lib/models/webhooksMappers.ts | 1 + 7 files changed, 94 insertions(+), 9 deletions(-) diff --git a/packages/@azure/arm-containerregistry/lib/models/index.ts b/packages/@azure/arm-containerregistry/lib/models/index.ts index d9ee8f7df228..fa2a8aa47e5b 100644 --- a/packages/@azure/arm-containerregistry/lib/models/index.ts +++ b/packages/@azure/arm-containerregistry/lib/models/index.ts @@ -299,15 +299,40 @@ export interface StorageAccountProperties { /** * @interface * An interface representing VirtualNetworkRule. - * The virtual network rule for a container registry. + * Virtual network rule. * */ export interface VirtualNetworkRule { /** - * @member {string} id Resource ID of a subnet, for example: + * @member {Action} [action] The action of virtual network rule. Possible + * values include: 'Allow'. Default value: 'Allow' . + */ + action?: Action; + /** + * @member {string} virtualNetworkResourceId Resource ID of a subnet, for + * example: * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}. */ - id: string; + virtualNetworkResourceId: string; +} + +/** + * @interface + * An interface representing IPRule. + * IP rule with specific IP or IP range in CIDR format. + * + */ +export interface IPRule { + /** + * @member {Action} [action] The action of IP ACL rule. Possible values + * include: 'Allow'. Default value: 'Allow' . + */ + action?: Action; + /** + * @member {string} iPAddressOrRange Specifies the IP or IP range in CIDR + * format. Only IPV4 address is allowed. + */ + iPAddressOrRange: string; } /** @@ -328,6 +353,10 @@ export interface NetworkRuleSet { * rules. */ virtualNetworkRules?: VirtualNetworkRule[]; + /** + * @member {IPRule[]} [ipRules] The IP ACL rules. + */ + ipRules?: IPRule[]; } /** @@ -1495,7 +1524,7 @@ export interface SourceProperties { */ sourceControlType: SourceControlType; /** - * @member {string} repositoryUrl The full URL to the source code respository + * @member {string} repositoryUrl The full URL to the source code repository */ repositoryUrl: string; /** @@ -1732,7 +1761,7 @@ export interface SourceUpdateParameters { sourceControlType?: SourceControlType; /** * @member {string} [repositoryUrl] The full URL to the source code - * respository + * repository */ repositoryUrl?: string; /** @@ -1942,7 +1971,7 @@ export interface DockerBuildRequest { agentConfiguration?: AgentProperties; /** * @member {string} [sourceLocation] The URL(absolute or relative) of the - * source context. It can be an URL to a tar or git repoistory. + * source context. It can be an URL to a tar or git repository. * If it is relative URL, the relative path should be obtained from calling * listBuildSourceUploadUrl API. */ @@ -2018,7 +2047,7 @@ export interface FileTaskRunRequest { agentConfiguration?: AgentProperties; /** * @member {string} [sourceLocation] The URL(absolute or relative) of the - * source context. It can be an URL to a tar or git repoistory. + * source context. It can be an URL to a tar or git repository. * If it is relative URL, the relative path should be obtained from calling * listBuildSourceUploadUrl API. */ @@ -2100,7 +2129,7 @@ export interface EncodedTaskRunRequest { agentConfiguration?: AgentProperties; /** * @member {string} [sourceLocation] The URL(absolute or relative) of the - * source context. It can be an URL to a tar or git repoistory. + * source context. It can be an URL to a tar or git repository. * If it is relative URL, the relative path should be obtained from calling * listBuildSourceUploadUrl API. */ @@ -2556,6 +2585,14 @@ export type ProvisioningState = 'Creating' | 'Updating' | 'Deleting' | 'Succeede */ export type DefaultAction = 'Allow' | 'Deny'; +/** + * Defines values for Action. + * Possible values include: 'Allow' + * @readonly + * @enum {string} + */ +export type Action = 'Allow'; + /** * Defines values for PasswordName. * Possible values include: 'password', 'password2' diff --git a/packages/@azure/arm-containerregistry/lib/models/mappers.ts b/packages/@azure/arm-containerregistry/lib/models/mappers.ts index add3fab8adff..c127fde0581b 100644 --- a/packages/@azure/arm-containerregistry/lib/models/mappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/mappers.ts @@ -395,7 +395,14 @@ export const VirtualNetworkRule: msRest.CompositeMapper = { name: "Composite", className: "VirtualNetworkRule", modelProperties: { - id: { + action: { + serializedName: "action", + defaultValue: 'Allow', + type: { + name: "String" + } + }, + virtualNetworkResourceId: { required: true, serializedName: "id", type: { @@ -406,6 +413,30 @@ export const VirtualNetworkRule: msRest.CompositeMapper = { } }; +export const IPRule: msRest.CompositeMapper = { + serializedName: "IPRule", + type: { + name: "Composite", + className: "IPRule", + modelProperties: { + action: { + serializedName: "action", + defaultValue: 'Allow', + type: { + name: "String" + } + }, + iPAddressOrRange: { + required: true, + serializedName: "value", + type: { + name: "String" + } + } + } + } +}; + export const NetworkRuleSet: msRest.CompositeMapper = { serializedName: "NetworkRuleSet", type: { @@ -431,6 +462,18 @@ export const NetworkRuleSet: msRest.CompositeMapper = { } } } + }, + ipRules: { + serializedName: "ipRules", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "IPRule" + } + } + } } } } diff --git a/packages/@azure/arm-containerregistry/lib/models/registriesMappers.ts b/packages/@azure/arm-containerregistry/lib/models/registriesMappers.ts index b6ef11c8bb85..cb61acf3390a 100644 --- a/packages/@azure/arm-containerregistry/lib/models/registriesMappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/registriesMappers.ts @@ -24,6 +24,7 @@ export { StorageAccountProperties, NetworkRuleSet, VirtualNetworkRule, + IPRule, RegistryUpdateParameters, RegistryListResult, RegistryListCredentialsResult, diff --git a/packages/@azure/arm-containerregistry/lib/models/replicationsMappers.ts b/packages/@azure/arm-containerregistry/lib/models/replicationsMappers.ts index b7b7e8f15035..0faccd72342d 100644 --- a/packages/@azure/arm-containerregistry/lib/models/replicationsMappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/replicationsMappers.ts @@ -22,6 +22,7 @@ export { StorageAccountProperties, NetworkRuleSet, VirtualNetworkRule, + IPRule, Webhook, Task, PlatformProperties, diff --git a/packages/@azure/arm-containerregistry/lib/models/runsMappers.ts b/packages/@azure/arm-containerregistry/lib/models/runsMappers.ts index 6db3d84c362a..98e6ee8712e6 100644 --- a/packages/@azure/arm-containerregistry/lib/models/runsMappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/runsMappers.ts @@ -42,6 +42,7 @@ export { StorageAccountProperties, NetworkRuleSet, VirtualNetworkRule, + IPRule, Replication, Webhook } from "../models/mappers"; diff --git a/packages/@azure/arm-containerregistry/lib/models/tasksMappers.ts b/packages/@azure/arm-containerregistry/lib/models/tasksMappers.ts index f9e465b6a1b0..6220d24eb9ba 100644 --- a/packages/@azure/arm-containerregistry/lib/models/tasksMappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/tasksMappers.ts @@ -38,6 +38,7 @@ export { StorageAccountProperties, NetworkRuleSet, VirtualNetworkRule, + IPRule, Replication, Webhook, ProxyResource, diff --git a/packages/@azure/arm-containerregistry/lib/models/webhooksMappers.ts b/packages/@azure/arm-containerregistry/lib/models/webhooksMappers.ts index 4e4efe34808f..499ee7df388a 100644 --- a/packages/@azure/arm-containerregistry/lib/models/webhooksMappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/webhooksMappers.ts @@ -34,6 +34,7 @@ export { StorageAccountProperties, NetworkRuleSet, VirtualNetworkRule, + IPRule, Replication, Task, PlatformProperties,