Skip to content

Commit c7ddf7b

Browse files
JefajersJefajers
authored
Update
1 parent f492b4f commit c7ddf7b

3 files changed

Lines changed: 165 additions & 3 deletions

File tree

‎src/AzOps.psd1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Customer Architecture Team (CAT)
55
#
6-
# Generated on: 09/16/2025
6+
# Generated on: 10/17/2025
77
#
88

99
@{
@@ -51,11 +51,11 @@ PowerShellVersion = '7.2'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'PSFramework'; RequiredVersion = '1.13.406'; },
54+
RequiredModules = @(@{ModuleName = 'PSFramework'; RequiredVersion = '1.13.414'; },
5555
@{ModuleName = 'Az.Accounts'; RequiredVersion = '5.3.0'; },
5656
@{ModuleName = 'Az.Billing'; RequiredVersion = '2.2.0'; },
5757
@{ModuleName = 'Az.ResourceGraph'; RequiredVersion = '1.2.1'; },
58-
@{ModuleName = 'Az.Resources'; RequiredVersion = '8.1.0'; })
58+
@{ModuleName = 'Az.Resources'; RequiredVersion = '8.1.1'; })
5959

6060
# Assemblies that must be loaded prior to importing this module
6161
# RequiredAssemblies = @()

‎src/tests/integration/Repository.Tests.ps1‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,6 +1481,35 @@ Describe "Repository" {
14811481
$allItems[0].Name | Should -Be "microsoft.subscription_subscriptions-$(($skipSubscription.Id).toLower()).json"
14821482
}
14831483
#endregion
1484+
1485+
#region Scope - Broken Logic App Resource Group (./root/tenant root group/test/platform/management/subscription-0/BrokenLogicApp-azopsrg)
1486+
It "Broken Logic App Resource Group directory should exist" {
1487+
$script:resourceGroupBrokenLogicAppPath = ($filePaths | Where-Object Name -eq "microsoft.resources_resourcegroups-brokenlogicapp-azopsrg.json")
1488+
$script:resourceGroupBrokenLogicAppDirectory = ($script:resourceGroupBrokenLogicAppPath).Directory
1489+
$script:resourceGroupBrokenLogicAppFile = ($script:resourceGroupBrokenLogicAppPath).FullName
1490+
Test-Path -Path $script:resourceGroupBrokenLogicAppDirectory | Should -BeTrue
1491+
}
1492+
1493+
It "Broken Logic App Resource Group file should exist" {
1494+
Test-Path -Path $script:resourceGroupBrokenLogicAppFile | Should -BeTrue
1495+
}
1496+
1497+
It "Working Logic App should be present in pulled resources" {
1498+
$workingLogicAppPath = Get-ChildItem -Path $script:resourceGroupBrokenLogicAppDirectory -Recurse -Filter "*my-xworking-logic-app*.json"
1499+
$workingLogicAppPath | Should -Not -BeNullOrEmpty
1500+
$workingLogicAppPath.Count | Should -Be 1
1501+
}
1502+
1503+
It "Broken Logic App should NOT be present in pulled resources (excluded due to retry failure)" {
1504+
$brokenLogicAppPath = Get-ChildItem -Path $script:resourceGroupBrokenLogicAppDirectory -Recurse -Filter "*my-xbroken-logic-app*.json"
1505+
$brokenLogicAppPath | Should -BeNullOrEmpty
1506+
}
1507+
1508+
It "Should have exactly 2 files in BrokenLogicApp-azopsrg directory (Resource Group + Working Logic App)" {
1509+
$allFiles = Get-ChildItem -Path $script:resourceGroupBrokenLogicAppDirectory -Recurse -File
1510+
$allFiles.Count | Should -Be 2
1511+
}
1512+
#endregion
14841513
}
14851514

14861515
AfterAll {

‎src/tests/templates/azuredeploy.jsonc‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,12 @@
575575
"name": "DeploymentStacksDeploy-azopsrg",
576576
"location": "northeurope"
577577
},
578+
{
579+
"type": "Microsoft.Resources/resourceGroups",
580+
"apiVersion": "2024-11-01",
581+
"name": "BrokenLogicApp-azopsrg",
582+
"location": "northeurope"
583+
},
578584
{
579585
"type": "Microsoft.Authorization/roleAssignments",
580586
"apiVersion": "2022-04-01",
@@ -861,6 +867,133 @@
861867
}
862868
}
863869
}
870+
},
871+
{
872+
"type": "Microsoft.Resources/deployments",
873+
"apiVersion": "2024-11-01",
874+
"name": "BrokenLogicApp",
875+
"resourceGroup": "BrokenLogicApp-azopsrg",
876+
"dependsOn": [
877+
"BrokenLogicApp-azopsrg"
878+
],
879+
"properties": {
880+
"mode": "Incremental",
881+
"expressionEvaluationOptions": {
882+
"scope": "inner"
883+
},
884+
"template": {
885+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
886+
"contentVersion": "1.0.0.0",
887+
"resources": [
888+
{
889+
"type": "Microsoft.Logic/workflows",
890+
"apiVersion": "2019-05-01",
891+
"name": "my-xbroken-logic-app",
892+
"location": "swedencentral",
893+
"properties": {
894+
"state": "Enabled",
895+
"definition": {
896+
"$schema": "https://schema.management.azure.com/providers/Microsoft.Logic/schemas/2016-06-01/workflowdefinition.json#",
897+
"contentVersion": "1.0.0.0",
898+
"parameters": {
899+
"$connections": {
900+
"defaultValue": {},
901+
"type": "Object"
902+
}
903+
},
904+
"triggers": {
905+
"Recurrence": {
906+
"recurrence": {
907+
"interval": 3,
908+
"frequency": "Month",
909+
"timeZone": "Dateline Standard Time"
910+
},
911+
"evaluatedRecurrence": {
912+
"interval": 3,
913+
"frequency": "Month",
914+
"timeZone": "Dateline Standard Time"
915+
},
916+
"type": "Recurrence"
917+
}
918+
},
919+
"actions": {
920+
"Select": {
921+
"runAfter": {},
922+
"type": "Select",
923+
"inputs": {
924+
"from": "@guid()",
925+
"select": {
926+
"": "valueofkey"
927+
}
928+
}
929+
}
930+
},
931+
"outputs": {}
932+
},
933+
"parameters": {
934+
"$connections": {
935+
"value": {}
936+
}
937+
}
938+
}
939+
},
940+
{
941+
"type": "Microsoft.Logic/workflows",
942+
"apiVersion": "2019-05-01",
943+
"name": "my-xworking-logic-app",
944+
"location": "swedencentral",
945+
"properties": {
946+
"state": "Enabled",
947+
"definition": {
948+
"$schema": "https://schema.management.azure.com/providers/Microsoft.Logic/schemas/2016-06-01/workflowdefinition.json#",
949+
"contentVersion": "1.0.0.0",
950+
"parameters": {
951+
"$connections": {
952+
"defaultValue": {},
953+
"type": "Object"
954+
}
955+
},
956+
"triggers": {
957+
"Recurrence": {
958+
"recurrence": {
959+
"interval": 3,
960+
"frequency": "Month",
961+
"timeZone": "Dateline Standard Time"
962+
},
963+
"evaluatedRecurrence": {
964+
"interval": 3,
965+
"frequency": "Month",
966+
"timeZone": "Dateline Standard Time"
967+
},
968+
"type": "Recurrence"
969+
}
970+
},
971+
"actions": {
972+
"Select": {
973+
"runAfter": {},
974+
"type": "Select",
975+
"inputs": {
976+
"from": "@guid()",
977+
"select": {
978+
"keyname": "valueofkey"
979+
}
980+
}
981+
}
982+
},
983+
"outputs": {}
984+
},
985+
"parameters": {
986+
"$connections": {
987+
"value": {}
988+
}
989+
}
990+
}
991+
}
992+
],
993+
"outputs": {
994+
}
995+
}
996+
}
864997
}
865998
]
866999
}

0 commit comments

Comments
 (0)