Moved test files

eriqua · Sep 22, 2023 · c460b9f · c460b9f
1 parent 30af01e
commit c460b9f
Show file tree

Hide file tree

Showing 8 changed files with 159 additions and 82 deletions.
diff --git a/.github/actions/templates/avm-validateModulePester/action.yml b/.github/actions/templates/avm-validateModulePester/action.yml
@@ -10,42 +10,42 @@
 ## ACTION PARAMETERS                         ##
 ##-------------------------------------------##
 ##
-##   |==================================================================================================================================================|
-##   | Parameter                | Required | Default | Description                          | Example                                                   |
-##   |--------------------------|----------|---------|--------------------------------------|-----------------------------------------------------------|
-##   | modulePath               | true     | ''      | The path to the module's folder      | 'modules/api-management/service'                          |
-##   | moduleTestFilePath       | true     | ''      | The path to the module Pester tests. | 'utilities/pipelines/staticValidation/module.tests.ps1'   |
-##   |==================================================================================================================================================|
+##   |===========================================================================================================================================================|
+##   | Parameter                | Required | Default | Description                          | Example                                                            |
+##   |--------------------------|----------|---------|--------------------------------------|--------------------------------------------------------------------|
+##   | modulePath               | true     | ''      | The path to the module's folder      | 'modules/api-management/service'                                   |
+##   | moduleTestFilePath       | true     | ''      | The path to the module Pester tests. | 'utilities/pipelines/staticValidation/compliance/module.tests.ps1' |
+##   |===========================================================================================================================================================|
 ##
 ##---------------------------------------------##
 
-name: 'Execute Pester module tests'
-description: 'Execute Pester module tests (if any)'
+name: "Execute Pester module tests"
+description: "Execute Pester module tests (if any)"
 
 inputs:
   modulePath:
     description: "The path to the module's folder"
     required: true
-    default: ''
+    default: ""
   moduleTestFilePath:
-    description: 'The path to the test file'
+    description: "The path to the test file"
     required: true
-    default: ''
+    default: "avm/utilities/pipelines/staticValidation/compliance/module.tests.ps1"
 
 runs:
-  using: 'composite'
+  using: "composite"
   steps:
     # [Module Pester Test] task(s)
     #-----------------------------
-    - name: 'Run Pester tests'
+    - name: "Run Pester tests"
       id: pester_run_step
       shell: pwsh
       run: |
         # Grouping task logs
         Write-Output '::group::Run Pester tests'
 
         # Load used functions
-        . (Join-Path $env:GITHUB_WORKSPACE 'avm' 'utilities' 'pipelines' 'staticValidation' 'Set-PesterGitHubOutput.ps1')
+        . (Join-Path $env:GITHUB_WORKSPACE 'avm' 'utilities' 'pipelines' 'staticValidation' 'compliance' 'Set-PesterGitHubOutput.ps1')
 
         # Set repo root path
         $repoRootPath = $env:GITHUB_WORKSPACE
@@ -86,7 +86,7 @@ runs:
         $pesterConfiguration = @{
           Run    = @{
             Container = New-PesterContainer -Path (Join-Path $repoRootPath $moduleTestFilePath) -Data @{
-              moduleFolderPaths              = $moduleFolderPaths
+              moduleFolderPaths                = $moduleFolderPaths
               # tokenConfiguration             = $tokenConfiguration
               # allowPreviewVersionsInAPITests = [System.Convert]::ToBoolean('${{ env.allowPreviewVersionsInAPITests }}')
             }
@@ -120,7 +120,7 @@ runs:
 
         Write-Output ('{0}={1}' -f 'formattedPesterResultsPath', $functionInput.outputFilePath) >> $env:GITHUB_OUTPUT
 
-    - name: 'Output to GitHub job summaries'
+    - name: "Output to GitHub job summaries"
       if: always()
       shell: pwsh
       run: |

diff --git a/.github/workflows/avm.template.module.yml b/.github/workflows/avm.template.module.yml
@@ -43,7 +43,6 @@ jobs:
         uses: ./.github/actions/templates/avm-validateModulePester
         with:
           modulePath: '${{ inputs.modulePath }}'
-          moduleTestFilePath: '${{ env.moduleTestFilePath }}'
 
   #########################
   #   PSRule validation   #

diff --git a/avm/res/cognitive-services/account/main.bicep b/avm/res/cognitive-services/account/main.bicep
@@ -113,7 +113,7 @@ param restrictOutboundNetworkAccess bool = true
 @description('Optional. The storage accounts for this resource.')
 param userOwnedStorage array = []
 
-@description('Optional. The managed identity definition for this resource')
+@description('Optional. The managed identity definition for this resource.')
 param managedIdentities managedIdentitiesType
 
 @description('Optional. Enable/Disable usage telemetry for module.')

diff --git a/avm/res/cognitive-services/account/main.json b/avm/res/cognitive-services/account/main.json
@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.21.1.54444",
-      "templateHash": "2011438504132117881"
+      "templateHash": "12649951839001498344"
     },
     "name": "Cognitive Services",
     "description": "This module deploys a Cognitive Service.",
@@ -390,6 +390,31 @@
         }
       },
       "nullable": true
+    },
+    "lockType": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "nullable": true,
+          "metadata": {
+            "description": "Optional. Specify the name of lock."
+          }
+        },
+        "kind": {
+          "type": "string",
+          "allowedValues": [
+            "CanNotDelete",
+            "None",
+            "ReadOnly"
+          ],
+          "nullable": true,
+          "metadata": {
+            "description": "Optional. Specify the type of lock."
+          }
+        }
+      },
+      "nullable": true
     }
   },
   "parameters": {
@@ -501,15 +526,9 @@
       }
     },
     "lock": {
-      "type": "string",
-      "defaultValue": "",
-      "allowedValues": [
-        "",
-        "CanNotDelete",
-        "ReadOnly"
-      ],
+      "$ref": "#/definitions/lockType",
       "metadata": {
-        "description": "Optional. Specify the type of lock."
+        "description": "Optional. The lock settings of the service."
       }
     },
     "roleAssignments": {
@@ -590,7 +609,7 @@
     "managedIdentities": {
       "$ref": "#/definitions/managedIdentitiesType",
       "metadata": {
-        "description": "Optional. The managed identity definition for this resource"
+        "description": "Optional. The managed identity definition for this resource."
       }
     },
     "enableTelemetry": {
@@ -720,14 +739,14 @@
       ]
     },
     "cognitiveService_lock": {
-      "condition": "[not(empty(parameters('lock')))]",
+      "condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]",
       "type": "Microsoft.Authorization/locks",
       "apiVersion": "2020-05-01",
       "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
-      "name": "[format('{0}-{1}-lock', parameters('name'), parameters('lock'))]",
+      "name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]",
       "properties": {
-        "level": "[parameters('lock')]",
-        "notes": "[if(equals(parameters('lock'), 'CanNotDelete'), 'Cannot delete resource or child resources.', 'Cannot modify the resource or child resources.')]"
+        "level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]",
+        "notes": "[if(equals(tryGet(parameters('lock'), 'kind'), 'CanNotDelete'), 'Cannot delete resource or child resources.', 'Cannot delete or modify the resource or child resources.')]"
       },
       "dependsOn": [
         "cognitiveService"
@@ -848,7 +867,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.21.1.54444",
-              "templateHash": "15547486634180132508"
+              "templateHash": "13438182834931170603"
             },
             "name": "Private Endpoints",
             "description": "This module deploys a Private Endpoint.",
@@ -1158,7 +1177,7 @@
               "condition": "[not(empty(parameters('privateDnsZoneResourceIds')))]",
               "type": "Microsoft.Resources/deployments",
               "apiVersion": "2022-09-01",
-              "name": "[format('{0}-PrivateEndpoint-PrivateDnsZoneGroup', uniqueString(deployment().name, parameters('location')))]",
+              "name": "[format('{0}-PrivateEndpoint-PrivateDnsZoneGroup', uniqueString(deployment().name))]",
               "properties": {
                 "expressionEvaluationOptions": {
                   "scope": "inner"
@@ -1328,7 +1347,7 @@
       },
       "value": "[reference('cognitiveService').endpoint]"
     },
-    "systemAssignedPrincipalId": {
+    "systemAssignedMIPrincipalId": {
       "type": "string",
       "metadata": {
         "description": "The principal ID of the system assigned identity."