Skip to content

Commit 80539b7

Browse files
committed
Revert changes in calling patterns for some cmdlets
1 parent 2b8903f commit 80539b7

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

src/ResourceManager/Network/Commands.Network/NetworkInterface/NewAzureNetworkInterfaceCommand.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,11 @@ public override void Execute()
229229
() =>
230230
{
231231
var networkInterface = CreateNetworkInterface();
232+
if (present)
233+
{
234+
networkInterface = this.GetNetworkInterface(this.ResourceGroupName, this.Name);
235+
}
236+
232237
WriteObject(networkInterface);
233238
},
234239
() => present);

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Models/StreamAnalyticsClient.Functions.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ public virtual PSFunction CreatePSFunction(CreatePSFunctionParameter parameter)
114114
}
115115

116116
PSFunction function = null;
117-
bool functionExists = CheckFunctionExists(parameter.ResourceGroupName, parameter.JobName, parameter.FunctionName);
118117
parameter.ConfirmAction(
119118
parameter.Force,
120119
string.Format(
@@ -142,7 +141,7 @@ public virtual PSFunction CreatePSFunction(CreatePSFunctionParameter parameter)
142141
JobName = parameter.JobName
143142
};
144143
},
145-
() => functionExists);
144+
() => CheckFunctionExists(parameter.ResourceGroupName, parameter.JobName, parameter.FunctionName));
146145

147146
return function;
148147
}

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Models/StreamAnalyticsClient.Inputs.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,8 @@ public virtual PSInput CreatePSInput(CreatePSInputParameter parameter)
114114
}
115115

116116
PSInput input = null;
117-
bool inputExists = CheckInputExists(parameter.ResourceGroupName, parameter.JobName, parameter.InputName);
118117
parameter.ConfirmAction(
119-
!inputExists,
118+
parameter.Force,
120119
string.Format(
121120
CultureInfo.InvariantCulture,
122121
Resources.InputExists,
@@ -142,7 +141,7 @@ public virtual PSInput CreatePSInput(CreatePSInputParameter parameter)
142141
JobName = parameter.JobName
143142
};
144143
},
145-
() => inputExists);
144+
() => CheckInputExists(parameter.ResourceGroupName, parameter.JobName, parameter.InputName));
146145

147146
return input;
148147
}

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Models/StreamAnalyticsClient.Jobs.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,8 @@ public virtual PSJob CreatePSJob(CreatePSJobParameter parameter)
137137
}
138138

139139
PSJob job = null;
140-
bool jobExists = CheckJobExists(parameter.ResourceGroupName, parameter.JobName);
141140
parameter.ConfirmAction(
142-
!jobExists,
141+
parameter.Force,
143142
string.Format(
144143
CultureInfo.InvariantCulture,
145144
Resources.JobExists,
@@ -155,7 +154,7 @@ public virtual PSJob CreatePSJob(CreatePSJobParameter parameter)
155154
{
156155
job = CreateOrUpdatePSJob(parameter.ResourceGroupName, parameter.JobName, parameter.RawJsonContent);
157156
},
158-
() => jobExists);
157+
() => CheckJobExists(parameter.ResourceGroupName, parameter.JobName));
159158
return job;
160159
}
161160

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Models/StreamAnalyticsClient.Outputs.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,8 @@ public virtual PSOutput CreatePSOutput(CreatePSOutputParameter parameter)
114114
}
115115

116116
PSOutput output = null;
117-
bool outputExists = CheckOutputExists(parameter.ResourceGroupName, parameter.JobName, parameter.OutputName);
118117
parameter.ConfirmAction(
119-
!outputExists,
118+
parameter.Force,
120119
string.Format(
121120
CultureInfo.InvariantCulture,
122121
Resources.OutputExists,
@@ -142,7 +141,7 @@ public virtual PSOutput CreatePSOutput(CreatePSOutputParameter parameter)
142141
JobName = parameter.JobName
143142
};
144143
},
145-
() => outputExists);
144+
() => CheckOutputExists(parameter.ResourceGroupName, parameter.JobName, parameter.OutputName));
146145

147146
return output;
148147
}

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Models/StreamAnalyticsClient.Transformation.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ public virtual PSTransformation CreatePSTransformation(CreatePSTransformationPar
6060
}
6161

6262
PSTransformation transformation = null;
63-
bool transformationExists = CheckTransformationExists(parameter.ResourceGroupName, parameter.JobName, parameter.TransformationName);
6463
parameter.ConfirmAction(
65-
!transformationExists,
64+
parameter.Force,
6665
string.Format(
6766
CultureInfo.InvariantCulture,
6867
Resources.TransformationExists,
@@ -88,7 +87,7 @@ public virtual PSTransformation CreatePSTransformation(CreatePSTransformationPar
8887
JobName = parameter.JobName
8988
};
9089
},
91-
() => transformationExists);
90+
() => CheckTransformationExists(parameter.ResourceGroupName, parameter.JobName, parameter.TransformationName));
9291

9392
return transformation;
9493
}

0 commit comments

Comments
 (0)