diff --git a/packages/@azure/arm-containerregistry/README.md b/packages/@azure/arm-containerregistry/README.md index 8a2a9e99b9a9..e39eeee50c4c 100644 --- a/packages/@azure/arm-containerregistry/README.md +++ b/packages/@azure/arm-containerregistry/README.md @@ -1,34 +1,24 @@ -## Azure ContainerRegistryManagementClient SDK for JavaScript - +# Azure ContainerRegistryManagementClient SDK for JavaScript This package contains an isomorphic SDK for ContainerRegistryManagementClient. -### Currently supported environments - +## Currently supported environments - Node.js version 6.x.x or higher - Browser JavaScript -### How to Install - +## How to Install ``` npm install @azure/arm-containerregistry ``` -### How to use - -#### nodejs - Authentication, client creation and get registries as an example written in TypeScript. -##### Install @azure/ms-rest-nodeauth - -``` -npm install @azure/ms-rest-nodeauth -``` +## How to use -##### Sample code +### nodejs - Authentication, client creation and get registries as an example written in TypeScript. ```ts -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; -import * as msRestNodeAuth from "@azure/ms-rest-nodeauth"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; +import * as msRestNodeAuth from "ms-rest-nodeauth"; import { ContainerRegistryManagementClient, ContainerRegistryManagementModels, ContainerRegistryManagementMappers } from "@azure/arm-containerregistry"; const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; @@ -45,16 +35,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => { }); ``` -#### browser - Authentication, client creation and get registries as an example written in JavaScript. - -##### Install @azure/ms-rest-browserauth - -``` -npm install @azure/ms-rest-browserauth -``` - -##### Sample code - +### browser - Authentication, client creation and get registries as an example written in JavaScript. See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. - index.html @@ -63,11 +44,11 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to @azure/arm-containerregistry sample - - - + + + - - + + ``` -## Related projects - -- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +# Related projects + - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/arm-containerregistry/lib/containerRegistryManagementClient.ts b/packages/@azure/arm-containerregistry/lib/containerRegistryManagementClient.ts index fec95885a3b7..8c1c7393de0a 100644 --- a/packages/@azure/arm-containerregistry/lib/containerRegistryManagementClient.ts +++ b/packages/@azure/arm-containerregistry/lib/containerRegistryManagementClient.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "./models"; import * as Mappers from "./models/mappers"; import * as operations from "./operations"; diff --git a/packages/@azure/arm-containerregistry/lib/containerRegistryManagementClientContext.ts b/packages/@azure/arm-containerregistry/lib/containerRegistryManagementClientContext.ts index b0b07fb3826a..410269584c96 100644 --- a/packages/@azure/arm-containerregistry/lib/containerRegistryManagementClientContext.ts +++ b/packages/@azure/arm-containerregistry/lib/containerRegistryManagementClientContext.ts @@ -9,8 +9,8 @@ */ import * as Models from "./models"; -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; const packageName = "@azure/arm-containerregistry"; const packageVersion = "0.1.0"; diff --git a/packages/@azure/arm-containerregistry/lib/models/index.ts b/packages/@azure/arm-containerregistry/lib/models/index.ts index ecd9211c426e..5b92858f9c91 100644 --- a/packages/@azure/arm-containerregistry/lib/models/index.ts +++ b/packages/@azure/arm-containerregistry/lib/models/index.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js"; -import * as msRest from "@azure/ms-rest-js"; +import { BaseResource, CloudError, AzureServiceClientOptions } from "ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; export { BaseResource, CloudError }; @@ -296,6 +296,40 @@ export interface StorageAccountProperties { id: string; } +/** + * @interface + * An interface representing VirtualNetworkRule. + * The virtual network rule for a container registry. + * + */ +export interface VirtualNetworkRule { + /** + * @member {string} id Resource ID of a subnet, for example: + * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}. + */ + id: string; +} + +/** + * @interface + * An interface representing NetworkRuleSet. + * The network rule set for a container registry. + * + */ +export interface NetworkRuleSet { + /** + * @member {DefaultAction} defaultAction The default action of allow or deny + * when no other rules match. Possible values include: 'Allow', 'Deny'. + * Default value: 'Allow' . + */ + defaultAction: DefaultAction; + /** + * @member {VirtualNetworkRule[]} [virtualNetworkRules] The virtual network + * rules. + */ + virtualNetworkRules?: VirtualNetworkRule[]; +} + /** * @interface * An interface representing Resource. @@ -387,6 +421,11 @@ export interface Registry extends Resource { * SKU. */ storageAccount?: StorageAccountProperties; + /** + * @member {NetworkRuleSet} [networkRuleSet] The network rule set for a + * container registry. + */ + networkRuleSet?: NetworkRuleSet; } /** @@ -417,6 +456,11 @@ export interface RegistryUpdateParameters { * location as the container registry. */ storageAccount?: StorageAccountProperties; + /** + * @member {NetworkRuleSet} [networkRuleSet] The network rule set for a + * container registry. + */ + networkRuleSet?: NetworkRuleSet; } /** @@ -1451,7 +1495,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; /** @@ -1541,7 +1585,7 @@ export interface TriggerProperties { * @interface * An interface representing Task. * The task that has the ARM resource and task properties. - * The task will have all information to schedule a run against it. + * The task will have all information to schedule a run against it. * * @extends Resource */ @@ -1688,7 +1732,7 @@ export interface SourceUpdateParameters { sourceControlType?: SourceControlType; /** * @member {string} [repositoryUrl] The full URL to the source code - * respository + * repository */ repositoryUrl?: string; /** @@ -1898,7 +1942,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. */ @@ -1974,7 +2018,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. */ @@ -2056,7 +2100,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. */ @@ -2504,6 +2548,14 @@ export type SkuTier = 'Classic' | 'Basic' | 'Standard' | 'Premium'; */ export type ProvisioningState = 'Creating' | 'Updating' | 'Deleting' | 'Succeeded' | 'Failed' | 'Canceled'; +/** + * Defines values for DefaultAction. + * Possible values include: 'Allow', 'Deny' + * @readonly + * @enum {string} + */ +export type DefaultAction = 'Allow' | 'Deny'; + /** * 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 b8be8baaa0e7..add3fab8adff 100644 --- a/packages/@azure/arm-containerregistry/lib/models/mappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/mappers.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js"; -import * as msRest from "@azure/ms-rest-js"; +import { CloudErrorMapper, BaseResourceMapper } from "ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; export const CloudError = CloudErrorMapper; export const BaseResource = BaseResourceMapper; @@ -389,6 +389,53 @@ export const StorageAccountProperties: msRest.CompositeMapper = { } }; +export const VirtualNetworkRule: msRest.CompositeMapper = { + serializedName: "VirtualNetworkRule", + type: { + name: "Composite", + className: "VirtualNetworkRule", + modelProperties: { + id: { + required: true, + serializedName: "id", + type: { + name: "String" + } + } + } + } +}; + +export const NetworkRuleSet: msRest.CompositeMapper = { + serializedName: "NetworkRuleSet", + type: { + name: "Composite", + className: "NetworkRuleSet", + modelProperties: { + defaultAction: { + required: true, + serializedName: "defaultAction", + defaultValue: 'Allow', + type: { + name: "String" + } + }, + virtualNetworkRules: { + serializedName: "virtualNetworkRules", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "VirtualNetworkRule" + } + } + } + } + } + } +}; + export const Resource: msRest.CompositeMapper = { serializedName: "Resource", type: { @@ -495,6 +542,13 @@ export const Registry: msRest.CompositeMapper = { name: "Composite", className: "StorageAccountProperties" } + }, + networkRuleSet: { + serializedName: "properties.networkRuleSet", + type: { + name: "Composite", + className: "NetworkRuleSet" + } } } } @@ -536,6 +590,13 @@ export const RegistryUpdateParameters: msRest.CompositeMapper = { name: "Composite", className: "StorageAccountProperties" } + }, + networkRuleSet: { + serializedName: "properties.networkRuleSet", + type: { + name: "Composite", + className: "NetworkRuleSet" + } } } } @@ -2075,6 +2136,11 @@ export const Task: msRest.CompositeMapper = { serializedName: "properties.step", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "type", + clientName: "type" + }, + uberParent: "TaskStepProperties", className: "TaskStepProperties" } }, @@ -2361,6 +2427,11 @@ export const TaskUpdateParameters: msRest.CompositeMapper = { serializedName: "properties.step", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "type", + clientName: "type" + }, + uberParent: "TaskStepUpdateParameters", className: "TaskStepUpdateParameters" } }, diff --git a/packages/@azure/arm-containerregistry/lib/models/parameters.ts b/packages/@azure/arm-containerregistry/lib/models/parameters.ts index 6ca1bdad0386..69943378d643 100644 --- a/packages/@azure/arm-containerregistry/lib/models/parameters.ts +++ b/packages/@azure/arm-containerregistry/lib/models/parameters.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; export const acceptLanguage: msRest.OperationParameter = { parameterPath: "acceptLanguage", @@ -102,6 +102,9 @@ export const resourceGroupName: msRest.OperationURLParameter = { mapper: { required: true, serializedName: "resourceGroupName", + constraints: { + MinLength: 1 + }, type: { name: "String" } diff --git a/packages/@azure/arm-containerregistry/lib/models/registriesMappers.ts b/packages/@azure/arm-containerregistry/lib/models/registriesMappers.ts index 8559a1c7f94c..b6ef11c8bb85 100644 --- a/packages/@azure/arm-containerregistry/lib/models/registriesMappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/registriesMappers.ts @@ -22,6 +22,8 @@ export { Sku, Status, StorageAccountProperties, + NetworkRuleSet, + VirtualNetworkRule, RegistryUpdateParameters, RegistryListResult, RegistryListCredentialsResult, diff --git a/packages/@azure/arm-containerregistry/lib/models/replicationsMappers.ts b/packages/@azure/arm-containerregistry/lib/models/replicationsMappers.ts index bc18707606af..b7b7e8f15035 100644 --- a/packages/@azure/arm-containerregistry/lib/models/replicationsMappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/replicationsMappers.ts @@ -20,6 +20,8 @@ export { Registry, Sku, StorageAccountProperties, + NetworkRuleSet, + VirtualNetworkRule, Webhook, Task, PlatformProperties, diff --git a/packages/@azure/arm-containerregistry/lib/models/runsMappers.ts b/packages/@azure/arm-containerregistry/lib/models/runsMappers.ts index 071ee3528573..6db3d84c362a 100644 --- a/packages/@azure/arm-containerregistry/lib/models/runsMappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/runsMappers.ts @@ -40,6 +40,8 @@ export { Sku, Status, StorageAccountProperties, + NetworkRuleSet, + VirtualNetworkRule, 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 e25bc0cf0139..f9e465b6a1b0 100644 --- a/packages/@azure/arm-containerregistry/lib/models/tasksMappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/tasksMappers.ts @@ -36,6 +36,8 @@ export { Sku, Status, StorageAccountProperties, + NetworkRuleSet, + VirtualNetworkRule, Replication, Webhook, ProxyResource, diff --git a/packages/@azure/arm-containerregistry/lib/models/webhooksMappers.ts b/packages/@azure/arm-containerregistry/lib/models/webhooksMappers.ts index 10ca566a6b50..4e4efe34808f 100644 --- a/packages/@azure/arm-containerregistry/lib/models/webhooksMappers.ts +++ b/packages/@azure/arm-containerregistry/lib/models/webhooksMappers.ts @@ -32,6 +32,8 @@ export { Sku, Status, StorageAccountProperties, + NetworkRuleSet, + VirtualNetworkRule, Replication, Task, PlatformProperties, diff --git a/packages/@azure/arm-containerregistry/lib/operations/operations.ts b/packages/@azure/arm-containerregistry/lib/operations/operations.ts index f3336832e747..eb03f3332355 100644 --- a/packages/@azure/arm-containerregistry/lib/operations/operations.ts +++ b/packages/@azure/arm-containerregistry/lib/operations/operations.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/operationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-containerregistry/lib/operations/registries.ts b/packages/@azure/arm-containerregistry/lib/operations/registries.ts index 23020287122a..181ebda6dc96 100644 --- a/packages/@azure/arm-containerregistry/lib/operations/registries.ts +++ b/packages/@azure/arm-containerregistry/lib/operations/registries.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/registriesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-containerregistry/lib/operations/replications.ts b/packages/@azure/arm-containerregistry/lib/operations/replications.ts index 81ce0b1451ba..8af125651834 100644 --- a/packages/@azure/arm-containerregistry/lib/operations/replications.ts +++ b/packages/@azure/arm-containerregistry/lib/operations/replications.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/replicationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-containerregistry/lib/operations/runs.ts b/packages/@azure/arm-containerregistry/lib/operations/runs.ts index 8ce3e9f5e7ed..530d0f5a6cf5 100644 --- a/packages/@azure/arm-containerregistry/lib/operations/runs.ts +++ b/packages/@azure/arm-containerregistry/lib/operations/runs.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/runsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-containerregistry/lib/operations/tasks.ts b/packages/@azure/arm-containerregistry/lib/operations/tasks.ts index 1d473f71bbc9..6e7a627a18e9 100644 --- a/packages/@azure/arm-containerregistry/lib/operations/tasks.ts +++ b/packages/@azure/arm-containerregistry/lib/operations/tasks.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/tasksMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-containerregistry/lib/operations/webhooks.ts b/packages/@azure/arm-containerregistry/lib/operations/webhooks.ts index 97a6a388abf8..184d4e4c1677 100644 --- a/packages/@azure/arm-containerregistry/lib/operations/webhooks.ts +++ b/packages/@azure/arm-containerregistry/lib/operations/webhooks.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/webhooksMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-containerregistry/package.json b/packages/@azure/arm-containerregistry/package.json index f41742ccbffd..00aeac7d1c57 100644 --- a/packages/@azure/arm-containerregistry/package.json +++ b/packages/@azure/arm-containerregistry/package.json @@ -4,8 +4,8 @@ "description": "ContainerRegistryManagementClient Library with typescript type definitions for node.js and browser.", "version": "0.1.0", "dependencies": { - "@azure/ms-rest-azure-js": "^1.1.0", - "@azure/ms-rest-js": "^1.1.0", + "ms-rest-azure-js": "^1.0.181", + "ms-rest-js": "^1.0.460", "tslib": "^1.9.3" }, "keywords": [ diff --git a/packages/@azure/arm-containerregistry/rollup.config.js b/packages/@azure/arm-containerregistry/rollup.config.js index 5d8e0b31e885..8dfbc0c1bfd1 100644 --- a/packages/@azure/arm-containerregistry/rollup.config.js +++ b/packages/@azure/arm-containerregistry/rollup.config.js @@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve"; */ const config = { input: './esm/containerRegistryManagementClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + external: ["ms-rest-js", "ms-rest-azure-js"], output: { file: "./dist/arm-containerregistry.js", format: "umd", name: "Azure.ArmContainerregistry", sourcemap: true, globals: { - "@azure/ms-rest-js": "msRest", - "@azure/ms-rest-azure-js": "msRestAzure" + "ms-rest-js": "msRest", + "ms-rest-azure-js": "msRestAzure" }, banner: `/* * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/@azure/arm-containerregistry/tsconfig.json b/packages/@azure/arm-containerregistry/tsconfig.json index 51ea90961ce5..f32d1664f320 100644 --- a/packages/@azure/arm-containerregistry/tsconfig.json +++ b/packages/@azure/arm-containerregistry/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*.ts"], + "include": ["./lib/**/*"], "exclude": ["node_modules"] }