From d92ddfa31a89046486da62dbebcf9e400f43f8de Mon Sep 17 00:00:00 2001 From: Alexandre Gattiker Date: Thu, 13 Jul 2023 13:42:39 +0200 Subject: [PATCH 1/5] Update main.bicep --- modules/data-factory/factories/main.bicep | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/data-factory/factories/main.bicep b/modules/data-factory/factories/main.bicep index 23c3384398..d7e83f94d7 100644 --- a/modules/data-factory/factories/main.bicep +++ b/modules/data-factory/factories/main.bicep @@ -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\'. Default is \'\'.') +param gitHostName string = '' + @description('Optional. List of Global Parameters for the factory.') param globalParameters object = {} @@ -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 From 2b648a9d0705689bb953285cc4c9c70270eaab50 Mon Sep 17 00:00:00 2001 From: Alexandre Gattiker Date: Thu, 13 Jul 2023 13:42:41 +0200 Subject: [PATCH 2/5] Update main.json --- modules/data-factory/factories/main.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/data-factory/factories/main.json b/modules/data-factory/factories/main.json index 22f8f1f343..8d3291a893 100644 --- a/modules/data-factory/factories/main.json +++ b/modules/data-factory/factories/main.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.18.4.5664", - "templateHash": "18376427660961730499" + "templateHash": "7237850138219692258" } }, "parameters": { @@ -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": {}, @@ -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())]" From a2db96fe46ac4925b6aaa39e42a43e72b946acf7 Mon Sep 17 00:00:00 2001 From: Alexandre Gattiker Date: Thu, 13 Jul 2023 13:42:44 +0200 Subject: [PATCH 3/5] Update README.md --- modules/data-factory/factories/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/data-factory/factories/README.md b/modules/data-factory/factories/README.md index 2b160d385b..2d549cca15 100644 --- a/modules/data-factory/factories/README.md +++ b/modules/data-factory/factories/README.md @@ -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'. Default is ''. | | `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'. | From ec38a70a1ad35951f3e2d1ada19b37c101c0c7ad Mon Sep 17 00:00:00 2001 From: Alexandre Gattiker Date: Thu, 13 Jul 2023 15:41:25 +0200 Subject: [PATCH 4/5] Update modules/data-factory/factories/main.bicep Co-authored-by: Alexander Sehr --- modules/data-factory/factories/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/data-factory/factories/main.bicep b/modules/data-factory/factories/main.bicep index d7e83f94d7..a3c7383ba6 100644 --- a/modules/data-factory/factories/main.bicep +++ b/modules/data-factory/factories/main.bicep @@ -42,7 +42,7 @@ 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\'. Default is \'\'.') +@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.') From 1cc28a0ae5110c6babeb2e2483b11b16880d2ddb Mon Sep 17 00:00:00 2001 From: Alexandre Gattiker Date: Thu, 13 Jul 2023 15:42:18 +0200 Subject: [PATCH 5/5] Update README.md --- modules/data-factory/factories/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/data-factory/factories/README.md b/modules/data-factory/factories/README.md index 2d549cca15..6864c49962 100644 --- a/modules/data-factory/factories/README.md +++ b/modules/data-factory/factories/README.md @@ -57,7 +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'. Default is ''. | +| `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'. |