Skip to content

Commit 847c87c

Browse files
authored
Merge pull request #209782 from maud-lv/ml-sc-integratereview
Review integrate docs
2 parents 96db968 + 0bb799b commit 847c87c

15 files changed

+115
-248
lines changed

articles/service-connector/how-to-integrate-app-configuration.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,13 @@ Supported authentication and clients for App Service, Container Apps and Azure S
4444

4545
### [Azure Spring Apps](#tab/spring-apps)
4646

47-
| Client type | System-assigned managed identity | User-assigned managed identity | Secret/connection string | Service principal |
48-
|-------------|:------------------------------------:|:------------------------------:|:------------------------------------:|:------------------------------------:|
49-
| Java | ![yes icon](./media/green-check.png) | | ![yes icon](./media/green-check.png) | ![yes icon](./media/green-check.png) |
47+
| Client type | System-assigned managed identity | User-assigned managed identity | Secret/connection string | Service principal |
48+
|-------------|:------------------------------------:|:------------------------------------:|:------------------------------------:|:------------------------------------:|
49+
| .NET | ![yes icon](./media/green-check.png) | | ![yes icon](./media/green-check.png) | ![yes icon](./media/green-check.png) |
50+
| Java | ![yes icon](./media/green-check.png) | | ![yes icon](./media/green-check.png) | ![yes icon](./media/green-check.png) |
51+
| Node.js | ![yes icon](./media/green-check.png) | | ![yes icon](./media/green-check.png) | ![yes icon](./media/green-check.png) |
52+
| Python | ![yes icon](./media/green-check.png) | | ![yes icon](./media/green-check.png) | ![yes icon](./media/green-check.png) |
53+
| None | ![yes icon](./media/green-check.png) | | ![yes icon](./media/green-check.png) | ![yes icon](./media/green-check.png) |
5054

5155
---
5256

@@ -55,29 +59,27 @@ Supported authentication and clients for App Service, Container Apps and Azure S
5559
Use the connection details below to connect compute services to Azure App Configuration stores instances. For each example below, replace the placeholder texts
5660
`<App-Configuration-name>`, `<ID>`, `<secret>`, `<client-ID>`, `<client-secret>`, and `<tenant-ID>` with your App Configuration store name, ID, secret, client ID, client secret and tenant ID.
5761

58-
### .NET, Java, Node.JS, Python
59-
60-
#### Secret / connection string
62+
### Secret / connection string
6163

6264
> [!div class="mx-tdBreakAll"]
6365
> | Default environment variable name | Description | Sample value |
6466
> | --------------------------------- | ------------| ------------ |
6567
> | AZURE_APPCONFIGURATION_CONNECTIONSTRING | Your App Configuration Connection String | `Endpoint=https://<App-Configuration-name>.azconfig.io;Id=<ID>;Secret=<secret>` |
6668
67-
#### System-assigned managed identity
69+
### System-assigned managed identity
6870

6971
| Default environment variable name | Description | Sample value |
7072
|-----------------------------------|------------------------------|------------------------------------------------|
7173
| AZURE_APPCONFIGURATION_ENDPOINT | App Configuration endpoint | `https://<App-Configuration-name>.azconfig.io` |
7274

73-
#### User-assigned managed identity
75+
### User-assigned managed identity
7476

7577
| Default environment variable name | Description | Sample value |
7678
|-----------------------------------|----------------------------|-----------------------------------------------|
7779
| AZURE_APPCONFIGURATION_ENDPOINT | App Configuration Endpoint | `https://App-Configuration-name>.azconfig.io` |
7880
| AZURE_APPCONFIGURATION_CLIENTID | Your client ID | `<client-ID>` |
7981

80-
#### Service principal
82+
### Service principal
8183

8284
| Default environment variable name | Description | Sample value |
8385
|-------------------------------------|----------------------------|----------------------------------------------|

articles/service-connector/how-to-integrate-confluent-kafka.md

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,46 +23,20 @@ This page shows the supported authentication types and client types of Apache ka
2323

2424
Supported authentication and clients for App Service, Container Apps and Azure Spring Apps:
2525

26-
### [Azure App Service](#tab/app-service)
27-
2826
| Client type | System-assigned managed identity | User-assigned managed identity | Secret / connection string | Service principal |
2927
|--------------------|----------------------------------|--------------------------------|--------------------------------------|-------------------|
3028
| .NET | | | ![yes icon](./media/green-check.png) | |
31-
| Go | | | ![yes icon](./media/green-check.png) | |
3229
| Java | | | ![yes icon](./media/green-check.png) | |
3330
| Java - Spring Boot | | | ![yes icon](./media/green-check.png) | |
3431
| Node.js | | | ![yes icon](./media/green-check.png) | |
3532
| Python | | | ![yes icon](./media/green-check.png) | |
36-
| Ruby | | | ![yes icon](./media/green-check.png) | |
3733
| None | | | ![yes icon](./media/green-check.png) | |
3834

39-
### [Azure Container Apps](#tab/container-apps)
40-
41-
| Client type | System-assigned managed identity | User-assigned managed identity | Secret / connection string | Service principal |
42-
|--------------------|----------------------------------|--------------------------------|--------------------------------------|-------------------|
43-
| .NET | | | ![yes icon](./media/green-check.png) | |
44-
| Go | | | ![yes icon](./media/green-check.png) | |
45-
| Java | | | ![yes icon](./media/green-check.png) | |
46-
| Java - Spring Boot | | | ![yes icon](./media/green-check.png) | |
47-
| Node.js | | | ![yes icon](./media/green-check.png) | |
48-
| Python | | | ![yes icon](./media/green-check.png) | |
49-
| Ruby | | | ![yes icon](./media/green-check.png) | |
50-
| None | | | ![yes icon](./media/green-check.png) | |
51-
52-
### [Azure Spring Apps](#tab/spring-apps)
53-
54-
| Client type | System-assigned managed identity | User-assigned managed identity | Secret / connection string | Service principal |
55-
|--------------------|----------------------------------|--------------------------------|--------------------------------------|-------------------|
56-
| Java | | | ![yes icon](./media/green-check.png) | |
57-
| Java - Spring Boot | | | ![yes icon](./media/green-check.png) | |
58-
59-
---
60-
6135
## Default environment variable names or application properties
6236

6337
Use the connection details below to connect compute services to Kafka. For each example below, replace the placeholder texts `<server-name>`, `<Bootstrap-server-key>`, `<Bootstrap-server-secret>`, `<schema-registry-key>`, and `<schema-registry-secret>` with your server name, Bootstrap server key, Bootstrap server secret, schema registry key, and schema registry secret.
6438

65-
### .NET, Java, Node.JS and Python
39+
### Azure App Service and Azure Container Apps
6640

6741
| Default environment variable name | Description | Example value |
6842
|---------------------------------------------|------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------|
@@ -71,7 +45,7 @@ Use the connection details below to connect compute services to Kafka. For each
7145
| AZURE_CONFLUENTCLOUDSCHEMAREGISTRY_URL | Your Confluent registry URL | `https://psrc-<server-name>.westus2.azure.confluent.cloud` |
7246
| AZURE_CONFLUENTCLOUDSCHEMAREGISTRY_USERINFO | Your Confluent registry user information | `<schema-registry-key>:<schema-registry-secret>` |
7347

74-
### Spring Boot
48+
### Azure Spring Apps
7549

7650
| Default environment variable name | Description | Example value |
7751
|--------------------------------------------------------------|------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------|

articles/service-connector/how-to-integrate-cosmos-db.md

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Integrate the Azure Cosmos DB Mongo API with Service Connector
3-
description: Integrate the Azure Cosmos DB Mongo API into your application with Service Connector
2+
title: Integrate the Azure Cosmos DB MongoDB API with Service Connector
3+
description: Integrate the Azure Cosmos DB MongoDB API into your application with Service Connector
44
author: maud-lv
55
ms.author: malev
66
ms.service: service-connector
@@ -9,9 +9,9 @@ ms.date: 08/11/2022
99
ms.custom: event-tier1-build-2022
1010
---
1111

12-
# Integrate the Azure Cosmos DB Mondo API with Service Connector
12+
# Integrate the Azure Cosmos DB API for MongoDB with Service Connector
1313

14-
This page shows the supported authentication types and client types for the Azure Cosmos DB Mongo API using Service Connector. You might still be able to connect to Azure Cosmos DB in other programming languages without using Service Connector. This page also shows default environment variable names and values (or Spring Boot configuration) you get when you create the service connection. You can learn more about [Service Connector environment variable naming convention](concept-service-connector-internals.md).
14+
This page shows the supported authentication types and client types for the Azure Cosmos DB Mongo API using Service Connector. You might still be able to connect to the Azure Cosmos DB API for MongoDB in other programming languages without using Service Connector. This page also shows default environment variable names and values (or Spring Boot configuration) you get when you create the service connection. You can learn more about [Service Connector environment variable naming convention](concept-service-connector-internals.md).
1515

1616
## Supported compute services
1717

@@ -47,30 +47,35 @@ Supported authentication and clients for App Service, Container Apps and Azure S
4747

4848
| Client type | System-assigned managed identity | User-assigned managed identity | Secret / connection string | Service principal |
4949
|--------------------|--------------------------------------|--------------------------------------|--------------------------------------|--------------------------------------|
50+
| .NET | ![yes icon](./media/green-check.png) | | ![yes icon](./media/green-check.png) | ![yes icon](./media/green-check.png) |
5051
| Java | ![yes icon](./media/green-check.png) | | ![yes icon](./media/green-check.png) | ![yes icon](./media/green-check.png) |
5152
| Java - Spring Boot | | | ![yes icon](./media/green-check.png) | |
53+
| Node.js | ![yes icon](./media/green-check.png) | | ![yes icon](./media/green-check.png) | ![yes icon](./media/green-check.png) |
54+
| Go | ![yes icon](./media/green-check.png) | | ![yes icon](./media/green-check.png) | ![yes icon](./media/green-check.png) |
5255

5356
---
5457

5558
## Default environment variable names or application properties
5659

5760
Use the connection details below to connect compute services to Cosmos DB. For each example below, replace the placeholder texts `<mongo-db-admin-user>`, `<password>`, `<mongo-db-server>`, `<subscription-ID>`, `<resource-group-name>`, `<database-server>`, `<client-secret>`, and `<tenant-id>` with your Mongo DB Admin username, password, Mongo DB server, subscription ID, resource group name, database server, client secret and tenant ID.
5861

59-
### Secret / Connection string
62+
### Azure App Service and Azure Container Apps
63+
64+
#### Secret / Connection string
6065

6166
| Default environment variable name | Description | Example value |
6267
|-----------------------------------|-----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
63-
| AZURE_COSMOS_CONNECTIONSTRING | Mongo DB in Cosmos DB connection string | `mongodb://<mongo-db-admin-user>:<password>@<mongo-db-server>.mongo.cosmos.azure.com:10255/?ssl=true&replicaSet=globaldb&retrywrites=false&maxIdleTimeMS=120000&appName=@<mongo-db-server>@` |
68+
| AZURE_COSMOS_CONNECTIONSTRING | Cosmos DB MongoDB API connection string | `mongodb://<mongo-db-admin-user>:<password>@<mongo-db-server>.mongo.cosmos.azure.com:10255/?ssl=true&replicaSet=globaldb&retrywrites=false&maxIdleTimeMS=120000&appName=@<mongo-db-server>@` |
6469

65-
### System-assigned managed identity
70+
#### System-assigned managed identity
6671

6772
| Default environment variable name | Description | Example value |
6873
|--------------------------------------|--------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
6974
| AZURE_COSMOS_LISTCONNECTIONSTRINGURL | The URL to get the connection string | `https://management.azure.com/subscriptions/<subscription-ID>/resourceGroups/<resource-group-name>/providers/Microsoft.DocumentDB/databaseAccounts/<database-server>/listConnectionStrings?api-version=2021-04-15` |
7075
| AZURE_COSMOS_SCOPE | Your managed identity scope | `https://management.azure.com/.default` |
7176
| AZURE_COSMOS_RESOURCEENDPOINT | Your resource endpoint | `https://<database-server>.documents.azure.com:443/` |
7277

73-
### User-assigned managed identity
78+
#### User-assigned managed identity
7479

7580
| Default environment variable name | Description | Example value |
7681
|--------------------------------------|--------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -80,7 +85,7 @@ Use the connection details below to connect compute services to Cosmos DB. For e
8085
| AZURE_COSMOS_SUBSCRIPTIONID | Your subscription ID | `<subscription-ID>` |
8186
| AZURE_COSMOS_RESOURCEENDPOINT | Your resource endpoint | `https://<database-server>.documents.azure.com:443/` |
8287

83-
### Service principal
88+
#### Service principal
8489

8590
| Default environment variable name | Description | Example value |
8691
|--------------------------------------|--------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -92,6 +97,13 @@ Use the connection details below to connect compute services to Cosmos DB. For e
9297
| AZURE_COSMOS_SUBSCRIPTIONID | Your subscription ID | `<subscription-ID>` |
9398
| AZURE_COSMOS_RESOURCEENDPOINT | Your resource endpoint | `https://<database-server>.documents.azure.com:443/` |
9499

100+
### Azure Spring Apps
101+
102+
| Default environment variable name | Description | Example value |
103+
|-----------------------------------|-------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
104+
| spring.data.mongodb.database | Your database | `<database-name>` |
105+
| spring.data.mongodb.uri | Your database URI | `mongodb://<mongo-db-admin-user>:<password>@<mongo-db-server>.mongo.cosmos.azure.com:10255/?ssl=true&replicaSet=globaldb&retrywrites=false&maxIdleTimeMS=120000&appName=@<mongo-db-server>@` |
106+
95107
## Next steps
96108

97109
Follow the tutorials listed below to learn more about Service Connector.

0 commit comments

Comments
 (0)