Skip to content

Commit b242179

Browse files
authored
Merge pull request #179040 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents db758cd + 73633e0 commit b242179

File tree

8 files changed

+51
-64
lines changed

8 files changed

+51
-64
lines changed

articles/active-directory/roles/custom-available-permissions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Assigning this permission results in the creator being added as the first owner
4141

4242
#### microsoft.directory/applications/create
4343

44-
Assigning this permission results in the creator not being added as the first owner of the created app registration, and the created app registration will not count against the creator's 250 created objects quota. Use this permission carefully, because there is nothing preventing the assignee from creating app registrations until the directory-level quota is hit. If both permissions are assigned, this permission takes precedence.
44+
Assigning this permission results in the creator not being added as the first owner of the created app registration, and the created app registration will not count against the creator's 250 created objects quota. Use this permission carefully, because there is nothing preventing the assignee from creating app registrations until the directory-level quota is hit.
4545

4646
If both permissions are assigned, the /create permission will take precedence. Though the /createAsOwner permission does not automatically add the creator as the first owner, owners can be specified during the creation of the app registration when using Graph APIs or PowerShell cmdlets.
4747

articles/active-directory/saas-apps/cloudtamer-io-tutorial.md

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ To configure and test Azure AD SSO with cloudtamer.io, perform the following ste
6161
1. **[Configure cloudtamer.io SSO](#configure-cloudtamerio-sso)** - to configure the single sign-on settings on application side.
6262
1. **[Create cloudtamer.io test user](#create-cloudtamerio-test-user)** - to have a counterpart of B.Simon in cloudtamer.io that is linked to the Azure AD representation of user.
6363
1. **[Test SSO](#test-sso)** - to verify whether the configuration works.
64+
1. **[Group assertions](#group-assertions)** - to set group assertions for Azure AD and cloudtamer.io.
6465

6566
### Begin cloudtamer.io SSO Configuration
6667

@@ -175,7 +176,41 @@ In this section, you test your Azure AD single sign-on configuration with follow
175176

176177
You can also use Microsoft My Apps to test the application in any mode. When you click the cloudtamer.io tile in the My Apps, if configured in SP mode you would be redirected to the application sign on page for initiating the login flow and if configured in IDP mode, you should be automatically signed in to the cloudtamer.io for which you set up the SSO. For more information about the My Apps, see [Introduction to the My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
177178

179+
## Group assertions
180+
181+
To easily manage cloudtamer.io user permissions by using existing Azure Active Directory groups, complete these steps:
182+
183+
### Azure AD configuration
184+
185+
1. In the Azure portal, go to **Azure Active Directory** > **Enterprise Applications**.
186+
1. In the list, select the enterprise application for cloudtamer.io.
187+
1. On **Overview**, in the left menu, select **Single sign-on**.
188+
1. On **Single Sign-On**, under **User Attributes & Claims**, select **Edit**.
189+
1. Select **Add a group claim**.
190+
> [!NOTE]
191+
> You can have only one group claim. If this option is disabled, you might already have a group claim defined.
192+
1. On **Group Claims**, select the groups that should be returned in the claim:
193+
- If you will always have every group you intend to use in cloudtamer.io assigned to this enterprise application, select **Groups assigned to the application**.
194+
- If you want all groups to appear (this selection can cause a large number of group assertions and might be subject to limits), select **Groups assigned to the application**.
195+
1. For **Source attribute**, leave the default **Group ID**.
196+
1. Select the **Customize the name of the group claim** checkbox.
197+
1. For **Name**, enter **memberOf**.
198+
1. Select **Save** to complete the configuration with Azure AD.
199+
200+
### cloudtamer.io configuration
201+
202+
1. In cloudtamer.io, go to **Users** > **Identity Management Systems**.
203+
1. Select the IDMS that you've created for Azure AD.
204+
1. On the overview page, select the **User Group Associations** tab.
205+
1. For each user group mapping that you want, complete these steps:
206+
1. Select **Add** > **Add New**.
207+
1. In the dialog that appears:
208+
1. For **Name**, enter **memberOf**.
209+
1. For **Regex**, enter the object ID (from Azure AD) of the group you want to match.
210+
1. For **User Group**, select the cloudtamer.io internal group you want to map to the group in **Regex**.
211+
1. Select the **Update on Login** checkbox.
212+
1. Select **Add** to add the group association.
178213

179214
## Next steps
180215

181-
Once you configure cloudtamer.io you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](/cloud-app-security/proxy-deployment-any-app).
216+
Once you configure cloudtamer.io you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](/cloud-app-security/proxy-deployment-any-app).

articles/azure-app-configuration/pull-key-value-devops-pipeline.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ The [Azure App Configuration](https://marketplace.visualstudio.com/items?itemNam
1818
- Azure subscription - [create one for free](https://azure.microsoft.com/free/)
1919
- App Configuration store - create one for free in the [Azure portal](https://portal.azure.com).
2020
- Azure DevOps project - [create one for free](https://go.microsoft.com/fwlink/?LinkId=2014881)
21-
- Azure App Configuration task - download for free from the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=AzureAppConfiguration.azure-app-configuration-task#:~:text=Navigate%20to%20the%20Tasks%20tab,the%20Azure%20App%20Configuration%20instance.).
21+
- Azure App Configuration task - download for free from the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=AzureAppConfiguration.azure-app-configuration-task#:~:text=Navigate%20to%20the%20Tasks%20tab,the%20Azure%20App%20Configuration%20instance.).
22+
- [Node 10](https://nodejs.org/en/blog/release/v10.21.0/) - for users running the task on self-hosted agents.
2223

2324
## Create a service connection
2425

articles/azure-sql/migration-guides/database/sql-server-to-sql-database-overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ ms.date: 11/06/2020
1616

1717
Learn about the options and considerations for migrating your SQL Server databases to Azure SQL Database.
1818

19-
You can migrate SQL Server databases running on-premises or on:
19+
You can migrate SQL Server databases running on-premises on:
2020

2121
- SQL Server on Azure Virtual Machines.
22+
- Azure SQL Database (PaaS).
23+
- Azure SQL Managed Instance (PaaS).
2224
- Amazon Web Services (AWS) Elastic Compute Cloud (EC2).
2325
- AWS Relational Database Service (RDS).
2426
- Compute Engine in Google Cloud Platform (GCP).

articles/cosmos-db/local-emulator-on-docker-windows.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 04/20/2021
1212
# <a id="run-on-windows-docker"></a>Use the emulator on Docker for Windows
1313
[!INCLUDE[appliesto-all-apis](includes/appliesto-all-apis.md)]
1414

15-
You can run the Azure Cosmos DB Emulator on a Windows Docker container. See the [Docker Hub](https://hub.docker.com/r/microsoft/azure-cosmosdb-emulator/) for the docker pull command and [GitHub](https://github.com/Azure/azure-cosmos-db-emulator-docker) for the `Dockerfile` and more information. Currently, the emulator does not work on Docker for Oracle Linux. Use the following instructions to run the emulator on Docker for Windows:
15+
You can run the Azure Cosmos DB Emulator on a Windows Docker container. See [GitHub](https://github.com/Azure/azure-cosmos-db-emulator-docker) for the `Dockerfile` and more information. Currently, the emulator does not work on Docker for Oracle Linux. Use the following instructions to run the emulator on Docker for Windows:
1616

1717
1. After you have [Docker for Windows](https://www.docker.com/docker-windows) installed, switch to Windows containers by right-clicking the Docker icon on the toolbar and selecting **Switch to Windows containers**.
1818

@@ -145,4 +145,4 @@ In this article, you've learned how to use the local emulator for free local dev
145145
146146
* [Export the Azure Cosmos DB Emulator certificates for use with Java, Python, and Node.js apps](local-emulator-export-ssl-certificates.md)
147147
* [Use command line parameters and PowerShell commands to control the emulator](emulator-command-line-parameters.md)
148-
* [Debug issues with the emulator](troubleshoot-local-emulator.md)
148+
* [Debug issues with the emulator](troubleshoot-local-emulator.md)

articles/cosmos-db/managed-identity-based-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ namespace Monitor
182182
var result = await httpClient.PostAsync(endpoint, new StringContent(""));
183183

184184
// Get the result back as a DatabaseAccountListKeysResult.
185-
DatabaseAccountListKeysResult keys = await result.Content.ReadAsAsync<DatabaseAccountListKeysResult>();
185+
DatabaseAccountListKeysResult keys = await result.Content.ReadFromJsonAsync<DatabaseAccountListKeysResult>();
186186

187187
log.LogInformation("Starting to create the client");
188188

articles/dms/tutorial-azure-postgresql-to-azure-postgresql-online-portal.md

Lines changed: 3 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -100,60 +100,9 @@ To complete all the database objects like table schemas, indexes and stored proc
100100
```
101101
psql -h mypgserver-source.postgres.database.azure.com -U pguser@mypgserver-source -d dvdrental citus < dvdrentalSchema.sql
102102
```
103-
104-
4. To extract the drop foreign key script and add it at the destination (Azure Database for PostgreSQL), in PgAdmin or in psql, run the following script.
105-
106-
> [!IMPORTANT]
107-
> Foreign keys in your schema will cause the initial load and continuous sync of the migration to fail.
108-
109-
```
110-
SELECT Q.table_name
111-
,CONCAT('ALTER TABLE ','"', table_schema,'"', '.','"', table_name ,'"', STRING_AGG(DISTINCT CONCAT(' DROP CONSTRAINT ','"', foreignkey,'"'), ','), ';') as DropQuery
112-
,CONCAT('ALTER TABLE ','"', table_schema,'"', '.','"', table_name,'"', STRING_AGG(DISTINCT CONCAT(' ADD CONSTRAINT ','"', foreignkey,'"', ' FOREIGN KEY (','"', column_name,'"', ')', ' REFERENCES ','"', foreign_table_schema,'"', '.','"', foreign_table_name,'"', '(','"', foreign_column_name,'"', ')',' ON UPDATE ',update_rule,' ON DELETE ',delete_rule), ','), ';') as AddQuery
113-
FROM
114-
(SELECT
115-
S.table_schema,
116-
S.foreignkey,
117-
S.table_name,
118-
STRING_AGG(DISTINCT S.column_name, ',') AS column_name,
119-
S.foreign_table_schema,
120-
S.foreign_table_name,
121-
STRING_AGG(DISTINCT S.foreign_column_name, ',') AS foreign_column_name,
122-
S.update_rule,
123-
S.delete_rule
124-
FROM
125-
(SELECT DISTINCT
126-
tc.table_schema,
127-
tc.constraint_name AS foreignkey,
128-
tc.table_name,
129-
kcu.column_name,
130-
ccu.table_schema AS foreign_table_schema,
131-
ccu.table_name AS foreign_table_name,
132-
ccu.column_name AS foreign_column_name,
133-
rc.update_rule AS update_rule,
134-
rc.delete_rule AS delete_rule
135-
FROM information_schema.table_constraints AS tc
136-
JOIN information_schema.key_column_usage AS kcu ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema
137-
JOIN information_schema.constraint_column_usage AS ccu ON ccu.constraint_name = tc.constraint_name AND ccu.table_schema = tc.table_schema
138-
JOIN information_schema.referential_constraints as rc ON rc.constraint_name = tc.constraint_name AND rc.constraint_schema = tc.table_schema
139-
WHERE constraint_type = 'FOREIGN KEY'
140-
) S
141-
GROUP BY S.table_schema, S.foreignkey, S.table_name, S.foreign_table_schema, S.foreign_table_name,S.update_rule,S.delete_rule
142-
) Q
143-
GROUP BY Q.table_schema, Q.table_name;
144-
```
145-
146-
5. Run the drop foreign key (which is the second column) in the query result.
147-
148-
6. To disable triggers in target database, run the script below.
149-
150-
> [!IMPORTANT]
151-
> Triggers (insert or update) in the data enforce data integrity in the target ahead of the data being replicated from the source. As a result, it's recommended that you disable triggers in all the tables **at the target** during migration, and then re-enable the triggers after migration is complete.
152-
153-
```
154-
SELECT DISTINCT CONCAT('ALTER TABLE ', event_object_schema, '.', event_object_table, ' DISABLE TRIGGER ', trigger_name, ';')
155-
FROM information_schema.triggers
156-
```
103+
104+
> [!NOTE]
105+
> The migration service internally handles the enable/disable of foreign keys and triggers to ensure a reliable and robust data migration. As a result, you do not have to worry about making any modifications to the target database schema.
157106
158107
[!INCLUDE [resource-provider-register](../../includes/database-migration-service-resource-provider-register.md)]
159108

articles/storage/blobs/quickstart-blobs-javascript-browser.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ The following table describes each CORS setting and explains the values used to
7070

7171
|Setting |Value | Description |
7272
|---------|---------|---------|
73-
| **ALLOWED ORIGINS** | **\*** | Accepts a comma-delimited list of domains set as acceptable origins. Setting the value to `*` allows all domains access to the storage account. |
73+
| **ALLOWED ORIGINS** | * | Accepts a comma-delimited list of domains set as acceptable origins. Setting the value to `*` allows all domains access to the storage account. |
7474
| **ALLOWED METHODS** | **DELETE**, **GET**, **HEAD**, **MERGE**, **POST**, **OPTIONS**, and **PUT** | Lists the HTTP verbs allowed to execute against the storage account. For the purposes of this quickstart, select all available options. |
75-
| **ALLOWED HEADERS** | **\*** | Defines a list of request headers (including prefixed headers) allowed by the storage account. Setting the value to `*` allows all headers access. |
76-
| **EXPOSED HEADERS** | **\*** | Lists the allowed response headers by the account. Setting the value to `*` allows the account to send any header. |
75+
| **ALLOWED HEADERS** | * | Defines a list of request headers (including prefixed headers) allowed by the storage account. Setting the value to `*` allows all headers access. |
76+
| **EXPOSED HEADERS** | * | Lists the allowed response headers by the account. Setting the value to `*` allows the account to send any header. |
7777
| **MAX AGE** | **86400** | The maximum amount of time the browser caches the preflight OPTIONS request in seconds. A value of *86400* allows the cache to remain for a full day. |
7878

7979
After you fill in the fields with the values from this table, click the **Save** button.

0 commit comments

Comments
 (0)