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: avm/res/app/managed-environment #737

Merged
merged 22 commits into from
Dec 21, 2023
Merged

feat: avm/res/app/managed-environment #737

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0d44abf
Initial commit
arnoldna Dec 18, 2023
030ecfe
Added GitHub action
arnoldna Dec 18, 2023
88b9e77
Updated settings
arnoldna Dec 19, 2023
2ca4c2f
updated default location and telemetry
arnoldna Dec 19, 2023
634c9ad
Updated named prefix
arnoldna Dec 19, 2023
6f6d1b8
Updated missing parameter
arnoldna Dec 19, 2023
9af3902
Updated orphaned
arnoldna Dec 19, 2023
3ce95cf
Defaults to internal vnet
arnoldna Dec 19, 2023
412927c
Updated test to set to internal
arnoldna Dec 19, 2023
0ec0f4c
Added network dependencies
arnoldna Dec 19, 2023
d5cb1a5
Updated parameter desscription
arnoldna Dec 19, 2023
14cd958
Updated default test and suppress default PSRule
arnoldna Dec 20, 2023
62771dc
Added PSRule suppression
arnoldna Dec 20, 2023
2d39f0c
Removed vnet from min test.
arnoldna Dec 20, 2023
1aeca72
Removed networking parameter
arnoldna Dec 20, 2023
d47b7c7
Set default internal load balancer parameter
arnoldna Dec 20, 2023
c407dce
Removed diagnostic settings type definition
arnoldna Dec 21, 2023
4de3fdd
Formated workflow file
arnoldna Dec 21, 2023
f26ea22
Moved test parameters to module deployment
arnoldna Dec 21, 2023
7edd0ee
Added manged identities tests
arnoldna Dec 21, 2023
21c4acd
Removed telemetry from test cases
arnoldna Dec 21, 2023
249b9ac
Merge branch 'main' into avm/res/app/managed-environment
AlexanderSehr Dec 21, 2023
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
44 changes: 36 additions & 8 deletions avm/res/app/managed-environment/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ module managedEnvironment 'br/public:avm/res/app/managed-environment:<version>'
// Non-required parameters
dockerBridgeCidr: '172.16.0.1/28'
enableTelemetry: '<enableTelemetry>'
infrastructureResourceGroupName: '<infrastructureResourceGroupName>'
infrastructureResourceGroupName: 'me-dep-app.managedenvironments-amemax-rg'
infrastructureSubnetId: '<infrastructureSubnetId>'
internal: true
location: '<location>'
Expand All @@ -124,7 +124,14 @@ module managedEnvironment 'br/public:avm/res/app/managed-environment:<version>'
Env: 'test'
'hidden-title': 'This is visible in the resource name'
}
workloadProfiles: '<workloadProfiles>'
workloadProfiles: [
{
maximumCount: 3
minimumCount: 0
name: 'CAW01'
workloadProfileType: 'D4'
}
]
}
}
```
Expand Down Expand Up @@ -156,7 +163,7 @@ module managedEnvironment 'br/public:avm/res/app/managed-environment:<version>'
"value": "<enableTelemetry>"
},
"infrastructureResourceGroupName": {
"value": "<infrastructureResourceGroupName>"
"value": "me-dep-app.managedenvironments-amemax-rg"
},
"infrastructureSubnetId": {
"value": "<infrastructureSubnetId>"
Expand Down Expand Up @@ -186,7 +193,14 @@ module managedEnvironment 'br/public:avm/res/app/managed-environment:<version>'
}
},
"workloadProfiles": {
"value": "<workloadProfiles>"
"value": [
{
"maximumCount": 3,
"minimumCount": 0,
"name": "CAW01",
"workloadProfileType": "D4"
}
]
}
}
}
Expand Down Expand Up @@ -214,7 +228,7 @@ module managedEnvironment 'br/public:avm/res/app/managed-environment:<version>'
// Non-required parameters
dockerBridgeCidr: '172.16.0.1/28'
enableTelemetry: '<enableTelemetry>'
infrastructureResourceGroupName: '<infrastructureResourceGroupName>'
infrastructureResourceGroupName: 'me-dep-app.managedenvironments-amewaf-rg'
infrastructureSubnetId: '<infrastructureSubnetId>'
internal: true
location: '<location>'
Expand All @@ -228,7 +242,14 @@ module managedEnvironment 'br/public:avm/res/app/managed-environment:<version>'
Env: 'test'
'hidden-title': 'This is visible in the resource name'
}
workloadProfiles: '<workloadProfiles>'
workloadProfiles: [
{
maximumCount: 3
minimumCount: 0
name: 'CAW01'
workloadProfileType: 'D4'
}
]
}
}
```
Expand Down Expand Up @@ -260,7 +281,7 @@ module managedEnvironment 'br/public:avm/res/app/managed-environment:<version>'
"value": "<enableTelemetry>"
},
"infrastructureResourceGroupName": {
"value": "<infrastructureResourceGroupName>"
"value": "me-dep-app.managedenvironments-amewaf-rg"
},
"infrastructureSubnetId": {
"value": "<infrastructureSubnetId>"
Expand Down Expand Up @@ -290,7 +311,14 @@ module managedEnvironment 'br/public:avm/res/app/managed-environment:<version>'
}
},
"workloadProfiles": {
"value": "<workloadProfiles>"
"value": [
{
"maximumCount": 3,
"minimumCount": 0,
"name": "CAW01",
"workloadProfileType": "D4"
}
]
}
}
}
Expand Down
24 changes: 9 additions & 15 deletions avm/res/app/managed-environment/tests/e2e/max/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ metadata description = 'This instance deploys the module with most of its featur
@maxLength(90)
param resourceGroupName string = 'dep-${namePrefix}-app.managedenvironments-${serviceShort}-rg'

@description('Optional. The name of the infrastructre resource group to deploy for testing purposes.')
param infrastructureResourceGroupName string = 'me-dep-${namePrefix}-app.managedenvironments-${serviceShort}-rg'

@description('Optional. The location to deploy resources to.')
param location string = deployment().location

Expand All @@ -25,16 +22,6 @@ param enableTelemetry bool = true
@description('Optional. A token to inject into the name of each resource.')
param namePrefix string = '#_namePrefix_#'

@description('Optional. WorkloadProfile')
param workloadProfiles array = [
{
workloadProfileType: 'D4'
name: 'CAW01'
minimumCount: 0
maximumCount: 3
}
]

// =========== //
// Deployments //
// =========== //
Expand Down Expand Up @@ -69,13 +56,20 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem'
name: '${namePrefix}${serviceShort}001'
logAnalyticsWorkspaceResourceId: nestedDependencies.outputs.logAnalyticsWorkspaceResourceId
location: location
workloadProfiles: workloadProfiles
workloadProfiles: [
{
workloadProfileType: 'D4'
name: 'CAW01'
minimumCount: 0
maximumCount: 3
}
]
internal: true
dockerBridgeCidr: '172.16.0.1/28'
platformReservedCidr: '172.17.17.0/24'
platformReservedDnsIP: '172.17.17.17'
infrastructureSubnetId: nestedDependencies.outputs.subnetResourceId
infrastructureResourceGroupName: infrastructureResourceGroupName
infrastructureResourceGroupName: 'me-dep-${namePrefix}-app.managedenvironments-${serviceShort}-rg'
AlexanderSehr marked this conversation as resolved.
Show resolved Hide resolved
lock: {
kind: 'CanNotDelete'
name: 'myCustomLockName'
Expand Down
23 changes: 9 additions & 14 deletions avm/res/app/managed-environment/tests/e2e/waf-aligned/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ metadata description = 'This instance deploys the module in alignment with the b
@maxLength(90)
param resourceGroupName string = 'dep-${namePrefix}-app.managedenvironments-${serviceShort}-rg'

@description('Optional. The name of the infrastructre resource group to deploy for testing purposes.')
param infrastructureResourceGroupName string = 'me-dep-${namePrefix}-app.managedenvironments-${serviceShort}-rg'

@description('Optional. The location to deploy resources to.')
param location string = deployment().location

Expand All @@ -25,15 +22,6 @@ param enableTelemetry bool = true
@description('Optional. A token to inject into the name of each resource.')
param namePrefix string = '#_namePrefix_#'

@description('Optional. WorkloadProfile')
param workloadProfiles array = [
{
workloadProfileType: 'D4'
name: 'CAW01'
minimumCount: 0
maximumCount: 3
}
]
// =========== //
// Deployments //
// =========== //
Expand Down Expand Up @@ -68,13 +56,20 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem'
name: '${namePrefix}${serviceShort}001'
logAnalyticsWorkspaceResourceId: nestedDependencies.outputs.logAnalyticsWorkspaceResourceId
location: location
workloadProfiles: workloadProfiles
workloadProfiles: [
{
workloadProfileType: 'D4'
name: 'CAW01'
minimumCount: 0
maximumCount: 3
}
]
internal: true
dockerBridgeCidr: '172.16.0.1/28'
platformReservedCidr: '172.17.17.0/24'
platformReservedDnsIP: '172.17.17.17'
infrastructureSubnetId: nestedDependencies.outputs.subnetResourceId
infrastructureResourceGroupName: infrastructureResourceGroupName
infrastructureResourceGroupName: 'me-dep-${namePrefix}-app.managedenvironments-${serviceShort}-rg'
AlexanderSehr marked this conversation as resolved.
Show resolved Hide resolved
lock: {
kind: 'CanNotDelete'
name: 'myCustomLockName'
Expand Down