diff --git a/sdk/confluent/arm-confluent/README.md b/sdk/confluent/arm-confluent/README.md index 41008e2f9e0c..02e4f8c1d920 100644 --- a/sdk/confluent/arm-confluent/README.md +++ b/sdk/confluent/arm-confluent/README.md @@ -1,11 +1,11 @@ ## Azure ConfluentManagementClient SDK for JavaScript -This package contains an isomorphic SDK (runs both in Node.js and in browsers) for ConfluentManagementClient. +This package contains an isomorphic SDK (runs both in node.js and in browsers) for ConfluentManagementClient. ### Currently supported environments - [LTS versions of Node.js](https://nodejs.org/about/releases/) -- Latest versions of Safari, Chrome, Edge, and Firefox. +- Latest versions of Safari, Chrome, Edge and Firefox. ### Prerequisites @@ -21,7 +21,6 @@ Install both packages using the below command: ```bash npm install --save @azure/arm-confluent @azure/identity ``` - > **Note**: You may have used either `@azure/ms-rest-nodeauth` or `@azure/ms-rest-browserauth` in the past. These packages are in maintenance mode receiving critical bug fixes, but no new features. If you are on a [Node.js that has LTS status](https://nodejs.org/about/releases/), or are writing a client side browser application, we strongly encourage you to upgrade to `@azure/identity` which uses the latest versions of Azure Active Directory and MSAL APIs and provides more authentication options. @@ -37,7 +36,6 @@ If you are on a [Node.js that has LTS status](https://nodejs.org/about/releases/ In the below samples, we pass the credential and the Azure subscription id to instantiate the client. Once the client is created, explore the operations on it either in your favorite editor or in our [API reference documentation](https://docs.microsoft.com/javascript/api) to get started. - #### nodejs - Authentication, client creation, and list marketplaceAgreements as an example written in JavaScript. ##### Sample code @@ -51,7 +49,6 @@ const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; // Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead. const creds = new DefaultAzureCredential(); const client = new ConfluentManagementClient(creds, subscriptionId); - client.marketplaceAgreements.list().then((result) => { console.log("The result is:"); console.log(result); @@ -86,7 +83,7 @@ In browser applications, we recommend using the `InteractiveBrowserCredential` t const credential = new InteractiveBrowserCredential( { clientId: "", - tenantId: "" + tenant: "" }); const client = new Azure.ArmConfluent.ConfluentManagementClient(creds, subscriptionId); client.marketplaceAgreements.list().then((result) => { diff --git a/sdk/confluent/arm-confluent/package.json b/sdk/confluent/arm-confluent/package.json index 530177d7afd9..33560aa946a2 100644 --- a/sdk/confluent/arm-confluent/package.json +++ b/sdk/confluent/arm-confluent/package.json @@ -27,7 +27,7 @@ "rollup-plugin-sourcemaps": "^0.4.2", "uglify-js": "^3.6.0" }, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/feature/v4/sdk/confluent/arm-confluent", + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/confluent/arm-confluent", "repository": { "type": "git", "url": "https://github.com/Azure/azure-sdk-for-js.git" diff --git a/sdk/confluent/arm-confluent/src/confluentManagementClient.ts b/sdk/confluent/arm-confluent/src/confluentManagementClient.ts index fc7af6cbdb46..f8a840db15cb 100644 --- a/sdk/confluent/arm-confluent/src/confluentManagementClient.ts +++ b/sdk/confluent/arm-confluent/src/confluentManagementClient.ts @@ -14,6 +14,7 @@ import * as Mappers from "./models/mappers"; import * as operations from "./operations"; import { ConfluentManagementClientContext } from "./confluentManagementClientContext"; + class ConfluentManagementClient extends ConfluentManagementClientContext { // Operation groups marketplaceAgreements: operations.MarketplaceAgreements; @@ -32,11 +33,7 @@ class ConfluentManagementClient extends ConfluentManagementClientContext { * @param subscriptionId Microsoft Azure subscription id * @param [options] The parameter options */ - constructor( - credentials: msRest.ServiceClientCredentials | TokenCredential, - subscriptionId: string, - options?: Models.ConfluentManagementClientOptions - ) { + constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.ConfluentManagementClientOptions) { super(credentials, subscriptionId, options); this.marketplaceAgreements = new operations.MarketplaceAgreements(this); this.organizationOperations = new operations.OrganizationOperations(this); diff --git a/sdk/confluent/arm-confluent/src/confluentManagementClientContext.ts b/sdk/confluent/arm-confluent/src/confluentManagementClientContext.ts index 1409270f50ae..0a13c66c40db 100644 --- a/sdk/confluent/arm-confluent/src/confluentManagementClientContext.ts +++ b/sdk/confluent/arm-confluent/src/confluentManagementClientContext.ts @@ -9,8 +9,8 @@ import * as Models from "./models"; import * as msRest from "@azure/ms-rest-js"; -import { TokenCredential } from "@azure/core-auth"; import * as msRestAzure from "@azure/ms-rest-azure-js"; +import { TokenCredential } from "@azure/core-auth"; const packageName = "@azure/arm-confluent"; const packageVersion = "2.1.1"; @@ -31,16 +31,12 @@ export class ConfluentManagementClientContext extends msRestAzure.AzureServiceCl * @param subscriptionId Microsoft Azure subscription id * @param [options] The parameter options */ - constructor( - credentials: msRest.ServiceClientCredentials | TokenCredential, - subscriptionId: string, - options?: Models.ConfluentManagementClientOptions - ) { + constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.ConfluentManagementClientOptions) { if (credentials == undefined) { - throw new Error("'credentials' cannot be null."); + throw new Error('\'credentials\' cannot be null.'); } if (subscriptionId == undefined) { - throw new Error("'subscriptionId' cannot be null."); + throw new Error('\'subscriptionId\' cannot be null.'); } if (!options) { @@ -53,8 +49,8 @@ export class ConfluentManagementClientContext extends msRestAzure.AzureServiceCl super(credentials, options); - this.apiVersion = "2021-03-01-preview"; - this.acceptLanguage = "en-US"; + this.apiVersion = '2021-09-01-preview'; + this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; this.requestContentType = "application/json; charset=utf-8"; @@ -64,10 +60,7 @@ export class ConfluentManagementClientContext extends msRestAzure.AzureServiceCl 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 8553b11ca301..06520bc9c256 100644 --- a/sdk/confluent/arm-confluent/src/models/index.ts +++ b/sdk/confluent/arm-confluent/src/models/index.ts @@ -392,7 +392,7 @@ export interface OrganizationResourceListResult extends Array - ): void; - list( - options?: - | msRest.RequestOptionsBase - | msRest.ServiceCallback, - callback?: msRest.ServiceCallback - ): Promise { + list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options }, listOperationSpec, - callback - ) as Promise; + callback) as Promise; } /** @@ -63,9 +54,7 @@ export class MarketplaceAgreements { * @param [options] The optional parameters * @returns Promise */ - create( - options?: Models.MarketplaceAgreementsCreateOptionalParams - ): Promise; + create(options?: Models.MarketplaceAgreementsCreateOptionalParams): Promise; /** * @param callback The callback */ @@ -74,23 +63,14 @@ export class MarketplaceAgreements { * @param options The optional parameters * @param callback The callback */ - create( - options: Models.MarketplaceAgreementsCreateOptionalParams, - callback: msRest.ServiceCallback - ): void; - create( - options?: - | Models.MarketplaceAgreementsCreateOptionalParams - | msRest.ServiceCallback, - callback?: msRest.ServiceCallback - ): Promise { + create(options: Models.MarketplaceAgreementsCreateOptionalParams, callback: msRest.ServiceCallback): void; + create(options?: Models.MarketplaceAgreementsCreateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options }, createOperationSpec, - callback - ) as Promise; + callback) as Promise; } /** @@ -99,43 +79,26 @@ export class MarketplaceAgreements { * @param [options] The optional parameters * @returns Promise */ - listNext( - nextPageLink: string, - options?: msRest.RequestOptionsBase - ): Promise; + listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback */ - listNext( - nextPageLink: string, - callback: msRest.ServiceCallback - ): void; + listNext(nextPageLink: string, callback: msRest.ServiceCallback): void; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param options The optional parameters * @param callback The callback */ - listNext( - nextPageLink: string, - options: msRest.RequestOptionsBase, - callback: msRest.ServiceCallback - ): void; - listNext( - nextPageLink: string, - options?: - | msRest.RequestOptionsBase - | msRest.ServiceCallback, - callback?: msRest.ServiceCallback - ): Promise { + listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, options }, listNextOperationSpec, - callback - ) as Promise; + callback) as Promise; } } @@ -144,9 +107,15 @@ const serializer = new msRest.Serializer(Mappers); const listOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements", - urlParameters: [Parameters.subscriptionId], - queryParameters: [Parameters.apiVersion], - headerParameters: [Parameters.acceptLanguage], + urlParameters: [ + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], responses: { 200: { bodyMapper: Mappers.ConfluentAgreementResourceListResponse @@ -161,11 +130,20 @@ const listOperationSpec: msRest.OperationSpec = { const createOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements/default", - urlParameters: [Parameters.subscriptionId], - queryParameters: [Parameters.apiVersion], - headerParameters: [Parameters.acceptLanguage], + urlParameters: [ + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], requestBody: { - parameterPath: ["options", "body"], + parameterPath: [ + "options", + "body" + ], mapper: Mappers.ConfluentAgreementResource }, responses: { @@ -183,9 +161,15 @@ const listNextOperationSpec: msRest.OperationSpec = { httpMethod: "GET", baseUrl: "https://management.azure.com", path: "{nextLink}", - urlParameters: [Parameters.nextPageLink], - queryParameters: [Parameters.apiVersion], - headerParameters: [Parameters.acceptLanguage], + urlParameters: [ + Parameters.nextPageLink + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], responses: { 200: { bodyMapper: Mappers.ConfluentAgreementResourceListResponse diff --git a/sdk/confluent/arm-confluent/src/operations/validations.ts b/sdk/confluent/arm-confluent/src/operations/validations.ts index deef4932c606..f63c5512c24a 100644 --- a/sdk/confluent/arm-confluent/src/operations/validations.ts +++ b/sdk/confluent/arm-confluent/src/operations/validations.ts @@ -33,24 +33,14 @@ export class Validations { * @param [options] The optional parameters * @returns Promise */ - validateOrganization( - resourceGroupName: string, - organizationName: string, - body: Models.OrganizationResource, - options?: msRest.RequestOptionsBase - ): Promise; + validateOrganization(resourceGroupName: string, organizationName: string, body: Models.OrganizationResource, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName Resource group name * @param organizationName Organization resource name * @param body Organization resource model * @param callback The callback */ - validateOrganization( - resourceGroupName: string, - organizationName: string, - body: Models.OrganizationResource, - callback: msRest.ServiceCallback - ): void; + validateOrganization(resourceGroupName: string, organizationName: string, body: Models.OrganizationResource, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName Resource group name * @param organizationName Organization resource name @@ -58,20 +48,8 @@ export class Validations { * @param options The optional parameters * @param callback The callback */ - validateOrganization( - resourceGroupName: string, - organizationName: string, - body: Models.OrganizationResource, - options: msRest.RequestOptionsBase, - callback: msRest.ServiceCallback - ): void; - validateOrganization( - resourceGroupName: string, - organizationName: string, - body: Models.OrganizationResource, - options?: msRest.RequestOptionsBase | msRest.ServiceCallback, - callback?: msRest.ServiceCallback - ): Promise { + validateOrganization(resourceGroupName: string, organizationName: string, body: Models.OrganizationResource, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + validateOrganization(resourceGroupName: string, organizationName: string, body: Models.OrganizationResource, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -80,8 +58,7 @@ export class Validations { options }, validateOrganizationOperationSpec, - callback - ) as Promise; + callback) as Promise; } } @@ -89,15 +66,18 @@ export class Validations { const serializer = new msRest.Serializer(Mappers); const validateOrganizationOperationSpec: msRest.OperationSpec = { httpMethod: "POST", - path: - "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Confluent/validations/{organizationName}/orgvalidate", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Confluent/validations/{organizationName}/orgvalidate", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName, Parameters.organizationName ], - queryParameters: [Parameters.apiVersion], - headerParameters: [Parameters.acceptLanguage], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], requestBody: { parameterPath: "body", mapper: {