Skip to content

Commit

Permalink
Ayjohnso/adf timeout and doc (#133)
Browse files Browse the repository at this point in the history 
* rename OneRoster folder folder and template

* mod: shorten timeouts for web activities in upload to sds pipleline

* mod: additional doc about inboundFlowId for ADF

* rename OneRoster readme

* fix: added back logic
  • Loading branch information
@AyronJohnson
AyronJohnson authored Jan 6, 2025
1 parent 6ca40f5 commit c78e9b1
Show file tree
Hide file tree
Showing 15 changed files with 57 additions and 58 deletions.
Binary file modified CustomSolutions/SDS_ADF_ETL_Integrations/Canvas/Canvas_to_SDS_ADF_template.json
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions CustomSolutions/SDS_ADF_ETL_Integrations/Canvas/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ following steps:

| **Global parameter name** | **Type** | **Description** |
| -------------------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| canvasAPIBaseUrl | string | Canvas API URL needed for retrieving data from Canvas. |
| canvasAPIBaseUrl | string | Canvas API URL needed for retrieving data from Canvas. |
| reportRecipientEmails | string | The list of email addresses to send email reports to. This needs to be entered as a json array in the following format: <br/><br/>[{"emailAddress":{"address":"[email protected]"}},{"emailAddress":{"address":"[email protected]"}}] |
| clientSecretForSdsApiKeyVaultUrl | string | The key vault access URL for the client secret for SDS API access. <br/>Found in the key vault resource under Secrets -> ClientSecretForSdsCsvADF -> Current Version -> Secret Identifier |
| canvasApiKeyVaultUrl | string | Store the customer canvasToken in key vault secrets and use that secret URL for this parameter. |
Expand All @@ -126,7 +126,7 @@ following steps:
| useFamilyAndGivenNames | Bool | Will send familyName and givenName as required for users if the option to ''Create unmatched users' is chosen in SDS (otherwise optional).  A value of false will not send familyName and givenName. |
| staffSourceIdentifier | String | Staff attribute based on data that is coming from your SIS / SMS. Valid values are username, email, or activeDirectory. This can be left as is if using a sync that has already been created in SDS. |
| staffMatchTarget | String | Property in Microsoft Entra ID to match to staff. Valid values are userPrincipalName or mail. This can be left as is if using a sync that has already been created in SDS. |
| staffDomainAddon | String | A valid tenant domain to append to the source value if your staff data doesn't include the @domain value. (Example: contoso.onmicrosoft.com) This can be left as is if not using appending a domain or using a sync that has already been created in SDS. |
| staffDomainAddon | String | A valid tenant domain to append to the source value if your staff data doesn't include the @domain value. (Example: contoso.onmicrosoft.com) This can be left as is if not using appending a domain or using a sync that has already been created in SDS. |
| studentSourceIdentifier | String | Student attribute based on data that is coming from your SIS / SMS. Valid values are username, email, or activeDirectory. This can be left as is if using a sync that has already been created in SDS. |
| studentMatchTarget | String | Property in Microsoft Entra ID to match to students. Valid values are userPrincipalName or mail. This can be left as is if using a sync that has already been created in SDS. |
| studentDomainAddon | string | A valid tenant domain to append to the source value if your student data doesn't include the @domain value. (Example: contoso.onmicrosoft.com) This can be left as is if not using appending a domain or using a sync that has<br> already been created in SDS. |
Expand Down
36 changes: 18 additions & 18 deletions ...tegrations/OR/OR_to_SDS_ADF_Template.Json → ...Roster/OneRoster_to_SDS_ADF_Template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4039,7 +4039,7 @@
}
],
"policy": {
"timeout": "7.00:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": true,
Expand Down Expand Up @@ -4102,7 +4102,7 @@
}
],
"policy": {
"timeout": "7.00:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": true,
Expand Down Expand Up @@ -4182,7 +4182,7 @@
]
},
{
"name": "VerifyUploadAndStartSync",
"name": "VerifyUpload",
"type": "WebActivity",
"dependsOn": [
{
Expand All @@ -4193,7 +4193,7 @@
}
],
"policy": {
"timeout": "7.00:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": false,
Expand Down Expand Up @@ -4225,7 +4225,7 @@
"type": "WebActivity",
"dependsOn": [],
"policy": {
"timeout": "7.00:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": true,
Expand Down Expand Up @@ -4261,7 +4261,7 @@
}
],
"policy": {
"timeout": "7.00:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": false,
Expand Down Expand Up @@ -4363,7 +4363,7 @@
"type": "Until",
"dependsOn": [
{
"activity": "VerifyUploadAndStartSync",
"activity": "VerifyUpload",
"dependencyConditions": [
"Succeeded"
]
Expand All @@ -4381,7 +4381,7 @@
"type": "WebActivity",
"dependsOn": [],
"policy": {
"timeout": "0.12:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": false,
Expand All @@ -4398,7 +4398,7 @@
},
"turnOffAsync": false,
"url": {
"value": "@activity('VerifyUploadAndStartSync').output.ADFWebActivityResponseHeaders.location",
"value": "@activity('VerifyUpload').output.ADFWebActivityResponseHeaders.location",
"type": "Expression"
},
"connectVia": {
Expand All @@ -4423,7 +4423,7 @@
}
],
"policy": {
"timeout": "0.12:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": true,
Expand Down Expand Up @@ -4471,7 +4471,7 @@
"type": "WebActivity",
"dependsOn": [],
"policy": {
"timeout": "0.12:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": true,
Expand Down Expand Up @@ -4551,7 +4551,7 @@
"type": "WebActivity",
"dependsOn": [],
"policy": {
"timeout": "0.12:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": true,
Expand Down Expand Up @@ -4593,7 +4593,7 @@
}
],
"policy": {
"timeout": "0.12:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": true,
Expand Down Expand Up @@ -4635,7 +4635,7 @@
}
],
"policy": {
"timeout": "0.12:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": true,
Expand Down Expand Up @@ -4677,7 +4677,7 @@
}
],
"policy": {
"timeout": "0.12:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": true,
Expand Down Expand Up @@ -4781,7 +4781,7 @@
"type": "WebActivity",
"dependsOn": [],
"policy": {
"timeout": "0.12:00:00",
"timeout": "0.00:10:00",
"retry": 0,
"retryIntervalInSeconds": 30,
"secureOutput": true,
Expand All @@ -4807,7 +4807,7 @@
}
}
],
"timeout": "0.12:00:00"
"timeout": "0.00:03:00"
}
}
],
Expand Down Expand Up @@ -7735,4 +7735,4 @@
}
}
]
}
}
Loading

0 comments on commit c78e9b1

Please sign in to comment.