Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/data-factory/factories/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ This module deploys a Data Factory.
| `gitAccountName` | string | `''` | | The account name. |
| `gitCollaborationBranch` | string | `'main'` | | The collaboration branch name. Default is 'main'. |
| `gitConfigureLater` | bool | `True` | | Boolean to define whether or not to configure git during template deployment. |
| `gitHostName` | string | `''` | | The GitHub Enterprise Server host (prefixed with 'https://'). Only relevant for 'FactoryGitHubConfiguration'. |
| `gitProjectName` | string | `''` | | The project name. Only relevant for 'FactoryVSTSConfiguration'. |
| `gitRepositoryName` | string | `''` | | The repository name. |
| `gitRepoType` | string | `'FactoryVSTSConfiguration'` | | Repository type - can be 'FactoryVSTSConfiguration' or 'FactoryGitHubConfiguration'. Default is 'FactoryVSTSConfiguration'. |
Expand Down
4 changes: 4 additions & 0 deletions modules/data-factory/factories/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ param gitCollaborationBranch string = 'main'
@description('Optional. The root folder path name. Default is \'/\'.')
param gitRootFolder string = '/'

@description('Optional. The GitHub Enterprise Server host (prefixed with \'https://\'). Only relevant for \'FactoryGitHubConfiguration\'.')
param gitHostName string = ''

@description('Optional. List of Global Parameters for the factory.')
param globalParameters object = {}

Expand Down Expand Up @@ -192,6 +195,7 @@ resource dataFactory 'Microsoft.DataFactory/factories@2018-06-01' = {
properties: {
repoConfiguration: bool(gitConfigureLater) ? null : union({
type: gitRepoType
hostName: gitHostName
accountName: gitAccountName
repositoryName: gitRepositoryName
collaborationBranch: gitCollaborationBranch
Expand Down
11 changes: 9 additions & 2 deletions modules/data-factory/factories/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.18.4.5664",
"templateHash": "18376427660961730499"
"templateHash": "7237850138219692258"
}
},
"parameters": {
Expand Down Expand Up @@ -104,6 +104,13 @@
"description": "Optional. The root folder path name. Default is '/'."
}
},
"gitHostName": {
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Optional. The GitHub Enterprise Server host (prefixed with 'https://'). . Only relevant for 'FactoryGitHubConfiguration'. Default is ''."
}
},
"globalParameters": {
"type": "object",
"defaultValue": {},
Expand Down Expand Up @@ -327,7 +334,7 @@
"tags": "[parameters('tags')]",
"identity": "[variables('identity')]",
"properties": {
"repoConfiguration": "[if(bool(parameters('gitConfigureLater')), null(), union(createObject('type', parameters('gitRepoType'), 'accountName', parameters('gitAccountName'), 'repositoryName', parameters('gitRepositoryName'), 'collaborationBranch', parameters('gitCollaborationBranch'), 'rootFolder', parameters('gitRootFolder')), if(equals(parameters('gitRepoType'), 'FactoryVSTSConfiguration'), createObject('projectName', parameters('gitProjectName')), createObject()), createObject()))]",
"repoConfiguration": "[if(bool(parameters('gitConfigureLater')), null(), union(createObject('type', parameters('gitRepoType'), 'hostName', parameters('gitHostName'), 'accountName', parameters('gitAccountName'), 'repositoryName', parameters('gitRepositoryName'), 'collaborationBranch', parameters('gitCollaborationBranch'), 'rootFolder', parameters('gitRootFolder')), if(equals(parameters('gitRepoType'), 'FactoryVSTSConfiguration'), createObject('projectName', parameters('gitProjectName')), createObject()), createObject()))]",
"globalParameters": "[if(not(empty(parameters('globalParameters'))), parameters('globalParameters'), null())]",
"publicNetworkAccess": "[if(not(empty(parameters('publicNetworkAccess'))), parameters('publicNetworkAccess'), if(not(empty(parameters('privateEndpoints'))), 'Disabled', null()))]",
"encryption": "[if(not(empty(parameters('cMKKeyName'))), createObject('identity', createObject('userAssignedIdentity', parameters('cMKUserAssignedIdentityResourceId')), 'keyName', parameters('cMKKeyName'), 'keyVersion', if(not(empty(parameters('cMKKeyVersion'))), parameters('cMKKeyVersion'), null()), 'vaultBaseUrl', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', split(parameters('cMKKeyVaultResourceId'), '/')[2], split(parameters('cMKKeyVaultResourceId'), '/')[4]), 'Microsoft.KeyVault/vaults', last(split(parameters('cMKKeyVaultResourceId'), '/'))), '2021-10-01').vaultUri), null())]"
Expand Down