Skip to content
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
3 changes: 2 additions & 1 deletion policyAssignments/dev/pa-d-monitor.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
},
"MON-001_allowedEmailDomains": {
"value": [
"contoso.com"
"contoso.com",
"microsoft.com"
]
},
"MON-002_Effect": {
Expand Down
3 changes: 2 additions & 1 deletion policyAssignments/prod/pa-p-monitor.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
},
"MON-001_allowedEmailDomains": {
"value": [
"contoso.com"
"contoso.com",
"microsoft.com"
]
},
"MON-002_Effect": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,6 @@
"field": "type",
"equals": "Microsoft.Storage/storageAccounts"
},
{
"not": {
"field": "tags[application]",
"equals": "databricks"
}
},
{
"not": {
"field": "tags[application]",
"equals": "purview"
}
},
{
"anyOf": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,6 @@
"field": "type",
"equals": "Microsoft.Storage/storageAccounts"
},
{
"not": {
"field": "tags[application]",
"equals": "databricks"
}
},
{
"not": {
"field": "tags[application]",
"equals": "purview"
}
},
{
"anyOf": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,6 @@
"field": "type",
"equals": "Microsoft.Storage/storageAccounts"
},
{
"not": {
"field": "tags[application]",
"equals": "databricks"
}
},
{
"not": {
"field": "tags[application]",
"equals": "purview"
}
},
{
"field": "Microsoft.Storage/storageAccounts/networkAcls.defaultAction",
"notEquals": "Deny"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,6 @@
"field": "type",
"equals": "Microsoft.Storage/storageAccounts"
},
{
"not": {
"field": "tags[application]",
"equals": "databricks"
}
},
{
"not": {
"field": "tags[application]",
"equals": "purview"
}
},
{
"field": "kind",
"in": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,11 @@ function getTestCasesFromAssignment {
[string]$policyIntegrationTestsPath
)
$testsInScope = @()
$testCases = Get-ChildItem -path $policyIntegrationTestsPath -Depth 1 -Directory
Write-Verbose " - Looking for test cases that are impacted by the policy assignment '$assignmentName' from '$policyIntegrationTestsPath'." -Verbose
$testCases = Get-ChildItem -path $policyIntegrationTestsPath -Depth 0 -Directory

foreach ($testCase in $testCases) {
Write-Verbose " - Checking test case '$($testCase.Name)' for assignment '$assignmentName'..." -Verbose
$testConfigFile = join-Path -Path $testCase.FullName -ChildPath 'config.json' -Resolve
$testConfig = Get-Content -Path $testConfigFile -Raw | ConvertFrom-Json -Depth 99
$policyAssignmentIds = $testConfig.policyAssignmentIds
Expand Down Expand Up @@ -523,7 +525,6 @@ Foreach ($file in $modifiedFiles) {
Write-Verbose " - File '$file' is not in the global test paths. Will Check if individual tests need to be executed." -Verbose
$getRequiredTestCasesParams = @{
changeFilePath = $file
policyIntegrationTestsPath = $policyIntegrationTestsPath
policyInitiativesPath = $policyInitiativesPath
policyAssignmentsPath = $policyAssignmentsPath
gitRoot = $gitRoot
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
"scripts/pipelines/pipeline-get-deployment-target-from-parameter-file.ps1",
"scripts/pipelines/pipeline-get-parameter-files.ps1",
"scripts/pipelines/pipeline-install-moduleFromRepo.ps1",
"scripts/pipelines/pipeline-template-deployment.ps1",
"scripts/pipelines/pipeline-template-deployment-rest.ps1",
"scripts/pipelines/pipeline-template-validation.ps1",
"scripts/pipelines/pipeline-set-policy-resource-bicep-template-file.ps1",
Expand Down