[Fixes] Removed redundant empty lines in test files (#4133)

* Updated first badge of templates (readmes pending) * Update to latest * Compiled templates * Compiled templates * Compiled first few readmes * Updated test files * Updated readmes * Reduced roles * Updated templates * Rollback different branches' changes * Updated nic & pip * Fixed test file * Refreshed vm * Remvoed empty rows * Update to latest
Azure · Oct 22, 2023 · f70aba5 · f70aba5
1 parent ecb4a4b
commit f70aba5
Show file tree

Hide file tree

Showing 46 changed files with 101 additions and 149 deletions.
diff --git a/modules/analysis-services/server/.test/common/main.test.bicep b/modules/analysis-services/server/.test/common/main.test.bicep
@@ -75,7 +75,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/analysis-services/server/.test/max/main.test.bicep b/modules/analysis-services/server/.test/max/main.test.bicep
@@ -83,7 +83,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/api-management/service/.test/common/main.test.bicep b/modules/api-management/service/.test/common/main.test.bicep
@@ -86,7 +86,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/api-management/service/.test/max/main.test.bicep b/modules/api-management/service/.test/max/main.test.bicep
@@ -182,7 +182,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/app-configuration/configuration-store/.test/common/main.test.bicep b/modules/app-configuration/configuration-store/.test/common/main.test.bicep
@@ -81,7 +81,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]
@@ -96,7 +95,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/app-configuration/configuration-store/.test/encr/main.test.bicep b/modules/app-configuration/configuration-store/.test/encr/main.test.bicep
@@ -1,95 +1,95 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'dep-${namePrefix}-appconfiguration.configurationstores-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'accencr'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Generated. Used as a basis for unique resource names.')
-param baseTime string = utcNow('u')
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
- name: resourceGroupName
- location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-nestedDependencies'
- params: {
- // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
- keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
- managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
- }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../main.bicep' = {
- scope: resourceGroup
- name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
- params: {
- enableDefaultTelemetry: enableDefaultTelemetry
- name: '${namePrefix}${serviceShort}001'
- createMode: 'Default'
- disableLocalAuth: false
- enablePurgeProtection: false
- keyValues: [
- {
- contentType: 'contentType'
- name: 'keyName'
- roleAssignments: [
- {
- roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- value: 'valueName'
- }
- ]
- roleAssignments: [
-  {
-  roleDefinitionIdOrName: 'Reader'
- principalId: nestedDependencies.outputs.managedIdentityPrincipalId
- principalType: 'ServicePrincipal'
- }
- ]
- softDeleteRetentionInDays: 1
- userAssignedIdentities: {
-  '${nestedDependencies.outputs.managedIdentityResourceId}': {}
- }
- tags: {
-  'hidden-title': 'This is visible in the resource name'
- Environment: 'Non-Prod'
- Role: 'DeploymentValidation'
- }
- cMKKeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
- cMKKeyName: nestedDependencies.outputs.keyName
- cMKUserAssignedIdentityResourceId: nestedDependencies.outputs.managedIdentityResourceId
- }
-}
-
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'dep-${namePrefix}-appconfiguration.configurationstores-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'accencr'
+
+@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
+param enableDefaultTelemetry bool = true
+
+@description('Generated. Used as a basis for unique resource names.')
+param baseTime string = utcNow('u')
+
+@description('Optional. A token to inject into the name of each resource.')
+param namePrefix string = '[[namePrefix]]'
+
+// ============ //
+// Dependencies //
+// ============ //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+ name: resourceGroupName
+ location: location
+}
+
+module nestedDependencies 'dependencies.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-nestedDependencies'
+ params: {
+ // Adding base time to make the name unique as purge protection must be enabled (but may not be longer than 24 characters total)
+ keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}-${substring(uniqueString(baseTime), 0, 3)}'
+ managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
+ }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../main.bicep' = {
+ scope: resourceGroup
+ name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
+ params: {
+ enableDefaultTelemetry: enableDefaultTelemetry
+ name: '${namePrefix}${serviceShort}001'
+ createMode: 'Default'
+ disableLocalAuth: false
+ enablePurgeProtection: false
+ keyValues: [
+ {
+ contentType: 'contentType'
+ name: 'keyName'
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+
+  principalType: 'ServicePrincipal'
+  }
+ ]
+  value: 'valueName'
+  }
+ ]
+ roleAssignments: [
+ {
+ roleDefinitionIdOrName: 'Reader'
+ principalId: nestedDependencies.outputs.managedIdentityPrincipalId
+  principalType: 'ServicePrincipal'
+  }
+ ]
+ softDeleteRetentionInDays: 1
+ userAssignedIdentities: {
+  '${nestedDependencies.outputs.managedIdentityResourceId}': {}
+ }
+ tags: {
+ 'hidden-title': 'This is visible in the resource name'
+ Environment: 'Non-Prod'
+  Role: 'DeploymentValidation'
+ }
+ cMKKeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
+ cMKKeyName: nestedDependencies.outputs.keyName
+  cMKUserAssignedIdentityResourceId: nestedDependencies.outputs.managedIdentityResourceId
+ }
+}
diff --git a/modules/automation/automation-account/.test/common/main.test.bicep b/modules/automation/automation-account/.test/common/main.test.bicep
@@ -128,7 +128,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/cache/redis-enterprise/.test/common/main.test.bicep b/modules/cache/redis-enterprise/.test/common/main.test.bicep
@@ -81,7 +81,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]
@@ -128,4 +127,3 @@ module testDeployment '../../main.bicep' = {
  }
  }
 }
-
diff --git a/modules/cdn/profile/.test/afd/main.test.bicep b/modules/cdn/profile/.test/afd/main.test.bicep
@@ -61,7 +61,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/cdn/profile/.test/common/main.test.bicep b/modules/cdn/profile/.test/common/main.test.bicep
@@ -94,7 +94,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/cognitive-services/account/.test/common/main.test.bicep b/modules/cognitive-services/account/.test/common/main.test.bicep
@@ -95,7 +95,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/compute/availability-set/.test/common/main.test.bicep b/modules/compute/availability-set/.test/common/main.test.bicep
@@ -62,7 +62,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/compute/disk-encryption-set/.test/accessPolicies/main.test.bicep b/modules/compute/disk-encryption-set/.test/accessPolicies/main.test.bicep
@@ -60,7 +60,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/compute/disk-encryption-set/.test/common/main.test.bicep b/modules/compute/disk-encryption-set/.test/common/main.test.bicep
@@ -67,7 +67,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/compute/disk/.test/common/main.test.bicep b/modules/compute/disk/.test/common/main.test.bicep
@@ -66,7 +66,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/compute/disk/.test/image/main.test.bicep b/modules/compute/disk/.test/image/main.test.bicep
@@ -55,7 +55,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/compute/disk/.test/import/main.test.bicep b/modules/compute/disk/.test/import/main.test.bicep
@@ -58,7 +58,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/compute/gallery/.test/common/main.test.bicep b/modules/compute/gallery/.test/common/main.test.bicep
@@ -67,7 +67,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]
@@ -92,7 +91,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]
@@ -114,7 +112,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]
@@ -136,7 +133,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]
@@ -158,7 +154,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]
@@ -182,7 +177,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/compute/image/.test/common/main.test.bicep b/modules/compute/image/.test/common/main.test.bicep
@@ -70,7 +70,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]

diff --git a/modules/compute/proximity-placement-group/.test/common/main.test.bicep b/modules/compute/proximity-placement-group/.test/common/main.test.bicep
@@ -60,7 +60,6 @@ module testDeployment '../../main.bicep' = {
  {
  roleDefinitionIdOrName: 'Reader'
  principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-
  principalType: 'ServicePrincipal'
  }
  ]