Skip to content

[Datafactory]subnet id support for swift injection of azure-ssis IR #15468

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
ruowan merged 10 commits into from
Aug 31, 2021
Merged

[Datafactory]subnet id support for swift injection of azure-ssis IR #15468

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1bcc20d
Add blockchain to latest profile
markcowl Aug 22, 2019
7b46097
Add additional types
markcowl Aug 22, 2019
a09061b
subnet id support for swift injection of azure-ssis IR
nick-ms-ts Aug 2, 2021
69a6e27
Merge branch 'main' into wamao/SubnetIdSupportForSwfitIR
nick-ms-ts Aug 26, 2021
c5c9fa5
Merge branch 'Azure:main' into main
nick-ms-ts Aug 26, 2021
e235ff6
Merge branch 'main' into wamao/SubnetIdSupportForSwfitIR
nick-ms-ts Aug 26, 2021
6a841d7
fix undesired changes
nick-ms-ts Aug 26, 2021
4f2ef9b
change desired files
nick-ms-ts Aug 26, 2021
9c8f356
remove change
nick-ms-ts Aug 26, 2021
58d45fa
correct message
nick-ms-ts Aug 31, 2021
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
14 changes: 14 additions & 0 deletions ...ource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@
"ssisProperties": {
"description": "SSIS properties for managed integration runtime.",
"$ref": "#/definitions/IntegrationRuntimeSsisProperties"
},
"customerVirtualNetwork": {
"description": "The customer virtual network properties for the Azure-SSIS integration runtime.",
"$ref": "#/definitions/IntegrationRuntimeCustomerVirtualNetwork"
}
}
},
Expand Down Expand Up @@ -255,6 +259,16 @@
"type": "object"
}
},
"IntegrationRuntimeCustomerVirtualNetwork": {
"description": "The customer virtual network properties for the Azure-SSIS integration runtime.",
"type": "object",
"properties": {
"subnetId": {
"description": "The ID of the Subnet that this Azure-SSIS integration runtime will join.",
"type": "string"
}
}
},
"IntegrationRuntimeSsisCatalogInfo": {
"description": "Catalog information for managed dedicated integration runtime.",
"type": "object",
Expand Down
14 changes: 14 additions & 0 deletions ...tion/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,6 +1403,10 @@
"ssisProperties": {
"description": "SSIS properties for managed integration runtime.",
"$ref": "#/definitions/IntegrationRuntimeSsisProperties"
},
"customerVirtualNetwork": {
"description": "The customer virtual network properties for the Azure-SSIS integration runtime.",
"$ref": "#/definitions/IntegrationRuntimeCustomerVirtualNetwork"
}
}
},
Expand Down Expand Up @@ -1557,6 +1561,16 @@
"type": "object"
}
},
"IntegrationRuntimeCustomerVirtualNetwork": {
"description": "The customer virtual network properties for the Azure-SSIS integration runtime.",
"type": "object",
"properties": {
"subnetId": {
"description": "The ID of the Subnet that this Azure-SSIS integration runtime will join.",
"type": "string"
}
}
},
"SecretBase": {
"description": "The base definition of a secret type.",
"discriminator": "type",
Expand Down