Merge branch 'main' into v2skus

Azure · Apr 27, 2024 · 584161d · 584161d
2 parents 7fc9daf + 494d8b6
commit 584161d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/avm/res/network/front-door/README.md b/avm/res/network/front-door/README.md
@@ -639,10 +639,10 @@ module frontDoor 'br/public:avm/res/network/front-door:<version>' = {
       {
         name: 'heathProbe'
         properties: {
-          enabledState: ''
-          healthProbeMethod: ''
+          enabledState: 'Enabled'
+          healthProbeMethod: 'HEAD'
           intervalInSeconds: 60
-          path: '/'
+          path: '/healthz'
           protocol: 'Https'
         }
       }
@@ -765,10 +765,10 @@ module frontDoor 'br/public:avm/res/network/front-door:<version>' = {
         {
           "name": "heathProbe",
           "properties": {
-            "enabledState": "",
-            "healthProbeMethod": "",
+            "enabledState": "Enabled",
+            "healthProbeMethod": "HEAD",
             "intervalInSeconds": 60,
-            "path": "/",
+            "path": "/healthz",
             "protocol": "Https"
           }
         }

diff --git a/avm/res/network/front-door/main.json b/avm/res/network/front-door/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.26.54.24096",
-      "templateHash": "11688367630078848691"
+      "version": "0.26.170.59819",
+      "templateHash": "10103314410755472523"
     },
     "name": "Azure Front Doors",
     "description": "This module deploys an Azure Front Door.",

diff --git a/avm/res/network/front-door/tests/e2e/waf-aligned/main.test.bicep b/avm/res/network/front-door/tests/e2e/waf-aligned/main.test.bicep
@@ -32,7 +32,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
 }
 
 // Diagnostics
-// ===========
+// ============
 module diagnosticDependencies '../../../../../../utilities/e2e-template-assets/templates/diagnostic.dependencies.bicep' = {
   scope: resourceGroup
   name: '${uniqueString(deployment().name, resourceLocation)}-diagnosticDependencies'
@@ -99,10 +99,10 @@ module testDeployment '../../../main.bicep' = [
         {
           name: 'heathProbe'
           properties: {
-            enabledState: ''
-            healthProbeMethod: ''
+            enabledState: 'Enabled'
+            healthProbeMethod: 'HEAD'
             intervalInSeconds: 60
-            path: '/'
+            path: '/healthz'
             protocol: 'Https'
           }
         }

diff --git a/avm/utilities/pipelines/platform/Set-AvmGitHubIssueOwnerConfig.ps1 b/avm/utilities/pipelines/platform/Set-AvmGitHubIssueOwnerConfig.ps1
@@ -74,7 +74,7 @@ function Set-AvmGitHubIssueOwnerConfig {
 **@$($issue.author.login), thanks for submitting this issue for the ``$moduleName`` module!**
 
 > [!IMPORTANT]
-> A member of the @azure/$($module.ModuleOwnersGHTeam) or @azure/$($module.ModuleContributorsGHTeam) team will review it soon!
+> A member of the @Azure/$($module.ModuleOwnersGHTeam) or @Azure/$($module.ModuleContributorsGHTeam) team will review it soon!
 "@
     }
 

diff --git a/avm/utilities/pipelines/platform/Set-AvmGithubIssueForWorkflow.ps1 b/avm/utilities/pipelines/platform/Set-AvmGithubIssueForWorkflow.ps1
@@ -109,7 +109,7 @@ function Set-AvmGithubIssueForWorkflow {
               $ProjectNumber = 566 # AVM - Module Issues
               $comment = @"
 > [!IMPORTANT]
-> @$($module.ModuleOwnersGHTeam), the workflow for the ``$moduleName`` module has failed. Please investigate the failed workflow run. If you are not able to do so, please inform the AVM core team to take over.
+> @Azure/$($module.ModuleOwnersGHTeam), the workflow for the ``$moduleName`` module has failed. Please investigate the failed workflow run. If you are not able to do so, please inform the AVM core team to take over.
 "@
               # assign owner
               $assign = gh issue edit $issue.url --add-assignee $module.PrimaryModuleOwnerGHHandle --repo $Repo
@@ -121,7 +121,7 @@ function Set-AvmGithubIssueForWorkflow {
 > This issue couldn't be assigend due to an internal error. @$($module.PrimaryModuleOwnerGHHandle), please make sure this issue is assigned to you and please provide an initial response as soon as possible, in accordance with the [AVM Support statement](https://aka.ms/AVM/Support).
 "@
 
-                  gh issue comment $issue.url --body $reply --repo $Repo
+                  gh issue comment $issue.url --body $comment --repo $Repo
                 }
               }
             }

diff --git a/avm/utilities/pipelines/staticValidation/psrule/.ps-rule/min-suppress.Rule.yaml b/avm/utilities/pipelines/staticValidation/psrule/.ps-rule/min-suppress.Rule.yaml
@@ -31,6 +31,10 @@ spec:
     # Azure App Service
     - Azure.AppService.WebProbe # Supressed as the probe path is specific to the app
     - Azure.AppService.WebProbePath # Supressed as the probe path is specific to the app
+    # Azure Front Door
+    - Azure.FrontDoor.Probe # Supressed as the probe is being provided as parameter and we are not able to enforce as default value
+    - Azure.FrontDoor.ProbeMethod # Supressed as the probe method is being provided as parameter and we are not able to enforce as default value
+    - Azure.FrontDoor.ProbePath # Supressed as the probe path is being provided as parameter and we are not able to enforce as default value
   if:
     name: "."
     contains: