Skip to content

Commit 8639a13

Browse files
toki95jtoroman
andauthored
Added operation parameters and operation steps in MI operations PS cmdlet (#12437)
* Added operation parameters and operation steps in `Get-AzSqlInstanceOperation` * Starting validation. * Fixing build Co-authored-by: Jovana Toroman <[email protected]>
1 parent 88a7820 commit 8639a13

File tree

4 files changed

+61
-0
lines changed

4 files changed

+61
-0
lines changed

src/Sql/Sql/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
## Version 2.9.1
2424
* Fixed potential server name case insensitive error in `New-AzSqlServer` and `Set-AzSqlServer`
2525
* Fixed wrong database name returned on existing database error in `New-AzSqlDatabaseSecondary`
26+
* Added operation parameters and steps in `Get-AzSqlInstanceOperation`
2627

2728
## Version 2.9.0
2829
* Added support for Service principal and guest users in Set-AzSqlInstanceActiveDirectoryAdministrator cmdlet`

src/Sql/Sql/ManagedInstanceOperation/Model/AzureSqlManagedInstanceOperationModel.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,15 @@ public class AzureSqlManagedInstanceOperationModel
105105
/// Gets whether the operation can be cancelled.
106106
/// </summary>
107107
public bool? IsCancellable { get; set; }
108+
109+
/// <summary>
110+
/// Gets the operation parameters.
111+
/// </summary>
112+
public Microsoft.Azure.Management.Sql.Models.ManagedInstanceOperationParametersPair OperationParameters { get; set; }
113+
114+
/// <summary>
115+
/// Gets the operation steps.
116+
/// </summary>
117+
public Microsoft.Azure.Management.Sql.Models.ManagedInstanceOperationSteps OperationSteps { get; set; }
108118
}
109119
}

src/Sql/Sql/ManagedInstanceOperation/Services/AzureSqlManagedInstanceOperationAdapter.cs

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,48 @@ private static AzureSqlManagedInstanceOperationModel CreateManagedInstanceOperat
123123
managedInstanceOperation.State = resp.State;
124124
managedInstanceOperation.IsUserError = resp.IsUserError;
125125

126+
if (resp.OperationParameters != null)
127+
{
128+
Management.Sql.Models.UpsertManagedServerOperationParameters currentParameters = new Management.Sql.Models.UpsertManagedServerOperationParameters();
129+
if (resp.OperationParameters.CurrentParameters != null)
130+
{
131+
currentParameters.Family = resp.OperationParameters.CurrentParameters.Family;
132+
currentParameters.Tier = resp.OperationParameters.CurrentParameters.Tier;
133+
currentParameters.VCores = resp.OperationParameters.CurrentParameters.VCores;
134+
currentParameters.StorageSizeInGB = resp.OperationParameters.CurrentParameters.StorageSizeInGB;
135+
}
136+
137+
Management.Sql.Models.UpsertManagedServerOperationParameters requestedParameters = new Management.Sql.Models.UpsertManagedServerOperationParameters();
138+
if (resp.OperationParameters.RequestedParameters != null)
139+
{
140+
requestedParameters.Family = resp.OperationParameters.RequestedParameters.Family;
141+
requestedParameters.Tier = resp.OperationParameters.RequestedParameters.Tier;
142+
requestedParameters.VCores = resp.OperationParameters.RequestedParameters.VCores;
143+
requestedParameters.StorageSizeInGB = resp.OperationParameters.RequestedParameters.StorageSizeInGB;
144+
}
145+
146+
managedInstanceOperation.OperationParameters = new Management.Sql.Models.ManagedInstanceOperationParametersPair(currentParameters, requestedParameters);
147+
}
148+
else
149+
{
150+
managedInstanceOperation.OperationParameters = new Management.Sql.Models.ManagedInstanceOperationParametersPair();
151+
}
152+
153+
IList<Management.Sql.Models.UpsertManagedServerOperationStep> stepsList = new List<Management.Sql.Models.UpsertManagedServerOperationStep>();
154+
if (resp.OperationSteps != null && resp.OperationSteps.StepsList != null)
155+
{
156+
foreach (Management.Sql.Models.UpsertManagedServerOperationStep step in resp.OperationSteps.StepsList)
157+
{
158+
stepsList.Add(new Management.Sql.Models.UpsertManagedServerOperationStep(step.Order, step.Name, step.Status));
159+
}
160+
161+
managedInstanceOperation.OperationSteps = new Management.Sql.Models.ManagedInstanceOperationSteps(resp.OperationSteps.TotalSteps, resp.OperationSteps.CurrentStep, stepsList);
162+
}
163+
else
164+
{
165+
managedInstanceOperation.OperationSteps = new Management.Sql.Models.ManagedInstanceOperationSteps();
166+
}
167+
126168
return managedInstanceOperation;
127169
}
128170
}

src/Sql/Sql/help/Get-AzSqlInstanceOperation.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ IsUserError :
5555
EstimatedCompletionTime :
5656
Description :
5757
IsCancellable : False
58+
OperationParameters : Microsoft.Azure.Management.Sql.Models.ManagedInstanceOperationParametersPair
59+
OperationSteps : Microsoft.Azure.Management.Sql.Models.ManagedInstanceOperationSteps
5860
5961
Id : /subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/resourceGroups/ps3753/providers/Microsoft.Sql/managedInstances/ps3698/operations/79f2c91b-0080-4c14-b9b4-d9991c6e82dd
6062
ResourceGroupName : ps3753
@@ -72,6 +74,8 @@ IsUserError :
7274
EstimatedCompletionTime :
7375
Description :
7476
IsCancellable : False
77+
OperationParameters : Microsoft.Azure.Management.Sql.Models.ManagedInstanceOperationParametersPair
78+
OperationSteps : Microsoft.Azure.Management.Sql.Models.ManagedInstanceOperationSteps
7579
```
7680

7781
This command gets all operations a SQL managed instance.
@@ -96,6 +100,8 @@ IsUserError :
96100
EstimatedCompletionTime :
97101
Description :
98102
IsCancellable : False
103+
OperationParameters : Microsoft.Azure.Management.Sql.Models.ManagedInstanceOperationParametersPair
104+
OperationSteps : Microsoft.Azure.Management.Sql.Models.ManagedInstanceOperationSteps
99105
```
100106

101107
This command gets operation with name '5870c6d8-6703-4b27-8ae4-687b4ca7caea' on a SQL managed instance.
@@ -121,6 +127,8 @@ IsUserError :
121127
EstimatedCompletionTime :
122128
Description :
123129
IsCancellable : False
130+
OperationParameters : Microsoft.Azure.Management.Sql.Models.ManagedInstanceOperationParametersPair
131+
OperationSteps : Microsoft.Azure.Management.Sql.Models.ManagedInstanceOperationSteps
124132
```
125133

126134
This command gets operation with id '/subscriptions/a8c9a924-06c0-4bde-9788-e7b1370969e1/resourceGroups/ps3753/providers/Microsoft.Sql/managedInstances/ps3698/operations/5870c6d8-6703-4b27-8ae4-687b4ca7caea'.

0 commit comments

Comments
 (0)