Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0894119
initial version
Msanzdelrio Oct 4, 2021
2350ca5
updated builtin role names with initial version
Msanzdelrio Oct 4, 2021
9cd1bf9
updated workflow with bicep modules
Msanzdelrio Oct 4, 2021
98d4b86
fixed role assignment error
Msanzdelrio Oct 4, 2021
47589d7
removed string concats
Msanzdelrio Oct 4, 2021
777a83b
added own object id
Msanzdelrio Oct 4, 2021
1c5475a
updated to be a string
Msanzdelrio Oct 4, 2021
f33d8f7
udpated as virtual wans
Msanzdelrio Oct 4, 2021
6adb104
downcast to string in rbac
Msanzdelrio Oct 4, 2021
59cbbaa
removed comments
Msanzdelrio Oct 4, 2021
dbaeba3
updated probe configuration
Msanzdelrio Oct 4, 2021
c9f57e8
created json object for probe
Msanzdelrio Oct 4, 2021
baf3179
updated parameter for sku
Msanzdelrio Oct 4, 2021
9ccaec6
back to waf_v2
Msanzdelrio Oct 4, 2021
a0651cf
updated with variable
Msanzdelrio Oct 4, 2021
e417bba
removed variable
Msanzdelrio Oct 4, 2021
57a52a8
added initial workflow steps + correct roles
Msanzdelrio Oct 4, 2021
0075256
remove test.json file
Msanzdelrio Oct 4, 2021
bd95d61
removed som unnecessary variables
Msanzdelrio Oct 4, 2021
8da22a1
Merge branch 'main' of https://github.com/Azure/ResourceModules into …
Msanzdelrio Oct 4, 2021
6106f53
remove roles assignments parameter
Msanzdelrio Oct 4, 2021
9a53ac2
test with WAF medium
Msanzdelrio Oct 4, 2021
c21ba8f
removing managed identity resource id
Msanzdelrio Oct 4, 2021
d3a6809
adding managed identity resource id back and updated sku
Msanzdelrio Oct 4, 2021
db1b4fb
Merge branch 'main' of https://github.com/Azure/ResourceModules into …
Msanzdelrio Oct 5, 2021
5a53669
restoring quotes format + using full rbac model
Msanzdelrio Oct 5, 2021
1614005
updated foreach loops
Msanzdelrio Oct 5, 2021
052cfa6
Merge branch 'main' of https://github.com/Azure/ResourceModules into …
Msanzdelrio Oct 5, 2021
c696d68
fixed remaining foreach loops
Msanzdelrio Oct 5, 2021
763c3c5
updated rbac module
Msanzdelrio Oct 5, 2021
3dbddf9
updated nested_rbac module
Msanzdelrio Oct 5, 2021
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
8 changes: 4 additions & 4 deletions .github/workflows/ms.network.applicationgateways.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
- name: "Test module"
uses: ./.github/actions/templates/validateModuleDeploy
with:
templateFilePath: '${{ env.modulePath }}/deploy.json'
templateFilePath: '${{ env.modulePath }}/deploy.bicep'
parameterFilePath: '${{ env.modulePath }}/parameters/${{ matrix.parameterFilePaths }}'
location: '${{ env.defaultLocation }}'
resourceGroupName: '${{ env.resourceGroupName }}'
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
uses: ./.github/actions/templates/deployModule
with:
moduleName: '${{ env.moduleName }}'
templateFilePath: '${{ env.modulePath }}/deploy.json'
templateFilePath: '${{ env.modulePath }}/deploy.bicep'
parameterFilePath: '${{ env.modulePath }}/parameters/${{ matrix.parameterFilePaths }}'
location: '${{ env.defaultLocation }}'
resourceGroupName: '${{ env.resourceGroupName }}'
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
- name: "Publish module"
uses: ./.github/actions/templates/publishModule
with:
templateFilePath: '${{ env.modulePath }}/deploy.json'
templateFilePath: '${{ env.modulePath }}/deploy.bicep'
componentTemplateSpecRGName: '${{ env.componentTemplateSpecRGName }}'
componentTemplateSpecRGLocation: '${{ env.componentTemplateSpecRGLocation }}'
componentTemplateSpecName: '${{ env.moduleName }}'
Expand Down Expand Up @@ -178,5 +178,5 @@ jobs:
uses: ./.github/actions/templates/removeModule
with:
moduleName: '${{ env.moduleName }}'
templateFilePath: '${{ env.modulePath }}/deploy.json'
templateFilePath: '${{ env.modulePath }}/deploy.bicep'
resourceGroupName: '${{ env.resourceGroupName }}'
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
param roleAssignmentObj object
param builtInRoleNames object
param resourceName string

resource roleAssignment 'Microsoft.Network/applicationGateways/providers/roleAssignments@2020-04-01-preview' = [for principalId in roleAssignmentObj.principalIds: {
name: '${resourceName}/Microsoft.Authorization/${guid(resourceName, principalId, roleAssignmentObj.roleDefinitionIdOrName)}'
properties: {
Comment thread
Msanzdelrio marked this conversation as resolved.
roleDefinitionId: (contains(builtInRoleNames, roleAssignmentObj.roleDefinitionIdOrName) ? builtInRoleNames[roleAssignmentObj.roleDefinitionIdOrName] : roleAssignmentObj.roleDefinitionIdOrName)
principalId: principalId
}
dependsOn: []
}]
Loading