diff --git a/sdk/hybridcompute/arm-hybridcompute/package.json b/sdk/hybridcompute/arm-hybridcompute/package.json index d19de48b4ddb..e9bbc5f7e8da 100644 --- a/sdk/hybridcompute/arm-hybridcompute/package.json +++ b/sdk/hybridcompute/arm-hybridcompute/package.json @@ -2,7 +2,7 @@ "name": "@azure/arm-hybridcompute", "author": "Microsoft Corporation", "description": "HybridComputeManagementClient Library with typescript type definitions for node.js and browser.", - "version": "1.0.0", + "version": "2.0.0", "dependencies": { "@azure/ms-rest-azure-js": "^2.0.1", "@azure/ms-rest-js": "^2.0.4", diff --git a/sdk/hybridcompute/arm-hybridcompute/src/hybridComputeManagementClient.ts b/sdk/hybridcompute/arm-hybridcompute/src/hybridComputeManagementClient.ts index ac48cdcd1a25..1dff14273cc3 100644 --- a/sdk/hybridcompute/arm-hybridcompute/src/hybridComputeManagementClient.ts +++ b/sdk/hybridcompute/arm-hybridcompute/src/hybridComputeManagementClient.ts @@ -24,7 +24,8 @@ class HybridComputeManagementClient extends HybridComputeManagementClientContext /** * Initializes a new instance of the HybridComputeManagementClient class. * @param credentials Credentials needed for the client to connect to Azure. - * @param subscriptionId The ID of the target subscription. + * @param subscriptionId Subscription credentials which uniquely identify Microsoft Azure + * subscription. The subscription ID forms part of the URI for every service call. * @param [options] The parameter options */ constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.HybridComputeManagementClientOptions) { diff --git a/sdk/hybridcompute/arm-hybridcompute/src/hybridComputeManagementClientContext.ts b/sdk/hybridcompute/arm-hybridcompute/src/hybridComputeManagementClientContext.ts index c10927790ff4..40de94b329c4 100644 --- a/sdk/hybridcompute/arm-hybridcompute/src/hybridComputeManagementClientContext.ts +++ b/sdk/hybridcompute/arm-hybridcompute/src/hybridComputeManagementClientContext.ts @@ -13,17 +13,18 @@ import * as msRest from "@azure/ms-rest-js"; import * as msRestAzure from "@azure/ms-rest-azure-js"; const packageName = "@azure/arm-hybridcompute"; -const packageVersion = "1.0.0"; +const packageVersion = "2.0.0"; export class HybridComputeManagementClientContext extends msRestAzure.AzureServiceClient { credentials: msRest.ServiceClientCredentials; - apiVersion?: string; subscriptionId: string; + apiVersion?: string; /** * Initializes a new instance of the HybridComputeManagementClient class. * @param credentials Credentials needed for the client to connect to Azure. - * @param subscriptionId The ID of the target subscription. + * @param subscriptionId Subscription credentials which uniquely identify Microsoft Azure + * subscription. The subscription ID forms part of the URI for every service call. * @param [options] The parameter options */ constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.HybridComputeManagementClientOptions) { @@ -37,14 +38,14 @@ export class HybridComputeManagementClientContext extends msRestAzure.AzureServi if (!options) { options = {}; } - if(!options.userAgent) { + if (!options.userAgent) { const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; } super(credentials, options); - this.apiVersion = '2019-12-12'; + this.apiVersion = '2020-08-02'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; @@ -52,10 +53,10 @@ export class HybridComputeManagementClientContext extends msRestAzure.AzureServi this.credentials = credentials; this.subscriptionId = subscriptionId; - if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) { + if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) { this.acceptLanguage = options.acceptLanguage; } - if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { + if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout; } } diff --git a/sdk/hybridcompute/arm-hybridcompute/src/models/index.ts b/sdk/hybridcompute/arm-hybridcompute/src/models/index.ts index dacb6cdfd4d7..993b7c5dabbc 100644 --- a/sdk/hybridcompute/arm-hybridcompute/src/models/index.ts +++ b/sdk/hybridcompute/arm-hybridcompute/src/models/index.ts @@ -141,24 +141,29 @@ export interface ErrorDetail { export interface MachineExtensionInstanceViewStatus { /** * The status code. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - code?: string; + readonly code?: string; /** * The level code. Possible values include: 'Info', 'Warning', 'Error' + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - level?: StatusLevelTypes; + readonly level?: StatusLevelTypes; /** * The short localizable label for the status. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - displayStatus?: string; + readonly displayStatus?: string; /** * The detailed status message, including for alerts and error messages. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - message?: string; + readonly message?: string; /** * The time of the status. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - time?: Date; + readonly time?: Date; } /** @@ -167,16 +172,19 @@ export interface MachineExtensionInstanceViewStatus { export interface MachineExtensionInstanceView { /** * The machine extension name. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - name?: string; + readonly name?: string; /** * Specifies the type of the extension; an example is "CustomScriptExtension". + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - type?: string; + readonly type?: string; /** * Specifies the version of the script handler. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - typeHandlerVersion?: string; + readonly typeHandlerVersion?: string; /** * Instance view status. */ @@ -246,24 +254,36 @@ export interface MachineProperties { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly osVersion?: string; + /** + * Specifies the Arc Machine's unique SMBIOS ID + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly vmUuid?: string; /** * Machine Extensions information + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - extensions?: MachineExtensionInstanceView[]; -} - -/** - * Describes the properties required to reconnect a hybrid machine. - */ -export interface MachineReconnectProperties { + readonly extensions?: MachineExtensionInstanceView[]; /** - * Specifies the hybrid machine unique ID. + * Specifies the Operating System product SKU. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - vmId?: string; + readonly osSku?: string; /** - * Public Key that the client provides to be used during initial resource onboarding. + * Specifies the Windows domain name. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - clientPublicKey?: string; + readonly domainName?: string; + /** + * Specifies the AD fully qualified display name. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly adFqdn?: string; + /** + * Specifies the DNS fully qualified display name. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly dnsFqdn?: string; } /** @@ -274,23 +294,24 @@ export interface MachineUpdateProperties { } /** - * Identity for the resource. + * An interface representing Identity. + * @summary Managed Identity. */ export interface Identity { /** - * The principal ID of resource identity. + * The identity type. + */ + type?: string; + /** + * The identity's principal id. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly principalId?: string; /** - * The tenant ID of resource. + * The identity's tenant id. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly tenantId?: string; - /** - * The identity type. Possible values include: 'SystemAssigned' - */ - type?: ResourceIdentityType; } /** @@ -399,10 +420,36 @@ export interface Machine extends TrackedResource { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly osVersion?: string; + /** + * Specifies the Arc Machine's unique SMBIOS ID + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly vmUuid?: string; /** * Machine Extensions information + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly extensions?: MachineExtensionInstanceView[]; + /** + * Specifies the Operating System product SKU. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly osSku?: string; + /** + * Specifies the Windows domain name. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly domainName?: string; + /** + * Specifies the AD fully qualified display name. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly adFqdn?: string; + /** + * Specifies the DNS fully qualified display name. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - extensions?: MachineExtensionInstanceView[]; + readonly dnsFqdn?: string; identity?: MachineIdentity; } @@ -421,34 +468,31 @@ export interface UpdateResource { */ export interface MachineUpdate extends UpdateResource { /** - * The principal ID of resource identity. + * The identity type. + */ + type?: string; + /** + * The identity's principal id. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly principalId?: string; /** - * The tenant ID of resource. + * The identity's tenant id. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly tenantId?: string; - /** - * The identity type. Possible values include: 'SystemAssigned' - */ - type?: ResourceIdentityType; locationData?: LocationData; } /** - * Describes a hybrid machine reconnect. + * Contains details when the response code indicates an error. + * @summary Error response. */ -export interface MachineReconnect { - /** - * Specifies the hybrid machine unique ID. - */ - vmId?: string; +export interface ErrorResponse { /** - * Public Key that the client provides to be used during initial resource onboarding. + * The error details. */ - clientPublicKey?: string; + error: ErrorDetail; } /** @@ -645,187 +689,6 @@ export interface AzureEntityResource extends Resource { readonly etag?: string; } -/** - * An interface representing ResourceModelWithAllowedPropertySetIdentity. - */ -export interface ResourceModelWithAllowedPropertySetIdentity extends Identity { -} - -/** - * The resource model definition representing SKU - */ -export interface Sku { - /** - * The name of the SKU. Ex - P3. It is typically a letter+number code - */ - name: string; - /** - * This field is required to be implemented by the Resource Provider if the service has more than - * one tier, but is not required on a PUT. Possible values include: 'Free', 'Basic', 'Standard', - * 'Premium' - */ - tier?: SkuTier; - /** - * The SKU size. When the name field is the combination of tier and some other value, this would - * be the standalone code. - */ - size?: string; - /** - * If the service has different generations of hardware, for the same SKU, then that can be - * captured here. - */ - family?: string; - /** - * If the SKU supports scale out/in then the capacity integer should be included. If scale out/in - * is not possible for the resource this may be omitted. - */ - capacity?: number; -} - -/** - * An interface representing ResourceModelWithAllowedPropertySetSku. - */ -export interface ResourceModelWithAllowedPropertySetSku extends Sku { -} - -/** - * Plan for the resource. - */ -export interface Plan { - /** - * A user defined name of the 3rd Party Artifact that is being procured. - */ - name: string; - /** - * The publisher of the 3rd Party Artifact that is being bought. E.g. NewRelic - */ - publisher: string; - /** - * The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID - * specified for the artifact at the time of Data Market onboarding. - */ - product: string; - /** - * A publisher provided promotion code as provisioned in Data Market for the said - * product/artifact. - */ - promotionCode?: string; - /** - * The version of the desired product/artifact. - */ - version?: string; -} - -/** - * An interface representing ResourceModelWithAllowedPropertySetPlan. - */ -export interface ResourceModelWithAllowedPropertySetPlan extends Plan { -} - -/** - * The resource model definition containing the full set of allowed properties for a resource. - * Except properties bag, there cannot be a top level property outside of this set. - */ -export interface ResourceModelWithAllowedPropertySet extends BaseResource { - /** - * Fully qualified resource Id for the resource. Ex - - * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly id?: string; - /** - * The name of the resource - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly name?: string; - /** - * The type of the resource. Ex- Microsoft.Compute/virtualMachines or - * Microsoft.Storage/storageAccounts.. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly type?: string; - /** - * The geo-location where the resource lives - */ - location?: string; - /** - * The fully qualified resource ID of the resource that manages this resource. Indicates if this - * resource is managed by another azure resource. If this is present, complete mode deployment - * will not delete the resource if it is removed from the template since it is managed by another - * resource. - */ - managedBy?: string; - /** - * Metadata used by portal/tooling/etc to render different UX experiences for resources of the - * same type; e.g. ApiApps are a kind of Microsoft.Web/sites type. If supported, the resource - * provider must validate and persist this value. - */ - kind?: string; - /** - * The etag field is *not* required. If it is provided in the response body, it must also be - * provided as a header per the normal etag convention. Entity tags are used for comparing two - * or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag - * (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range - * (section 14.27) header fields. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly etag?: string; - /** - * Resource tags. - */ - tags?: { [propertyName: string]: string }; - identity?: ResourceModelWithAllowedPropertySetIdentity; - sku?: ResourceModelWithAllowedPropertySetSku; - plan?: ResourceModelWithAllowedPropertySetPlan; -} - -/** - * The resource management error additional info. - */ -export interface ErrorAdditionalInfo { - /** - * The additional info type. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly type?: string; - /** - * The additional info. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly info?: any; -} - -/** - * The resource management error response. - */ -export interface ErrorResponse { - /** - * The error code. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly code?: string; - /** - * The error message. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly message?: string; - /** - * The error target. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly target?: string; - /** - * The error details. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly details?: ErrorResponse[]; - /** - * The error additional info. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly additionalInfo?: ErrorAdditionalInfo[]; -} - /** * Optional Parameters. */ @@ -903,22 +766,6 @@ export type StatusTypes = 'Connected' | 'Disconnected' | 'Error'; */ export type StatusLevelTypes = 'Info' | 'Warning' | 'Error'; -/** - * Defines values for SkuTier. - * Possible values include: 'Free', 'Basic', 'Standard', 'Premium' - * @readonly - * @enum {string} - */ -export type SkuTier = 'Free' | 'Basic' | 'Standard' | 'Premium'; - -/** - * Defines values for ResourceIdentityType. - * Possible values include: 'SystemAssigned' - * @readonly - * @enum {string} - */ -export type ResourceIdentityType = 'SystemAssigned'; - /** * Defines values for InstanceViewTypes. * Possible values include: 'instanceView' diff --git a/sdk/hybridcompute/arm-hybridcompute/src/models/machineExtensionsMappers.ts b/sdk/hybridcompute/arm-hybridcompute/src/models/machineExtensionsMappers.ts index 1b1b5f751de2..67663c9ee0f5 100644 --- a/sdk/hybridcompute/arm-hybridcompute/src/models/machineExtensionsMappers.ts +++ b/sdk/hybridcompute/arm-hybridcompute/src/models/machineExtensionsMappers.ts @@ -24,14 +24,8 @@ export { MachinePropertiesOsProfile, MachineUpdate, OSProfile, - Plan, ProxyResource, Resource, - ResourceModelWithAllowedPropertySet, - ResourceModelWithAllowedPropertySetIdentity, - ResourceModelWithAllowedPropertySetPlan, - ResourceModelWithAllowedPropertySetSku, - Sku, TrackedResource, UpdateResource } from "../models/mappers"; diff --git a/sdk/hybridcompute/arm-hybridcompute/src/models/machinesMappers.ts b/sdk/hybridcompute/arm-hybridcompute/src/models/machinesMappers.ts index 18ae96ee14ce..c4d65dc1db0f 100644 --- a/sdk/hybridcompute/arm-hybridcompute/src/models/machinesMappers.ts +++ b/sdk/hybridcompute/arm-hybridcompute/src/models/machinesMappers.ts @@ -9,7 +9,6 @@ export { AzureEntityResource, BaseResource, - ErrorAdditionalInfo, ErrorDetail, ErrorResponse, Identity, @@ -23,13 +22,7 @@ export { MachineListResult, MachinePropertiesOsProfile, OSProfile, - Plan, ProxyResource, Resource, - ResourceModelWithAllowedPropertySet, - ResourceModelWithAllowedPropertySetIdentity, - ResourceModelWithAllowedPropertySetPlan, - ResourceModelWithAllowedPropertySetSku, - Sku, TrackedResource } from "../models/mappers"; diff --git a/sdk/hybridcompute/arm-hybridcompute/src/models/mappers.ts b/sdk/hybridcompute/arm-hybridcompute/src/models/mappers.ts index 42bf7bf9e577..43cd6ada7615 100644 --- a/sdk/hybridcompute/arm-hybridcompute/src/models/mappers.ts +++ b/sdk/hybridcompute/arm-hybridcompute/src/models/mappers.ts @@ -217,30 +217,35 @@ export const MachineExtensionInstanceViewStatus: msRest.CompositeMapper = { className: "MachineExtensionInstanceViewStatus", modelProperties: { code: { + readOnly: true, serializedName: "code", type: { name: "String" } }, level: { + readOnly: true, serializedName: "level", type: { name: "String" } }, displayStatus: { + readOnly: true, serializedName: "displayStatus", type: { name: "String" } }, message: { + readOnly: true, serializedName: "message", type: { name: "String" } }, time: { + readOnly: true, serializedName: "time", type: { name: "DateTime" @@ -257,18 +262,21 @@ export const MachineExtensionInstanceView: msRest.CompositeMapper = { className: "MachineExtensionInstanceView", modelProperties: { name: { + readOnly: true, serializedName: "name", type: { name: "String" } }, type: { + readOnly: true, serializedName: "type", type: { name: "String" } }, typeHandlerVersion: { + readOnly: true, serializedName: "typeHandlerVersion", type: { name: "String" @@ -386,7 +394,15 @@ export const MachineProperties: msRest.CompositeMapper = { name: "String" } }, + vmUuid: { + readOnly: true, + serializedName: "vmUuid", + type: { + name: "String" + } + }, extensions: { + readOnly: true, serializedName: "extensions", type: { name: "Sequence", @@ -397,25 +413,31 @@ export const MachineProperties: msRest.CompositeMapper = { } } } - } - } - } -}; - -export const MachineReconnectProperties: msRest.CompositeMapper = { - serializedName: "MachineReconnectProperties", - type: { - name: "Composite", - className: "MachineReconnectProperties", - modelProperties: { - vmId: { - serializedName: "vmId", + }, + osSku: { + readOnly: true, + serializedName: "osSku", type: { name: "String" } }, - clientPublicKey: { - serializedName: "clientPublicKey", + domainName: { + readOnly: true, + serializedName: "domainName", + type: { + name: "String" + } + }, + adFqdn: { + readOnly: true, + serializedName: "adFqdn", + type: { + name: "String" + } + }, + dnsFqdn: { + readOnly: true, + serializedName: "dnsFqdn", type: { name: "String" } @@ -447,6 +469,12 @@ export const Identity: msRest.CompositeMapper = { name: "Composite", className: "Identity", modelProperties: { + type: { + serializedName: "type", + type: { + name: "String" + } + }, principalId: { readOnly: true, serializedName: "principalId", @@ -460,15 +488,6 @@ export const Identity: msRest.CompositeMapper = { type: { name: "String" } - }, - type: { - serializedName: "type", - type: { - name: "Enum", - allowedValues: [ - "SystemAssigned" - ] - } } } } @@ -647,7 +666,15 @@ export const Machine: msRest.CompositeMapper = { name: "String" } }, + vmUuid: { + readOnly: true, + serializedName: "properties.vmUuid", + type: { + name: "String" + } + }, extensions: { + readOnly: true, serializedName: "properties.extensions", type: { name: "Sequence", @@ -659,6 +686,34 @@ export const Machine: msRest.CompositeMapper = { } } }, + osSku: { + readOnly: true, + serializedName: "properties.osSku", + type: { + name: "String" + } + }, + domainName: { + readOnly: true, + serializedName: "properties.domainName", + type: { + name: "String" + } + }, + adFqdn: { + readOnly: true, + serializedName: "properties.adFqdn", + type: { + name: "String" + } + }, + dnsFqdn: { + readOnly: true, + serializedName: "properties.dnsFqdn", + type: { + name: "String" + } + }, identity: { serializedName: "identity", type: { @@ -698,6 +753,12 @@ export const MachineUpdate: msRest.CompositeMapper = { className: "MachineUpdate", modelProperties: { ...UpdateResource.type.modelProperties, + type: { + serializedName: "identity.type", + type: { + name: "String" + } + }, principalId: { readOnly: true, serializedName: "identity.principalId", @@ -712,15 +773,6 @@ export const MachineUpdate: msRest.CompositeMapper = { name: "String" } }, - type: { - serializedName: "identity.type", - type: { - name: "Enum", - allowedValues: [ - "SystemAssigned" - ] - } - }, locationData: { serializedName: "properties.locationData", type: { @@ -732,22 +784,18 @@ export const MachineUpdate: msRest.CompositeMapper = { } }; -export const MachineReconnect: msRest.CompositeMapper = { - serializedName: "MachineReconnect", +export const ErrorResponse: msRest.CompositeMapper = { + serializedName: "ErrorResponse", type: { name: "Composite", - className: "MachineReconnect", + className: "ErrorResponse", modelProperties: { - vmId: { - serializedName: "properties.vmId", - type: { - name: "String" - } - }, - clientPublicKey: { - serializedName: "properties.clientPublicKey", + error: { + required: true, + serializedName: "error", type: { - name: "String" + name: "Composite", + className: "ErrorDetail" } } } @@ -1032,301 +1080,6 @@ export const AzureEntityResource: msRest.CompositeMapper = { } }; -export const ResourceModelWithAllowedPropertySetIdentity: msRest.CompositeMapper = { - serializedName: "ResourceModelWithAllowedPropertySet_identity", - type: { - name: "Composite", - className: "ResourceModelWithAllowedPropertySetIdentity", - modelProperties: { - ...Identity.type.modelProperties - } - } -}; - -export const Sku: msRest.CompositeMapper = { - serializedName: "Sku", - type: { - name: "Composite", - className: "Sku", - modelProperties: { - name: { - required: true, - serializedName: "name", - type: { - name: "String" - } - }, - tier: { - serializedName: "tier", - type: { - name: "Enum", - allowedValues: [ - "Free", - "Basic", - "Standard", - "Premium" - ] - } - }, - size: { - serializedName: "size", - type: { - name: "String" - } - }, - family: { - serializedName: "family", - type: { - name: "String" - } - }, - capacity: { - serializedName: "capacity", - type: { - name: "Number" - } - } - } - } -}; - -export const ResourceModelWithAllowedPropertySetSku: msRest.CompositeMapper = { - serializedName: "ResourceModelWithAllowedPropertySet_sku", - type: { - name: "Composite", - className: "ResourceModelWithAllowedPropertySetSku", - modelProperties: { - ...Sku.type.modelProperties - } - } -}; - -export const Plan: msRest.CompositeMapper = { - serializedName: "Plan", - type: { - name: "Composite", - className: "Plan", - modelProperties: { - name: { - required: true, - serializedName: "name", - type: { - name: "String" - } - }, - publisher: { - required: true, - serializedName: "publisher", - type: { - name: "String" - } - }, - product: { - required: true, - serializedName: "product", - type: { - name: "String" - } - }, - promotionCode: { - serializedName: "promotionCode", - type: { - name: "String" - } - }, - version: { - serializedName: "version", - type: { - name: "String" - } - } - } - } -}; - -export const ResourceModelWithAllowedPropertySetPlan: msRest.CompositeMapper = { - serializedName: "ResourceModelWithAllowedPropertySet_plan", - type: { - name: "Composite", - className: "ResourceModelWithAllowedPropertySetPlan", - modelProperties: { - ...Plan.type.modelProperties - } - } -}; - -export const ResourceModelWithAllowedPropertySet: msRest.CompositeMapper = { - serializedName: "ResourceModelWithAllowedPropertySet", - type: { - name: "Composite", - className: "ResourceModelWithAllowedPropertySet", - modelProperties: { - id: { - readOnly: true, - serializedName: "id", - type: { - name: "String" - } - }, - name: { - readOnly: true, - serializedName: "name", - type: { - name: "String" - } - }, - type: { - readOnly: true, - serializedName: "type", - type: { - name: "String" - } - }, - location: { - serializedName: "location", - type: { - name: "String" - } - }, - managedBy: { - serializedName: "managedBy", - type: { - name: "String" - } - }, - kind: { - serializedName: "kind", - constraints: { - Pattern: /^[-\w\._,\(\)]+$/ - }, - type: { - name: "String" - } - }, - etag: { - readOnly: true, - serializedName: "etag", - type: { - name: "String" - } - }, - tags: { - serializedName: "tags", - type: { - name: "Dictionary", - value: { - type: { - name: "String" - } - } - } - }, - identity: { - serializedName: "identity", - type: { - name: "Composite", - className: "ResourceModelWithAllowedPropertySetIdentity" - } - }, - sku: { - serializedName: "sku", - type: { - name: "Composite", - className: "ResourceModelWithAllowedPropertySetSku" - } - }, - plan: { - serializedName: "plan", - type: { - name: "Composite", - className: "ResourceModelWithAllowedPropertySetPlan" - } - } - } - } -}; - -export const ErrorAdditionalInfo: msRest.CompositeMapper = { - serializedName: "ErrorAdditionalInfo", - type: { - name: "Composite", - className: "ErrorAdditionalInfo", - modelProperties: { - type: { - readOnly: true, - serializedName: "type", - type: { - name: "String" - } - }, - info: { - readOnly: true, - serializedName: "info", - type: { - name: "Object" - } - } - } - } -}; - -export const ErrorResponse: msRest.CompositeMapper = { - serializedName: "ErrorResponse", - type: { - name: "Composite", - className: "ErrorResponse", - modelProperties: { - code: { - readOnly: true, - serializedName: "code", - type: { - name: "String" - } - }, - message: { - readOnly: true, - serializedName: "message", - type: { - name: "String" - } - }, - target: { - readOnly: true, - serializedName: "target", - type: { - name: "String" - } - }, - details: { - readOnly: true, - serializedName: "details", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "ErrorResponse" - } - } - } - }, - additionalInfo: { - readOnly: true, - serializedName: "additionalInfo", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "ErrorAdditionalInfo" - } - } - } - } - } - } -}; - export const MachineListResult: msRest.CompositeMapper = { serializedName: "MachineListResult", type: { diff --git a/sdk/hybridcompute/arm-hybridcompute/src/models/operationsMappers.ts b/sdk/hybridcompute/arm-hybridcompute/src/models/operationsMappers.ts index fb4f1e19fb86..17e27c67ba9f 100644 --- a/sdk/hybridcompute/arm-hybridcompute/src/models/operationsMappers.ts +++ b/sdk/hybridcompute/arm-hybridcompute/src/models/operationsMappers.ts @@ -7,7 +7,7 @@ */ export { - ErrorAdditionalInfo, + ErrorDetail, ErrorResponse, OperationListResult, OperationValue diff --git a/sdk/hybridcompute/arm-hybridcompute/src/models/parameters.ts b/sdk/hybridcompute/arm-hybridcompute/src/models/parameters.ts index 7491d9aa69a3..8d12a0909808 100644 --- a/sdk/hybridcompute/arm-hybridcompute/src/models/parameters.ts +++ b/sdk/hybridcompute/arm-hybridcompute/src/models/parameters.ts @@ -25,9 +25,6 @@ export const apiVersion: msRest.OperationQueryParameter = { mapper: { required: true, serializedName: "api-version", - constraints: { - MinLength: 1 - }, type: { name: "String" } @@ -91,9 +88,6 @@ export const subscriptionId: msRest.OperationURLParameter = { mapper: { required: true, serializedName: "subscriptionId", - constraints: { - MinLength: 1 - }, type: { name: "String" }