Skip to content

Commit cdbd88d

Browse files
jackmagic313jackmagic313
committed
address feedback
1 parent 621bea1 commit cdbd88d

12 files changed

+174
-84
lines changed

‎src/DataFactory/DataFactoryV2/DataFactoryV2.format.ps1xml

Lines changed: 110 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,116 @@
3636
<ViewSelectedBy>
3737
<TypeName>Microsoft.Azure.Commands.DataFactoryV2.Models.PSDataFlow</TypeName>
3838
</ViewSelectedBy>
39-
<ListControl>
40-
<ListEntries>
41-
<ListEntry>
42-
<ListItems>
43-
<ListItem>
44-
<Label>DataFlowName</Label>
45-
<PropertyName>Name</PropertyName>
46-
</ListItem>
47-
<ListItem>
48-
<Label>ResourceGroupName</Label>
49-
<PropertyName>ResourceGroupName</PropertyName>
50-
</ListItem>
51-
<ListItem>
52-
<Label>DataFactoryName</Label>
53-
<PropertyName>DataFactoryName</PropertyName>
54-
</ListItem>
55-
<ListItem>
56-
<Label>Properties</Label>
57-
<PropertyName>Properties</PropertyName>
58-
</ListItem>
59-
</ListItems>
60-
</ListEntry>
61-
</ListEntries>
62-
</ListControl>
39+
<TableControl>
40+
<TableHeaders>
41+
<TableColumnHeader>
42+
<Label>DataFlowName</Label>
43+
<Alignment>Left</Alignment>
44+
</TableColumnHeader>
45+
<TableColumnHeader>
46+
<Label>DataFactoryName</Label>
47+
<Alignment>Right</Alignment>
48+
</TableColumnHeader>
49+
<TableColumnHeader>
50+
<Label>ResourceGroupName</Label>
51+
<Alignment>Right</Alignment>
52+
</TableColumnHeader>
53+
<TableColumnHeader>
54+
<Label>Properties</Label>
55+
<Alignment>Right</Alignment>
56+
</TableColumnHeader>
57+
</TableHeaders>
58+
<TableRowEntries>
59+
<TableRowEntry>
60+
<TableColumnItems>
61+
<TableColumnItem>
62+
<ScriptBlock>$_.Name</ScriptBlock>
63+
</TableColumnItem>
64+
<TableColumnItem>
65+
<ScriptBlock>$_.DFName</ScriptBlock>
66+
</TableColumnItem>
67+
<TableColumnItem>
68+
<ScriptBlock>$_.RGName</ScriptBlock>
69+
</TableColumnItem>
70+
<TableColumnItem>
71+
<ScriptBlock>$_.Properties</ScriptBlock>
72+
</TableColumnItem>
73+
</TableColumnItems>
74+
</TableRowEntry>
75+
</TableRowEntries>
76+
</TableControl>
77+
</View>
78+
<View>
79+
<Name>Microsoft.Azure.Commands.DataFactoryV2.Models.PSDataFlowDebugSessionInfo</Name>
80+
<ViewSelectedBy>
81+
<TypeName>Microsoft.Azure.Commands.DataFactoryV2.Models.PSDataFlowDebugSessionInfo</TypeName>
82+
</ViewSelectedBy>
83+
<TableControl>
84+
<TableHeaders>
85+
<TableColumnHeader>
86+
<Label>SessionId</Label>
87+
<Alignment>Left</Alignment>
88+
</TableColumnHeader>
89+
<TableColumnHeader>
90+
<Label>ComputeType</Label>
91+
<Alignment>Right</Alignment>
92+
</TableColumnHeader>
93+
<TableColumnHeader>
94+
<Label>CoreCount</Label>
95+
<Alignment>Right</Alignment>
96+
</TableColumnHeader>
97+
<TableColumnHeader>
98+
<Label>StartTime</Label>
99+
<Alignment>Right</Alignment>
100+
</TableColumnHeader>
101+
<TableColumnHeader>
102+
<Label>LastActivityTime</Label>
103+
<Alignment>Right</Alignment>
104+
</TableColumnHeader>
105+
<TableColumnHeader>
106+
<Label>TimeToLiveInMinutes</Label>
107+
<Alignment>Right</Alignment>
108+
</TableColumnHeader>
109+
<TableColumnHeader>
110+
<Label>IntegrationRuntimeName</Label>
111+
<Alignment>Right</Alignment>
112+
</TableColumnHeader>
113+
<TableColumnHeader>
114+
<Label>DataFlowName</Label>
115+
<Alignment>Right</Alignment>
116+
</TableColumnHeader>
117+
</TableHeaders>
118+
<TableRowEntries>
119+
<TableRowEntry>
120+
<TableColumnItems>
121+
<TableColumnItem>
122+
<ScriptBlock>$_.SessionId</ScriptBlock>
123+
</TableColumnItem>
124+
<TableColumnItem>
125+
<ScriptBlock>$_.ComputeType</ScriptBlock>
126+
</TableColumnItem>
127+
<TableColumnItem>
128+
<ScriptBlock>$_.CoreCount</ScriptBlock>
129+
</TableColumnItem>
130+
<TableColumnItem>
131+
<ScriptBlock>$_.StartTime</ScriptBlock>
132+
</TableColumnItem>
133+
<TableColumnItem>
134+
<ScriptBlock>$_.LastActivityTime</ScriptBlock>
135+
</TableColumnItem>
136+
<TableColumnItem>
137+
<ScriptBlock>$_.TimeToLiveInMinutes</ScriptBlock>
138+
</TableColumnItem>
139+
<TableColumnItem>
140+
<ScriptBlock>$_.IntegrationRuntimeName</ScriptBlock>
141+
</TableColumnItem>
142+
<TableColumnItem>
143+
<ScriptBlock>$_.DataFlowName</ScriptBlock>
144+
</TableColumnItem>
145+
</TableColumnItems>
146+
</TableRowEntry>
147+
</TableRowEntries>
148+
</TableControl>
63149
</View>
64150
<View>
65151
<Name>Microsoft.Azure.Commands.DataFactoryV2.Models.PSDataset</Name>

‎src/DataFactory/DataFactoryV2/DataFlowDebugSessions/AddAzureDataFactoryDataFlowDebugSessionPackageCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.DataFactoryV2
2222
{
2323
[Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "DataFactoryV2DataFlowDebugSessionPackage", DefaultParameterSetName = ParameterSetNames.ByFactoryName, SupportsShouldProcess = true)]
2424
[OutputType(typeof(void))]
25-
[OutputType(typeof(string))]
25+
[OutputType(typeof(bool))]
2626
public class AddAzureDataFactoryDataFlowDebugSessionDataFlowPackageCommand : DataFactoryDataFlowDebugSessionBaseCmdlet
2727
{
2828
[Parameter(ParameterSetName = ParameterSetNames.ByFactoryName, Position = 2, Mandatory = true,

‎src/DataFactory/DataFactoryV2/DataFlowDebugSessions/StopAzureDataFactoryDataFlowDebugSessionCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.DataFactoryV2
2020
{
2121
[Cmdlet("Stop", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "DataFactoryV2DataFlowDebugSession", DefaultParameterSetName = ParameterSetNames.ByFactoryName, SupportsShouldProcess = true)]
2222
[OutputType(typeof(void))]
23-
[OutputType(typeof(string))]
23+
[OutputType(typeof(bool))]
2424
public class StopAzureDataFactoryDataFlowDebugSessionCommand : DataFactoryDataFlowDebugSessionBaseCmdlet
2525
{
2626
[Parameter(ParameterSetName = ParameterSetNames.ByFactoryName, Position = 2, Mandatory = true, ValueFromPipelineByPropertyName = true,

‎src/DataFactory/DataFactoryV2/DataFlows/RemoveAzureDataFactoryDataFlowCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.DataFactoryV2
2222
{
2323
[Cmdlet("Remove", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "DataFactoryV2DataFlow", DefaultParameterSetName = ParameterSetNames.ByFactoryName, SupportsShouldProcess = true)]
2424
[OutputType(typeof(void))]
25-
[OutputType(typeof(string))]
25+
[OutputType(typeof(bool))]
2626
public class RemoveAzureDataFactoryDataFlowCommand : DataFactoryContextActionBaseCmdlet
2727
{
2828
[Parameter(ParameterSetName = ParameterSetNames.ByFactoryName, Position = 2, Mandatory = true,

‎src/DataFactory/DataFactoryV2/Models/PSDataFlow.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
using System;
1616
using Microsoft.Azure.Management.DataFactory.Models;
17+
using Microsoft.WindowsAzure.Commands.Common.Attributes;
1718

1819
namespace Microsoft.Azure.Commands.DataFactoryV2.Models
1920
{
@@ -43,6 +44,7 @@ public PSDataFlow(DataFlowResource dataFlow, string resourceGroupName, string fa
4344
this.DataFactoryName = factoryName;
4445
}
4546

47+
[Ps1Xml(Label = "DataFlowName", Target = ViewControl.Table)]
4648
public override string Name
4749
{
4850
get
@@ -51,6 +53,25 @@ public override string Name
5153
}
5254
}
5355

56+
[Ps1Xml(Label = "ResourceGroupName", Target = ViewControl.Table)]
57+
public string RGName
58+
{
59+
get
60+
{
61+
return this.ResourceGroupName;
62+
}
63+
}
64+
65+
[Ps1Xml(Label = "DataFactoryName", Target = ViewControl.Table)]
66+
public string DFName
67+
{
68+
get
69+
{
70+
return this.DataFactoryName;
71+
}
72+
}
73+
74+
[Ps1Xml(Target = ViewControl.Table)]
5475
public DataFlow Properties
5576
{
5677
get

‎src/DataFactory/DataFactoryV2/Models/PSDataFlowDebugSessionInfo.cs

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
using System;
1616
using Microsoft.Azure.Management.DataFactory.Models;
17+
using Microsoft.WindowsAzure.Commands.Common.Attributes;
1718

1819
namespace Microsoft.Azure.Commands.DataFactoryV2.Models
1920
{
@@ -31,14 +32,7 @@ public PSDataFlowDebugSessionInfo(DataFlowDebugSessionInfo debugSession)
3132
this._debugSessionInfo = debugSession ?? throw new ArgumentNullException("debugSession");
3233
}
3334

34-
public string DataFlowName
35-
{
36-
get
37-
{
38-
return this._debugSessionInfo.DataFlowName;
39-
}
40-
}
41-
35+
[Ps1Xml(Target = ViewControl.Table)]
4236
public string SessionId
4337
{
4438
get
@@ -47,6 +41,7 @@ public string SessionId
4741
}
4842
}
4943

44+
[Ps1Xml(Target = ViewControl.Table)]
5045
public string ComputeType
5146
{
5247
get
@@ -55,14 +50,16 @@ public string ComputeType
5550
}
5651
}
5752

58-
public string IntegrationRuntimeName
53+
[Ps1Xml(Target = ViewControl.Table)]
54+
public int? CoreCount
5955
{
6056
get
6157
{
62-
return this._debugSessionInfo.IntegrationRuntimeName;
58+
return this._debugSessionInfo.CoreCount;
6359
}
6460
}
6561

62+
[Ps1Xml(Target = ViewControl.Table)]
6663
public string StartTime
6764
{
6865
get
@@ -71,6 +68,7 @@ public string StartTime
7168
}
7269
}
7370

71+
[Ps1Xml(Target = ViewControl.Table)]
7472
public string LastActivityTime
7573
{
7674
get
@@ -79,19 +77,30 @@ public string LastActivityTime
7977
}
8078
}
8179

82-
public int? CoreCount
80+
[Ps1Xml(Target = ViewControl.Table)]
81+
public int? TimeToLiveInMinutes
8382
{
8483
get
8584
{
86-
return this._debugSessionInfo.CoreCount;
85+
return this._debugSessionInfo.TimeToLiveInMinutes;
8786
}
8887
}
8988

90-
public int? TimeToLiveInMinutes
89+
[Ps1Xml(Target = ViewControl.Table)]
90+
public string IntegrationRuntimeName
9191
{
9292
get
9393
{
94-
return this._debugSessionInfo.TimeToLiveInMinutes;
94+
return this._debugSessionInfo.IntegrationRuntimeName;
95+
}
96+
}
97+
98+
[Ps1Xml(Target = ViewControl.Table)]
99+
public string DataFlowName
100+
{
101+
get
102+
{
103+
return this._debugSessionInfo.DataFlowName;
95104
}
96105
}
97106
}

‎src/DataFactory/DataFactoryV2/help/Add-AzDataFactoryV2DataFlowDebugSessionPackage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
283283
284284
### System.Void
285285
286-
### System.String
286+
### System.Boolean
287287
288288
## NOTES
289289
Keywords: azure, azurerm, arm, resource, management, manager, data, factories

‎src/DataFactory/DataFactoryV2/help/Get-AzDataFactoryV2DataFlow.md

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,11 @@ If you do not specify a name, this cmdlet gets information about all the data fl
4040
```powershell
4141
PS C:\> Get-AzDataFactoryV2DataFlow -ResourceGroupName "ADF" -DataFactoryName "UncycloADF"
4242
43-
DataFlowName : TaxiDemo1
44-
ResourceGroupName : adf
45-
DataFactoryName : UncycloADF
46-
Properties : Microsoft.Azure.Management.DataFactory.Models.MappingDataFlow
47-
48-
DataFlowName : dataflow1
49-
ResourceGroupName : adf
50-
DataFactoryName : UncycloADF
51-
Properties : Microsoft.Azure.Management.DataFactory.Models.MappingDataFlow
52-
53-
DataFlowName : dataflow3
54-
ResourceGroupName : adf
55-
DataFactoryName : UncycloADF
56-
Properties : Microsoft.Azure.Management.DataFactory.Models.MappingDataFlow
43+
DataFlowName DataFactoryName ResourceGroupName Properties
44+
------------ --------------- ----------------- ----------
45+
TaxiDemo1 UncycloADF adf Microsoft.Azure.Management.DataFactory.Models.MappingDataFlow
46+
dataflow1 UncycloADF adf Microsoft.Azure.Management.DataFactory.Models.MappingDataFlow
47+
dataflow3 UncycloADF adf Microsoft.Azure.Management.DataFactory.Models.MappingDataFlow
5748
```
5849

5950
This command gets information about all data flows in the data factory named UncycloADF.
@@ -62,10 +53,9 @@ This command gets information about all data flows in the data factory named Wik
6253
```powershell
6354
PS C:\> Get-AzDataFactoryV2DataFlow -ResourceGroupName "ADF" -DataFactoryName "UncycloADF" -Name "dataflow1"
6455
65-
DataFlowName : dataflow1
66-
ResourceGroupName : adf
67-
DataFactoryName : UncycloADF
68-
Properties : Microsoft.Azure.Management.DataFactory.Models.MappingDataFlow
56+
DataFlowName DataFactoryName ResourceGroupName Properties
57+
------------ --------------- ----------------- ----------
58+
TaxiDemo1 UncycloADF adf Microsoft.Azure.Management.DataFactory.Models.MappingDataFlow
6959
```
7060

7161
This command gets information about the data flow named dataflow1 in the data factory named UncycloADF.

‎src/DataFactory/DataFactoryV2/help/Get-AzDataFactoryV2DataFlowDebugSession.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,9 @@ List all active data flow debug sessions by Azure Data Factory with details.
3939
```powershell
4040
PS C:\WINDOWS\system32> Get-AzDataFactoryV2DataFlowDebugSession -ResourceGroupName adf -DataFactoryName UncycloADF
4141
42-
DataFlowName : DebugSession-0a7e0d6e-f2b7-48cc-8cd8-618326f5662f
43-
SessionId : 550effe4-93a3-485c-8525-eaf25259efbd
44-
ComputeType : General
45-
IntegrationRuntimeName :
46-
StartTime : 2019-10-01T18:28:11.3757036+00:00
47-
LastActivityTime : 2019-10-01T18:32:36.6798991+00:00
48-
CoreCount : 8
49-
TimeToLiveInMinutes : 60
42+
SessionId ComputeType CoreCount StartTime LastActivityTime TimeToLiveInMinutes IntegrationRuntimeName DataFlowName
43+
--------- ----------- --------- --------- ---------------- ------------------- ---------------------- ------------
44+
3c68dbd6-f9c3-4b5f-a200-2310258016a7 General 8 2019-10-04T18:19:58.5550364+00:00 2019-10-04T18:24:51.3680548+00:00 60 DebugSession-0a7e0d6e-f2b7-48cc-8cd8-618326f5662f
5045
```
5146

5247
Get all active data flow debug sessions in Azure Data Factory "UncycloADF".

‎src/DataFactory/DataFactoryV2/help/Remove-AzDataFactoryV2DataFlow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
214214
215215
### System.Void
216216
217-
### System.String
217+
### System.Boolean
218218
219219
## NOTES
220220
Keywords: azure, azurerm, arm, resource, management, manager, data, factories

0 commit comments

Comments
 (0)