Skip to content

Commit 9dcac9c

Browse files
ggarima01Copilot
andauthored
Update Standard Logic App templates and scripts (logic-app-changes) (#158)
Update Standard Logic App workflows, orchestrator parameters, and onboarding agent documentation from the validated logic-app-changes export. Bump the Standard Logic App VERSION from 9.0 to 10.0. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 18a3e81 commit 9dcac9c

6 files changed

Lines changed: 5654 additions & 5679 deletions

File tree

Microsoft.SCIM.LogicAppValidationTemplate/StandardLogicApp/GroupTests_Workflow.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3906,7 +3906,7 @@
39063906
"expression": "@greater(length(coalesce(body('RestoreGroupTest_SCIM_Check_Created')?['Resources'], json('[]'))), 0)",
39073907
"limit": {
39083908
"count": 200,
3909-
"timeout": "PT50M"
3909+
"timeout": "PT20M"
39103910
},
39113911
"actions": {
39123912
"RestoreGroupTest_SCIM_Check_Created": {
@@ -4138,7 +4138,7 @@
41384138
"expression": "@equals(length(coalesce(body('RestoreGroupTest_SCIM_Check_Gone')?['Resources'], json('[]'))), 0)",
41394139
"limit": {
41404140
"count": 200,
4141-
"timeout": "PT50M"
4141+
"timeout": "PT20M"
41424142
},
41434143
"actions": {
41444144
"RestoreGroupTest_SCIM_Check_Gone": {
@@ -4380,7 +4380,7 @@
43804380
"expression": "@greater(length(coalesce(body('RestoreGroupTest_SCIM_Check_Restored')?['Resources'], json('[]'))), 0)",
43814381
"limit": {
43824382
"count": 200,
4383-
"timeout": "PT50M"
4383+
"timeout": "PT20M"
43844384
},
43854385
"actions": {
43864386
"RestoreGroupTest_SCIM_Check_Restored": {

Microsoft.SCIM.LogicAppValidationTemplate/StandardLogicApp/Initialization_Workflow.json

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@
6868
"name": "scimDirectUserCreateBody",
6969
"type": "Object",
7070
"value": {}
71+
},
72+
{
73+
"name": "additionalFunctionSources",
74+
"type": "Array",
75+
"value": []
7176
}
7277
]
7378
}
@@ -216,7 +221,10 @@
216221
"memberUser1Mail": "@{concat('lamem1', substring(guid(),0,8), '@', parameters('testUserDomain'))}",
217222
"memberUser2Mail": "@{concat('lamem2', substring(guid(),0,8), '@', parameters('testUserDomain'))}",
218223
"scimDirectUser": "@{concat('lascuser', substring(guid(),0,8), '@', parameters('testUserDomain'))}",
219-
"scimDirectUserNickname": "@{concat('lascuser', substring(guid(),0,8))}"
224+
"scimDirectUserNickname": "@{concat('lascuser', substring(guid(),0,8))}",
225+
"podUser": "@{concat('lapod', substring(guid(),0,8), '@', parameters('testUserDomain'))}",
226+
"podUserMail": "@{concat('lapod', substring(guid(),0,8), '@', parameters('testUserDomain'))}",
227+
"podUserNickname": "@{concat('lapod', substring(guid(),0,8))}"
220228
}
221229
},
222230
"Generate_Test_GroupNames": {
@@ -626,6 +634,40 @@
626634
"else": {
627635
"actions": {}
628636
}
637+
},
638+
"Select_Transformed_Additional_Sources": {
639+
"runAfter": {
640+
"Condition_Source_Not_Exists": [
641+
"Succeeded",
642+
"Skipped"
643+
]
644+
},
645+
"type": "Select",
646+
"inputs": {
647+
"from": "@if(and(equals(coalesce(items('ForEach_AttributeMappings')?['source']?['type'], ''), 'Function'), greater(length(body('Select_Source_Attribute_Names')), 1)), skip(body('Select_Source_Attribute_Names'), 1), json('[]'))",
648+
"select": "@if(contains(parameters('attributeTransforms'), item()), parameters('attributeTransforms')[item()], item())"
649+
}
650+
},
651+
"Compose_Union_AdditionalFunctionSources": {
652+
"runAfter": {
653+
"Select_Transformed_Additional_Sources": [
654+
"Succeeded"
655+
]
656+
},
657+
"type": "Compose",
658+
"inputs": "@union(variables('additionalFunctionSources'), body('Select_Transformed_Additional_Sources'))"
659+
},
660+
"Set_AdditionalFunctionSources": {
661+
"runAfter": {
662+
"Compose_Union_AdditionalFunctionSources": [
663+
"Succeeded"
664+
]
665+
},
666+
"type": "SetVariable",
667+
"inputs": {
668+
"name": "additionalFunctionSources",
669+
"value": "@outputs('Compose_Union_AdditionalFunctionSources')"
670+
}
629671
}
630672
},
631673
"else": {
@@ -681,8 +723,17 @@
681723
"select": "@item()?['source']"
682724
}
683725
},
726+
"Compose_All_Source_Names": {
727+
"runAfter": {
728+
"Select_Graph_Property_Names": [
729+
"Succeeded"
730+
]
731+
},
732+
"type": "Compose",
733+
"inputs": "@union(body('Select_Graph_Property_Names'), variables('additionalFunctionSources'))"
734+
},
684735
"For_Each_Build_UserBody": {
685-
"foreach": "@body('Select_Graph_Property_Names')",
736+
"foreach": "@outputs('Compose_All_Source_Names')",
686737
"actions": {
687738
"Filter_Lookup_For_Source": {
688739
"runAfter": {},
@@ -778,7 +829,7 @@
778829
}
779830
},
780831
"runAfter": {
781-
"Select_Graph_Property_Names": [
832+
"Compose_All_Source_Names": [
782833
"Succeeded"
783834
],
784835
"Select_ObjectAddOnly_SourceNames": [

Microsoft.SCIM.LogicAppValidationTemplate/StandardLogicApp/Orchestrator_Parameters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"description": "Version of the Logic App for tracking and deployment purposes"
4040
},
4141
"type": "String",
42-
"value": "9.0"
42+
"value": "10.0"
4343
},
4444
"attributeTransforms": {
4545
"metadata": {

0 commit comments

Comments
 (0)