Skip to content

Commit

Permalink
Merge pull request #48 from CloudFormations/develop
Browse files Browse the repository at this point in the history
Upgrade functions to .Net 8, plus namespace renaming
  • Loading branch information
mrpaulandrew authored Feb 14, 2024
2 parents 54362fb + dd2681a commit 83f8b72
Show file tree
Hide file tree
Showing 183 changed files with 2,433 additions and 1,643 deletions.
59 changes: 36 additions & 23 deletions src/CloudFormations.CumulusFramework.sln
Original file line number Diff line number Diff line change
Expand Up @@ -42,37 +42,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integrationRuntime", "integ
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "linkedService", "linkedService", "{6859A9D9-8F80-47A8-B688-FECA79DF0923}"
ProjectSection(SolutionItems) = preProject
azure.datafactory\linkedService\FrameworkFunctions.json = azure.datafactory\linkedService\FrameworkFunctions.json
azure.datafactory\linkedService\Keys.json = azure.datafactory\linkedService\Keys.json
azure.datafactory\linkedService\SupportDatabase.json = azure.datafactory\linkedService\SupportDatabase.json
azure.datafactory\linkedService\cumulusdatabase.json = azure.datafactory\linkedService\cumulusdatabase.json
azure.datafactory\linkedService\cumuluskeys.json = azure.datafactory\linkedService\cumuluskeys.json
azure.datafactory\linkedService\cumulusfunctions.json = azure.datafactory\linkedService\cumulusfunctions.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipeline", "pipeline", "{D3E5B580-301B-4B04-BDA3-7A17FB0B494C}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipelines", "pipelines", "{D3E5B580-301B-4B04-BDA3-7A17FB0B494C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "trigger", "trigger", "{B59F2304-062E-47C1-8D06-A23A8A384897}"
ProjectSection(SolutionItems) = preProject
azure.datafactory\trigger\FunctionalTestingTrigger.json = azure.datafactory\trigger\FunctionalTestingTrigger.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cumulus.Control", "Cumulus.Control", "{2E511592-037A-4117-8039-1ECA7F662A0E}"
ProjectSection(SolutionItems) = preProject
azure.datafactory\pipeline\01-SolutionExecutor.json = azure.datafactory\pipeline\01-SolutionExecutor.json
azure.datafactory\pipeline\02-BatchExecutor.json = azure.datafactory\pipeline\02-BatchExecutor.json
azure.datafactory\pipeline\03-StageExecutor.json = azure.datafactory\pipeline\03-StageExecutor.json
azure.datafactory\pipeline\04-PipelineExecutor.json = azure.datafactory\pipeline\04-PipelineExecutor.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cumulus.Utils", "Cumulus.Utils", "{85858FFB-41A3-46ED-B6A6-EAD44EBE1486}"
ProjectSection(SolutionItems) = preProject
azure.datafactory\pipeline\01-Grandparent.json = azure.datafactory\pipeline\01-Grandparent.json
azure.datafactory\pipeline\02-Parent.json = azure.datafactory\pipeline\02-Parent.json
azure.datafactory\pipeline\03-Child.json = azure.datafactory\pipeline\03-Child.json
azure.datafactory\pipeline\04-Infant.json = azure.datafactory\pipeline\04-Infant.json
azure.datafactory\pipeline\Check For Running Pipeline.json = azure.datafactory\pipeline\Check For Running Pipeline.json
azure.datafactory\pipeline\Email Sender.json = azure.datafactory\pipeline\Email Sender.json
azure.datafactory\pipeline\Intentional Error.json = azure.datafactory\pipeline\Intentional Error.json
azure.datafactory\pipeline\Throw Exception.json = azure.datafactory\pipeline\Throw Exception.json
azure.datafactory\pipeline\Wait 1.json = azure.datafactory\pipeline\Wait 1.json
azure.datafactory\pipeline\Wait 10.json = azure.datafactory\pipeline\Wait 10.json
azure.datafactory\pipeline\Wait 2.json = azure.datafactory\pipeline\Wait 2.json
azure.datafactory\pipeline\Wait 3.json = azure.datafactory\pipeline\Wait 3.json
azure.datafactory\pipeline\Wait 4.json = azure.datafactory\pipeline\Wait 4.json
azure.datafactory\pipeline\Wait 5.json = azure.datafactory\pipeline\Wait 5.json
azure.datafactory\pipeline\Wait 6.json = azure.datafactory\pipeline\Wait 6.json
azure.datafactory\pipeline\Wait 7.json = azure.datafactory\pipeline\Wait 7.json
azure.datafactory\pipeline\Wait 8.json = azure.datafactory\pipeline\Wait 8.json
azure.datafactory\pipeline\Wait 9.json = azure.datafactory\pipeline\Wait 9.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "trigger", "trigger", "{B59F2304-062E-47C1-8D06-A23A8A384897}"
ProjectSection(SolutionItems) = preProject
azure.datafactory\trigger\FunctionalTestingTrigger.json = azure.datafactory\trigger\FunctionalTestingTrigger.json
EndProjectSection
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "metadata.helpers", "metadata.helpers\metadata.helpers.sqlproj", "{80410129-BB8B-4387-AF73-297F98D7B583}"
EndProject
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "framework.reporting", "framework.reporting\framework.reporting.sqlproj", "{3BAA9710-A73D-4B19-85A7-5D55A3E089B9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -112,6 +111,18 @@ Global
{9F82FD86-629E-405F-A344-52AE8466A260}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F82FD86-629E-405F-A344-52AE8466A260}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F82FD86-629E-405F-A344-52AE8466A260}.Release|Any CPU.Build.0 = Release|Any CPU
{80410129-BB8B-4387-AF73-297F98D7B583}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80410129-BB8B-4387-AF73-297F98D7B583}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80410129-BB8B-4387-AF73-297F98D7B583}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{80410129-BB8B-4387-AF73-297F98D7B583}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80410129-BB8B-4387-AF73-297F98D7B583}.Release|Any CPU.Build.0 = Release|Any CPU
{80410129-BB8B-4387-AF73-297F98D7B583}.Release|Any CPU.Deploy.0 = Release|Any CPU
{3BAA9710-A73D-4B19-85A7-5D55A3E089B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3BAA9710-A73D-4B19-85A7-5D55A3E089B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3BAA9710-A73D-4B19-85A7-5D55A3E089B9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{3BAA9710-A73D-4B19-85A7-5D55A3E089B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3BAA9710-A73D-4B19-85A7-5D55A3E089B9}.Release|Any CPU.Build.0 = Release|Any CPU
{3BAA9710-A73D-4B19-85A7-5D55A3E089B9}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -123,6 +134,8 @@ Global
{6859A9D9-8F80-47A8-B688-FECA79DF0923} = {07BC36F2-627C-406B-B222-9D9F22454D4E}
{D3E5B580-301B-4B04-BDA3-7A17FB0B494C} = {07BC36F2-627C-406B-B222-9D9F22454D4E}
{B59F2304-062E-47C1-8D06-A23A8A384897} = {07BC36F2-627C-406B-B222-9D9F22454D4E}
{2E511592-037A-4117-8039-1ECA7F662A0E} = {D3E5B580-301B-4B04-BDA3-7A17FB0B494C}
{85858FFB-41A3-46ED-B6A6-EAD44EBE1486} = {D3E5B580-301B-4B04-BDA3-7A17FB0B494C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DE134F06-80BF-4EA6-97EE-083FA3BDAA86}
Expand Down
4 changes: 2 additions & 2 deletions src/azure.datafactory/dataset/GetSetMetadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"properties": {
"description": "Single generic dataset used to get and set all database metadata.",
"linkedServiceName": {
"referenceName": "SupportDatabase",
"referenceName": "cumulusdatabase",
"type": "LinkedServiceReference"
},
"folder": {
"name": "_ProcFwk"
"name": "Cumulus"
},
"annotations": [
"procfwk"
Expand Down
20 changes: 0 additions & 20 deletions src/azure.datafactory/linkedService/SupportDatabase.json

This file was deleted.

13 changes: 13 additions & 0 deletions src/azure.datafactory/linkedService/cumulusdatabase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "cumulusdatabase",
"properties": {
"description": "Connection between ADF and processing framework metadata SQLDB.",
"annotations": [
"procfwk"
],
"type": "AzureSqlDatabase",
"typeProperties": {
"connectionString": "Integrated Security=False;Encrypt=True;Connection Timeout=30;Data Source=cumulussqlinstancedev.database.windows.net;Initial Catalog=cumulusdatabasedev"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{
"name": "FrameworkFunctions",
"name": "cumulusfunctions",
"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"
],
"type": "AzureFunction",
"typeProperties": {
"functionAppUrl": "https://frameworksupportfunctions.azurewebsites.net",
"functionAppUrl": "https://cumulusfunctionappdev.azurewebsites.net",
"functionKey": {
"type": "AzureKeyVaultSecret",
"store": {
"referenceName": "Keys",
"referenceName": "cumuluskeys",
"type": "LinkedServiceReference"
},
"secretName": "FrameworkFunctionsKey"
}
},
"description": "Interact with the Azure Functions App used as middle ware when making requests to Worker pipelines. Authentication done at the Function App level."
"secretName": "cumulusfunctionsKey"
},
"authentication": "Anonymous"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "Keys",
"name": "cumuluskeys",
"properties": {
"description": "Connection to Key Vault for all other ADF linked service credentials required to run the processing framework.",
"annotations": [
"procfwk"
],
"type": "AzureKeyVault",
"typeProperties": {
"baseUrl": "https://FrameworkKeys.vault.azure.net/"
},
"description": "Connection to Key Vault for all other ADF linked service credentials required to run the processing framework."
"baseUrl": "https://cumuluskeysdev.vault.azure.net/"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
{
"name": "01-Grandparent",
"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.",
"activities": [
{
"name": "procfwk",
"description": "Call procfwk",
"name": "Cumulus Default Batch",
"description": "Call Cumulus.Control",
"type": "ExecutePipeline",
"dependsOn": [],
"userProperties": [],
"typeProperties": {
"pipeline": {
"referenceName": "02-Parent",
"type": "PipelineReference"
},
"waitOnCompletion": true,
"parameters": {
"BatchName": {
"value": "@pipeline().parameters.BatchName",
"type": "Expression"
}
}
"waitOnCompletion": true
}
}
],
Expand All @@ -31,7 +21,7 @@
}
},
"folder": {
"name": "_ProcFwk"
"name": "Cumulus.Control"
},
"annotations": [
"procfwk",
Expand Down
Loading

0 comments on commit 83f8b72

Please sign in to comment.