diff --git a/sdk/signalr/arm-signalr/LICENSE.txt b/sdk/signalr/arm-signalr/LICENSE.txt index ea8fb1516028..2d3163745319 100644 --- a/sdk/signalr/arm-signalr/LICENSE.txt +++ b/sdk/signalr/arm-signalr/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2020 Microsoft +Copyright (c) 2021 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/sdk/signalr/arm-signalr/README.md b/sdk/signalr/arm-signalr/README.md index f0888a1ce19b..af1cda4d6390 100644 --- a/sdk/signalr/arm-signalr/README.md +++ b/sdk/signalr/arm-signalr/README.md @@ -15,7 +15,7 @@ npm install @azure/arm-signalr ### How to use -#### nodejs - Authentication, client creation and list operations as an example written in TypeScript. +#### nodejs - client creation and list operations as an example written in TypeScript. ##### Install @azure/ms-rest-nodeauth @@ -26,11 +26,10 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0" ##### Sample code +While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package ```typescript -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 { SignalRManagementClient, SignalRManagementModels, SignalRManagementMappers } from "@azure/arm-signalr"; +const msRestNodeAuth = require("@azure/ms-rest-nodeauth"); +const { SignalRManagementClient } = require("@azure/arm-signalr"); const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; msRestNodeAuth.interactiveLogin().then((creds) => { diff --git a/sdk/signalr/arm-signalr/rollup.config.js b/sdk/signalr/arm-signalr/rollup.config.js index 476685b5d0d8..0f16348bb245 100644 --- a/sdk/signalr/arm-signalr/rollup.config.js +++ b/sdk/signalr/arm-signalr/rollup.config.js @@ -21,8 +21,8 @@ const config = { "@azure/ms-rest-azure-js": "msRestAzure" }, banner: `/* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. diff --git a/sdk/signalr/arm-signalr/src/models/index.ts b/sdk/signalr/arm-signalr/src/models/index.ts index b5cab3e82b91..2c8f781b2c2f 100644 --- a/sdk/signalr/arm-signalr/src/models/index.ts +++ b/sdk/signalr/arm-signalr/src/models/index.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. @@ -12,48 +12,127 @@ import * as msRest from "@azure/ms-rest-js"; export { BaseResource, CloudError }; /** - * The object that describes a operation. + * Specifications of the Dimension of metrics. */ -export interface OperationDisplay { +export interface Dimension { /** - * Friendly name of the resource provider + * The public facing name of the dimension. */ - provider?: string; + name?: string; /** - * Resource type on which the operation is performed. + * Localized friendly display name of the dimension. */ - resource?: string; + displayName?: string; /** - * The localized friendly name for the operation. + * Name of the dimension as it appears in MDM. */ - operation?: string; + internalName?: string; /** - * The localized friendly description for the operation + * A Boolean flag indicating whether this dimension should be included for the shoebox export + * scenario. */ - description?: string; + toBeExportedForShoebox?: boolean; } /** - * Specifications of the Dimension of metrics. + * Describes a particular API error with an error code and a message. */ -export interface Dimension { +export interface ErrorResponseBody { /** - * The public facing name of the dimension. + * An error code that describes the error condition more precisely than an HTTP status code. + * Can be used to programmatically handle specific error cases. + */ + code: string; + /** + * A message that describes the error in detail and provides debugging information. + */ + message: string; + /** + * The target of the particular error (for example, the name of the property in error). + */ + target?: string; + /** + * Contains nested errors that are related to this error. + */ + details?: ErrorResponseBody[]; +} + +/** + * Contains information about an API error. + */ +export interface ErrorResponse { + /** + * Describes a particular API error with an error code and a message. + */ + error?: ErrorResponseBody; +} + +/** + * Specifications of the Logs for Azure Monitoring. + */ +export interface LogSpecification { + /** + * Name of the log. */ name?: string; /** - * Localized friendly display name of the dimension. + * Localized friendly display name of the log. */ displayName?: string; +} + +/** + * Properties of user assigned identity. + */ +export interface UserAssignedIdentityProperty { /** - * Name of the dimension as it appears in MDM. + * Get the principal id for the user assigned identity + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - internalName?: string; + readonly principalId?: string; /** - * A Boolean flag indicating whether this dimension should be included for the shoebox export - * scenario. + * Get the client id for the user assigned identity + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - toBeExportedForShoebox?: boolean; + readonly clientId?: string; +} + +/** + * A class represent managed identities used for request and response + */ +export interface ManagedIdentity { + /** + * Represent the identity type: systemAssigned, userAssigned, None. Possible values include: + * 'None', 'SystemAssigned', 'UserAssigned' + */ + type?: ManagedIdentityType; + /** + * Get or set the user assigned identities + */ + userAssignedIdentities?: { [propertyName: string]: UserAssignedIdentityProperty }; + /** + * Get the principal id for the system assigned identity. + * Only be used in response. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly principalId?: string; + /** + * Get the tenant id for the system assigned identity. + * Only be used in response + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly tenantId?: string; +} + +/** + * Managed identity settings for upstream. + */ +export interface ManagedIdentitySettings { + /** + * The Resource indicating the App ID URI of the target resource. + * It also appears in the aud (audience) claim of the issued token. + */ + resource?: string; } /** @@ -101,169 +180,126 @@ export interface MetricSpecification { } /** - * Specifications of the Logs for Azure Monitoring. + * Result of the request to check name availability. It contains a flag and possible reason of + * failure. */ -export interface LogSpecification { - /** - * Name of the log. - */ - name?: string; +export interface NameAvailability { /** - * Localized friendly display name of the log. + * Indicates whether the name is available or not. */ - displayName?: string; -} - -/** - * An object that describes a specification. - */ -export interface ServiceSpecification { + nameAvailable?: boolean; /** - * Specifications of the Metrics for Azure Monitoring. + * The reason of the availability. Required if name is not available. */ - metricSpecifications?: MetricSpecification[]; + reason?: string; /** - * Specifications of the Logs for Azure Monitoring. + * The message of the operation. */ - logSpecifications?: LogSpecification[]; + message?: string; } /** - * Extra Operation properties. + * Data POST-ed to the nameAvailability action */ -export interface OperationProperties { +export interface NameAvailabilityParameters { /** - * The service specifications. + * The resource type. Can be "Microsoft.SignalRService/SignalR" or + * "Microsoft.SignalRService/webPubSub" */ - serviceSpecification?: ServiceSpecification; + type: string; + /** + * The SignalR service name to validate. e.g."my-signalR-name-here" + */ + name: string; } /** - * REST API operation supported by SignalR resource provider. + * Network ACL */ -export interface Operation { - /** - * Name of the operation with format: {provider}/{resource}/{operation} - */ - name?: string; - /** - * If the operation is a data action. (for data plane rbac) - */ - isDataAction?: boolean; - /** - * The object that describes the operation. - */ - display?: OperationDisplay; +export interface NetworkACL { /** - * Optional. The intended executor of the operation; governs the display of the operation in the - * RBAC UX and the audit logs UX. + * Allowed request types. The value can be one or more of: ClientConnection, ServerConnection, + * RESTAPI. */ - origin?: string; + allow?: SignalRRequestType[]; /** - * Extra properties for the operation. + * Denied request types. The value can be one or more of: ClientConnection, ServerConnection, + * RESTAPI. */ - properties?: OperationProperties; + deny?: SignalRRequestType[]; } /** - * Describes a particular API error with an error code and a message. + * The object that describes a operation. */ -export interface ErrorResponseBody { - /** - * An error code that describes the error condition more precisely than an HTTP status code. - * Can be used to programmatically handle specific error cases. - */ - code: string; +export interface OperationDisplay { /** - * A message that describes the error in detail and provides debugging information. + * Friendly name of the resource provider */ - message: string; + provider?: string; /** - * The target of the particular error (for example, the name of the property in error). + * Resource type on which the operation is performed. */ - target?: string; + resource?: string; /** - * Contains nested errors that are related to this error. + * The localized friendly name for the operation. */ - details?: ErrorResponseBody[]; -} - -/** - * Contains information about an API error. - */ -export interface ErrorResponse { + operation?: string; /** - * Describes a particular API error with an error code and a message. + * The localized friendly description for the operation */ - error?: ErrorResponseBody; + description?: string; } /** - * Data POST-ed to the nameAvailability action + * An object that describes a specification. */ -export interface NameAvailabilityParameters { +export interface ServiceSpecification { /** - * The resource type. Should be always "Microsoft.SignalRService/SignalR". + * Specifications of the Metrics for Azure Monitoring. */ - type: string; + metricSpecifications?: MetricSpecification[]; /** - * The SignalR service name to validate. e.g."my-signalR-name-here" + * Specifications of the Logs for Azure Monitoring. */ - name: string; + logSpecifications?: LogSpecification[]; } /** - * Result of the request to check name availability. It contains a flag and possible reason of - * failure. + * Extra Operation properties. */ -export interface NameAvailability { - /** - * Indicates whether the name is available or not. - */ - nameAvailable?: boolean; - /** - * The reason of the availability. Required if name is not available. - */ - reason?: string; +export interface OperationProperties { /** - * The message of the operation. + * The service specifications. */ - message?: string; + serviceSpecification?: ServiceSpecification; } /** - * The billing information of the SignalR resource. + * REST API operation supported by resource provider. */ -export interface ResourceSku { +export interface Operation { /** - * The name of the SKU. Required. - * - * Allowed values: Standard_S1, Free_F1 + * Name of the operation with format: {provider}/{resource}/{operation} */ - name: string; + name?: string; /** - * Optional tier of this particular SKU. 'Standard' or 'Free'. - * - * `Basic` is deprecated, use `Standard` instead. Possible values include: 'Free', 'Basic', - * 'Standard', 'Premium' + * If the operation is a data action. (for data plane rbac) */ - tier?: SignalRSkuTier; + isDataAction?: boolean; /** - * Optional string. For future use. + * The object that describes the operation. */ - size?: string; + display?: OperationDisplay; /** - * Optional string. For future use. + * Optional. The intended executor of the operation; governs the display of the operation in the + * RBAC UX and the audit logs UX. */ - family?: string; + origin?: string; /** - * Optional, integer. The unit count of SignalR resource. 1 by default. - * - * If present, following values are allowed: - * Free: 1 - * Standard: 1,2,5,10,20,50,100 + * Extra properties for the operation. */ - capacity?: number; + properties?: OperationProperties; } /** @@ -276,6 +312,16 @@ export interface PrivateEndpoint { id?: string; } +/** + * ACL for a private endpoint + */ +export interface PrivateEndpointACL extends NetworkACL { + /** + * Name of the private endpoint connection + */ + name: string; +} + /** * Connection state of the private endpoint connection */ @@ -344,136 +390,85 @@ export interface PrivateEndpointConnection extends ProxyResource { } /** - * The resource model definition for a ARM tracked top level resource. + * Private link resource */ -export interface TrackedResource extends Resource { +export interface PrivateLinkResource extends ProxyResource { /** - * The GEO location of the SignalR service. e.g. West US | East US | North Central US | South - * Central US. + * Group Id of the private link resource */ - location?: string; + groupId?: string; /** - * Tags of the service which is a list of key value pairs that describe the resource. + * Required members of the private link resource */ - tags?: { [propertyName: string]: string }; + requiredMembers?: string[]; + /** + * Required private DNS zone names + */ + requiredZoneNames?: string[]; } /** - * A class represent a SignalR service resource. + * Parameters describes the request to regenerate access keys */ -export interface SignalRResource extends TrackedResource { - /** - * The billing information of the resource.(e.g. Free, Standard) - */ - sku?: ResourceSku; +export interface RegenerateKeyParameters { /** - * Prefix for the hostName of the SignalR service. Retained for future use. - * The hostname will be of format: <hostNamePrefix>.service.signalr.net. + * The keyType to regenerate. Must be either 'primary' or 'secondary'(case-insensitive). Possible + * values include: 'Primary', 'Secondary' */ - hostNamePrefix?: string; + keyType?: KeyType; +} + +/** + * The billing information of the resource. + */ +export interface ResourceSku { /** - * List of SignalR featureFlags. e.g. ServiceMode. + * The name of the SKU. Required. * - * FeatureFlags that are not included in the parameters for the update operation will not be - * modified. - * And the response will only include featureFlags that are explicitly set. - * When a featureFlag is not explicitly set, SignalR service will use its globally default value. - * But keep in mind, the default value doesn't mean "false". It varies in terms of different - * FeatureFlags. - */ - features?: SignalRFeature[]; - /** - * Cross-Origin Resource Sharing (CORS) settings. - */ - cors?: SignalRCorsSettings; - /** - * Upstream settings when the Azure SignalR is in server-less mode. - */ - upstream?: ServerlessUpstreamSettings; - /** - * Network ACLs - */ - networkACLs?: SignalRNetworkACLs; - /** - * Provisioning state of the resource. Possible values include: 'Unknown', 'Succeeded', 'Failed', - * 'Canceled', 'Running', 'Creating', 'Updating', 'Deleting', 'Moving' - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly provisioningState?: ProvisioningState; - /** - * The publicly accessible IP of the SignalR service. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly externalIP?: string; - /** - * FQDN of the SignalR service instance. Format: xxx.service.signalr.net - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly hostName?: string; - /** - * The publicly accessible port of the SignalR service which is designed for browser/client side - * usage. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Allowed values: Standard_S1, Free_F1 */ - readonly publicPort?: number; + name: string; /** - * The publicly accessible port of the SignalR service which is designed for customer server side - * usage. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Optional tier of this particular SKU. 'Standard' or 'Free'. + * + * `Basic` is deprecated, use `Standard` instead. Possible values include: 'Free', 'Basic', + * 'Standard', 'Premium' */ - readonly serverPort?: number; + tier?: SignalRSkuTier; /** - * Version of the SignalR resource. Probably you need the same or higher version of client SDKs. + * Not used. Retained for future use. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly version?: string; + readonly size?: string; /** - * Private endpoint connections to the SignalR resource. + * Not used. Retained for future use. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly privateEndpointConnections?: PrivateEndpointConnection[]; + readonly family?: string; /** - * The kind of the service - e.g. "SignalR", or "RawWebSockets" for - * "Microsoft.SignalRService/SignalR". Possible values include: 'SignalR', 'RawWebSockets' + * Optional, integer. The unit count of SignalR resource. 1 by default. + * + * If present, following values are allowed: + * Free: 1 + * Standard: 1,2,5,10,20,50,100 */ - kind?: ServiceKind; + capacity?: number; } /** - * Feature of a SignalR resource, which controls the SignalR runtime behavior. + * Upstream auth settings. */ -export interface SignalRFeature { - /** - * FeatureFlags is the supported features of Azure SignalR service. - * - ServiceMode: Flag for backend server for SignalR service. Values allowed: "Default": have - * your own backend server; "Serverless": your application doesn't have a backend server; - * "Classic": for backward compatibility. Support both Default and Serverless mode but not - * recommended; "PredefinedOnly": for future use. - * - EnableConnectivityLogs: "true"/"false", to enable/disable the connectivity log category - * respectively. Possible values include: 'ServiceMode', 'EnableConnectivityLogs', - * 'EnableMessagingLogs' - */ - flag: FeatureFlags; +export interface UpstreamAuthSettings { /** - * Value of the feature flag. See Azure SignalR service document - * https://docs.microsoft.com/azure/azure-signalr/ for allowed values. + * Gets or sets the type of auth. None or ManagedIdentity is supported now. Possible values + * include: 'None', 'ManagedIdentity' */ - value: string; + type?: UpstreamAuthType; /** - * Optional properties related to this feature. + * Gets or sets the managed identity settings. It's required if the auth type is set to + * ManagedIdentity. */ - properties?: { [propertyName: string]: string }; -} - -/** - * Cross-Origin Resource Sharing (CORS) settings. - */ -export interface SignalRCorsSettings { - /** - * Gets or sets the list of origins that should be allowed to make cross-origin calls (for - * example: http://example.com:12345). Use "*" to allow all. If omitted, allow all by default. - */ - allowedOrigins?: string[]; + managedIdentity?: ManagedIdentitySettings; } /** @@ -517,10 +512,15 @@ export interface UpstreamTemplate { * `http://example.com/chat/api/connect`. */ urlTemplate: string; + /** + * Gets or sets the auth settings for an upstream. If not set, no auth is used for upstream + * messages. + */ + auth?: UpstreamAuthSettings; } /** - * The settings for the Upstream when the Azure SignalR is in server-less mode. + * The settings for the Upstream when the service is in server-less mode. */ export interface ServerlessUpstreamSettings { /** @@ -531,58 +531,144 @@ export interface ServerlessUpstreamSettings { } /** - * Network ACL + * Cross-Origin Resource Sharing (CORS) settings. */ -export interface NetworkACL { +export interface SignalRCorsSettings { + /** + * Gets or sets the list of origins that should be allowed to make cross-origin calls (for + * example: http://example.com:12345). Use "*" to allow all. If omitted, allow all by default. + */ + allowedOrigins?: string[]; +} + +/** + * Feature of a SignalR resource, which controls the SignalR runtime behavior. + */ +export interface SignalRFeature { + /** + * FeatureFlags is the supported features of Azure SignalR service. + * - ServiceMode: Flag for backend server for SignalR service. Values allowed: "Default": have + * your own backend server; "Serverless": your application doesn't have a backend server; + * "Classic": for backward compatibility. Support both Default and Serverless mode but not + * recommended; "PredefinedOnly": for future use. + * - EnableConnectivityLogs: "true"/"false", to enable/disable the connectivity log category + * respectively. Possible values include: 'ServiceMode', 'EnableConnectivityLogs', + * 'EnableMessagingLogs' + */ + flag: FeatureFlags; + /** + * Value of the feature flag. See Azure SignalR service document + * https://docs.microsoft.com/azure/azure-signalr/ for allowed values. + */ + value: string; + /** + * Optional properties related to this feature. + */ + properties?: { [propertyName: string]: string }; +} + +/** + * Network ACLs for the resource + */ +export interface SignalRNetworkACLs { + /** + * Default action when no other rule matches. Possible values include: 'Allow', 'Deny' + */ + defaultAction?: ACLAction; + /** + * ACL for requests from public network + */ + publicNetwork?: NetworkACL; + /** + * ACLs for requests from private endpoints + */ + privateEndpoints?: PrivateEndpointACL[]; +} + +/** + * Settings used to provision or configure the resource. + */ +export interface SignalRCreateOrUpdateProperties { + /** + * List of SignalR featureFlags. e.g. ServiceMode. + * + * FeatureFlags that are not included in the parameters for the update operation will not be + * modified. + * And the response will only include featureFlags that are explicitly set. + * When a featureFlag is not explicitly set, SignalR service will use its globally default value. + * But keep in mind, the default value doesn't mean "false". It varies in terms of different + * FeatureFlags. + */ + features?: SignalRFeature[]; + /** + * Cross-Origin Resource Sharing (CORS) settings. + */ + cors?: SignalRCorsSettings; + /** + * Upstream settings when the Azure SignalR is in server-less mode. + */ + upstream?: ServerlessUpstreamSettings; + /** + * Network ACLs + */ + networkACLs?: SignalRNetworkACLs; +} + +/** + * A class represents the access keys of the resource. + */ +export interface SignalRKeys { + /** + * The primary access key. + */ + primaryKey?: string; + /** + * The secondary access key. + */ + secondaryKey?: string; /** - * Allowed request types. The value can be one or more of: ClientConnection, ServerConnection, - * RESTAPI. + * Connection string constructed via the primaryKey */ - allow?: SignalRRequestType[]; + primaryConnectionString?: string; /** - * Denied request types. The value can be one or more of: ClientConnection, ServerConnection, - * RESTAPI. + * Connection string constructed via the secondaryKey */ - deny?: SignalRRequestType[]; + secondaryConnectionString?: string; } /** - * ACL for a private endpoint + * TLS settings for the resource */ -export interface PrivateEndpointACL extends NetworkACL { +export interface SignalRTlsSettings { /** - * Name of the private endpoint connection + * Request client certificate during TLS handshake if enabled */ - name: string; + clientCertEnabled?: boolean; } /** - * Network ACLs for SignalR + * The resource model definition for a ARM tracked top level resource. */ -export interface SignalRNetworkACLs { - /** - * Default action when no other rule matches. Possible values include: 'Allow', 'Deny' - */ - defaultAction?: ACLAction; +export interface TrackedResource extends Resource { /** - * ACL for requests from public network + * The GEO location of the resource. e.g. West US | East US | North Central US | South Central + * US. */ - publicNetwork?: NetworkACL; + location?: string; /** - * ACLs for requests from private endpoints + * Tags of the service which is a list of key value pairs that describe the resource. */ - privateEndpoints?: PrivateEndpointACL[]; + tags?: { [propertyName: string]: string }; } /** - * Settings used to provision or configure the resource. + * A class represent a resource. */ -export interface SignalRCreateOrUpdateProperties { +export interface SignalRResource extends TrackedResource { /** - * Prefix for the hostName of the SignalR service. Retained for future use. - * The hostname will be of format: <hostNamePrefix>.service.signalr.net. + * The billing information of the resource.(e.g. Free, Standard) */ - hostNamePrefix?: string; + sku?: ResourceSku; /** * List of SignalR featureFlags. e.g. ServiceMode. * @@ -606,57 +692,55 @@ export interface SignalRCreateOrUpdateProperties { * Network ACLs */ networkACLs?: SignalRNetworkACLs; -} - -/** - * Private link resource - */ -export interface PrivateLinkResource extends ProxyResource { /** - * Group Id of the private link resource + * Provisioning state of the resource. Possible values include: 'Unknown', 'Succeeded', 'Failed', + * 'Canceled', 'Running', 'Creating', 'Updating', 'Deleting', 'Moving' + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - groupId?: string; + readonly provisioningState?: ProvisioningState; /** - * Required members of the private link resource + * The publicly accessible IP of the resource. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - requiredMembers?: string[]; + readonly externalIP?: string; /** - * Required private DNS zone names + * FQDN of the service instance. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - requiredZoneNames?: string[]; -} - -/** - * A class represents the access keys of SignalR service. - */ -export interface SignalRKeys { + readonly hostName?: string; /** - * The primary access key. + * The publicly accessible port of the resource which is designed for browser/client side usage. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - primaryKey?: string; + readonly publicPort?: number; /** - * The secondary access key. + * The publicly accessible port of the resource which is designed for customer server side usage. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - secondaryKey?: string; + readonly serverPort?: number; /** - * SignalR connection string constructed via the primaryKey + * Version of the resource. Probably you need the same or higher version of client SDKs. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - primaryConnectionString?: string; + readonly version?: string; /** - * SignalR connection string constructed via the secondaryKey + * Private endpoint connections to the resource. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - secondaryConnectionString?: string; -} - -/** - * Parameters describes the request to regenerate access keys - */ -export interface RegenerateKeyParameters { + readonly privateEndpointConnections?: PrivateEndpointConnection[]; /** - * The keyType to regenerate. Must be either 'primary' or 'secondary'(case-insensitive). Possible - * values include: 'Primary', 'Secondary' + * TLS settings. */ - keyType?: KeyType; + tls?: SignalRTlsSettings; + /** + * The kind of the service - e.g. "SignalR" for "Microsoft.SignalRService/SignalR". Possible + * values include: 'SignalR', 'RawWebSockets' + */ + kind?: ServiceKind; + /** + * The managed identity response + */ + identity?: ManagedIdentity; } /** @@ -674,7 +758,7 @@ export interface SignalRUsageName { } /** - * Object that describes a specific usage of SignalR resources. + * Object that describes a specific usage of the resources. */ export interface SignalRUsage { /** @@ -710,16 +794,6 @@ export interface SignalRCheckNameAvailabilityOptionalParams extends msRest.Reque parameters?: NameAvailabilityParameters; } -/** - * Optional Parameters. - */ -export interface SignalRRegenerateKeyOptionalParams extends msRest.RequestOptionsBase { - /** - * Parameter that describes the Regenerate Key Operation. - */ - parameters?: RegenerateKeyParameters; -} - /** * Optional Parameters. */ @@ -743,7 +817,7 @@ export interface SignalRUpdateOptionalParams extends msRest.RequestOptionsBase { /** * Optional Parameters. */ -export interface SignalRBeginRegenerateKeyOptionalParams extends msRest.RequestOptionsBase { +export interface SignalRRegenerateKeyOptionalParams extends msRest.RequestOptionsBase { /** * Parameter that describes the Regenerate Key Operation. */ @@ -770,6 +844,16 @@ export interface SignalRBeginUpdateOptionalParams extends msRest.RequestOptionsB parameters?: SignalRResource; } +/** + * Optional Parameters. + */ +export interface SignalRBeginRegenerateKeyOptionalParams extends msRest.RequestOptionsBase { + /** + * Parameter that describes the Regenerate Key Operation. + */ + parameters?: RegenerateKeyParameters; +} + /** * Optional Parameters. */ @@ -802,7 +886,7 @@ export interface OperationList extends Array { /** * @interface - * Object that includes an array of SignalR services and a possible link for next set. + * Object that includes an array of resources and a possible link for next set. * @extends Array */ export interface SignalRResourceList extends Array { @@ -815,11 +899,10 @@ export interface SignalRResourceList extends Array { /** * @interface - * Contains a list of AzSignalR.Models.Response.PrivateLink.PrivateLinkResource and a possible link - * to query more results - * @extends Array + * Object that includes an array of the resource usages and a possible link for next set. + * @extends Array */ -export interface PrivateLinkResourceList extends Array { +export interface SignalRUsageList extends Array { /** * The URL the client should use to fetch the next page (per server side paging). * It's null for now, added for future use. @@ -829,10 +912,11 @@ export interface PrivateLinkResourceList extends Array { /** * @interface - * Object that includes an array of SignalR resource usages and a possible link for next set. - * @extends Array + * Contains a list of AzSignalR.Models.Response.PrivateLink.PrivateLinkResource and a possible link + * to query more results + * @extends Array */ -export interface SignalRUsageList extends Array { +export interface PrivateLinkResourceList extends Array { /** * The URL the client should use to fetch the next page (per server side paging). * It's null for now, added for future use. @@ -841,69 +925,85 @@ export interface SignalRUsageList extends Array { } /** - * Defines values for SignalRSkuTier. - * Possible values include: 'Free', 'Basic', 'Standard', 'Premium' + * Defines values for ACLAction. + * Possible values include: 'Allow', 'Deny' * @readonly * @enum {string} */ -export type SignalRSkuTier = 'Free' | 'Basic' | 'Standard' | 'Premium'; +export type ACLAction = 'Allow' | 'Deny'; /** - * Defines values for ProvisioningState. - * Possible values include: 'Unknown', 'Succeeded', 'Failed', 'Canceled', 'Running', 'Creating', - * 'Updating', 'Deleting', 'Moving' + * Defines values for FeatureFlags. + * Possible values include: 'ServiceMode', 'EnableConnectivityLogs', 'EnableMessagingLogs' * @readonly * @enum {string} */ -export type ProvisioningState = 'Unknown' | 'Succeeded' | 'Failed' | 'Canceled' | 'Running' | 'Creating' | 'Updating' | 'Deleting' | 'Moving'; +export type FeatureFlags = 'ServiceMode' | 'EnableConnectivityLogs' | 'EnableMessagingLogs'; /** - * Defines values for PrivateLinkServiceConnectionStatus. - * Possible values include: 'Pending', 'Approved', 'Rejected', 'Disconnected' + * Defines values for KeyType. + * Possible values include: 'Primary', 'Secondary' * @readonly * @enum {string} */ -export type PrivateLinkServiceConnectionStatus = 'Pending' | 'Approved' | 'Rejected' | 'Disconnected'; +export type KeyType = 'Primary' | 'Secondary'; /** - * Defines values for ServiceKind. - * Possible values include: 'SignalR', 'RawWebSockets' + * Defines values for ManagedIdentityType. + * Possible values include: 'None', 'SystemAssigned', 'UserAssigned' * @readonly * @enum {string} */ -export type ServiceKind = 'SignalR' | 'RawWebSockets'; +export type ManagedIdentityType = 'None' | 'SystemAssigned' | 'UserAssigned'; /** - * Defines values for FeatureFlags. - * Possible values include: 'ServiceMode', 'EnableConnectivityLogs', 'EnableMessagingLogs' + * Defines values for SignalRRequestType. + * Possible values include: 'ClientConnection', 'ServerConnection', 'RESTAPI' * @readonly * @enum {string} */ -export type FeatureFlags = 'ServiceMode' | 'EnableConnectivityLogs' | 'EnableMessagingLogs'; +export type SignalRRequestType = 'ClientConnection' | 'ServerConnection' | 'RESTAPI'; /** - * Defines values for ACLAction. - * Possible values include: 'Allow', 'Deny' + * Defines values for ProvisioningState. + * Possible values include: 'Unknown', 'Succeeded', 'Failed', 'Canceled', 'Running', 'Creating', + * 'Updating', 'Deleting', 'Moving' * @readonly * @enum {string} */ -export type ACLAction = 'Allow' | 'Deny'; +export type ProvisioningState = 'Unknown' | 'Succeeded' | 'Failed' | 'Canceled' | 'Running' | 'Creating' | 'Updating' | 'Deleting' | 'Moving'; /** - * Defines values for SignalRRequestType. - * Possible values include: 'ClientConnection', 'ServerConnection', 'RESTAPI' + * Defines values for PrivateLinkServiceConnectionStatus. + * Possible values include: 'Pending', 'Approved', 'Rejected', 'Disconnected' * @readonly * @enum {string} */ -export type SignalRRequestType = 'ClientConnection' | 'ServerConnection' | 'RESTAPI'; +export type PrivateLinkServiceConnectionStatus = 'Pending' | 'Approved' | 'Rejected' | 'Disconnected'; /** - * Defines values for KeyType. - * Possible values include: 'Primary', 'Secondary' + * Defines values for SignalRSkuTier. + * Possible values include: 'Free', 'Basic', 'Standard', 'Premium' * @readonly * @enum {string} */ -export type KeyType = 'Primary' | 'Secondary'; +export type SignalRSkuTier = 'Free' | 'Basic' | 'Standard' | 'Premium'; + +/** + * Defines values for UpstreamAuthType. + * Possible values include: 'None', 'ManagedIdentity' + * @readonly + * @enum {string} + */ +export type UpstreamAuthType = 'None' | 'ManagedIdentity'; + +/** + * Defines values for ServiceKind. + * Possible values include: 'SignalR', 'RawWebSockets' + * @readonly + * @enum {string} + */ +export type ServiceKind = 'SignalR' | 'RawWebSockets'; /** * Contains response data for the list operation. @@ -1006,9 +1106,9 @@ export type SignalRListByResourceGroupResponse = SignalRResourceList & { }; /** - * Contains response data for the listKeys operation. + * Contains response data for the get operation. */ -export type SignalRListKeysResponse = SignalRKeys & { +export type SignalRGetResponse = SignalRResource & { /** * The underlying HTTP response. */ @@ -1021,14 +1121,14 @@ export type SignalRListKeysResponse = SignalRKeys & { /** * The response body as parsed JSON or XML */ - parsedBody: SignalRKeys; + parsedBody: SignalRResource; }; }; /** - * Contains response data for the regenerateKey operation. + * Contains response data for the createOrUpdate operation. */ -export type SignalRRegenerateKeyResponse = SignalRKeys & { +export type SignalRCreateOrUpdateResponse = SignalRResource & { /** * The underlying HTTP response. */ @@ -1041,14 +1141,14 @@ export type SignalRRegenerateKeyResponse = SignalRKeys & { /** * The response body as parsed JSON or XML */ - parsedBody: SignalRKeys; + parsedBody: SignalRResource; }; }; /** - * Contains response data for the get operation. + * Contains response data for the update operation. */ -export type SignalRGetResponse = SignalRResource & { +export type SignalRUpdateResponse = SignalRResource & { /** * The underlying HTTP response. */ @@ -1066,9 +1166,9 @@ export type SignalRGetResponse = SignalRResource & { }; /** - * Contains response data for the createOrUpdate operation. + * Contains response data for the listKeys operation. */ -export type SignalRCreateOrUpdateResponse = SignalRResource & { +export type SignalRListKeysResponse = SignalRKeys & { /** * The underlying HTTP response. */ @@ -1081,14 +1181,14 @@ export type SignalRCreateOrUpdateResponse = SignalRResource & { /** * The response body as parsed JSON or XML */ - parsedBody: SignalRResource; + parsedBody: SignalRKeys; }; }; /** - * Contains response data for the update operation. + * Contains response data for the regenerateKey operation. */ -export type SignalRUpdateResponse = SignalRResource & { +export type SignalRRegenerateKeyResponse = SignalRKeys & { /** * The underlying HTTP response. */ @@ -1101,14 +1201,14 @@ export type SignalRUpdateResponse = SignalRResource & { /** * The response body as parsed JSON or XML */ - parsedBody: SignalRResource; + parsedBody: SignalRKeys; }; }; /** - * Contains response data for the beginRegenerateKey operation. + * Contains response data for the beginCreateOrUpdate operation. */ -export type SignalRBeginRegenerateKeyResponse = SignalRKeys & { +export type SignalRBeginCreateOrUpdateResponse = SignalRResource & { /** * The underlying HTTP response. */ @@ -1121,14 +1221,14 @@ export type SignalRBeginRegenerateKeyResponse = SignalRKeys & { /** * The response body as parsed JSON or XML */ - parsedBody: SignalRKeys; + parsedBody: SignalRResource; }; }; /** - * Contains response data for the beginCreateOrUpdate operation. + * Contains response data for the beginUpdate operation. */ -export type SignalRBeginCreateOrUpdateResponse = SignalRResource & { +export type SignalRBeginUpdateResponse = SignalRResource & { /** * The underlying HTTP response. */ @@ -1146,9 +1246,9 @@ export type SignalRBeginCreateOrUpdateResponse = SignalRResource & { }; /** - * Contains response data for the beginUpdate operation. + * Contains response data for the beginRegenerateKey operation. */ -export type SignalRBeginUpdateResponse = SignalRResource & { +export type SignalRBeginRegenerateKeyResponse = SignalRKeys & { /** * The underlying HTTP response. */ @@ -1161,7 +1261,7 @@ export type SignalRBeginUpdateResponse = SignalRResource & { /** * The response body as parsed JSON or XML */ - parsedBody: SignalRResource; + parsedBody: SignalRKeys; }; }; @@ -1206,9 +1306,9 @@ export type SignalRListByResourceGroupNextResponse = SignalRResourceList & { }; /** - * Contains response data for the get operation. + * Contains response data for the list operation. */ -export type SignalRPrivateEndpointConnectionsGetResponse = PrivateEndpointConnection & { +export type UsagesListResponse = SignalRUsageList & { /** * The underlying HTTP response. */ @@ -1221,14 +1321,14 @@ export type SignalRPrivateEndpointConnectionsGetResponse = PrivateEndpointConnec /** * The response body as parsed JSON or XML */ - parsedBody: PrivateEndpointConnection; + parsedBody: SignalRUsageList; }; }; /** - * Contains response data for the update operation. + * Contains response data for the listNext operation. */ -export type SignalRPrivateEndpointConnectionsUpdateResponse = PrivateEndpointConnection & { +export type UsagesListNextResponse = SignalRUsageList & { /** * The underlying HTTP response. */ @@ -1241,14 +1341,14 @@ export type SignalRPrivateEndpointConnectionsUpdateResponse = PrivateEndpointCon /** * The response body as parsed JSON or XML */ - parsedBody: PrivateEndpointConnection; + parsedBody: SignalRUsageList; }; }; /** - * Contains response data for the list operation. + * Contains response data for the get operation. */ -export type SignalRPrivateLinkResourcesListResponse = PrivateLinkResourceList & { +export type SignalRPrivateEndpointConnectionsGetResponse = PrivateEndpointConnection & { /** * The underlying HTTP response. */ @@ -1261,14 +1361,14 @@ export type SignalRPrivateLinkResourcesListResponse = PrivateLinkResourceList & /** * The response body as parsed JSON or XML */ - parsedBody: PrivateLinkResourceList; + parsedBody: PrivateEndpointConnection; }; }; /** - * Contains response data for the listNext operation. + * Contains response data for the update operation. */ -export type SignalRPrivateLinkResourcesListNextResponse = PrivateLinkResourceList & { +export type SignalRPrivateEndpointConnectionsUpdateResponse = PrivateEndpointConnection & { /** * The underlying HTTP response. */ @@ -1281,14 +1381,14 @@ export type SignalRPrivateLinkResourcesListNextResponse = PrivateLinkResourceLis /** * The response body as parsed JSON or XML */ - parsedBody: PrivateLinkResourceList; + parsedBody: PrivateEndpointConnection; }; }; /** * Contains response data for the list operation. */ -export type UsagesListResponse = SignalRUsageList & { +export type SignalRPrivateLinkResourcesListResponse = PrivateLinkResourceList & { /** * The underlying HTTP response. */ @@ -1301,14 +1401,14 @@ export type UsagesListResponse = SignalRUsageList & { /** * The response body as parsed JSON or XML */ - parsedBody: SignalRUsageList; + parsedBody: PrivateLinkResourceList; }; }; /** * Contains response data for the listNext operation. */ -export type UsagesListNextResponse = SignalRUsageList & { +export type SignalRPrivateLinkResourcesListNextResponse = PrivateLinkResourceList & { /** * The underlying HTTP response. */ @@ -1321,6 +1421,6 @@ export type UsagesListNextResponse = SignalRUsageList & { /** * The response body as parsed JSON or XML */ - parsedBody: SignalRUsageList; + parsedBody: PrivateLinkResourceList; }; }; diff --git a/sdk/signalr/arm-signalr/src/models/mappers.ts b/sdk/signalr/arm-signalr/src/models/mappers.ts index d3370fa5d0bb..8f67e6f69606 100644 --- a/sdk/signalr/arm-signalr/src/models/mappers.ts +++ b/sdk/signalr/arm-signalr/src/models/mappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. @@ -12,40 +12,6 @@ import * as msRest from "@azure/ms-rest-js"; export const CloudError = CloudErrorMapper; export const BaseResource = BaseResourceMapper; -export const OperationDisplay: msRest.CompositeMapper = { - serializedName: "OperationDisplay", - type: { - name: "Composite", - className: "OperationDisplay", - modelProperties: { - provider: { - serializedName: "provider", - type: { - name: "String" - } - }, - resource: { - serializedName: "resource", - type: { - name: "String" - } - }, - operation: { - serializedName: "operation", - type: { - name: "String" - } - }, - description: { - serializedName: "description", - type: { - name: "String" - } - } - } - } -}; - export const Dimension: msRest.CompositeMapper = { serializedName: "Dimension", type: { @@ -80,62 +46,40 @@ export const Dimension: msRest.CompositeMapper = { } }; -export const MetricSpecification: msRest.CompositeMapper = { - serializedName: "MetricSpecification", +export const ErrorResponseBody: msRest.CompositeMapper = { + serializedName: "ErrorResponseBody", type: { name: "Composite", - className: "MetricSpecification", + className: "ErrorResponseBody", modelProperties: { - name: { - serializedName: "name", - type: { - name: "String" - } - }, - displayName: { - serializedName: "displayName", - type: { - name: "String" - } - }, - displayDescription: { - serializedName: "displayDescription", - type: { - name: "String" - } - }, - unit: { - serializedName: "unit", - type: { - name: "String" - } - }, - aggregationType: { - serializedName: "aggregationType", + code: { + required: true, + serializedName: "code", type: { name: "String" } }, - fillGapWithZero: { - serializedName: "fillGapWithZero", + message: { + required: true, + serializedName: "message", type: { name: "String" } }, - category: { - serializedName: "category", + target: { + serializedName: "target", type: { name: "String" } }, - dimensions: { - serializedName: "dimensions", + details: { + serializedName: "details", type: { name: "Sequence", element: { type: { name: "Composite", - className: "Dimension" + className: "ErrorResponseBody" } } } @@ -144,6 +88,23 @@ export const MetricSpecification: msRest.CompositeMapper = { } }; +export const ErrorResponse: msRest.CompositeMapper = { + serializedName: "ErrorResponse", + type: { + name: "Composite", + className: "ErrorResponse", + modelProperties: { + error: { + serializedName: "error", + type: { + name: "Composite", + className: "ErrorResponseBody" + } + } + } + } +}; + export const LogSpecification: msRest.CompositeMapper = { serializedName: "LogSpecification", type: { @@ -166,62 +127,93 @@ export const LogSpecification: msRest.CompositeMapper = { } }; -export const ServiceSpecification: msRest.CompositeMapper = { - serializedName: "ServiceSpecification", +export const UserAssignedIdentityProperty: msRest.CompositeMapper = { + serializedName: "UserAssignedIdentityProperty", type: { name: "Composite", - className: "ServiceSpecification", + className: "UserAssignedIdentityProperty", modelProperties: { - metricSpecifications: { - serializedName: "metricSpecifications", + principalId: { + readOnly: true, + serializedName: "principalId", type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "MetricSpecification" - } - } + name: "String" } }, - logSpecifications: { - serializedName: "logSpecifications", + clientId: { + readOnly: true, + serializedName: "clientId", type: { - name: "Sequence", - element: { + name: "String" + } + } + } + } +}; + +export const ManagedIdentity: msRest.CompositeMapper = { + serializedName: "ManagedIdentity", + type: { + name: "Composite", + className: "ManagedIdentity", + modelProperties: { + type: { + serializedName: "type", + type: { + name: "String" + } + }, + userAssignedIdentities: { + serializedName: "userAssignedIdentities", + type: { + name: "Dictionary", + value: { type: { name: "Composite", - className: "LogSpecification" + className: "UserAssignedIdentityProperty" } } } + }, + principalId: { + readOnly: true, + serializedName: "principalId", + type: { + name: "String" + } + }, + tenantId: { + readOnly: true, + serializedName: "tenantId", + type: { + name: "String" + } } } } }; -export const OperationProperties: msRest.CompositeMapper = { - serializedName: "OperationProperties", +export const ManagedIdentitySettings: msRest.CompositeMapper = { + serializedName: "ManagedIdentitySettings", type: { name: "Composite", - className: "OperationProperties", + className: "ManagedIdentitySettings", modelProperties: { - serviceSpecification: { - serializedName: "serviceSpecification", + resource: { + serializedName: "resource", type: { - name: "Composite", - className: "ServiceSpecification" + name: "String" } } } } }; -export const Operation: msRest.CompositeMapper = { - serializedName: "Operation", +export const MetricSpecification: msRest.CompositeMapper = { + serializedName: "MetricSpecification", type: { name: "Composite", - className: "Operation", + className: "MetricSpecification", modelProperties: { name: { serializedName: "name", @@ -229,70 +221,50 @@ export const Operation: msRest.CompositeMapper = { name: "String" } }, - isDataAction: { - serializedName: "isDataAction", + displayName: { + serializedName: "displayName", type: { - name: "Boolean" + name: "String" } }, - display: { - serializedName: "display", + displayDescription: { + serializedName: "displayDescription", type: { - name: "Composite", - className: "OperationDisplay" + name: "String" } }, - origin: { - serializedName: "origin", + unit: { + serializedName: "unit", type: { name: "String" } }, - properties: { - serializedName: "properties", - type: { - name: "Composite", - className: "OperationProperties" - } - } - } - } -}; - -export const ErrorResponseBody: msRest.CompositeMapper = { - serializedName: "ErrorResponseBody", - type: { - name: "Composite", - className: "ErrorResponseBody", - modelProperties: { - code: { - required: true, - serializedName: "code", + aggregationType: { + serializedName: "aggregationType", type: { name: "String" } }, - message: { - required: true, - serializedName: "message", + fillGapWithZero: { + serializedName: "fillGapWithZero", type: { name: "String" } }, - target: { - serializedName: "target", + category: { + serializedName: "category", type: { name: "String" } }, - details: { - serializedName: "details", + dimensions: { + serializedName: "dimensions", type: { name: "Sequence", element: { type: { name: "Composite", - className: "ErrorResponseBody" + className: "Dimension" } } } @@ -301,17 +273,28 @@ export const ErrorResponseBody: msRest.CompositeMapper = { } }; -export const ErrorResponse: msRest.CompositeMapper = { - serializedName: "ErrorResponse", +export const NameAvailability: msRest.CompositeMapper = { + serializedName: "NameAvailability", type: { name: "Composite", - className: "ErrorResponse", + className: "NameAvailability", modelProperties: { - error: { - serializedName: "error", + nameAvailable: { + serializedName: "nameAvailable", type: { - name: "Composite", - className: "ErrorResponseBody" + name: "Boolean" + } + }, + reason: { + serializedName: "reason", + type: { + name: "String" + } + }, + message: { + serializedName: "message", + type: { + name: "String" } } } @@ -342,69 +325,159 @@ export const NameAvailabilityParameters: msRest.CompositeMapper = { } }; -export const NameAvailability: msRest.CompositeMapper = { - serializedName: "NameAvailability", +export const NetworkACL: msRest.CompositeMapper = { + serializedName: "NetworkACL", type: { name: "Composite", - className: "NameAvailability", + className: "NetworkACL", modelProperties: { - nameAvailable: { - serializedName: "nameAvailable", + allow: { + serializedName: "allow", type: { - name: "Boolean" + name: "Sequence", + element: { + type: { + name: "String" + } + } } }, - reason: { - serializedName: "reason", + deny: { + serializedName: "deny", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + } + } + } +}; + +export const OperationDisplay: msRest.CompositeMapper = { + serializedName: "OperationDisplay", + type: { + name: "Composite", + className: "OperationDisplay", + modelProperties: { + provider: { + serializedName: "provider", type: { name: "String" } }, - message: { - serializedName: "message", + resource: { + serializedName: "resource", + type: { + name: "String" + } + }, + operation: { + serializedName: "operation", + type: { + name: "String" + } + }, + description: { + serializedName: "description", + type: { + name: "String" + } + } + } + } +}; + +export const ServiceSpecification: msRest.CompositeMapper = { + serializedName: "ServiceSpecification", + type: { + name: "Composite", + className: "ServiceSpecification", + modelProperties: { + metricSpecifications: { + serializedName: "metricSpecifications", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "MetricSpecification" + } + } + } + }, + logSpecifications: { + serializedName: "logSpecifications", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "LogSpecification" + } + } + } + } + } + } +}; + +export const OperationProperties: msRest.CompositeMapper = { + serializedName: "OperationProperties", + type: { + name: "Composite", + className: "OperationProperties", + modelProperties: { + serviceSpecification: { + serializedName: "serviceSpecification", type: { - name: "String" + name: "Composite", + className: "ServiceSpecification" } } } } }; -export const ResourceSku: msRest.CompositeMapper = { - serializedName: "ResourceSku", +export const Operation: msRest.CompositeMapper = { + serializedName: "Operation", type: { name: "Composite", - className: "ResourceSku", + className: "Operation", modelProperties: { name: { - required: true, serializedName: "name", type: { name: "String" } }, - tier: { - serializedName: "tier", + isDataAction: { + serializedName: "isDataAction", type: { - name: "String" + name: "Boolean" } }, - size: { - serializedName: "size", + display: { + serializedName: "display", type: { - name: "String" + name: "Composite", + className: "OperationDisplay" } }, - family: { - serializedName: "family", + origin: { + serializedName: "origin", type: { name: "String" } }, - capacity: { - serializedName: "capacity", + properties: { + serializedName: "properties", type: { - name: "Number" + name: "Composite", + className: "OperationProperties" } } } @@ -427,6 +500,24 @@ export const PrivateEndpoint: msRest.CompositeMapper = { } }; +export const PrivateEndpointACL: msRest.CompositeMapper = { + serializedName: "PrivateEndpointACL", + type: { + name: "Composite", + className: "PrivateEndpointACL", + modelProperties: { + ...NetworkACL.type.modelProperties, + name: { + required: true, + serializedName: "name", + type: { + name: "String" + } + } + } + } +}; + export const PrivateLinkServiceConnectionState: msRest.CompositeMapper = { serializedName: "PrivateLinkServiceConnectionState", type: { @@ -529,24 +620,35 @@ export const PrivateEndpointConnection: msRest.CompositeMapper = { } }; -export const TrackedResource: msRest.CompositeMapper = { - serializedName: "TrackedResource", +export const PrivateLinkResource: msRest.CompositeMapper = { + serializedName: "PrivateLinkResource", type: { name: "Composite", - className: "TrackedResource", + className: "PrivateLinkResource", modelProperties: { - ...Resource.type.modelProperties, - location: { - serializedName: "location", + ...ProxyResource.type.modelProperties, + groupId: { + serializedName: "properties.groupId", type: { name: "String" } }, - tags: { - serializedName: "tags", + requiredMembers: { + serializedName: "properties.requiredMembers", type: { - name: "Dictionary", - value: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + requiredZoneNames: { + serializedName: "properties.requiredZoneNames", + type: { + name: "Sequence", + element: { type: { name: "String" } @@ -557,178 +659,82 @@ export const TrackedResource: msRest.CompositeMapper = { } }; -export const SignalRResource: msRest.CompositeMapper = { - serializedName: "SignalRResource", +export const RegenerateKeyParameters: msRest.CompositeMapper = { + serializedName: "RegenerateKeyParameters", type: { name: "Composite", - className: "SignalRResource", + className: "RegenerateKeyParameters", modelProperties: { - ...TrackedResource.type.modelProperties, - sku: { - serializedName: "sku", - type: { - name: "Composite", - className: "ResourceSku" - } - }, - hostNamePrefix: { - serializedName: "properties.hostNamePrefix", + keyType: { + serializedName: "keyType", type: { name: "String" } - }, - features: { - serializedName: "properties.features", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "SignalRFeature" - } - } - } - }, - cors: { - serializedName: "properties.cors", - type: { - name: "Composite", - className: "SignalRCorsSettings" - } - }, - upstream: { - serializedName: "properties.upstream", - type: { - name: "Composite", - className: "ServerlessUpstreamSettings" - } - }, - networkACLs: { - serializedName: "properties.networkACLs", - type: { - name: "Composite", - className: "SignalRNetworkACLs" - } - }, - provisioningState: { - readOnly: true, - serializedName: "properties.provisioningState", + } + } + } +}; + +export const ResourceSku: msRest.CompositeMapper = { + serializedName: "ResourceSku", + type: { + name: "Composite", + className: "ResourceSku", + modelProperties: { + name: { + required: true, + serializedName: "name", type: { name: "String" } }, - externalIP: { - readOnly: true, - serializedName: "properties.externalIP", + tier: { + serializedName: "tier", type: { name: "String" } }, - hostName: { + size: { readOnly: true, - serializedName: "properties.hostName", + serializedName: "size", type: { name: "String" } }, - publicPort: { - readOnly: true, - serializedName: "properties.publicPort", - type: { - name: "Number" - } - }, - serverPort: { - readOnly: true, - serializedName: "properties.serverPort", - type: { - name: "Number" - } - }, - version: { + family: { readOnly: true, - serializedName: "properties.version", + serializedName: "family", type: { name: "String" } }, - privateEndpointConnections: { - readOnly: true, - serializedName: "properties.privateEndpointConnections", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "PrivateEndpointConnection" - } - } - } - }, - kind: { - serializedName: "kind", + capacity: { + serializedName: "capacity", type: { - name: "String" + name: "Number" } } } } }; -export const SignalRFeature: msRest.CompositeMapper = { - serializedName: "SignalRFeature", +export const UpstreamAuthSettings: msRest.CompositeMapper = { + serializedName: "UpstreamAuthSettings", type: { name: "Composite", - className: "SignalRFeature", + className: "UpstreamAuthSettings", modelProperties: { - flag: { - required: true, - serializedName: "flag", - type: { - name: "String" - } - }, - value: { - required: true, - serializedName: "value", - constraints: { - MaxLength: 128, - MinLength: 1 - }, + type: { + serializedName: "type", type: { name: "String" } }, - properties: { - serializedName: "properties", - type: { - name: "Dictionary", - value: { - type: { - name: "String" - } - } - } - } - } - } -}; - -export const SignalRCorsSettings: msRest.CompositeMapper = { - serializedName: "SignalRCorsSettings", - type: { - name: "Composite", - className: "SignalRCorsSettings", - modelProperties: { - allowedOrigins: { - serializedName: "allowedOrigins", + managedIdentity: { + serializedName: "managedIdentity", type: { - name: "Sequence", - element: { - type: { - name: "String" - } - } + name: "Composite", + className: "ManagedIdentitySettings" } } } @@ -765,6 +771,13 @@ export const UpstreamTemplate: msRest.CompositeMapper = { type: { name: "String" } + }, + auth: { + serializedName: "auth", + type: { + name: "Composite", + className: "UpstreamAuthSettings" + } } } } @@ -792,25 +805,14 @@ export const ServerlessUpstreamSettings: msRest.CompositeMapper = { } }; -export const NetworkACL: msRest.CompositeMapper = { - serializedName: "NetworkACL", +export const SignalRCorsSettings: msRest.CompositeMapper = { + serializedName: "SignalRCorsSettings", type: { name: "Composite", - className: "NetworkACL", + className: "SignalRCorsSettings", modelProperties: { - allow: { - serializedName: "allow", - type: { - name: "Sequence", - element: { - type: { - name: "String" - } - } - } - }, - deny: { - serializedName: "deny", + allowedOrigins: { + serializedName: "allowedOrigins", type: { name: "Sequence", element: { @@ -824,19 +826,40 @@ export const NetworkACL: msRest.CompositeMapper = { } }; -export const PrivateEndpointACL: msRest.CompositeMapper = { - serializedName: "PrivateEndpointACL", +export const SignalRFeature: msRest.CompositeMapper = { + serializedName: "SignalRFeature", type: { name: "Composite", - className: "PrivateEndpointACL", + className: "SignalRFeature", modelProperties: { - ...NetworkACL.type.modelProperties, - name: { + flag: { required: true, - serializedName: "name", + serializedName: "flag", + type: { + name: "String" + } + }, + value: { + required: true, + serializedName: "value", + constraints: { + MaxLength: 128, + MinLength: 1 + }, type: { name: "String" } + }, + properties: { + serializedName: "properties", + type: { + name: "Dictionary", + value: { + type: { + name: "String" + } + } + } } } } @@ -883,12 +906,6 @@ export const SignalRCreateOrUpdateProperties: msRest.CompositeMapper = { name: "Composite", className: "SignalRCreateOrUpdateProperties", modelProperties: { - hostNamePrefix: { - serializedName: "hostNamePrefix", - type: { - name: "String" - } - }, features: { serializedName: "features", type: { @@ -926,35 +943,74 @@ export const SignalRCreateOrUpdateProperties: msRest.CompositeMapper = { } }; -export const PrivateLinkResource: msRest.CompositeMapper = { - serializedName: "PrivateLinkResource", +export const SignalRKeys: msRest.CompositeMapper = { + serializedName: "SignalRKeys", type: { name: "Composite", - className: "PrivateLinkResource", + className: "SignalRKeys", modelProperties: { - ...ProxyResource.type.modelProperties, - groupId: { - serializedName: "properties.groupId", + primaryKey: { + serializedName: "primaryKey", type: { name: "String" } }, - requiredMembers: { - serializedName: "properties.requiredMembers", + secondaryKey: { + serializedName: "secondaryKey", type: { - name: "Sequence", - element: { - type: { - name: "String" - } - } + name: "String" } }, - requiredZoneNames: { - serializedName: "properties.requiredZoneNames", + primaryConnectionString: { + serializedName: "primaryConnectionString", type: { - name: "Sequence", - element: { + name: "String" + } + }, + secondaryConnectionString: { + serializedName: "secondaryConnectionString", + type: { + name: "String" + } + } + } + } +}; + +export const SignalRTlsSettings: msRest.CompositeMapper = { + serializedName: "SignalRTlsSettings", + type: { + name: "Composite", + className: "SignalRTlsSettings", + modelProperties: { + clientCertEnabled: { + serializedName: "clientCertEnabled", + type: { + name: "Boolean" + } + } + } + } +}; + +export const TrackedResource: msRest.CompositeMapper = { + serializedName: "TrackedResource", + type: { + name: "Composite", + className: "TrackedResource", + modelProperties: { + ...Resource.type.modelProperties, + location: { + serializedName: "location", + type: { + name: "String" + } + }, + tags: { + serializedName: "tags", + type: { + name: "Dictionary", + value: { type: { name: "String" } @@ -965,51 +1021,127 @@ export const PrivateLinkResource: msRest.CompositeMapper = { } }; -export const SignalRKeys: msRest.CompositeMapper = { - serializedName: "SignalRKeys", +export const SignalRResource: msRest.CompositeMapper = { + serializedName: "SignalRResource", type: { name: "Composite", - className: "SignalRKeys", + className: "SignalRResource", modelProperties: { - primaryKey: { - serializedName: "primaryKey", + ...TrackedResource.type.modelProperties, + sku: { + serializedName: "sku", + type: { + name: "Composite", + className: "ResourceSku" + } + }, + features: { + serializedName: "properties.features", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "SignalRFeature" + } + } + } + }, + cors: { + serializedName: "properties.cors", + type: { + name: "Composite", + className: "SignalRCorsSettings" + } + }, + upstream: { + serializedName: "properties.upstream", + type: { + name: "Composite", + className: "ServerlessUpstreamSettings" + } + }, + networkACLs: { + serializedName: "properties.networkACLs", + type: { + name: "Composite", + className: "SignalRNetworkACLs" + } + }, + provisioningState: { + readOnly: true, + serializedName: "properties.provisioningState", type: { name: "String" } }, - secondaryKey: { - serializedName: "secondaryKey", + externalIP: { + readOnly: true, + serializedName: "properties.externalIP", type: { name: "String" } }, - primaryConnectionString: { - serializedName: "primaryConnectionString", + hostName: { + readOnly: true, + serializedName: "properties.hostName", type: { name: "String" } }, - secondaryConnectionString: { - serializedName: "secondaryConnectionString", + publicPort: { + readOnly: true, + serializedName: "properties.publicPort", + type: { + name: "Number" + } + }, + serverPort: { + readOnly: true, + serializedName: "properties.serverPort", + type: { + name: "Number" + } + }, + version: { + readOnly: true, + serializedName: "properties.version", type: { name: "String" } - } - } - } -}; - -export const RegenerateKeyParameters: msRest.CompositeMapper = { - serializedName: "RegenerateKeyParameters", - type: { - name: "Composite", - className: "RegenerateKeyParameters", - modelProperties: { - keyType: { - serializedName: "keyType", + }, + privateEndpointConnections: { + readOnly: true, + serializedName: "properties.privateEndpointConnections", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "PrivateEndpointConnection" + } + } + } + }, + tls: { + serializedName: "properties.tls", + type: { + name: "Composite", + className: "SignalRTlsSettings" + } + }, + kind: { + serializedName: "kind", type: { name: "String" } + }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "ManagedIdentity" + } } } } @@ -1134,11 +1266,11 @@ export const SignalRResourceList: msRest.CompositeMapper = { } }; -export const PrivateLinkResourceList: msRest.CompositeMapper = { - serializedName: "PrivateLinkResourceList", +export const SignalRUsageList: msRest.CompositeMapper = { + serializedName: "SignalRUsageList", type: { name: "Composite", - className: "PrivateLinkResourceList", + className: "SignalRUsageList", modelProperties: { value: { serializedName: "", @@ -1147,7 +1279,7 @@ export const PrivateLinkResourceList: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "PrivateLinkResource" + className: "SignalRUsage" } } } @@ -1162,11 +1294,11 @@ export const PrivateLinkResourceList: msRest.CompositeMapper = { } }; -export const SignalRUsageList: msRest.CompositeMapper = { - serializedName: "SignalRUsageList", +export const PrivateLinkResourceList: msRest.CompositeMapper = { + serializedName: "PrivateLinkResourceList", type: { name: "Composite", - className: "SignalRUsageList", + className: "PrivateLinkResourceList", modelProperties: { value: { serializedName: "", @@ -1175,7 +1307,7 @@ export const SignalRUsageList: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "SignalRUsage" + className: "PrivateLinkResource" } } } diff --git a/sdk/signalr/arm-signalr/src/models/operationsMappers.ts b/sdk/signalr/arm-signalr/src/models/operationsMappers.ts index cbabd104412b..0e9919e78167 100644 --- a/sdk/signalr/arm-signalr/src/models/operationsMappers.ts +++ b/sdk/signalr/arm-signalr/src/models/operationsMappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. diff --git a/sdk/signalr/arm-signalr/src/models/parameters.ts b/sdk/signalr/arm-signalr/src/models/parameters.ts index 21d86c35fadf..9a231ce07278 100644 --- a/sdk/signalr/arm-signalr/src/models/parameters.ts +++ b/sdk/signalr/arm-signalr/src/models/parameters.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is diff --git a/sdk/signalr/arm-signalr/src/models/signalRMappers.ts b/sdk/signalr/arm-signalr/src/models/signalRMappers.ts index 1dc9a2c17d74..827c04662bdc 100644 --- a/sdk/signalr/arm-signalr/src/models/signalRMappers.ts +++ b/sdk/signalr/arm-signalr/src/models/signalRMappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. @@ -10,6 +10,8 @@ export { BaseResource, ErrorResponse, ErrorResponseBody, + ManagedIdentity, + ManagedIdentitySettings, NameAvailability, NameAvailabilityParameters, NetworkACL, @@ -29,6 +31,9 @@ export { SignalRNetworkACLs, SignalRResource, SignalRResourceList, + SignalRTlsSettings, TrackedResource, - UpstreamTemplate + UpstreamAuthSettings, + UpstreamTemplate, + UserAssignedIdentityProperty } from "../models/mappers"; diff --git a/sdk/signalr/arm-signalr/src/models/signalRPrivateEndpointConnectionsMappers.ts b/sdk/signalr/arm-signalr/src/models/signalRPrivateEndpointConnectionsMappers.ts index aca05d6160ef..2b56b6f54587 100644 --- a/sdk/signalr/arm-signalr/src/models/signalRPrivateEndpointConnectionsMappers.ts +++ b/sdk/signalr/arm-signalr/src/models/signalRPrivateEndpointConnectionsMappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. @@ -10,6 +10,8 @@ export { BaseResource, ErrorResponse, ErrorResponseBody, + ManagedIdentity, + ManagedIdentitySettings, NetworkACL, PrivateEndpoint, PrivateEndpointACL, @@ -24,6 +26,9 @@ export { SignalRFeature, SignalRNetworkACLs, SignalRResource, + SignalRTlsSettings, TrackedResource, - UpstreamTemplate + UpstreamAuthSettings, + UpstreamTemplate, + UserAssignedIdentityProperty } from "../models/mappers"; diff --git a/sdk/signalr/arm-signalr/src/models/signalRPrivateLinkResourcesMappers.ts b/sdk/signalr/arm-signalr/src/models/signalRPrivateLinkResourcesMappers.ts index d3e7746fca4a..0ea0e42ff6b4 100644 --- a/sdk/signalr/arm-signalr/src/models/signalRPrivateLinkResourcesMappers.ts +++ b/sdk/signalr/arm-signalr/src/models/signalRPrivateLinkResourcesMappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. @@ -10,6 +10,8 @@ export { BaseResource, ErrorResponse, ErrorResponseBody, + ManagedIdentity, + ManagedIdentitySettings, NetworkACL, PrivateEndpoint, PrivateEndpointACL, @@ -25,6 +27,9 @@ export { SignalRFeature, SignalRNetworkACLs, SignalRResource, + SignalRTlsSettings, TrackedResource, - UpstreamTemplate + UpstreamAuthSettings, + UpstreamTemplate, + UserAssignedIdentityProperty } from "../models/mappers"; diff --git a/sdk/signalr/arm-signalr/src/models/usagesMappers.ts b/sdk/signalr/arm-signalr/src/models/usagesMappers.ts index 1bfca1391509..e41bd2de1262 100644 --- a/sdk/signalr/arm-signalr/src/models/usagesMappers.ts +++ b/sdk/signalr/arm-signalr/src/models/usagesMappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. diff --git a/sdk/signalr/arm-signalr/src/operations/index.ts b/sdk/signalr/arm-signalr/src/operations/index.ts index c39628af041e..e21863ab862d 100644 --- a/sdk/signalr/arm-signalr/src/operations/index.ts +++ b/sdk/signalr/arm-signalr/src/operations/index.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -10,6 +9,6 @@ export * from "./operations"; export * from "./signalR"; +export * from "./usages"; export * from "./signalRPrivateEndpointConnections"; export * from "./signalRPrivateLinkResources"; -export * from "./usages"; diff --git a/sdk/signalr/arm-signalr/src/operations/operations.ts b/sdk/signalr/arm-signalr/src/operations/operations.ts index f71f913e310b..1b62d1543355 100644 --- a/sdk/signalr/arm-signalr/src/operations/operations.ts +++ b/sdk/signalr/arm-signalr/src/operations/operations.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -108,6 +107,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/signalr/arm-signalr/src/operations/signalR.ts b/sdk/signalr/arm-signalr/src/operations/signalR.ts index 8dd4294249f3..0dcdeef220a3 100644 --- a/sdk/signalr/arm-signalr/src/operations/signalR.ts +++ b/sdk/signalr/arm-signalr/src/operations/signalR.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -28,7 +27,7 @@ export class SignalR { } /** - * Checks that the SignalR name is valid and is not already in use. + * Checks that the resource name is valid and is not already in use. * @param location the region * @param [options] The optional parameters * @returns Promise @@ -111,21 +110,21 @@ export class SignalR { } /** - * Get the access keys of the SignalR resource. + * Get the resource and its properties. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - listKeys(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise; + get(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. * @param callback The callback */ - listKeys(resourceGroupName: string, resourceName: string, callback: msRest.ServiceCallback): void; + get(resourceGroupName: string, resourceName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. @@ -133,108 +132,108 @@ export class SignalR { * @param options The optional parameters * @param callback The callback */ - listKeys(resourceGroupName: string, resourceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listKeys(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, resourceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + get(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, resourceName, options }, - listKeysOperationSpec, - callback) as Promise; + getOperationSpec, + callback) as Promise; } /** - * Regenerate SignalR service access key. PrimaryKey and SecondaryKey cannot be regenerated at the - * same time. + * Create or update a resource. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - regenerateKey(resourceGroupName: string, resourceName: string, options?: Models.SignalRRegenerateKeyOptionalParams): Promise { - return this.beginRegenerateKey(resourceGroupName,resourceName,options) - .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + createOrUpdate(resourceGroupName: string, resourceName: string, options?: Models.SignalRCreateOrUpdateOptionalParams): Promise { + return this.beginCreateOrUpdate(resourceGroupName,resourceName,options) + .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; } /** - * Get the SignalR service and its properties. + * Operation to delete a resource. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - get(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise; + deleteMethod(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise { + return this.beginDeleteMethod(resourceGroupName,resourceName,options) + .then(lroPoller => lroPoller.pollUntilFinished()); + } + /** + * Operation to update an exiting resource. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. - * @param callback The callback + * @param [options] The optional parameters + * @returns Promise */ - get(resourceGroupName: string, resourceName: string, callback: msRest.ServiceCallback): void; + update(resourceGroupName: string, resourceName: string, options?: Models.SignalRUpdateOptionalParams): Promise { + return this.beginUpdate(resourceGroupName,resourceName,options) + .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + } + /** + * Get the access keys of the resource. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. - * @param options The optional parameters - * @param callback The callback + * @param [options] The optional parameters + * @returns Promise */ - get(resourceGroupName: string, resourceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - resourceGroupName, - resourceName, - options - }, - getOperationSpec, - callback) as Promise; - } - + listKeys(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise; /** - * Create a new SignalR service and update an exiting SignalR service. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. - * @param [options] The optional parameters - * @returns Promise + * @param callback The callback */ - createOrUpdate(resourceGroupName: string, resourceName: string, options?: Models.SignalRCreateOrUpdateOptionalParams): Promise { - return this.beginCreateOrUpdate(resourceGroupName,resourceName,options) - .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; - } - + listKeys(resourceGroupName: string, resourceName: string, callback: msRest.ServiceCallback): void; /** - * Operation to delete a SignalR service. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. - * @param [options] The optional parameters - * @returns Promise + * @param options The optional parameters + * @param callback The callback */ - deleteMethod(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise { - return this.beginDeleteMethod(resourceGroupName,resourceName,options) - .then(lroPoller => lroPoller.pollUntilFinished()); + listKeys(resourceGroupName: string, resourceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listKeys(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + resourceName, + options + }, + listKeysOperationSpec, + callback) as Promise; } /** - * Operation to update an exiting SignalR service. + * Regenerate the access key for the resource. PrimaryKey and SecondaryKey cannot be regenerated at + * the same time. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - update(resourceGroupName: string, resourceName: string, options?: Models.SignalRUpdateOptionalParams): Promise { - return this.beginUpdate(resourceGroupName,resourceName,options) - .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + regenerateKey(resourceGroupName: string, resourceName: string, options?: Models.SignalRRegenerateKeyOptionalParams): Promise { + return this.beginRegenerateKey(resourceGroupName,resourceName,options) + .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; } /** - * Operation to restart a SignalR service. + * Operation to restart a resource. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. @@ -247,84 +246,84 @@ export class SignalR { } /** - * Regenerate SignalR service access key. PrimaryKey and SecondaryKey cannot be regenerated at the - * same time. + * Create or update a resource. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. * @param [options] The optional parameters * @returns Promise */ - beginRegenerateKey(resourceGroupName: string, resourceName: string, options?: Models.SignalRBeginRegenerateKeyOptionalParams): Promise { + beginCreateOrUpdate(resourceGroupName: string, resourceName: string, options?: Models.SignalRBeginCreateOrUpdateOptionalParams): Promise { return this.client.sendLRORequest( { resourceGroupName, resourceName, options }, - beginRegenerateKeyOperationSpec, + beginCreateOrUpdateOperationSpec, options); } /** - * Create a new SignalR service and update an exiting SignalR service. + * Operation to delete a resource. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. * @param [options] The optional parameters * @returns Promise */ - beginCreateOrUpdate(resourceGroupName: string, resourceName: string, options?: Models.SignalRBeginCreateOrUpdateOptionalParams): Promise { + beginDeleteMethod(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise { return this.client.sendLRORequest( { resourceGroupName, resourceName, options }, - beginCreateOrUpdateOperationSpec, + beginDeleteMethodOperationSpec, options); } /** - * Operation to delete a SignalR service. + * Operation to update an exiting resource. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. * @param [options] The optional parameters * @returns Promise */ - beginDeleteMethod(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise { + beginUpdate(resourceGroupName: string, resourceName: string, options?: Models.SignalRBeginUpdateOptionalParams): Promise { return this.client.sendLRORequest( { resourceGroupName, resourceName, options }, - beginDeleteMethodOperationSpec, + beginUpdateOperationSpec, options); } /** - * Operation to update an exiting SignalR service. + * Regenerate the access key for the resource. PrimaryKey and SecondaryKey cannot be regenerated at + * the same time. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. * @param [options] The optional parameters * @returns Promise */ - beginUpdate(resourceGroupName: string, resourceName: string, options?: Models.SignalRBeginUpdateOptionalParams): Promise { + beginRegenerateKey(resourceGroupName: string, resourceName: string, options?: Models.SignalRBeginRegenerateKeyOptionalParams): Promise { return this.client.sendLRORequest( { resourceGroupName, resourceName, options }, - beginUpdateOperationSpec, + beginRegenerateKeyOperationSpec, options); } /** - * Operation to restart a SignalR service. + * Operation to restart a resource. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param resourceName The name of the SignalR resource. @@ -479,31 +478,6 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = { serializer }; -const listKeysOperationSpec: msRest.OperationSpec = { - httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/signalR/{resourceName}/listKeys", - urlParameters: [ - Parameters.subscriptionId, - Parameters.resourceGroupName, - Parameters.resourceName - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.SignalRKeys - }, - default: { - bodyMapper: Mappers.ErrorResponse - } - }, - serializer -}; - const getOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/signalR/{resourceName}", @@ -529,9 +503,9 @@ const getOperationSpec: msRest.OperationSpec = { serializer }; -const beginRegenerateKeyOperationSpec: msRest.OperationSpec = { +const listKeysOperationSpec: msRest.OperationSpec = { httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/signalR/{resourceName}/regenerateKey", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/signalR/{resourceName}/listKeys", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName, @@ -543,15 +517,8 @@ const beginRegenerateKeyOperationSpec: msRest.OperationSpec = { headerParameters: [ Parameters.acceptLanguage ], - requestBody: { - parameterPath: [ - "options", - "parameters" - ], - mapper: Mappers.RegenerateKeyParameters - }, responses: { - 201: { + 200: { bodyMapper: Mappers.SignalRKeys }, default: { @@ -654,6 +621,38 @@ const beginUpdateOperationSpec: msRest.OperationSpec = { serializer }; +const beginRegenerateKeyOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/signalR/{resourceName}/regenerateKey", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.resourceName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + requestBody: { + parameterPath: [ + "options", + "parameters" + ], + mapper: Mappers.RegenerateKeyParameters + }, + responses: { + 201: { + bodyMapper: Mappers.SignalRKeys + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + const beginRestartOperationSpec: msRest.OperationSpec = { httpMethod: "POST", path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/signalR/{resourceName}/restart", @@ -685,6 +684,9 @@ const listBySubscriptionNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -706,6 +708,9 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/signalr/arm-signalr/src/operations/signalRPrivateEndpointConnections.ts b/sdk/signalr/arm-signalr/src/operations/signalRPrivateEndpointConnections.ts index 59f78ac2c8df..99d6eebb5e92 100644 --- a/sdk/signalr/arm-signalr/src/operations/signalRPrivateEndpointConnections.ts +++ b/sdk/signalr/arm-signalr/src/operations/signalRPrivateEndpointConnections.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is diff --git a/sdk/signalr/arm-signalr/src/operations/signalRPrivateLinkResources.ts b/sdk/signalr/arm-signalr/src/operations/signalRPrivateLinkResources.ts index 588b23f11534..0c479b3026d3 100644 --- a/sdk/signalr/arm-signalr/src/operations/signalRPrivateLinkResources.ts +++ b/sdk/signalr/arm-signalr/src/operations/signalRPrivateLinkResources.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -124,6 +123,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/signalr/arm-signalr/src/operations/usages.ts b/sdk/signalr/arm-signalr/src/operations/usages.ts index ac88a23c5717..282817bef03f 100644 --- a/sdk/signalr/arm-signalr/src/operations/usages.ts +++ b/sdk/signalr/arm-signalr/src/operations/usages.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -27,7 +26,7 @@ export class Usages { } /** - * List usage quotas for Azure SignalR service by location. + * List resource usage quotas by location. * @param location the location like "eastus" * @param [options] The optional parameters * @returns Promise @@ -55,7 +54,7 @@ export class Usages { } /** - * List usage quotas for Azure SignalR service by location. + * List resource usage quotas by location. * @param nextPageLink The NextLink from the previous successful call to List operation. * @param [options] The optional parameters * @returns Promise @@ -116,6 +115,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/signalr/arm-signalr/src/signalRManagementClient.ts b/sdk/signalr/arm-signalr/src/signalRManagementClient.ts index 014292692df5..f8d9f5f1ee35 100644 --- a/sdk/signalr/arm-signalr/src/signalRManagementClient.ts +++ b/sdk/signalr/arm-signalr/src/signalRManagementClient.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -19,9 +18,9 @@ class SignalRManagementClient extends SignalRManagementClientContext { // Operation groups operations: operations.Operations; signalR: operations.SignalR; + usages: operations.Usages; signalRPrivateEndpointConnections: operations.SignalRPrivateEndpointConnections; signalRPrivateLinkResources: operations.SignalRPrivateLinkResources; - usages: operations.Usages; /** * Initializes a new instance of the SignalRManagementClient class. @@ -34,9 +33,9 @@ class SignalRManagementClient extends SignalRManagementClientContext { super(credentials, subscriptionId, options); this.operations = new operations.Operations(this); this.signalR = new operations.SignalR(this); + this.usages = new operations.Usages(this); this.signalRPrivateEndpointConnections = new operations.SignalRPrivateEndpointConnections(this); this.signalRPrivateLinkResources = new operations.SignalRPrivateLinkResources(this); - this.usages = new operations.Usages(this); } } diff --git a/sdk/signalr/arm-signalr/src/signalRManagementClientContext.ts b/sdk/signalr/arm-signalr/src/signalRManagementClientContext.ts index 8fb233b8113d..4cef354cb7f2 100644 --- a/sdk/signalr/arm-signalr/src/signalRManagementClientContext.ts +++ b/sdk/signalr/arm-signalr/src/signalRManagementClientContext.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -38,14 +37,14 @@ export class SignalRManagementClientContext extends msRestAzure.AzureServiceClie if (!options) { options = {}; } - if (!options.userAgent) { + if(!options.userAgent) { const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; } super(credentials, options); - this.apiVersion = '2020-05-01'; + this.apiVersion = '2020-07-01-preview'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; @@ -53,10 +52,10 @@ export class SignalRManagementClientContext extends msRestAzure.AzureServiceClie 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; } }