Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arm cosmosdb release #15789

Merged
merged 3 commits into from
Jun 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 21 additions & 31 deletions sdk/cosmosdb/arm-cosmosdb/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Azure CosmosDBManagementClient SDK for JavaScript

This package contains an isomorphic SDK (runs both in Node.js and in browsers) for CosmosDBManagementClient.
This package contains an isomorphic SDK (runs both in node.js and in browsers) for CosmosDBManagementClient.

### 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

Expand All @@ -14,18 +14,15 @@ You must have an [Azure subscription](https://azure.microsoft.com/free/).
### How to install

To use this SDK in your project, you will need to install two packages.

- `@azure/arm-cosmosdb` that contains the client.
- `@azure/identity` that provides different mechanisms for the client to authenticate your requests using Azure Active Directory.

Install both packages using the below command:

```bash
npm install --save @azure/arm-cosmosdb @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.
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.

### How to use

Expand All @@ -39,7 +36,6 @@ npm install --save @azure/arm-cosmosdb @azure/identity

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 get databaseAccounts as an example written in JavaScript.

##### Sample code
Expand All @@ -55,24 +51,20 @@ const creds = new DefaultAzureCredential();
const client = new CosmosDBManagementClient(creds, subscriptionId);
const resourceGroupName = "testresourceGroupName";
const accountName = "testaccountName";
client.databaseAccounts
.get(resourceGroupName, accountName)
.then((result) => {
console.log("The result is:");
console.log(result);
})
.catch((err) => {
console.log("An error occurred:");
console.error(err);
});
client.databaseAccounts.get(resourceGroupName, accountName).then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
console.log("An error occurred:");
console.error(err);
});
```

#### browser - Authentication, client creation, and get databaseAccounts as an example written in JavaScript.

In browser applications, we recommend using the `InteractiveBrowserCredential` that interactively authenticates using the default system browser.

- See [Single-page application: App registration guide](https://docs.microsoft.com/azure/active-directory/develop/scenario-spa-app-registration) to configure your app registration for the browser.
- Note down the client Id from the previous step and use it in the browser sample below.
- See [Single-page application: App registration guide](https://docs.microsoft.com/azure/active-directory/develop/scenario-spa-app-registration) to configure your app registration for the browser.
- Note down the client Id from the previous step and use it in the browser sample below.

##### Sample code

Expand All @@ -90,23 +82,21 @@ In browser applications, we recommend using the `InteractiveBrowserCredential` t
const subscriptionId = "<Subscription_Id>";
// Create credentials using the `@azure/identity` package.
// Please note that you can also use credentials from the `@azure/ms-rest-browserauth` package instead.
const credential = new InteractiveBrowserCredential({
const credential = new InteractiveBrowserCredential(
{
clientId: "<client id for your Azure AD app>",
tenant: "<optional tenant for your organization>"
});
const client = new Azure.ArmCosmosdb.CosmosDBManagementClient(creds, subscriptionId);
const resourceGroupName = "testresourceGroupName";
const accountName = "testaccountName";
client.databaseAccounts
.get(resourceGroupName, accountName)
.then((result) => {
console.log("The result is:");
console.log(result);
})
.catch((err) => {
console.log("An error occurred:");
console.error(err);
});
client.databaseAccounts.get(resourceGroupName, accountName).then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
console.log("An error occurred:");
console.error(err);
});
</script>
</head>
<body></body>
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmosdb/arm-cosmosdb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@azure/arm-cosmosdb",
"author": "Microsoft Corporation",
"description": "CosmosDBManagementClient Library with typescript type definitions for node.js and browser.",
"version": "14.0.0",
"version": "14.1.0",
"dependencies": {
"@azure/ms-rest-azure-js": "^2.1.0",
"@azure/ms-rest-js": "^2.2.0",
Expand Down
25 changes: 18 additions & 7 deletions sdk/cosmosdb/arm-cosmosdb/src/cosmosDBManagementClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import * as Mappers from "./models/mappers";
import * as operations from "./operations";
import { CosmosDBManagementClientContext } from "./cosmosDBManagementClientContext";


class CosmosDBManagementClient extends CosmosDBManagementClientContext {
// Operation groups
databaseAccounts: operations.DatabaseAccounts;
Expand All @@ -35,8 +36,15 @@ class CosmosDBManagementClient extends CosmosDBManagementClientContext {
cassandraResources: operations.CassandraResources;
gremlinResources: operations.GremlinResources;
notebookWorkspaces: operations.NotebookWorkspaces;
privateLinkResources: operations.PrivateLinkResources;
privateEndpointConnections: operations.PrivateEndpointConnections;
privateLinkResources: operations.PrivateLinkResources;
restorableDatabaseAccounts: operations.RestorableDatabaseAccounts;
restorableSqlDatabases: operations.RestorableSqlDatabases;
restorableSqlContainers: operations.RestorableSqlContainers;
restorableSqlResources: operations.RestorableSqlResources;
restorableMongodbDatabases: operations.RestorableMongodbDatabases;
restorableMongodbCollections: operations.RestorableMongodbCollections;
restorableMongodbResources: operations.RestorableMongodbResources;

/**
* Initializes a new instance of the CosmosDBManagementClient class.
Expand All @@ -49,11 +57,7 @@ class CosmosDBManagementClient extends CosmosDBManagementClientContext {
* @param subscriptionId The ID of the target subscription.
* @param [options] The parameter options
*/
constructor(
credentials: msRest.ServiceClientCredentials | TokenCredential,
subscriptionId: string,
options?: Models.CosmosDBManagementClientOptions
) {
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.CosmosDBManagementClientOptions) {
super(credentials, subscriptionId, options);
this.databaseAccounts = new operations.DatabaseAccounts(this);
this.operations = new operations.Operations(this);
Expand All @@ -74,8 +78,15 @@ class CosmosDBManagementClient extends CosmosDBManagementClientContext {
this.cassandraResources = new operations.CassandraResources(this);
this.gremlinResources = new operations.GremlinResources(this);
this.notebookWorkspaces = new operations.NotebookWorkspaces(this);
this.privateLinkResources = new operations.PrivateLinkResources(this);
this.privateEndpointConnections = new operations.PrivateEndpointConnections(this);
this.privateLinkResources = new operations.PrivateLinkResources(this);
this.restorableDatabaseAccounts = new operations.RestorableDatabaseAccounts(this);
this.restorableSqlDatabases = new operations.RestorableSqlDatabases(this);
this.restorableSqlContainers = new operations.RestorableSqlContainers(this);
this.restorableSqlResources = new operations.RestorableSqlResources(this);
this.restorableMongodbDatabases = new operations.RestorableMongodbDatabases(this);
this.restorableMongodbCollections = new operations.RestorableMongodbCollections(this);
this.restorableMongodbResources = new operations.RestorableMongodbResources(this);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import * as msRestAzure from "@azure/ms-rest-azure-js";
import { TokenCredential } from "@azure/core-auth";

const packageName = "@azure/arm-cosmosdb";
const packageVersion = "14.0.0";
const packageVersion = "14.1.0";

export class CosmosDBManagementClientContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials | TokenCredential;
Expand All @@ -31,16 +31,12 @@ export class CosmosDBManagementClientContext extends msRestAzure.AzureServiceCli
* @param subscriptionId The ID of the target subscription.
* @param [options] The parameter options
*/
constructor(
credentials: msRest.ServiceClientCredentials | TokenCredential,
subscriptionId: string,
options?: Models.CosmosDBManagementClientOptions
) {
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.CosmosDBManagementClientOptions) {
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) {
Expand All @@ -53,8 +49,8 @@ export class CosmosDBManagementClientContext extends msRestAzure.AzureServiceCli

super(credentials, options);

this.apiVersion = "2021-05-15";
this.acceptLanguage = "en-US";
this.apiVersion = '2021-06-15';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
this.requestContentType = "application/json; charset=utf-8";
Expand All @@ -64,10 +60,7 @@ export class CosmosDBManagementClientContext extends msRestAzure.AzureServiceCli
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;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export {
AutoUpgradePolicyResource,
AzureEntityResource,
BackupPolicy,
BackupPolicyMigrationState,
BaseResource,
Capability,
CassandraKeyspaceCreateUpdateParameters,
Expand Down Expand Up @@ -45,6 +46,7 @@ export {
CreateUpdateOptions,
DatabaseAccountCreateUpdateParameters,
DatabaseAccountGetResults,
DatabaseRestoreResource,
ExcludedPath,
FailoverPolicy,
GremlinDatabaseCreateUpdateParameters,
Expand Down Expand Up @@ -89,6 +91,7 @@ export {
PrivateLinkServiceConnectionStateProperty,
ProxyResource,
Resource,
RestoreParameters,
SpatialSpec,
SqlContainerCreateUpdateParameters,
SqlContainerGetPropertiesOptions,
Expand All @@ -114,6 +117,7 @@ export {
SqlUserDefinedFunctionGetPropertiesResource,
SqlUserDefinedFunctionGetResults,
SqlUserDefinedFunctionResource,
SystemData,
TableCreateUpdateParameters,
TableGetPropertiesOptions,
TableGetPropertiesResource,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export {
AutoUpgradePolicyResource,
AzureEntityResource,
BackupPolicy,
BackupPolicyMigrationState,
BaseResource,
Capability,
CassandraKeyspaceCreateUpdateParameters,
Expand Down Expand Up @@ -50,6 +51,7 @@ export {
DatabaseAccountRegenerateKeyParameters,
DatabaseAccountsListResult,
DatabaseAccountUpdateParameters,
DatabaseRestoreResource,
ErrorResponse,
ExcludedPath,
FailoverPolicies,
Expand Down Expand Up @@ -107,6 +109,7 @@ export {
ProxyResource,
RegionForOnlineOffline,
Resource,
RestoreParameters,
SpatialSpec,
SqlContainerCreateUpdateParameters,
SqlContainerGetPropertiesOptions,
Expand All @@ -132,6 +135,7 @@ export {
SqlUserDefinedFunctionGetPropertiesResource,
SqlUserDefinedFunctionGetResults,
SqlUserDefinedFunctionResource,
SystemData,
TableCreateUpdateParameters,
TableGetPropertiesOptions,
TableGetPropertiesResource,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export {
AutoUpgradePolicyResource,
AzureEntityResource,
BackupPolicy,
BackupPolicyMigrationState,
BaseResource,
Capability,
CassandraKeyspaceCreateUpdateParameters,
Expand All @@ -43,6 +44,7 @@ export {
CreateUpdateOptions,
DatabaseAccountCreateUpdateParameters,
DatabaseAccountGetResults,
DatabaseRestoreResource,
ExcludedPath,
FailoverPolicy,
GremlinDatabaseCreateUpdateParameters,
Expand Down Expand Up @@ -89,6 +91,7 @@ export {
PrivateLinkServiceConnectionStateProperty,
ProxyResource,
Resource,
RestoreParameters,
SpatialSpec,
SqlContainerCreateUpdateParameters,
SqlContainerGetPropertiesOptions,
Expand All @@ -114,6 +117,7 @@ export {
SqlUserDefinedFunctionGetPropertiesResource,
SqlUserDefinedFunctionGetResults,
SqlUserDefinedFunctionResource,
SystemData,
TableCreateUpdateParameters,
TableGetPropertiesOptions,
TableGetPropertiesResource,
Expand Down
Loading