Make tests work

peterbud · May 9, 2024 · 130d7ca · 130d7ca
1 parent 9dd734d
commit 130d7ca
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/avm/ptn/authorization/resource-role-assignment/tests/e2e/defaults/main.test.bicep b/avm/ptn/authorization/resource-role-assignment/tests/e2e/defaults/main.test.bicep
@@ -1,6 +1,6 @@
 targetScope = 'subscription'
 metadata name = 'Resource Role Assignments'
-metadata description = 'This module deploys a Role Assignment at a Resource scope using minimal parameters.'
+metadata description = 'This module deploys a Resource Role Assignment using minimal parameters.'
 
 // ========== //
 // Parameters //
@@ -47,10 +47,13 @@ module nestedDependencies 'dependencies.bicep' = {
 @batchSize(1)
 module testDeployment '../../../main.bicep' = [
   for iteration in ['init', 'idem']: {
-    name: '${uniqueString(deployment().name, resourceLocation)}-test-${serviceShort}-${iteration}'
+    name: '${guid(deployment().name, resourceLocation)}-test-${serviceShort}-${iteration}'
+    scope: resourceGroup
     params: {
-      name: '${namePrefix}${serviceShort}001'
-      location: resourceLocation
+      name: guid(
+        nestedDependencies.outputs.managedIdentityPrincipalId,
+        nestedDependencies.outputs.storageAccountResourceId
+      )
       resourceId: nestedDependencies.outputs.storageAccountResourceId
       principalId: nestedDependencies.outputs.managedIdentityPrincipalId
       principalType: 'ServicePrincipal'

diff --git a/avm/ptn/authorization/resource-role-assignment/tests/e2e/waf-aligned/main.test.bicep b/avm/ptn/authorization/resource-role-assignment/tests/e2e/waf-aligned/main.test.bicep
@@ -47,11 +47,14 @@ module nestedDependencies 'dependencies.bicep' = {
 @batchSize(1)
 module testDeployment '../../../main.bicep' = [
   for iteration in ['init', 'idem']: {
-    name: '${uniqueString(deployment().name, resourceLocation)}-test-${serviceShort}-${iteration}'
+    name: '${guid(deployment().name, resourceLocation)}-test-${serviceShort}-${iteration}'
+    scope: resourceGroup
     params: {
-      name: '${namePrefix}${serviceShort}001'
-      location: resourceLocation
-      resourceId: ''
+      name: guid(
+        nestedDependencies.outputs.managedIdentityPrincipalId,
+        nestedDependencies.outputs.storageAccountResourceId,
+      )
+      resourceId: nestedDependencies.outputs.storageAccountResourceId
       principalId: nestedDependencies.outputs.managedIdentityPrincipalId
       principalType: 'ServicePrincipal'
       roleDefinitionId: '2a2b9908-6ea1-4ae2-8e65-a410df84e7d1' // Storage Blob Data Reader