Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fixes] Fix sql and purview tests #3315

Merged
merged 2 commits into from
Jun 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions modules/purview/accounts/.test/common/main.test.bicep
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
targetScope = 'subscription'
}

@description('Optional. A token to inject into the name of each resource.')
param namePrefix string = '<<namePrefix>>'
targetScope = 'subscription'

// ========== //
// Parameters //
Expand All @@ -19,8 +14,10 @@ param location string = deployment().location
param serviceShort string = 'pvacom'

@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
param enableDefaultTelemetry bool = false
param enableDefaultTelemetry bool = true

@description('Optional. A token to inject into the name of each resource.')
param namePrefix string = '<<namePrefix>>'
// =========== //
// Deployments //
// =========== //
Expand Down
12 changes: 7 additions & 5 deletions modules/sql/servers/.test/secondary/main.test.bicep
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
targetScope = 'subscription'
}

@description('Optional. A token to inject into the name of each resource.')
param namePrefix string = '<<namePrefix>>'
targetScope = 'subscription'

// ========== //
// Parameters //
Expand All @@ -23,6 +18,12 @@ param serviceShort string = 'sqlsec'
@secure()
param password string = newGuid()

@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
param enableDefaultTelemetry bool = true

@description('Optional. A token to inject into the name of each resource.')
param namePrefix string = '<<namePrefix>>'

// ============ //
// Dependencies //
// ============ //
Expand Down Expand Up @@ -50,6 +51,7 @@ module testDeployment '../../main.bicep' = {
scope: resourceGroup
name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
params: {
enableDefaultTelemetry: enableDefaultTelemetry
name: '${namePrefix}-${serviceShort}-sec'
administratorLogin: 'adminUserName'
administratorLoginPassword: password
Expand Down
4 changes: 4 additions & 0 deletions modules/sql/servers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,7 @@ module servers './sql/servers/main.bicep' = {
sourceDatabaseResourceId: '<sourceDatabaseResourceId>'
}
]
enableDefaultTelemetry: '<enableDefaultTelemetry>'
tags: {
Environment: 'Non-Prod'
Role: 'DeploymentValidation'
Expand Down Expand Up @@ -896,6 +897,9 @@ module servers './sql/servers/main.bicep' = {
}
]
},
"enableDefaultTelemetry": {
"value": "<enableDefaultTelemetry>"
},
"tags": {
"value": {
"Environment": "Non-Prod",
Expand Down