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

[Data Factory][Bug fix before publishing] Add new sub resource wrapper with name property #7366

Merged
merged 4 commits into from
Oct 2, 2019
Merged

[Data Factory][Bug fix before publishing] Add new sub resource wrapper with name property #7366

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
e453c23
Fix definition wrapper
jackmagic313 Sep 30, 2019
7923e6a
Fix definition wrapper
jackmagic313 Sep 30, 2019
a88d279
Fix definition wrapper
jackmagic313 Sep 30, 2019
199bf60
Fix definition wrapper
jackmagic313 Oct 1, 2019
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
85 changes: 81 additions & 4 deletions ...ion/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3870,6 +3870,15 @@
},
"x-ms-azure-resource": true
},
"SubResourceDebugResource": {
"description": "Azure Data Factory nested debug resource.",
"properties": {
"name": {
"type": "string",
"description": "The resource name."
}
}
},
"Expression": {
"description": "Azure Data Factory expression definition.",
"type": "object",
Expand Down Expand Up @@ -4033,6 +4042,23 @@
"properties"
]
},
"IntegrationRuntimeDebugResource": {
"description": "Integration runtime debug resource.",
"allOf": [
{
"$ref": "#/definitions/SubResourceDebugResource"
}
],
"properties": {
"properties": {
"$ref": "./entityTypes/IntegrationRuntime.json#/definitions/IntegrationRuntime",
"description": "Integration runtime properties."
}
},
"required": [
"properties"
]
},
"IntegrationRuntimeStatusResponse": {
"description": "Integration runtime status response.",
"properties": {
Expand Down Expand Up @@ -4747,6 +4773,23 @@
"properties"
]
},
"DatasetDebugResource": {
"description": "Dataset debug resource.",
"allOf": [
{
"$ref": "#/definitions/SubResourceDebugResource"
}
],
"properties": {
"properties": {
"$ref": "./entityTypes/Dataset.json#/definitions/Dataset",
"description": "Dataset properties."
}
},
"required": [
"properties"
]
},
"LinkedServiceReference": {
"description": "Linked service reference type.",
"properties": {
Expand Down Expand Up @@ -4788,6 +4831,23 @@
"properties"
]
},
"LinkedServiceDebugResource": {
"description": "Linked service debug resource.",
"allOf": [
{
"$ref": "#/definitions/SubResourceDebugResource"
}
],
"properties": {
"properties": {
"$ref": "./entityTypes/LinkedService.json#/definitions/LinkedService",
"description": "Properties of linked service."
}
},
"required": [
"properties"
]
},
"RunFilterParameters": {
"description": "Query parameters for listing runs.",
"type": "object",
Expand Down Expand Up @@ -5596,7 +5656,7 @@
},
"integrationRuntime": {
"description": "Set to use integration runtime setting for data flow debug session.",
"$ref": "#/definitions/IntegrationRuntimeResource"
"$ref": "#/definitions/IntegrationRuntimeDebugResource"
}
}
},
Expand Down Expand Up @@ -5654,20 +5714,20 @@
},
"dataFlow": {
"description": "Data flow instance.",
"$ref": "#/definitions/DataFlowResource"
"$ref": "#/definitions/DataFlowDebugResource"
},
"datasets": {
"type": "array",
"description": "List of datasets.",
"items": {
"$ref": "#/definitions/DatasetResource"
"$ref": "#/definitions/DatasetDebugResource"
}
},
"linkedServices": {
"type": "array",
"description": "List of linked services.",
"items": {
"$ref": "#/definitions/LinkedServiceResource"
"$ref": "#/definitions/LinkedServiceDebugResource"
}
},
"staging": {
Expand Down Expand Up @@ -5881,6 +5941,23 @@
"properties"
]
},
"DataFlowDebugResource": {
"description": "Data flow debug resource.",
"allOf": [
{
"$ref": "#/definitions/SubResourceDebugResource"
}
],
"properties": {
"properties": {
"$ref": "./entityTypes/DataFlow.json#/definitions/DataFlow",
"description": "Data flow properties."
}
},
"required": [
"properties"
]
},
"DataFlowReference": {
"description": "Data flow reference type.",
"properties": {
Expand Down
3 changes: 3 additions & 0 deletions ...er/Microsoft.DataFactory/stable/2018-06-01/examples/DataFlowDebugSession_AddDataFlow.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"factoryName": "exampleFactoryName",
"request": {
"dataFlow": {
"name": "dataflow1",
"properties": {
"type": "MappingDataFlow",
"typeProperties": {
Expand All @@ -25,6 +26,7 @@
},
"datasets": [
{
"name": "dataset1",
"properties": {
"linkedServiceName": {
"referenceName": "linkedService5",
Expand Down Expand Up @@ -53,6 +55,7 @@
],
"linkedServices": [
{
"name": "linkedService1",
"properties": {
"type": "AzureBlobStorage",
"typeProperties": {
Expand Down
1 change: 1 addition & 0 deletions ...manager/Microsoft.DataFactory/stable/2018-06-01/examples/DataFlowDebugSession_Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"request": {
"timeToLive": 60,
"integrationRuntime": {
"name": "ir1",
"properties": {
"type": "Managed",
"typeProperties": {
Expand Down