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

fix: Update avm/res/dev-test-lab/lab module virtual network parameters and increased test coverage. #3180

Merged
merged 6 commits into from
Sep 9, 2024
Merged

fix: Update avm/res/dev-test-lab/lab module virtual network parameters and increased test coverage. #3180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ee08fa
fix: Updated virtualNetwork child module and increased test cases
ahmadabdalla Sep 4, 2024
c8968c9
Merge branch 'main' into users/ahmad/3126_DTL
ahmadabdalla Sep 5, 2024
8aed9a6
fix: Update required parameter in dev-test-lab README.md files
ahmadabdalla Sep 6, 2024
fd8e02b
Merge remote-tracking branch 'upstream/main' into users/ahmad/3126_DTL
ahmadabdalla Sep 8, 2024
9441489
sync from AVM public
ahmadabdalla Sep 8, 2024
8b5e41f
Merge branch 'main' into users/ahmad/3126_DTL
ahmadabdalla Sep 9, 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
30 changes: 28 additions & 2 deletions avm/res/dev-test-lab/lab/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ module lab 'br/public:avm/res/dev-test-lab/lab:<version>' = {
target: 450
thresholdValue100DisplayOnChart: 'Enabled'
thresholdValue100SendNotificationWhenExceeded: 'Enabled'
thresholdValue125DisplayOnChart: 'Disabled'
thresholdValue75DisplayOnChart: 'Enabled'
}
disableAutoUpgradeCseMinorVersion: true
encryptionDiskEncryptionSetId: '<encryptionDiskEncryptionSetId>'
Expand Down Expand Up @@ -320,6 +322,11 @@ module lab 'br/public:avm/res/dev-test-lab/lab:<version>' = {
labSubnetName: '<labSubnetName>'
resourceId: '<resourceId>'
}
{
allowPublicIp: 'Deny'
labSubnetName: '<labSubnetName>'
resourceId: '<resourceId>'
}
]
description: 'lab virtual network description'
externalProviderResourceId: '<externalProviderResourceId>'
Expand All @@ -343,6 +350,12 @@ module lab 'br/public:avm/res/dev-test-lab/lab:<version>' = {
useInVmCreationPermission: 'Allow'
usePublicIpAddressPermission: 'Allow'
}
{
labSubnetName: '<labSubnetName>'
resourceId: '<resourceId>'
useInVmCreationPermission: 'Deny'
usePublicIpAddressPermission: 'Deny'
}
]
}
]
Expand Down Expand Up @@ -425,7 +438,9 @@ module lab 'br/public:avm/res/dev-test-lab/lab:<version>' = {
"status": "Enabled",
"target": 450,
"thresholdValue100DisplayOnChart": "Enabled",
"thresholdValue100SendNotificationWhenExceeded": "Enabled"
"thresholdValue100SendNotificationWhenExceeded": "Enabled",
"thresholdValue125DisplayOnChart": "Disabled",
"thresholdValue75DisplayOnChart": "Enabled"
}
},
"disableAutoUpgradeCseMinorVersion": {
Expand Down Expand Up @@ -634,6 +649,11 @@ module lab 'br/public:avm/res/dev-test-lab/lab:<version>' = {
"allowPublicIp": "Allow",
"labSubnetName": "<labSubnetName>",
"resourceId": "<resourceId>"
},
{
"allowPublicIp": "Deny",
"labSubnetName": "<labSubnetName>",
"resourceId": "<resourceId>"
}
],
"description": "lab virtual network description",
Expand All @@ -657,6 +677,12 @@ module lab 'br/public:avm/res/dev-test-lab/lab:<version>' = {
},
"useInVmCreationPermission": "Allow",
"usePublicIpAddressPermission": "Allow"
},
{
"labSubnetName": "<labSubnetName>",
"resourceId": "<resourceId>",
"useInVmCreationPermission": "Deny",
"usePublicIpAddressPermission": "Deny"
}
]
}
Expand Down Expand Up @@ -2026,7 +2052,7 @@ The resource ID of the subnet.

The permission policy of the subnet for allowing public IP addresses (i.e. Allow, Deny)).

- Required: Yes
- Required: No
- Type: object

**Required parameters**
Expand Down
4 changes: 2 additions & 2 deletions avm/res/dev-test-lab/lab/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,10 +461,10 @@ type virtualNetworkType = {
description: string?

@description('Optional. The allowed subnets of the virtual network.')
allowedSubnets: allowedSubnetType[]?
allowedSubnets: allowedSubnetType?

@description('Optional. The subnet overrides of the virtual network.')
subnetOverrides: subnetOverrideType[]?
subnetOverrides: subnetOverrideType?
}[]?

type costsType = {
Expand Down
Loading