Skip to content
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

fix: Namefix for integration runtime /avm/res/data-factory/factory /integration-runtime/ #1616

Merged
merged 3 commits into from
Apr 8, 2024
Merged

fix: Namefix for integration runtime /avm/res/data-factory/factory /integration-runtime/ #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c3f569
Namefix for integration runtime
clintgrove Apr 8, 2024
5083c4f
Merge branch 'main' into integrationRuntime-namefix
clintgrove Apr 8, 2024
a87feaa
Merge branch 'main' into integrationRuntime-namefix
eriqua Apr 8, 2024
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
4 changes: 2 additions & 2 deletions avm/res/data-factory/factory/integration-runtime/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This module deploys a Data Factory Managed or Self-Hosted Integration Runtime.

| Parameter | Type | Description |
| :-- | :-- | :-- |
| [`interagrationRuntimeCustomDescription`](#parameter-interagrationruntimecustomdescription) | string | The description of the Integration Runtime. |
| [`integrationRuntimeCustomDescription`](#parameter-integrationruntimecustomdescription) | string | The description of the Integration Runtime. |
| [`managedVirtualNetworkName`](#parameter-managedvirtualnetworkname) | string | The name of the Managed Virtual Network if using type "Managed" . |
| [`typeProperties`](#parameter-typeproperties) | object | Integration Runtime type properties. Required if type is "Managed". |

Expand Down Expand Up @@ -68,7 +68,7 @@ The name of the parent Azure Data Factory. Required if the template is used in a
- Required: Yes
- Type: string

### Parameter: `interagrationRuntimeCustomDescription`
### Parameter: `integrationRuntimeCustomDescription`

The description of the Integration Runtime.

Expand Down
20 changes: 11 additions & 9 deletions avm/res/data-factory/factory/integration-runtime/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ param managedVirtualNetworkName string = ''
param typeProperties object = {}

@description('Optional. The description of the Integration Runtime.')
param interagrationRuntimeCustomDescription string = 'Managed Integration Runtime created by avm-res-datafactory-factories'
param integrationRuntimeCustomDescription string = 'Managed Integration Runtime created by avm-res-datafactory-factories'

var managedVirtualNetworkVar = {
referenceName: type == 'Managed' ? managedVirtualNetworkName : null
Expand All @@ -36,14 +36,16 @@ resource dataFactory 'Microsoft.DataFactory/factories@2018-06-01' existing = {
resource integrationRuntime 'Microsoft.DataFactory/factories/integrationRuntimes@2018-06-01' = {
name: name
parent: dataFactory
properties: type == 'Managed' ? {
description: interagrationRuntimeCustomDescription
type: type
managedVirtualNetwork: managedVirtualNetworkVar
typeProperties: typeProperties
} : {
type: type
}
properties: type == 'Managed'
? {
description: integrationRuntimeCustomDescription
type: type
managedVirtualNetwork: managedVirtualNetworkVar
typeProperties: typeProperties
}
: {
type: type
}
}

@description('The name of the Resource Group the Integration Runtime was created in.')
Expand Down
6 changes: 3 additions & 3 deletions avm/res/data-factory/factory/integration-runtime/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "5995255380692588407"
"templateHash": "6019779622358376532"
},
"name": "Data Factory Integration RunTimes",
"description": "This module deploys a Data Factory Managed or Self-Hosted Integration Runtime.",
Expand Down Expand Up @@ -48,7 +48,7 @@
"description": "Optional. Integration Runtime type properties. Required if type is \"Managed\"."
}
},
"interagrationRuntimeCustomDescription": {
"integrationRuntimeCustomDescription": {
"type": "string",
"defaultValue": "Managed Integration Runtime created by avm-res-datafactory-factories",
"metadata": {
Expand All @@ -67,7 +67,7 @@
"type": "Microsoft.DataFactory/factories/integrationRuntimes",
"apiVersion": "2018-06-01",
"name": "[format('{0}/{1}', parameters('dataFactoryName'), parameters('name'))]",
"properties": "[if(equals(parameters('type'), 'Managed'), createObject('description', parameters('interagrationRuntimeCustomDescription'), 'type', parameters('type'), 'managedVirtualNetwork', variables('managedVirtualNetworkVar'), 'typeProperties', parameters('typeProperties')), createObject('type', parameters('type')))]"
"properties": "[if(equals(parameters('type'), 'Managed'), createObject('description', parameters('integrationRuntimeCustomDescription'), 'type', parameters('type'), 'managedVirtualNetwork', variables('managedVirtualNetworkVar'), 'typeProperties', parameters('typeProperties')), createObject('type', parameters('type')))]"
}
],
"outputs": {
Expand Down
2 changes: 1 addition & 1 deletion avm/res/data-factory/factory/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ module dataFactory_integrationRuntimes 'integration-runtime/main.bicep' = [
dataFactoryName: dataFactory.name
name: integrationRuntime.name
type: integrationRuntime.type
interagrationRuntimeCustomDescription: integrationRuntime.?interagrationRuntimeCustomDescription ?? 'Managed Integration Runtime created by avm-res-datafactory-factories'
integrationRuntimeCustomDescription: integrationRuntime.?integrationRuntimeCustomDescription ?? 'Managed Integration Runtime created by avm-res-datafactory-factories'
managedVirtualNetworkName: contains(integrationRuntime, 'managedVirtualNetworkName')
? integrationRuntime.managedVirtualNetworkName
: ''
Expand Down
12 changes: 6 additions & 6 deletions avm/res/data-factory/factory/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "13420826412692086400"
"templateHash": "14187397977187427796"
},
"name": "Data Factories",
"description": "This module deploys a Data Factory.",
Expand Down Expand Up @@ -1033,8 +1033,8 @@
"type": {
"value": "[parameters('integrationRuntimes')[copyIndex()].type]"
},
"interagrationRuntimeCustomDescription": {
"value": "[coalesce(tryGet(parameters('integrationRuntimes')[copyIndex()], 'interagrationRuntimeCustomDescription'), 'Managed Integration Runtime created by avm-res-datafactory-factories')]"
"integrationRuntimeCustomDescription": {
"value": "[coalesce(tryGet(parameters('integrationRuntimes')[copyIndex()], 'integrationRuntimeCustomDescription'), 'Managed Integration Runtime created by avm-res-datafactory-factories')]"
},
"managedVirtualNetworkName": "[if(contains(parameters('integrationRuntimes')[copyIndex()], 'managedVirtualNetworkName'), createObject('value', parameters('integrationRuntimes')[copyIndex()].managedVirtualNetworkName), createObject('value', ''))]",
"typeProperties": "[if(contains(parameters('integrationRuntimes')[copyIndex()], 'typeProperties'), createObject('value', parameters('integrationRuntimes')[copyIndex()].typeProperties), createObject('value', createObject()))]"
Expand All @@ -1046,7 +1046,7 @@
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "5995255380692588407"
"templateHash": "6019779622358376532"
},
"name": "Data Factory Integration RunTimes",
"description": "This module deploys a Data Factory Managed or Self-Hosted Integration Runtime.",
Expand Down Expand Up @@ -1089,7 +1089,7 @@
"description": "Optional. Integration Runtime type properties. Required if type is \"Managed\"."
}
},
"interagrationRuntimeCustomDescription": {
"integrationRuntimeCustomDescription": {
"type": "string",
"defaultValue": "Managed Integration Runtime created by avm-res-datafactory-factories",
"metadata": {
Expand All @@ -1108,7 +1108,7 @@
"type": "Microsoft.DataFactory/factories/integrationRuntimes",
"apiVersion": "2018-06-01",
"name": "[format('{0}/{1}', parameters('dataFactoryName'), parameters('name'))]",
"properties": "[if(equals(parameters('type'), 'Managed'), createObject('description', parameters('interagrationRuntimeCustomDescription'), 'type', parameters('type'), 'managedVirtualNetwork', variables('managedVirtualNetworkVar'), 'typeProperties', parameters('typeProperties')), createObject('type', parameters('type')))]"
"properties": "[if(equals(parameters('type'), 'Managed'), createObject('description', parameters('integrationRuntimeCustomDescription'), 'type', parameters('type'), 'managedVirtualNetwork', variables('managedVirtualNetworkVar'), 'typeProperties', parameters('typeProperties')), createObject('type', parameters('type')))]"
}
],
"outputs": {
Expand Down