Skip to content

[Modules] Add support for ADF GlobalParameter #2842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahmadabdalla merged 4 commits into from
Feb 27, 2023
Merged

[Modules] Add support for ADF GlobalParameter #2842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e1d717
Add support for ADF GlobalParameter
tyconsulting Feb 27, 2023
38e5e09
add tags
tyconsulting Feb 27, 2023
0ce98e8
update readme
tyconsulting Feb 27, 2023
bf6851b
add tags to PE
tyconsulting Feb 27, 2023
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
12 changes: 12 additions & 0 deletions modules/Microsoft.DataFactory/factories/.test/common/deploy.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ module testDeployment '../../deploy.bicep' = {
params: {
enableDefaultTelemetry: enableDefaultTelemetry
name: '<<namePrefix>>${serviceShort}001'
tags: {
application: 'CARML'
}
cMKKeyName: nestedDependencies.outputs.keyVaultEncryptionKeyName
cMKKeyVaultResourceId: nestedDependencies.outputs.keyVaultResourceId
cMKUserAssignedIdentityResourceId: nestedDependencies.outputs.managedIdentityResourceId
Expand All @@ -72,6 +75,12 @@ module testDeployment '../../deploy.bicep' = {
diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
gitConfigureLater: true
globalParameters: {
testParameter1: {
type: 'String'
value: 'testValue1'
}
}
integrationRuntimes: [
{
managedVirtualNetworkName: 'default'
Expand Down Expand Up @@ -110,6 +119,9 @@ module testDeployment '../../deploy.bicep' = {
}
service: 'dataFactory'
subnetResourceId: nestedDependencies.outputs.subnetResourceId
tags: {
application: 'CARML'
}
}
]
roleAssignments: [
Expand Down
4 changes: 4 additions & 0 deletions modules/Microsoft.DataFactory/factories/deploy.bicep
View file
Open in desktop
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. List of Global Parameters for the factory.')
param globalParameters object = {}

@description('Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely.')
@minValue(0)
@maxValue(365)
Expand Down Expand Up @@ -196,6 +199,7 @@ resource dataFactory 'Microsoft.DataFactory/factories@2018-06-01' = {
}, (gitRepoType == 'FactoryVSTSConfiguration' ? {
projectName: gitProjectName
} : {}), {})
globalParameters: !empty(globalParameters) ? globalParameters : null
publicNetworkAccess: !empty(publicNetworkAccess) ? any(publicNetworkAccess) : (!empty(privateEndpoints) ? 'Disabled' : null)
encryption: !empty(cMKKeyName) ? {
identity: {
Expand Down
31 changes: 30 additions & 1 deletion modules/Microsoft.DataFactory/factories/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
| `gitRepositoryName` | string | `''` | | The repository name. |
| `gitRepoType` | string | `'FactoryVSTSConfiguration'` | | Repository type - can be 'FactoryVSTSConfiguration' or 'FactoryGitHubConfiguration'. Default is 'FactoryVSTSConfiguration'. |
| `gitRootFolder` | string | `'/'` | | The root folder path name. Default is '/'. |
| `globalParameters` | object | `{object}` | | List of Global Parameters for the factory. |
| `integrationRuntimes` | _[integrationRuntimes](integrationRuntimes/readme.md)_ array | `[]` | | An array of objects for the configuration of an Integration Runtime. |
| `location` | string | `[resourceGroup().location]` | | Location for all Resources. |
| `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. |
Expand Down Expand Up @@ -403,6 +404,12 @@ module factories './Microsoft.DataFactory/factories/deploy.bicep' = {
diagnosticWorkspaceId: '<diagnosticWorkspaceId>'
enableDefaultTelemetry: '<enableDefaultTelemetry>'
gitConfigureLater: true
globalParameters: {
testParameter1: {
type: 'String'
value: 'testValue1'
}
}
integrationRuntimes: [
{
managedVirtualNetworkName: 'default'
Expand Down Expand Up @@ -440,6 +447,9 @@ module factories './Microsoft.DataFactory/factories/deploy.bicep' = {
}
service: 'dataFactory'
subnetResourceId: '<subnetResourceId>'
tags: {
application: 'CARML'
}
}
]
roleAssignments: [
Expand All @@ -452,6 +462,9 @@ module factories './Microsoft.DataFactory/factories/deploy.bicep' = {
}
]
systemAssignedIdentity: true
tags: {
application: 'CARML'
}
userAssignedIdentities: {
'<managedIdentityResourceId>': {}
}
Expand Down Expand Up @@ -506,6 +519,14 @@ module factories './Microsoft.DataFactory/factories/deploy.bicep' = {
"gitConfigureLater": {
"value": true
},
"globalParameters": {
"value": {
"testParameter1": {
"type": "String",
"value": "testValue1"
}
}
},
"integrationRuntimes": {
"value": [
{
Expand Down Expand Up @@ -551,7 +572,10 @@ module factories './Microsoft.DataFactory/factories/deploy.bicep' = {
]
},
"service": "dataFactory",
"subnetResourceId": "<subnetResourceId>"
"subnetResourceId": "<subnetResourceId>",
"tags": {
"application": "CARML"
}
}
]
},
Expand All @@ -569,6 +593,11 @@ module factories './Microsoft.DataFactory/factories/deploy.bicep' = {
"systemAssignedIdentity": {
"value": true
},
"tags": {
"value": {
"application": "CARML"
}
},
"userAssignedIdentities": {
"value": {
"<managedIdentityResourceId>": {}
Expand Down