Skip to content

Commit 6a38fb9

Browse files
authored
Merge pull request #263012 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents febd3bb + 9a156dd commit 6a38fb9

File tree

12 files changed

+29
-41
lines changed

12 files changed

+29
-41
lines changed

articles/app-service/scripts/cli-continuous-deployment-vsts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Create the following variables containing your Azure DevOps information.
3636

3737
```azurecli
3838
gitrepo=<Replace with your Azure DevOps Services (formerly Visual Studio Team Services, or VSTS) repo URL>
39-
token=<Replace with a Azure DevOps Services (formerly Visual Studio Team Services, or VSTS) personal access token>
39+
token=<Replace with an Azure DevOps Services (formerly Visual Studio Team Services, or VSTS) personal access token>
4040
```
4141

4242
Configure continuous deployment from Azure DevOps Services (formerly Visual Studio Team Services, or VSTS). The `--git-token` parameter is required only once per Azure account (Azure remembers token).

articles/azure-resource-manager/bicep/bicep-config.md

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ ms.date: 09/27/2023
88

99
# Configure your Bicep environment
1010

11-
Bicep supports a configuration file named `bicepconfig.json`. Within this file, you can add values that customize your Bicep development experience. If you don't add this file, Bicep uses default values.
11+
Bicep supports an optional configuration file named `bicepconfig.json`. Within this file, you can add values that customize your Bicep development experience.
1212

13-
To customize values, create this file in the directory where you store Bicep files. You can add `bicepconfig.json` files in multiple directories. The configuration file closest to the Bicep file in the directory hierarchy is used.
13+
To customize configuration, create this file in the same directory, or a parent directory of your Bicep files. If multiple parent directories contain `bicepconfig.json` files, Bicep uses configuration from the nearest one. If a configuration file is not found, Bicep uses default values.
1414

1515
To configure Bicep extension settings, see [VS Code and Bicep extension](./install.md#visual-studio-code-and-bicep-extension).
1616

@@ -36,30 +36,20 @@ The [Bicep linter](linter.md) checks Bicep files for syntax errors and best prac
3636

3737
## Enable experimental features
3838

39-
You can enable preview features by adding:
39+
You can enable experimental features by adding the following section to your `bicepconfig.json` file.
40+
41+
Here is an example of enabling features 'compileTimeImports' and 'userDefinedFunctions`.
4042

4143
```json
4244
{
4345
"experimentalFeaturesEnabled": {
44-
"userDefinedTypes": true,
45-
"extensibility": true
46+
"compileTimeImports": true,
47+
"userDefinedFunctions": true
4648
}
4749
}
4850
```
4951

50-
> [!WARNING]
51-
> To utilize the experimental features, it's necessary to have the latest version of [Azure CLI](./install.md#azure-cli).
52-
53-
The preceding sample enables 'userDefineTypes' and 'extensibility`. The available experimental features include:
54-
55-
- **assertions**: Should be enabled in tandem with `testFramework` experimental feature flag for expected functionality. Allows you to author boolean assertions using the `assert` keyword comparing the actual value of a parameter, variable, or resource name to an expected value. Assert statements can only be written directly within the Bicep file whose resources they reference. For more information, see [Bicep Experimental Test Framework](https://github.com/Azure/bicep/issues/11967).
56-
- **compileTimeImports**: Allows you to use symbols defined in another Bicep file. See [Import types, variables and functions](./bicep-import.md#import-types-variables-and-functions-preview).
57-
- **extensibility**: Allows Bicep to use a provider model to deploy non-ARM resources. Currently, we only support a Kubernetes provider. See [Bicep extensibility Kubernetes provider](./bicep-extensibility-kubernetes-provider.md).
58-
- **sourceMapping**: Enables basic source mapping to map an error location returned in the ARM template layer back to the relevant location in the Bicep file.
59-
- **resourceTypedParamsAndOutputs**: Enables the type for a parameter or output to be of type resource to make it easier to pass resource references between modules. This feature is only partially implemented. See [Simplifying resource referencing](https://github.com/azure/bicep/issues/2245).
60-
- **symbolicNameCodegen**: Allows the ARM template layer to use a new schema to represent resources as an object dictionary rather than an array of objects. This feature improves the semantic equivalent of the Bicep and ARM templates, resulting in more reliable code generation. Enabling this feature has no effect on the Bicep layer's functionality.
61-
- **testFramework**: Should be enabled in tandem with `assertions` experimental feature flag for expected functionality. Allows you to author client-side, offline unit-test test blocks that reference Bicep files and mock deployment parameters in a separate `test.bicep` file using the new `test` keyword. Test blocks can be run with the command *bicep test <filepath_to_file_with_test_blocks>* which runs all `assert` statements in the Bicep files referenced by the test blocks. For more information, see [Bicep Experimental Test Framework](https://github.com/Azure/bicep/issues/11967).
62-
- **userDefinedFunctions**: Allows you to define your own custom functions. See [User-defined functions in Bicep](./user-defined-functions.md).
52+
For information on the current set of experimental features, see [Experimental Features](https://aka.ms/bicep/experimental-features).
6353

6454
## Next steps
6555

articles/azure-resource-manager/bicep/user-defined-data-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ The valid type expressions include:
146146
type mixedTypeArray = ('fizz' | 42 | {an: 'object'} | null)[]
147147
```
148148
149-
In addition to be used in the `type` statement, type expressions can also be used in these places for creating user-defined date types:
149+
In addition to be used in the `type` statement, type expressions can also be used in these places for creating user-defined data types:
150150
151151
- As the type clause of a `param` statement. For example:
152152

articles/hdinsight/hdinsight-custom-ambari-db.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,17 @@ The custom Ambari DB has the following other requirements:
3232
- The name of the database cannot contain hyphens or spaces
3333
- You must have an existing Azure SQL DB server and database.
3434
- The database that you provide for Ambari setup must be empty. There should be no tables in the default dbo schema.
35-
- The user used to connect to the database should have SELECT, CREATE TABLE, and INSERT permissions on the database.
35+
- The user used to connect to the database should have **SELECT, CREATE TABLE, INSERT, UPDATE, DELETE, ALTER ON SCHEMA and REFERENCES ON SCHEMA** permissions on the database.
36+
```sql
37+
GRANT CREATE TABLE TO newuser;
38+
GRANT INSERT TO newuser;
39+
GRANT SELECT TO newuser;
40+
GRANT UPDATE TO newuser;
41+
GRANT DELETE TO newuser;
42+
GRANT ALTER ON SCHEMA::dbo TO newuser;
43+
GRANT REFERENCES ON SCHEMA::dbo TO newuser;
44+
```
45+
3646
- Turn on the option to [Allow access to Azure services](/azure/azure-sql/database/vnet-service-endpoint-rule-overview#azure-portal-steps) on the server where you host Ambari.
3747
- Management IP addresses from HDInsight service need to be allowed in the firewall rule. See [HDInsight management IP addresses](hdinsight-management-ip-addresses.md) for a list of the IP addresses that must be added to the server-level firewall rule.
3848

articles/search/search-indexer-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ An *indexer* in Azure AI Search is a crawler that extracts textual data from clo
1919

2020
Indexers also drive [skillset execution and AI enrichment](cognitive-search-concept-intro.md), where you can configure skills to integrate extra processing of content en route to an index. A few examples are OCR over image files, text split skill for data chunking, text translation for multiple languages.
2121

22-
Indexers target[supported data sources](#supported-data-sources). An indexer configuration specifies a data source (origin) and a search index (destination). Several sources, such as Azure Blob Storage, have more configuration properties specific to that content type.
22+
Indexers target [supported data sources](#supported-data-sources). An indexer configuration specifies a data source (origin) and a search index (destination). Several sources, such as Azure Blob Storage, have more configuration properties specific to that content type.
2323

2424
You can run indexers on demand or on a recurring data refresh schedule that runs as often as every five minutes. More frequent updates require a ['push model'](search-what-is-data-import.md) that simultaneously updates data in both Azure AI Search and your external data source.
2525

articles/sentinel/create-codeless-connector-legacy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ Use one of the following methods:
622622

623623
- **Azure portal**: In your Microsoft Sentinel data connector page, select **Disconnect**.
624624

625-
- **API**: Use the [DISCONNECT](/rest/api/securityinsights/preview/data-connectors/disconnect) API to send a PUT call with an empty body to the following URL:
625+
- **API**: Use the *DISCONNECT* API to send a PUT call with an empty body to the following URL:
626626

627627
```http
628628
https://management.azure.com /subscriptions/{{SUB}}/resourceGroups/{{RG}}/providers/Microsoft.OperationalInsights/workspaces/{{WS-NAME}}/providers/Microsoft.SecurityInsights/dataConnectors/{{Connector_Id}}/disconnect?api-version=2021-03-01-preview

articles/sentinel/workspace-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Common reasons for failure include:
124124
### API references
125125
- [Workspace Manager Assignment Jobs](/rest/api/securityinsights/preview/workspace-manager-assignment-jobs)
126126
- [Workspace Manager Assignments](/rest/api/securityinsights/preview/workspace-manager-assignments)
127-
- [Workspace Manager Configurations](/rest/api/securityinsights/preview/workspace-manager-configurations)
127+
- *Workspace Manager Configurations*
128128
- [Workspace Manager Groups](/rest/api/securityinsights/preview/workspace-manager-groups)
129129
- [Workspace Manager Members](/rest/api/securityinsights/preview/workspace-manager-members)
130130

articles/spring-apps/basic-standard/breadcrumb/toc.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@ items:
55
items:
66
- name: Azure Spring Apps
77
tocHref: /azure/spring-apps
8-
topicHref: /azure/spring-apps/index
9-
items:
10-
- name: Basic/Standard plan
11-
tocHref: /
12-
topicHref: /azure/spring-apps/basic-standard/index
8+
topicHref: /azure/spring-apps/index

articles/spring-apps/consumption-dedicated/breadcrumb/toc.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@ items:
55
items:
66
- name: Azure Spring Apps
77
tocHref: /azure/spring-apps
8-
topicHref: /azure/spring-apps/index
9-
items:
10-
- name: Standard consumption and dedicated plan
11-
tocHref: /
12-
topicHref: /azure/spring-apps/consumption-dedicated/index
8+
topicHref: /azure/spring-apps/index

articles/spring-apps/enterprise/breadcrumb/toc.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@ items:
55
items:
66
- name: Azure Spring Apps
77
tocHref: /azure/spring-apps
8-
topicHref: /azure/spring-apps/index
9-
items:
10-
- name: Enterprise plan
11-
tocHref: /
12-
topicHref: /azure/spring-apps/enterprise/index
8+
topicHref: /azure/spring-apps/index

0 commit comments

Comments
 (0)