From 9d88d43fcf4f6bb6f4bcf6aca1730a985df9dcb3 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Sun, 28 Jun 2020 03:02:41 +0000 Subject: [PATCH] Generated from 7f423cfec1a7f14d825201deb3b03ad3f10240fc Spelling err --- .../src/models/deploymentOperationsMappers.ts | 1 + .../arm-resources/src/models/index.ts | 50 ++++++++++++++++--- .../arm-resources/src/models/mappers.ts | 39 ++++++++++++++- .../src/operations/deployments.ts | 6 ++- .../src/resourceManagementClientContext.ts | 2 +- 5 files changed, 86 insertions(+), 12 deletions(-) diff --git a/sdk/resources/arm-resources/src/models/deploymentOperationsMappers.ts b/sdk/resources/arm-resources/src/models/deploymentOperationsMappers.ts index dc963f1e8398..000030dddb55 100644 --- a/sdk/resources/arm-resources/src/models/deploymentOperationsMappers.ts +++ b/sdk/resources/arm-resources/src/models/deploymentOperationsMappers.ts @@ -14,5 +14,6 @@ export { ErrorAdditionalInfo, ErrorResponse, HttpMessage, + StatusMessage, TargetResource } from "../models/mappers"; diff --git a/sdk/resources/arm-resources/src/models/index.ts b/sdk/resources/arm-resources/src/models/index.ts index 0916795083fc..fe5c5fdb610c 100644 --- a/sdk/resources/arm-resources/src/models/index.ts +++ b/sdk/resources/arm-resources/src/models/index.ts @@ -58,9 +58,18 @@ export interface ResourceGroupFilter { */ export interface TemplateLink { /** - * The URI of the template to deploy. + * The URI of the template to deploy. Use either the uri or id property, but not both. */ - uri: string; + uri?: string; + /** + * The resource id of a Template Spec. Use either the id or uri property, but not both. + */ + id?: string; + /** + * Applicable only if this template link references a Template Spec. This relativePath property + * can optionally be used to reference a Template Spec artifact by path. + */ + relativePath?: string; /** * If included, must match the ContentVersion in the template. */ @@ -483,10 +492,12 @@ export interface ResourceReference { */ export interface DeploymentPropertiesExtended { /** - * The state of the provisioning. + * Denotes the state of provisioning. Possible values include: 'NotSpecified', 'Accepted', + * 'Running', 'Ready', 'Creating', 'Created', 'Deleting', 'Deleted', 'Canceled', 'Failed', + * 'Succeeded', 'Updating' * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly provisioningState?: string; + readonly provisioningState?: ProvisioningState; /** * The correlation ID of the deployment. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -987,6 +998,20 @@ export interface HttpMessage { content?: any; } +/** + * Operation status message object. + */ +export interface StatusMessage { + /** + * Status of the deployment operation. + */ + status?: string; + /** + * The error reported by the operation. + */ + error?: ErrorResponse; +} + /** * Deployment operation properties. */ @@ -1019,15 +1044,17 @@ export interface DeploymentOperationProperties { */ readonly serviceRequestId?: string; /** - * Operation status code. + * Operation status code from the resource provider. This property may not be set if a response + * has not yet been received. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly statusCode?: string; /** - * Operation status message. + * Operation status message from the resource provider. This property is optional. It will only + * be provided if an error was received from the resource provider. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly statusMessage?: any; + readonly statusMessage?: StatusMessage; /** * The target resource. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -1711,6 +1738,15 @@ export type AliasPatternType = 'NotSpecified' | 'Extract'; */ export type AliasType = 'NotSpecified' | 'PlainText' | 'Mask'; +/** + * Defines values for ProvisioningState. + * Possible values include: 'NotSpecified', 'Accepted', 'Running', 'Ready', 'Creating', 'Created', + * 'Deleting', 'Deleted', 'Canceled', 'Failed', 'Succeeded', 'Updating' + * @readonly + * @enum {string} + */ +export type ProvisioningState = 'NotSpecified' | 'Accepted' | 'Running' | 'Ready' | 'Creating' | 'Created' | 'Deleting' | 'Deleted' | 'Canceled' | 'Failed' | 'Succeeded' | 'Updating'; + /** * Defines values for ResourceIdentityType. * Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', diff --git a/sdk/resources/arm-resources/src/models/mappers.ts b/sdk/resources/arm-resources/src/models/mappers.ts index 69a63e536f3f..77e00860abeb 100644 --- a/sdk/resources/arm-resources/src/models/mappers.ts +++ b/sdk/resources/arm-resources/src/models/mappers.ts @@ -85,12 +85,23 @@ export const TemplateLink: msRest.CompositeMapper = { className: "TemplateLink", modelProperties: { uri: { - required: true, serializedName: "uri", type: { name: "String" } }, + id: { + serializedName: "id", + type: { + name: "String" + } + }, + relativePath: { + serializedName: "relativePath", + type: { + name: "String" + } + }, contentVersion: { serializedName: "contentVersion", type: { @@ -1654,6 +1665,29 @@ export const HttpMessage: msRest.CompositeMapper = { } }; +export const StatusMessage: msRest.CompositeMapper = { + serializedName: "StatusMessage", + type: { + name: "Composite", + className: "StatusMessage", + modelProperties: { + status: { + serializedName: "status", + type: { + name: "String" + } + }, + error: { + serializedName: "error", + type: { + name: "Composite", + className: "ErrorResponse" + } + } + } + } +}; + export const DeploymentOperationProperties: msRest.CompositeMapper = { serializedName: "DeploymentOperationProperties", type: { @@ -1718,7 +1752,8 @@ export const DeploymentOperationProperties: msRest.CompositeMapper = { readOnly: true, serializedName: "statusMessage", type: { - name: "Object" + name: "Composite", + className: "StatusMessage" } }, targetResource: { diff --git a/sdk/resources/arm-resources/src/operations/deployments.ts b/sdk/resources/arm-resources/src/operations/deployments.ts index 571323f26ffd..17600b1ae0ef 100644 --- a/sdk/resources/arm-resources/src/operations/deployments.ts +++ b/sdk/resources/arm-resources/src/operations/deployments.ts @@ -2605,7 +2605,8 @@ const beginWhatIfAtSubscriptionScopeOperationSpec: msRest.OperationSpec = { headersMapper: Mappers.DeploymentsWhatIfAtSubscriptionScopeHeaders }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.CloudError, + headersMapper: Mappers.DeploymentsWhatIfAtSubscriptionScopeHeaders } }, serializer @@ -2736,7 +2737,8 @@ const beginWhatIfOperationSpec: msRest.OperationSpec = { headersMapper: Mappers.DeploymentsWhatIfHeaders }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.CloudError, + headersMapper: Mappers.DeploymentsWhatIfHeaders } }, serializer diff --git a/sdk/resources/arm-resources/src/resourceManagementClientContext.ts b/sdk/resources/arm-resources/src/resourceManagementClientContext.ts index 0259767defe2..153cf9aa9ff5 100644 --- a/sdk/resources/arm-resources/src/resourceManagementClientContext.ts +++ b/sdk/resources/arm-resources/src/resourceManagementClientContext.ts @@ -44,7 +44,7 @@ export class ResourceManagementClientContext extends msRestAzure.AzureServiceCli super(credentials, options); - this.apiVersion = '2019-10-01'; + this.apiVersion = '2020-06-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";