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.

Sign up for GitHub

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

feat: additional parameters for anf #3055

Merged
merged 39 commits into from
Aug 21, 2024
Merged

feat: additional parameters for anf #3055

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e9e6a7c
additional parameters for AVM modules
bobmclane999 May 29, 2024
eef07e2
add udt
jtracey93 Jun 4, 2024
a06b933
align to spec and update api versions
jtracey93 Jun 4, 2024
2edc770
set-avmmodule ran
jtracey93 Jun 4, 2024
a1181ce
Merge pull request #1 from jtracey93/users/jtracey93/cmk-fixes
bobmclane999 Jun 5, 2024
c6c0d6e
Merge branch 'main' into main
bobmclane999 Jun 5, 2024
af97eed
Merge branch 'main' into main
eriqua Jun 6, 2024
468a2c1
Update platform.toggle-avm-workflows.yml
bobmclane999 Jun 6, 2024
7997c90
Update platform.toggle-avm-workflows.yml
bobmclane999 Jun 7, 2024
1612bc7
Merge branch 'main' into main
jtracey93 Jun 7, 2024
1de3d77
additional parameters for ANF
bobmclane999 Jun 28, 2024
7064e96
additional ANF paramaters
bobmclane999 Jun 28, 2024
e6893c9
additional ANF params
bobmclane999 Jun 28, 2024
6cc0d66
remove snapshot policies and address later.
bobmclane999 Jul 9, 2024
50b0569
amend waf aligned test script to include iteration so no duplication …
bobmclane999 Jul 10, 2024
2eedd2b
update documentation and json files
bobmclane999 Jul 10, 2024
0f3950b
add capacity volumes check for null aray
bobmclane999 Jul 10, 2024
572dc09
testing BackupPolcies naming logic
bobmclane999 Jul 10, 2024
c4413aa
alter backupPolicyName logic
bobmclane999 Jul 10, 2024
ce325e3
change coolAccessRetrievalPolicy to Default
bobmclane999 Jul 10, 2024
00e430c
Merge branch 'main' into feat--additional-parameters-for-ANF
bobmclane999 Jul 11, 2024
98758e9
Merge remote-tracking branch 'upstream/main' into feat--additional-pa…
bobmclane999 Jul 15, 2024
986ab38
resolved conflicts and reran set-avmmodule
bobmclane999 Jul 15, 2024
894b5dd
Merge branch 'main' into feat--additional-parameters-for-ANF
bobmclane999 Jul 15, 2024
3ee16f2
put networkFeatures and Zones back as previous
bobmclane999 Jul 16, 2024
06157ef
re-ran Set-AVMModule, updated json files
bobmclane999 Jul 16, 2024
6a45927
feat: additional ANF Parameters
bobmclane999 Aug 16, 2024
2c58076
Merge branch 'main' into feat--additional-parameters-for-ANF
bobmclane999 Aug 16, 2024
52c403f
Merge branch 'main' into feat--additional-parameters-for-ANF
bobmclane999 Aug 18, 2024
26ac7b9
remove invalid chars from conflict
bobmclane999 Aug 20, 2024
d08a300
update API to latest
bobmclane999 Aug 20, 2024
157ddc7
update documentation
bobmclane999 Aug 20, 2024
fd380e4
add encryptionKeySource to the Test Bicep files
bobmclane999 Aug 20, 2024
4c0e5e2
fix ternary statements and add mandatory encryptionKeysource value
bobmclane999 Aug 20, 2024
8b101ce
add ternary for keyvaultprivateendpoint
bobmclane999 Aug 20, 2024
32ffa05
Update extensions.json
bobmclane999 Aug 20, 2024
0c03a33
Merge branch 'main' into feat--additional-parameters-for-ANF
bobmclane999 Aug 20, 2024
565c692
Merge branch 'main' into feat--additional-parameters-for-ANF
fbinotto Aug 21, 2024
054adb9
Update extensions.json
jtracey93 Aug 21, 2024
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
1 change: 0 additions & 1 deletion .vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"recommendations": [
"esbenp.prettier-vscode",
"editorconfig.editorconfig",
jtracey93 marked this conversation as resolved.
Show resolved Hide resolved
"ms-vscode.powershell"
]
}
13 changes: 7 additions & 6 deletions avm/res/net-app/net-app-account/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ This module deploys an Azure NetApp File.
| :-- | :-- |
| `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) |
| `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) |
| `Microsoft.NetApp/netAppAccounts` | [2023-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2023-07-01/netAppAccounts) |
| `Microsoft.NetApp/netAppAccounts/backupPolicies` | [2023-11-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2023-11-01/netAppAccounts/backupPolicies) |
| `Microsoft.NetApp/netAppAccounts/backupVaults` | [2023-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2023-05-01-preview/netAppAccounts/backupVaults) |
| `Microsoft.NetApp/netAppAccounts/backupVaults/backups` | [2023-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2023-05-01-preview/netAppAccounts/backupVaults/backups) |
| `Microsoft.NetApp/netAppAccounts/capacityPools` | [2023-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2023-07-01/netAppAccounts/capacityPools) |
| `Microsoft.NetApp/netAppAccounts/capacityPools/volumes` | [2023-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2023-07-01/netAppAccounts/capacityPools/volumes) |
| `Microsoft.NetApp/netAppAccounts` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts) |
| `Microsoft.NetApp/netAppAccounts/backupPolicies` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/backupPolicies) |
| `Microsoft.NetApp/netAppAccounts/backupVaults` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/backupVaults) |
| `Microsoft.NetApp/netAppAccounts/backupVaults/backups` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/backupVaults/backups) |
| `Microsoft.NetApp/netAppAccounts/capacityPools` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/capacityPools) |
| `Microsoft.NetApp/netAppAccounts/capacityPools/volumes` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/capacityPools/volumes) |
| `Microsoft.NetApp/netAppAccounts/snapshotPolicies` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/snapshotPolicies) |

## Usage examples

Expand Down
11 changes: 6 additions & 5 deletions avm/res/net-app/net-app-account/capacity-pool/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ This module deploys an Azure NetApp Files Capacity Pool.
| Resource Type | API Version |
| :-- | :-- |
| `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) |
| `Microsoft.NetApp/netAppAccounts/backupPolicies` | [2023-11-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2023-11-01/netAppAccounts/backupPolicies) |
| `Microsoft.NetApp/netAppAccounts/backupVaults` | [2023-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2023-05-01-preview/netAppAccounts/backupVaults) |
| `Microsoft.NetApp/netAppAccounts/backupVaults/backups` | [2023-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2023-05-01-preview/netAppAccounts/backupVaults/backups) |
| `Microsoft.NetApp/netAppAccounts/capacityPools` | [2023-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2023-07-01/netAppAccounts/capacityPools) |
| `Microsoft.NetApp/netAppAccounts/capacityPools/volumes` | [2023-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2023-07-01/netAppAccounts/capacityPools/volumes) |
| `Microsoft.NetApp/netAppAccounts/backupPolicies` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/backupPolicies) |
| `Microsoft.NetApp/netAppAccounts/backupVaults` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/backupVaults) |
| `Microsoft.NetApp/netAppAccounts/backupVaults/backups` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/backupVaults/backups) |
| `Microsoft.NetApp/netAppAccounts/capacityPools` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/capacityPools) |
| `Microsoft.NetApp/netAppAccounts/capacityPools/volumes` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/capacityPools/volumes) |
| `Microsoft.NetApp/netAppAccounts/snapshotPolicies` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2024-03-01/netAppAccounts/snapshotPolicies) |

## Parameters

Expand Down
30 changes: 28 additions & 2 deletions avm/res/net-app/net-app-account/capacity-pool/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ var formattedRoleAssignments = [
})
]

resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2023-07-01' existing = {
resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2024-03-01' existing = {
name: netAppAccountName
}

resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2023-07-01' = {
resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2024-03-01' = {
name: name
parent: netAppAccount
location: location
Expand Down Expand Up @@ -118,10 +118,35 @@ module capacityPool_volumes 'volume/main.bicep' = [
? volume.coolAccessRetrievalPolicy
: 'Default'
coolnessPeriod: contains(volume, 'coolnessPeriod') ? volume.coolnessPeriod : 0
encryptionKeySource: contains(volume, 'encryptionKeySource') ? volume.encryptionKeySource : 'Microsoft.NetApp'
keyVaultPrivateEndpointResourceId: contains(volume, 'keyVaultPrivateEndpointResourceId')
? volume.keyVaultPrivateEndpointResourceId
: ''
endpointType: contains(volume, 'endpointType') ? volume.endpointType : ''
remoteVolumeRegion: contains(volume, 'remoteVolumeRegion') ? volume.remoteVolumeRegion : ''
remoteVolumeResourceId: contains(volume, 'remoteVolumeResourceId') ? volume.remoteVolumeResourceId : ''
replicationSchedule: contains(volume, 'replicationSchedule') ? volume.replicationSchedule : ''
snapshotPolicyId: contains(volume, 'snapshotPolicyId') ? volume.snapshotPolicyId : ''
snapshotPolicyName: contains(volume, 'snapshotPolicyName') ? volume.snapshotPolicyName : 'snapshotPolicy'
snapshotPolicyLocation: contains(volume, 'snapshotPolicyLocation') ? volume.snapshotPolicyLocation : ''
snapEnabled: contains(volume, 'snapEnabled') ? volume.snapEnabled : false
dailyHour: contains(volume, 'dailyHour') ? volume.dailyHour : 0
dailyMinute: contains(volume, 'dailyMinute') ? volume.dailyMinute : 0
dailySnapshotsToKeep: contains(volume, 'dailySnapshotsToKeep') ? volume.dailySnapshotsToKeep : 0
dailyUsedBytes: contains(volume, 'dailyUsedBytes') ? volume.dailyUsedBytes : 0
hourlyMinute: contains(volume, 'hourlyMinute') ? volume.hourlyMinute : 0
hourlySnapshotsToKeep: contains(volume, 'hourlySnapshotsToKeep') ? volume.hourlySnapshotsToKeep : 0
hourlyUsedBytes: contains(volume, 'hourlyUsedBytes') ? volume.hourlyUsedBytes : 0
daysOfMonth: contains(volume, 'daysOfMonth') ? volume.daysOfMonth : ''
monthlyHour: contains(volume, 'monthlyHour') ? volume.monthlyHour : 0
monthlyMinute: contains(volume, 'monthlyMinute') ? volume.monthlyMinute : 0
monthlySnapshotsToKeep: contains(volume, 'monthlySnapshotsToKeep') ? volume.monthlySnapshotsToKeep : 0
monthlyUsedBytes: contains(volume, 'monthlyUsedBytes') ? volume.monthlyUsedBytes : 0
weeklyDay: contains(volume, 'weeklyDay') ? volume.weeklyDay : ''
weeklyHour: contains(volume, 'weeklyHour') ? volume.weeklyHour : 0
weeklyMinute: contains(volume, 'weeklyMinute') ? volume.weeklyMinute : 0
weeklySnapshotsToKeep: contains(volume, 'weeklySnapshotsToKeep') ? volume.weeklySnapshotsToKeep : 0
weeklyUsedBytes: contains(volume, 'weeklyUsedBytes') ? volume.weeklyUsedBytes : 0
backupPolicyName: contains(volume, 'backupPolicyName') ? volume.backupPolicyName : 'backupPolicy'
backupPolicyLocation: contains(volume, 'backupPolicyLocation') ? volume.backupPolicyLocation : ''
dailyBackupsToKeep: contains(volume, 'dailyBackupsToKeep') ? volume.dailyBackupsToKeep : 0
Expand All @@ -135,6 +160,7 @@ module capacityPool_volumes 'volume/main.bicep' = [
snapshotName: contains(volume, 'snapshotName') ? volume.snapshotName : 'snapshot'
useExistingSnapshot: contains(volume, 'useExistingSnapshot') ? volume.useExistingSnapshot : false
volumeResourceId: contains(volume, 'volumeResourceId') ? volume.volumeResourceId : ''
volumeType: contains(volume, 'volumeType') ? volume.volumeType : ''
}
}
]
Expand Down
Loading