Merge pull request #94 from mrpaulandrew/develop

Develop - support added for Azure Synapse Pipelines
mrpaulandrew · Dec 14, 2020 · d059d08 · d059d08
2 parents 8be49e1 + 554d50d
commit d059d08
Show file tree

Hide file tree

Showing 141 changed files with 6,549 additions and 2,658 deletions.
diff --git a/DataFactory/dataset/GetSetMetadata.json b/DataFactory/dataset/GetSetMetadata.json
@@ -10,7 +10,7 @@
 			"name": "_ProcFwk"
 		},
 		"annotations": [
-			"ADF.procfwk"
+			"procfwk"
 		],
 		"type": "AzureSqlTable",
 		"schema": []

diff --git a/DataFactory/linkedService/FrameworkFunctions.json b/DataFactory/linkedService/FrameworkFunctions.json
@@ -2,7 +2,7 @@
 	"name": "FrameworkFunctions",
 	"properties": {
 		"annotations": [
-			"ADF.procfwk"
+			"procfwk"
 		],
 		"type": "AzureFunction",
 		"typeProperties": {

diff --git a/DataFactory/linkedService/Keys.json b/DataFactory/linkedService/Keys.json
@@ -2,7 +2,7 @@
 	"name": "Keys",
 	"properties": {
 		"annotations": [
-			"ADF.procfwk"
+			"procfwk"
 		],
 		"type": "AzureKeyVault",
 		"typeProperties": {

diff --git a/DataFactory/linkedService/SupportDatabase.json b/DataFactory/linkedService/SupportDatabase.json
@@ -3,7 +3,7 @@
 	"properties": {
 		"description": "Connection between ADF and processing framework metadata SQLDB.",
 		"annotations": [
-			"ADF.procfwk"
+			"procfwk"
 		],
 		"type": "AzureSqlDatabase",
 		"typeProperties": {

diff --git a/DataFactory/pipeline/01-Grandparent.json b/DataFactory/pipeline/01-Grandparent.json
@@ -1,7 +1,7 @@
 {
 	"name": "01-Grandparent",
 	"properties": {
-		"description": "ADF.procfwk grandparent pipeline used optionally to bootstrap any wider processes in your Data Factory that then calls the processing framework.",
+		"description": "procfwk grandparent pipeline used optionally to bootstrap any wider processes in your Data Factory that then calls the processing framework.",
 		"activities": [
 			{
 				"name": "procfwk",

diff --git a/DataFactory/pipeline/02-Parent.json b/DataFactory/pipeline/02-Parent.json
@@ -206,7 +206,7 @@
 						"type": "AzureSqlSource",
 						"sqlReaderStoredProcedureName": "[procfwk].[ExecutionWrapper]",
 						"storedProcedureParameters": {
-							"CallingDataFactory": {
+							"CallingOrchestratorName": {
 								"type": "String",
 								"value": {
 									"value": "@pipeline().DataFactory",
@@ -464,7 +464,7 @@
 								"functionName": "CheckPipelineStatus",
 								"method": "POST",
 								"body": {
-									"value": "@concat('\n{\n    \"tenantId\": \"',activity('Get SPN Details').output.firstRow.TenantId,'\",\n    \"applicationId\": \"',activity('Get SPN Details').output.firstRow.AppId,'\",\n    \"authenticationKey\": \"',activity('Get SPN Details').output.firstRow.AppSecret,'\",\n    \"subscriptionId\": \"',activity('Get SPN Details').output.firstRow.SubscriptionId,'\",\n    \"resourceGroup\": \"',item().ResourceGroupName,'\",\n    \"factoryName\": \"',item().DataFactoryName,'\",\n    \"pipelineName\": \"',item().PipelineName,'\",\n    \"runId\": \"',item().AdfPipelineRunId,'\"\n}')",
+									"value": "@concat('\n{\n    \"tenantId\": \"',activity('Get SPN Details').output.firstRow.TenantId,'\",\n    \"applicationId\": \"',activity('Get SPN Details').output.firstRow.AppId,'\",\n    \"authenticationKey\": \"',activity('Get SPN Details').output.firstRow.AppSecret,'\",\n    \"subscriptionId\": \"',activity('Get SPN Details').output.firstRow.SubscriptionId,'\",\n    \"resourceGroupName\": \"',item().ResourceGroupName,'\",\n    \"orchestratorName\": \"',item().OrchestratorName,'\",\n    \"orchestratorType\": \"',item().OrchestratorType,'\",\n    \"pipelineName\": \"',item().PipelineName,'\",\n    \"runId\": \"',item().PipelineRunId,'\"\n}')",
 									"type": "Expression"
 								}
 							},
@@ -488,7 +488,7 @@
 							"userProperties": [],
 							"typeProperties": {
 								"on": {
-									"value": "@activity('Get Pipeline Status').output.Status",
+									"value": "@activity('Get Pipeline Status').output.ActualStatus",
 									"type": "Expression"
 								},
 								"cases": [

diff --git a/DataFactory/pipeline/03-Child.json b/DataFactory/pipeline/03-Child.json
@@ -1,7 +1,7 @@
 {
 	"name": "03-Child",
 	"properties": {
-		"description": "ADF.procfwk child pipeline used to execute Worker pipelines within a given execution stage. This pipeline will be called once for each stage, then execute all Workers in parallel.",
+		"description": "procfwk child pipeline used to execute Worker pipelines within a given execution stage. This pipeline will be called once for each stage, then execute all Workers in parallel.",
 		"activities": [
 			{
 				"name": "Get Pipelines",