From b6cb3ff151c6d02f58c1367f57b0199827c23f5e Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 10 May 2021 09:45:26 +0000 Subject: [PATCH] CodeGen from PR 14340 in Azure/azure-rest-api-specs Merge cd43235b4447e1b44ae4b6710ebd325e96714bac into a80c025adbc7c41a7a99d47e35965ef5684b879d --- .../src/confluentManagementClientContext.ts | 8 ++++---- sdk/confluent/arm-confluent/src/models/index.ts | 16 +++++++++------- .../arm-confluent/src/models/mappers.ts | 4 +++- .../arm-confluent/src/models/parameters.ts | 2 +- .../src/operations/marketplaceAgreements.ts | 11 ++++++++++- 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/sdk/confluent/arm-confluent/src/confluentManagementClientContext.ts b/sdk/confluent/arm-confluent/src/confluentManagementClientContext.ts index 0625c926f555..b37da363a893 100644 --- a/sdk/confluent/arm-confluent/src/confluentManagementClientContext.ts +++ b/sdk/confluent/arm-confluent/src/confluentManagementClientContext.ts @@ -36,14 +36,14 @@ export class ConfluentManagementClientContext extends msRestAzure.AzureServiceCl if (!options) { options = {}; } - if (!options.userAgent) { + if(!options.userAgent) { const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; } super(credentials, options); - this.apiVersion = '2020-03-01'; + this.apiVersion = '2020-03-01-preview'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; @@ -51,10 +51,10 @@ export class ConfluentManagementClientContext extends msRestAzure.AzureServiceCl this.credentials = credentials; this.subscriptionId = subscriptionId; - if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) { + if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) { this.acceptLanguage = options.acceptLanguage; } - if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { + if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout; } } diff --git a/sdk/confluent/arm-confluent/src/models/index.ts b/sdk/confluent/arm-confluent/src/models/index.ts index 5398bfa493fe..ceb476b75887 100644 --- a/sdk/confluent/arm-confluent/src/models/index.ts +++ b/sdk/confluent/arm-confluent/src/models/index.ts @@ -12,21 +12,21 @@ import * as msRest from "@azure/ms-rest-js"; export { BaseResource, CloudError }; /** - * Confluent Agreements Resource. + * Agreement Terms definition */ export interface ConfluentAgreementResource extends BaseResource { /** - * ARM id of the resource. + * The ARM id of the resource. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly id?: string; /** - * Name of the agreement. + * The name of the agreement. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly name?: string; /** - * The type of the resource. + * The type of the agreement. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly type?: string; @@ -217,8 +217,9 @@ export interface OrganizationResourceProperties { /** * Provision states for confluent RP. Possible values include: 'Accepted', 'Creating', * 'Updating', 'Deleting', 'Succeeded', 'Failed', 'Canceled', 'Deleted', 'NotSpecified' + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - provisioningState?: ProvisionState; + readonly provisioningState?: ProvisionState; /** * Id of the Confluent organization. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -266,8 +267,9 @@ export interface OrganizationResource extends BaseResource { /** * Provision states for confluent RP. Possible values include: 'Accepted', 'Creating', * 'Updating', 'Deleting', 'Succeeded', 'Failed', 'Canceled', 'Deleted', 'NotSpecified' + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - provisioningState?: ProvisionState; + readonly provisioningState?: ProvisionState; /** * Id of the Confluent organization. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -311,7 +313,7 @@ export interface OrganizationResourceUpdate { */ export interface MarketplaceAgreementsCreateOptionalParams extends msRest.RequestOptionsBase { /** - * Confluent Agreement resource + * Confluent Marketplace Agreement resource */ body?: ConfluentAgreementResource; } diff --git a/sdk/confluent/arm-confluent/src/models/mappers.ts b/sdk/confluent/arm-confluent/src/models/mappers.ts index 0f3eb00a6f6a..a0887dc70454 100644 --- a/sdk/confluent/arm-confluent/src/models/mappers.ts +++ b/sdk/confluent/arm-confluent/src/models/mappers.ts @@ -304,7 +304,7 @@ export const UserDetail: msRest.CompositeMapper = { emailAddress: { serializedName: "emailAddress", constraints: { - Pattern: /\S+@\S+\.\S+/ + Pattern: /^\S+@\S+\.\S+$/ }, type: { name: "String" @@ -350,6 +350,7 @@ export const OrganizationResourceProperties: msRest.CompositeMapper = { } }, provisioningState: { + readOnly: true, serializedName: "provisioningState", type: { name: "String" @@ -422,6 +423,7 @@ export const OrganizationResource: msRest.CompositeMapper = { } }, provisioningState: { + readOnly: true, serializedName: "properties.provisioningState", type: { name: "String" diff --git a/sdk/confluent/arm-confluent/src/models/parameters.ts b/sdk/confluent/arm-confluent/src/models/parameters.ts index 8c0faae19022..0652f9084aff 100644 --- a/sdk/confluent/arm-confluent/src/models/parameters.ts +++ b/sdk/confluent/arm-confluent/src/models/parameters.ts @@ -25,7 +25,7 @@ export const apiVersion: msRest.OperationQueryParameter = { required: true, isConstant: true, serializedName: "api-version", - defaultValue: '2020-03-01', + defaultValue: '2020-03-01-preview', type: { name: "String" } diff --git a/sdk/confluent/arm-confluent/src/operations/marketplaceAgreements.ts b/sdk/confluent/arm-confluent/src/operations/marketplaceAgreements.ts index 3731942dac97..03526180e3e2 100644 --- a/sdk/confluent/arm-confluent/src/operations/marketplaceAgreements.ts +++ b/sdk/confluent/arm-confluent/src/operations/marketplaceAgreements.ts @@ -50,7 +50,7 @@ export class MarketplaceAgreements { } /** - * @summary Accept marketplace terms. + * @summary Create Confluent Marketplace agreement in the subscription. * @param [options] The optional parameters * @returns Promise */ @@ -110,6 +110,9 @@ const listOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.subscriptionId ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -130,6 +133,9 @@ const createOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.subscriptionId ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -158,6 +164,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ],