-
Notifications
You must be signed in to change notification settings - Fork 454
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[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
- Loading branch information
1 parent
ecb4a4b
commit f70aba5
Showing
46 changed files
with
101 additions
and
149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
190 changes: 95 additions & 95 deletions
190
modules/app-configuration/configuration-store/.test/encr/main.test.bicep
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.