Skip to content

Commit

Permalink
merge latesrt
Browse files Browse the repository at this point in the history
  • Loading branch information
eriqua committed Nov 9, 2023
2 parents d687ea1 + c0ad6d2 commit 92c81e1
Show file tree
Hide file tree
Showing 29 changed files with 377 additions and 173 deletions.
63 changes: 45 additions & 18 deletions avm/res/batch/batch-account/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Batch Accounts `[Microsoft.Batch/batchAccounts]`

> ⚠️THIS MODULE IS CURRENTLY ORPHANED.⚠️
>
>
> - Only security and bug fixes are being handled by the AVM core team at present.
> - If interested in becoming the module owner of this orphaned module (must be Microsoft FTE), please look for the related "orphaned module" GitHub issue [here](https://aka.ms/AVM/OrphanedModules)!
Expand Down Expand Up @@ -32,7 +32,7 @@ The following section provides usage examples for the module, which were used to

>**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.
>**Note**: To reference the module, please use the following syntax `br/public:avm-res-batch-batchaccount:1.0.0`.
>**Note**: To reference the module, please use the following syntax `br/public:avm/res/batch/batch-account:0.1.1`.
- [Using only defaults](#example-1-using-only-defaults)
- [Using Customer-Managed-Keys with User-Assigned identity](#example-2-using-customer-managed-keys-with-user-assigned-identity)
Expand All @@ -49,7 +49,7 @@ This instance deploys the module with the minimum set of required parameters.
<summary>via Bicep module</summary>

```bicep
module batchAccount 'br/public:avm-res-batch-batchaccount:1.0.0' = {
module batchAccount 'br/public:avm/res/batch/batch-account:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-bbamin'
params: {
// Required parameters
Expand Down Expand Up @@ -145,7 +145,7 @@ This instance deploys the module using Customer-Managed-Keys using a User-Assign
<summary>via Bicep module</summary>

```bicep
module batchAccount 'br/public:avm-res-batch-batchaccount:1.0.0' = {
module batchAccount 'br/public:avm/res/batch/batch-account:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-bbaencr'
params: {
// Required parameters
Expand Down Expand Up @@ -235,7 +235,7 @@ This instance deploys the module with most of its features enabled.
<summary>via Bicep module</summary>

```bicep
module batchAccount 'br/public:avm-res-batch-batchaccount:1.0.0' = {
module batchAccount 'br/public:avm/res/batch/batch-account:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-bbamax'
params: {
// Required parameters
Expand Down Expand Up @@ -447,7 +447,7 @@ This instance deploys the module in alignment with the best-practices of the Azu
<summary>via Bicep module</summary>

```bicep
module batchAccount 'br/public:avm-res-batch-batchaccount:1.0.0' = {
module batchAccount 'br/public:avm/res/batch/batch-account:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-bbawaf'
params: {
// Required parameters
Expand Down Expand Up @@ -628,7 +628,14 @@ module batchAccount 'br/public:avm-res-batch-batchaccount:1.0.0' = {
List of allowed authentication modes for the Batch account that can be used to authenticate with the data plane.
- Required: No
- Type: array
- Allowed: `[AAD, SharedKey, TaskAuthenticationToken]`
- Allowed:
```Bicep
[
'AAD'
'SharedKey'
'TaskAuthenticationToken'
]
```

### Parameter: `customerManagedKey`

Expand Down Expand Up @@ -875,22 +882,29 @@ Network access profile. It is only applicable when publicNetworkAccess is not ex
Optional. Network access profile for batchAccount endpoint (Batch account data plane API).

- Required: No
- Type: object

### Parameter: `networkProfile.nodeManagementAccess`

Optional. Network access profile for nodeManagement endpoint (Batch service managing compute nodes for Batch pools).

- Required: No
- Type: object
- Type: string
- Default: `'Deny'`
- Allowed:
```Bicep
[
'Allow'
'Deny'
]
```

### Parameter: `poolAllocationMode`

The allocation mode for creating pools in the Batch account. Determines which quota will be used.
- Required: No
- Type: string
- Default: `'BatchService'`
- Allowed: `[BatchService, UserSubscription]`
- Allowed:
```Bicep
[
'BatchService'
'UserSubscription'
]
```

### Parameter: `privateEndpoints`

Expand Down Expand Up @@ -1066,7 +1080,14 @@ Whether or not public network access is allowed for this resource. For security
- Required: No
- Type: string
- Default: `''`
- Allowed: `['', Disabled, Enabled]`
- Allowed:
```Bicep
[
''
'Disabled'
'Enabled'
]
```

### Parameter: `roleAssignments`

Expand Down Expand Up @@ -1154,7 +1175,13 @@ The authentication mode which the Batch service will use to manage the auto-stor
- Required: No
- Type: string
- Default: `'StorageKeys'`
- Allowed: `[BatchAccountManagedIdentity, StorageKeys]`
- Allowed:
```Bicep
[
'BatchAccountManagedIdentity'
'StorageKeys'
]
```

### Parameter: `tags`

Expand Down
74 changes: 64 additions & 10 deletions avm/res/cognitive-services/account/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ The following section provides usage examples for the module, which were used to

>**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.
>**Note**: To reference the module, please use the following syntax `br/public:avm-res-cognitiveservices-account:1.0.0`.
>**Note**: To reference the module, please use the following syntax `br/public:avm/res/cognitive-services/account:0.1.1`.
- [Using only defaults](#example-1-using-only-defaults)
- [Using large parameter set](#example-2-using-large-parameter-set)
Expand All @@ -51,7 +51,7 @@ This instance deploys the module with the minimum set of required parameters.
<summary>via Bicep module</summary>

```bicep
module account 'br/public:avm-res-cognitiveservices-account:1.0.0' = {
module account 'br/public:avm/res/cognitive-services/account:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-csamin'
params: {
// Required parameters
Expand Down Expand Up @@ -155,7 +155,7 @@ This instance deploys the module with most of its features enabled.
<summary>via Bicep module</summary>

```bicep
module account 'br/public:avm-res-cognitiveservices-account:1.0.0' = {
module account 'br/public:avm/res/cognitive-services/account:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-csamax'
params: {
// Required parameters
Expand Down Expand Up @@ -407,7 +407,7 @@ This instance deploys the module as a Speech Service.
<summary>via Bicep module</summary>

```bicep
module account 'br/public:avm-res-cognitiveservices-account:1.0.0' = {
module account 'br/public:avm/res/cognitive-services/account:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-csaspeech'
params: {
// Required parameters
Expand Down Expand Up @@ -557,7 +557,7 @@ This instance deploys the module using Customer-Managed-Keys using a System-Assi
<summary>via Bicep module</summary>

```bicep
module account 'br/public:avm-res-cognitiveservices-account:1.0.0' = {
module account 'br/public:avm/res/cognitive-services/account:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-csaecrs'
params: {
// Required parameters
Expand Down Expand Up @@ -683,7 +683,7 @@ This instance deploys the module using Customer-Managed-Keys using a User-Assign
<summary>via Bicep module</summary>

```bicep
module account 'br/public:avm-res-cognitiveservices-account:1.0.0' = {
module account 'br/public:avm/res/cognitive-services/account:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-csaencr'
params: {
// Required parameters
Expand Down Expand Up @@ -815,7 +815,7 @@ This instance deploys the module in alignment with the best-pratices of the Well
<summary>via Bicep module</summary>

```bicep
module account 'br/public:avm-res-cognitiveservices-account:1.0.0' = {
module account 'br/public:avm/res/cognitive-services/account:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-csawaf'
params: {
// Required parameters
Expand Down Expand Up @@ -1211,7 +1211,33 @@ Enable/Disable usage telemetry for module.
Kind of the Cognitive Services. Use 'Get-AzCognitiveServicesAccountSku' to determine a valid combinations of 'kind' and 'SKU' for your Azure region.
- Required: Yes
- Type: string
- Allowed: `[AnomalyDetector, Bing.Autosuggest.v7, Bing.CustomSearch, Bing.EntitySearch, Bing.Search.v7, Bing.SpellCheck.v7, CognitiveServices, ComputerVision, ContentModerator, CustomVision.Prediction, CustomVision.Training, Face, FormRecognizer, ImmersiveReader, Internal.AllInOne, LUIS, LUIS.Authoring, Personalizer, QnAMaker, SpeechServices, TextAnalytics, TextTranslation]`
- Allowed:
```Bicep
[
'AnomalyDetector'
'Bing.Autosuggest.v7'
'Bing.CustomSearch'
'Bing.EntitySearch'
'Bing.Search.v7'
'Bing.SpellCheck.v7'
'CognitiveServices'
'ComputerVision'
'ContentModerator'
'CustomVision.Prediction'
'CustomVision.Training'
'Face'
'FormRecognizer'
'ImmersiveReader'
'Internal.AllInOne'
'LUIS'
'LUIS.Authoring'
'Personalizer'
'QnAMaker'
'SpeechServices'
'TextAnalytics'
'TextTranslation'
]
```

### Parameter: `location`

Expand Down Expand Up @@ -1465,7 +1491,14 @@ Whether or not public network access is allowed for this resource. For security
- Required: No
- Type: string
- Default: `''`
- Allowed: `['', Disabled, Enabled]`
- Allowed:
```Bicep
[
''
'Disabled'
'Enabled'
]
```

### Parameter: `restore`

Expand Down Expand Up @@ -1555,7 +1588,28 @@ SKU of the Cognitive Services resource. Use 'Get-AzCognitiveServicesAccountSku'
- Required: No
- Type: string
- Default: `'S0'`
- Allowed: `[C2, C3, C4, F0, F1, S, S0, S1, S10, S2, S3, S4, S5, S6, S7, S8, S9]`
- Allowed:
```Bicep
[
'C2'
'C3'
'C4'
'F0'
'F1'
'S'
'S0'
'S1'
'S10'
'S2'
'S3'
'S4'
'S5'
'S6'
'S7'
'S8'
'S9'
]
```

### Parameter: `tags`

Expand Down
8 changes: 4 additions & 4 deletions avm/res/compute/ssh-public-key/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The following section provides usage examples for the module, which were used to

>**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.
>**Note**: To reference the module, please use the following syntax `br/public:avm-res-compute-sshpublickey:1.0.0`.
>**Note**: To reference the module, please use the following syntax `br/public:avm/res/compute/ssh-public-key:0.1.1`.
- [Using only defaults](#example-1-using-only-defaults)
- [Using large parameter set](#example-2-using-large-parameter-set)
Expand All @@ -44,7 +44,7 @@ This instance deploys the module with the minimum set of required parameters.
<summary>via Bicep module</summary>

```bicep
module sshPublicKey 'br/public:avm-res-compute-sshpublickey:1.0.0' = {
module sshPublicKey 'br/public:avm/res/compute/ssh-public-key:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-cspkmin'
params: {
// Required parameters
Expand Down Expand Up @@ -104,7 +104,7 @@ This instance deploys the module with most of its features enabled.
<summary>via Bicep module</summary>

```bicep
module sshPublicKey 'br/public:avm-res-compute-sshpublickey:1.0.0' = {
module sshPublicKey 'br/public:avm/res/compute/ssh-public-key:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-cspkmax'
params: {
// Required parameters
Expand Down Expand Up @@ -198,7 +198,7 @@ This instance deploys the module in alignment with the best-practices of the Azu
<summary>via Bicep module</summary>

```bicep
module sshPublicKey 'br/public:avm-res-compute-sshpublickey:1.0.0' = {
module sshPublicKey 'br/public:avm/res/compute/ssh-public-key:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-test-cspkwaf'
params: {
// Required parameters
Expand Down
8 changes: 4 additions & 4 deletions avm/res/insights/action-group/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The following section provides usage examples for the module, which were used to

>**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.
>**Note**: To reference the module, please use the following syntax `br/public:avm-res-insights-actiongroup:1.0.0`.
>**Note**: To reference the module, please use the following syntax `br/public:avm/res/insights/action-group:0.1.2`.
- [Defaults](#example-1-defaults)
- [Max](#example-2-max)
Expand All @@ -36,7 +36,7 @@ The following section provides usage examples for the module, which were used to
<summary>via Bicep module</summary>

```bicep
module actionGroup 'br/public:avm-res-insights-actiongroup:1.0.0' = {
module actionGroup 'br/public:avm/res/insights/action-group:0.1.2' = {
name: '${uniqueString(deployment().name, location)}-test-iagmin'
params: {
// Required parameters
Expand Down Expand Up @@ -133,7 +133,7 @@ module actionGroup 'br/public:avm-res-insights-actiongroup:1.0.0' = {
<summary>via Bicep module</summary>

```bicep
module actionGroup 'br/public:avm-res-insights-actiongroup:1.0.0' = {
module actionGroup 'br/public:avm/res/insights/action-group:0.1.2' = {
name: '${uniqueString(deployment().name, location)}-test-iagmax'
params: {
// Required parameters
Expand Down Expand Up @@ -252,7 +252,7 @@ module actionGroup 'br/public:avm-res-insights-actiongroup:1.0.0' = {
<summary>via Bicep module</summary>

```bicep
module actionGroup 'br/public:avm-res-insights-actiongroup:1.0.0' = {
module actionGroup 'br/public:avm/res/insights/action-group:0.1.2' = {
name: '${uniqueString(deployment().name, location)}-test-iagwaf'
params: {
// Required parameters
Expand Down
Loading

0 comments on commit 92c81e1

Please sign in to comment.