Merge pull request #49 from CloudFormations/develop_control

Cosmetic tweaks
CloudFormations · Mar 26, 2024 · 3c7d913 · 3c7d913
2 parents dea0657 + 4efa0cf
commit 3c7d913
Show file tree

Hide file tree

Showing 12 changed files with 83 additions and 117 deletions.
diff --git a/src/azure.datafactory/dataset/GetSetMetadata.json b/src/azure.datafactory/dataset/GetSetMetadata.json
@@ -10,7 +10,9 @@
 			"name": "Cumulus"
 		},
 		"annotations": [
-			"procfwk"
+			"Cloud Formations",
+			"CF.Cumulus",
+			"Control"
 		],
 		"type": "AzureSqlTable",
 		"schema": []

diff --git a/src/azure.datafactory/integrationRuntime/AzureIR-UKSouth.json b/src/azure.datafactory/integrationRuntime/AzureIR-UKSouth.json
diff --git a/src/azure.datafactory/linkedService/cumulusdatabase.json b/src/azure.datafactory/linkedService/cumulusdatabase.json
@@ -3,7 +3,9 @@
 	"properties": {
 		"description": "Connection between ADF and processing framework metadata SQLDB.",
 		"annotations": [
-			"procfwk"
+			"Cloud Formations",
+			"CF.Cumulus",
+			"Control"
 		],
 		"type": "AzureSqlDatabase",
 		"typeProperties": {

diff --git a/src/azure.datafactory/linkedService/cumulusfunctions.json b/src/azure.datafactory/linkedService/cumulusfunctions.json
@@ -3,7 +3,9 @@
 	"properties": {
 		"description": "Interact with the Azure Functions App used as middle ware when making requests to Worker pipelines. Authentication done at the Function App level.",
 		"annotations": [
-			"procfwk"
+			"Cloud Formations",
+			"CF.Cumulus",
+			"Control"
 		],
 		"type": "AzureFunction",
 		"typeProperties": {

diff --git a/src/azure.datafactory/linkedService/cumuluskeys.json b/src/azure.datafactory/linkedService/cumuluskeys.json
@@ -3,7 +3,9 @@
 	"properties": {
 		"description": "Connection to Key Vault for all other ADF linked service credentials required to run the processing framework.",
 		"annotations": [
-			"procfwk"
+			"Cloud Formations",
+			"CF.Cumulus",
+			"Control"
 		],
 		"type": "AzureKeyVault",
 		"typeProperties": {

diff --git a/src/azure.datafactory/pipeline/01-SolutionExecutor.json b/src/azure.datafactory/pipeline/01-SolutionExecutor.json
@@ -1,7 +1,7 @@
 {
 	"name": "01-SolutionExecutor",
 	"properties": {
-		"description": "procfwk grandparent pipeline used optionally to bootstrap any wider processes in your Data Factory that then calls the processing framework.",
+		"description": "CF.Cumulus pipeline used optionally to bootstrap any wider processes in your Data Factory that then calls the processing framework.",
 		"activities": [
 			{
 				"name": "Cumulus Default Batch",
@@ -37,8 +37,10 @@
 			"name": "Cumulus.Control"
 		},
 		"annotations": [
-			"procfwk",
-			"Grandparent"
+			"Cloud Formations",
+			"CF.Cumulus",
+			"Control",
+			"Solution Executor"
 		]
 	}
 }
diff --git a/src/azure.datafactory/pipeline/02-BatchExecutor.json b/src/azure.datafactory/pipeline/02-BatchExecutor.json
@@ -1,7 +1,7 @@
 {
 	"name": "02-BatchExecutor",
 	"properties": {
-		"description": "ADF.procfwk parent pipeline used to bootstrap the orchestration framework in perform the first level ForEach calls in sequence for the metadata stages.",
+		"description": "CF.Cumulus pipeline used to bootstrap the orchestration framework in perform the first level ForEach calls in sequence for the metadata stages.",
 		"activities": [
 			{
 				"name": "Get Stages",
@@ -78,6 +78,9 @@
 									]
 								}
 							],
+							"policy": {
+								"secureInput": false
+							},
 							"userProperties": [],
 							"typeProperties": {
 								"pipeline": {
@@ -918,6 +921,9 @@
 				"state": "Inactive",
 				"onInactiveMarkAs": "Succeeded",
 				"dependsOn": [],
+				"policy": {
+					"secureInput": false
+				},
 				"userProperties": [],
 				"typeProperties": {
 					"pipeline": {
@@ -1001,8 +1007,10 @@
 			"name": "Cumulus.Control"
 		},
 		"annotations": [
-			"procfwk",
-			"Parent"
+			"Cloud Formations",
+			"CF.Cumulus",
+			"Control",
+			"Batch Executor"
 		]
 	}
 }
diff --git a/src/azure.datafactory/pipeline/03-StageExecutor.json b/src/azure.datafactory/pipeline/03-StageExecutor.json
@@ -1,7 +1,7 @@
 {
 	"name": "03-StageExecutor",
 	"properties": {
-		"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.",
+		"description": "CF.Cumulus 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",
@@ -72,6 +72,9 @@
 							"description": "Run the required worker pipeline and wait for its completion. Update metadata once done.",
 							"type": "ExecutePipeline",
 							"dependsOn": [],
+							"policy": {
+								"secureInput": false
+							},
 							"userProperties": [],
 							"typeProperties": {
 								"pipeline": {
@@ -111,8 +114,10 @@
 			"name": "Cumulus.Control"
 		},
 		"annotations": [
-			"procfwk",
-			"Child"
+			"Cloud Formations",
+			"CF.Cumulus",
+			"Control",
+			"Stage Executor"
 		]
 	}
 }
diff --git a/src/azure.datafactory/pipeline/04-PipelineExecutor.json b/src/azure.datafactory/pipeline/04-PipelineExecutor.json
@@ -1,7 +1,7 @@
 {
 	"name": "04-PipelineExecutor",
 	"properties": {
-		"description": "procfwk infant pipeline used to check when the processing pipeline called by the Child completes and passes the resulting status back to the metadata database.",
+		"description": "CF.Cumulus pipeline used to check when the processing pipeline called by the Child completes and passes the resulting status back to the metadata database.",
 		"activities": [
 			{
 				"name": "Execute Worker Pipeline",
@@ -361,6 +361,9 @@
 									]
 								}
 							],
+							"policy": {
+								"secureInput": false
+							},
 							"userProperties": [],
 							"typeProperties": {
 								"pipeline": {
@@ -1033,26 +1036,6 @@
 						"type": "Expression"
 					},
 					"ifFalseActivities": [
-						{
-							"name": "Throw Exception - Invalid Infant",
-							"description": "Throw an exception with details about the invalid worker pipeline name.",
-							"type": "ExecutePipeline",
-							"dependsOn": [],
-							"userProperties": [],
-							"typeProperties": {
-								"pipeline": {
-									"referenceName": "Throw Exception",
-									"type": "PipelineReference"
-								},
-								"waitOnCompletion": true,
-								"parameters": {
-									"Message": {
-										"value": "@concat('Worker pipeline [',variables('WorkerCoreDetails')[0].pipelineName,'] is not valid in target Orchestrator [',variables('WorkerCoreDetails')[0].orchestratorName,']')",
-										"type": "Expression"
-									}
-								}
-							}
-						},
 						{
 							"name": "Update Execution With Invalid Worker",
 							"description": "Update the current execution table with an informed status for the worker pipeline that couldn't be executed.",
@@ -1100,6 +1083,20 @@
 								"referenceName": "cumulusdatabase",
 								"type": "LinkedServiceReference"
 							}
+						},
+						{
+							"name": "Throw Exception - Invalid Worker",
+							"description": "Throw an exception with details about the invalid worker pipeline name.",
+							"type": "Fail",
+							"dependsOn": [],
+							"userProperties": [],
+							"typeProperties": {
+								"message": {
+									"value": "@concat('Worker pipeline [',variables('WorkerCoreDetails')[0].pipelineName,'] is not valid in target Orchestrator [',variables('WorkerCoreDetails')[0].orchestratorName,']')",
+									"type": "Expression"
+								},
+								"errorCode": "16"
+							}
 						}
 					]
 				}
@@ -1304,8 +1301,10 @@
 			"name": "Cumulus.Control"
 		},
 		"annotations": [
-			"procfwk",
-			"Infant"
+			"Cloud Formations",
+			"CF.Cumulus",
+			"Control",
+			"Pipeline Executor"
 		]
 	}
 }
diff --git a/src/azure.datafactory/pipeline/Check For Running Pipeline.json b/src/azure.datafactory/pipeline/Check For Running Pipeline.json
@@ -114,23 +114,17 @@
 					},
 					"ifTrueActivities": [
 						{
-							"name": "Throw Exception - Pipeline Running",
-							"description": "Using the utils pipeline raise an exception to stop the new trigger while a run is already in progress.",
-							"type": "ExecutePipeline",
+							"name": "Throw Exception - Pipeline Already Running",
+							"description": "Raise an exception to stop the new trigger while a run is already in progress.",
+							"type": "Fail",
 							"dependsOn": [],
 							"userProperties": [],
 							"typeProperties": {
-								"pipeline": {
-									"referenceName": "Throw Exception",
-									"type": "PipelineReference"
+								"message": {
+									"value": "@concat('Provided pipeline name (',pipeline().parameters.PipelineName,') still has a run in progress or queued given the query range parameters set in the properties table.')",
+									"type": "Expression"
 								},
-								"waitOnCompletion": true,
-								"parameters": {
-									"Message": {
-										"value": "@concat('Provided pipeline name (',pipeline().parameters.PipelineName,') still has a run in progress or queued given the query range parameters set in the properties table.')",
-										"type": "Expression"
-									}
-								}
+								"errorCode": "16"
 							}
 						}
 					]
@@ -387,11 +381,11 @@
 									},
 									"userProperties": [],
 									"typeProperties": {
+										"method": "GET",
 										"url": {
 											"value": "https://management.azure.com/subscriptions/@{variables('SubscriptionId')}/resourceGroups/@{variables('ResourceGroupName')}/providers/Microsoft.DataFactory/factories/@{pipeline().DataFactory}/pipelines/@{pipeline().parameters.PipelineName}?api-version=2018-06-01",
 											"type": "Expression"
 										},
-										"method": "GET",
 										"authentication": {
 											"type": "MSI",
 											"resource": "https://management.core.windows.net/"
@@ -419,11 +413,11 @@
 									},
 									"userProperties": [],
 									"typeProperties": {
+										"method": "POST",
 										"url": {
 											"value": "https://management.azure.com/subscriptions/@{variables('SubscriptionId')}/resourceGroups/@{variables('ResourceGroupName')}/providers/Microsoft.DataFactory/factories/@{pipeline().DataFactory}/queryPipelineRuns?api-version=2018-06-01",
 											"type": "Expression"
 										},
-										"method": "POST",
 										"body": {
 											"value": "{\n  \"lastUpdatedAfter\": \"@{adddays(utcnow(),int(variables('QueryRunDays')))}\",\n  \"lastUpdatedBefore\": \"@{utcnow()}\",\n  \"filters\": [\n    {\n      \"operand\": \"PipelineName\",\n      \"operator\": \"Equals\",\n      \"values\": [\n        \"@{pipeline().parameters.PipelineName}\"\n      ]\n    }\n  ]\n}",
 											"type": "Expression"
@@ -478,11 +472,11 @@
 									},
 									"userProperties": [],
 									"typeProperties": {
+										"method": "GET",
 										"url": {
 											"value": "https://@{pipeline().DataFactory}.dev.azuresynapse.net/pipelines/@{pipeline().parameters.PipelineName}?api-version=2019-06-01-preview",
 											"type": "Expression"
 										},
-										"method": "GET",
 										"authentication": {
 											"type": "MSI",
 											"resource": "https://management.core.windows.net/"
@@ -510,11 +504,11 @@
 									},
 									"userProperties": [],
 									"typeProperties": {
+										"method": "POST",
 										"url": {
 											"value": "https://@{pipeline().DataFactory}.dev.azuresynapse.net/queryPipelineRuns?api-version=2019-06-01-preview",
 											"type": "Expression"
 										},
-										"method": "POST",
 										"body": {
 											"value": "{\n  \"lastUpdatedAfter\": \"@{adddays(utcnow(),int(variables('QueryRunDays')))}\",\n  \"lastUpdatedBefore\": \"@{utcnow()}\",\n  \"filters\": [\n    {\n      \"operand\": \"PipelineName\",\n      \"operator\": \"Equals\",\n      \"values\": [\n        \"@{pipeline().parameters.PipelineName}\"\n      ]\n    }\n  ]\n}",
 											"type": "Expression"
@@ -555,20 +549,17 @@
 					],
 					"defaultActivities": [
 						{
-							"name": "Throw Exception Invalid Orchestrator Type",
+							"name": "Throw Exception - Invalid Orchestrator Type",
 							"description": "Throw exception if switch cases are not met.",
-							"type": "ExecutePipeline",
+							"type": "Fail",
 							"dependsOn": [],
 							"userProperties": [],
 							"typeProperties": {
-								"pipeline": {
-									"referenceName": "Throw Exception",
-									"type": "PipelineReference"
+								"message": {
+									"value": "@concat('Invalid orchestrator type provided. Unable to check pipeline running state.')",
+									"type": "Expression"
 								},
-								"waitOnCompletion": true,
-								"parameters": {
-									"Message": "Invalid orchestrator type provided. Unable to check pipeline running state."
-								}
+								"errorCode": "16"
 							}
 						}
 					]
@@ -636,8 +627,10 @@
 			"name": "Cumulus.Utils"
 		},
 		"annotations": [
-			"procfwk",
-			"Utils"
+			"Cloud Formations",
+			"CF.Cumulus",
+			"Control",
+			"Running Pipeline Check"
 		]
 	}
 }
diff --git a/src/azure.datafactory/pipeline/Email Sender.json b/src/azure.datafactory/pipeline/Email Sender.json
@@ -54,8 +54,10 @@
 			"name": "Cumulus.Utils"
 		},
 		"annotations": [
-			"procfwk",
-			"Utils"
+			"Cloud Formations",
+			"CF.Cumulus",
+			"Control",
+			"Send Alerts"
 		]
 	}
 }