Skip to content

Commit 6eed963

Browse files
KotasudhakarreddyKotasudhakarreddy
committed
#7682- Added new cmdlets for managing Routing Rules- Added code review comments
1 parent 6f1ac85 commit 6eed963

File tree

8 files changed

+188
-14
lines changed

8 files changed

+188
-14
lines changed

‎src/Websites/Websites/Cmdlets/TrafficRouting/AddAzureWebAppTrafficRoutingRule.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ public override void ExecuteCmdlet()
7979
}
8080
else
8181
{
82-
throw new ValidationMetadataException(string.Format("A Routing Rule with name '{0}' in WebApp '{1}' already exists." +
83-
"Please use Update-AzWebAppTrafficRouting to update an existing Routing Rule.", rampUpRule.Name, WebAppName));
82+
throw new ValidationMetadataException(string.Format(Properties.Resources.AddRoutingRuleErrorMessage, rampUpRule.Name, WebAppName));
8483
}
8584

8685
}

‎src/Websites/Websites/Cmdlets/TrafficRouting/GetAzureWebAppTrafficRoutingRule.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ public override void ExecuteCmdlet()
5656
}
5757
else
5858
{
59-
throw new ValidationMetadataException(string.Format("Given Routing Rule with name '{0}' in WebApp '{1}' is not present." +
60-
"Please use a valid RuleName to remove ", RuleName, WebAppName));
59+
throw new ValidationMetadataException(string.Format(Properties.Resources.UpdateAndGetRoutingRuleErrorMessage, RuleName, WebAppName));
6160
}
6261
}
6362
}

‎src/Websites/Websites/Cmdlets/TrafficRouting/RemoveAzureWebAppTrafficRoutingRule.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.WebApps.Cmdlets.TrafficRouting
2424
/// <summary>
2525
/// this commandlet will let you Remove the given Azure App Service Traffic Routing using ARM APIs
2626
/// </summary>
27-
[Cmdlet(VerbsCommon.Remove, ResourceManager.Common.AzureRMConstants.AzurePrefix + "WebAppTrafficRouting", DefaultParameterSetName = RoutingParameterSet, SupportsShouldProcess = true), OutputType(typeof(RampUpRule))]
27+
[Cmdlet(VerbsCommon.Remove, ResourceManager.Common.AzureRMConstants.AzurePrefix + "WebAppTrafficRouting", DefaultParameterSetName = RoutingParameterSet, SupportsShouldProcess = true), OutputType(typeof(bool))]
2828
public class RemoveAzureWebAppTrafficRoutingRuleCmdlet : WebAppBaseClientCmdLet
2929
{
3030
private const string RoutingParameterSet = "RoutingParameterSet";
@@ -63,16 +63,14 @@ public override void ExecuteCmdlet()
6363
// Update web app configuration
6464
WebsitesClient.UpdateWebAppConfiguration(ResourceGroupName, webApp.Location, WebAppName, null, siteConfig, null, null, null);
6565
if (PassThru.IsPresent)
66-
{
67-
var app = WebsitesClient.GetWebApp(ResourceGroupName, WebAppName, null);
68-
WriteObject(app.SiteConfig.Experiments.RampUpRules.FirstOrDefault(rule => rule.Name == RuleName));
66+
{
67+
WriteObject(true);
6968
}
7069
}
7170
}
7271
else
7372
{
74-
throw new ValidationMetadataException(string.Format("Given Routing Rule with name '{0}' in WebApp '{1}' is not present." +
75-
"Please use a valid RuleName to remove ", RuleName, WebAppName));
73+
throw new ValidationMetadataException(string.Format(Properties.Resources.UpdateAndGetRoutingRuleErrorMessage, RuleName, WebAppName));
7674
}
7775
}
7876
}

‎src/Websites/Websites/Cmdlets/TrafficRouting/UpdateAzureWebAppTrafficRoutingRule.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,12 @@ public override void ExecuteCmdlet()
7676
siteConfig.Experiments.RampUpRules.Add(rampUpRule);
7777
// Update web app configuration
7878
WebsitesClient.UpdateWebAppConfiguration(ResourceGroupName, webApp.Location, WebAppName, null, siteConfig, null, null, null);
79-
//var app = WebsitesClient.GetWebApp(ResourceGroupName, WebAppName, null);
80-
//WriteObject(app.SiteConfig.Experiments.RampUpRules.FirstOrDefault(rule => rule.Name == rampUpRule.Name));
8179
WriteObject(rampUpRule);
8280
}
8381
}
8482
else
8583
{
86-
throw new ValidationMetadataException(string.Format("A Routing Rule with name '{0}' in WebApp '{1}' already exists." +
87-
"Please use Update-AzWebAppTrafficRouting to update an existing Routing Rule.", rampUpRule.Name, WebAppName));
84+
throw new ValidationMetadataException(string.Format(Properties.Resources.UpdateAndGetRoutingRuleErrorMessage, rampUpRule.Name, WebAppName));
8885
}
8986

9087
}

‎src/Websites/Websites/Properties/Resources.Designer.cs

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Websites/Websites/Properties/Resources.resx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,4 +179,12 @@
179179
<data name="EnterContainerPSSessionPSCoreVersionNotSupported" xml:space="preserve">
180180
<value>Remote Powershell sessions into Windows Containers on App Service from this version of PowerShell is not supported.</value>
181181
</data>
182+
<data name="AddRoutingRuleErrorMessage" xml:space="preserve">
183+
<value>"A Routing Rule with name '{0}' in WebApp '{1}' already exists.Please use Update-AzWebAppTrafficRouting to update an existing Routing Rule."</value>
184+
<comment>{0}=RuleName,{1}=WebAppName</comment>
185+
</data>
186+
<data name="UpdateAndGetRoutingRuleErrorMessage" xml:space="preserve">
187+
<value>"Given Routing Rule with name '{0}' in WebApp '{1}' is not present.Please use a valid Name to remove "</value>
188+
<comment>{0}=RuleName,{1}=WebAppName</comment>
189+
</data>
182190
</root>

‎src/Websites/Websites/Websites.csproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,21 @@
1515
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
1616
</ItemGroup>
1717

18+
<ItemGroup>
19+
<Compile Update="Properties\Resources.Designer.cs">
20+
<DesignTime>True</DesignTime>
21+
<AutoGen>True</AutoGen>
22+
<DependentUpon>Resources.resx</DependentUpon>
23+
</Compile>
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<EmbeddedResource Update="Properties\Resources.resx">
28+
<Generator>ResXFileCodeGenerator</Generator>
29+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
30+
</EmbeddedResource>
31+
</ItemGroup>
32+
1833
<ItemGroup>
1934
<None Update="WebsitesStartup.ps1" CopyToOutputDirectory="PreserveNewest" />
2035
</ItemGroup>

‎tools/StaticAnalysis/Exceptions/ValidateHelpIssues.csv

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
Target,Description
2+
Get-AzApiManagementProperty.md,No synopsis found
3+
Get-AzApiManagementProperty.md,No description found
4+
Remove-AzApiManagementAuthorizationServer.md,No examples found
5+
Update-AzApiManagementRegion.md,No examples found
6+
Remove-AzAutomationDscConfiguration.md,No examples found
7+
Remove-AzAutomationDscNodeConfiguration.md,No examples found
8+
Get-AzBatchAccountKeys.md,No examples found
9+
Remove-AzBatchJobSchedule.md,No examples found
10+
Set-AzBatchJobSchedule.md,No examples found
11+
Get-AzCdnCustomDomain.md,No examples found
12+
Get-AzCdnEdgeNode.md,No examples found
13+
Get-AzCdnEndpoint.md,No examples found
14+
Get-AzCdnEndpointNameAvailability.md,No examples found
15+
Get-AzCdnEndpointResourceUsage.md,No examples found
16+
Get-AzCdnOrigin.md,No examples found
17+
Get-AzCdnProfile.md,No examples found
18+
Get-AzCdnProfileResourceUsage.md,No examples found
19+
Get-AzCdnProfileSsoUrl.md,No examples found
20+
Get-AzCdnSubscriptionResourceUsage.md,No examples found
21+
New-AzCdnCustomDomain.md,No examples found
22+
New-AzCdnEndpoint.md,No examples found
23+
New-AzCdnProfile.md,No examples found
24+
Publish-AzCdnEndpointContent.md,No examples found
25+
Remove-AzCdnCustomDomain.md,No examples found
26+
Remove-AzCdnEndpoint.md,No examples found
27+
Remove-AzCdnProfile.md,No examples found
28+
Set-AzCdnEndpoint.md,No examples found
29+
Set-AzCdnOrigin.md,No examples found
30+
Set-AzCdnProfile.md,No examples found
31+
Start-AzCdnEndpoint.md,No examples found
32+
Stop-AzCdnEndpoint.md,No examples found
33+
Test-AzCdnCustomDomain.md,No examples found
34+
Unpublish-AzCdnEndpointContent.md,No examples found
35+
Get-AzVMADDomainExtension.md,No examples found
36+
Get-AzVMDscExtensionStatus.md,No examples found
37+
New-AzVMSqlServerKeyVaultCredentialConfig.md,No description found
38+
New-AzVMSqlServerKeyVaultCredentialConfig.md,No examples found
39+
Remove-AzVMAccessExtension.md,No examples found
40+
Remove-AzVMBackup.md,No description found
41+
Remove-AzVMCustomScriptExtension.md,No examples found
42+
Remove-AzVMNetworkInterface.md,No examples found
43+
Set-AzVMADDomainExtension.md,No examples found
44+
Set-AzVMBackupExtension.md,No description found
45+
Set-AzVMPlan.md,No examples found
46+
Set-AzVmssVM.md,No examples found
47+
Get-AzDtlAllowedVMSizesPolicy.md,No examples found
48+
Get-AzDtlAutoShutdownPolicy.md,No examples found
49+
Get-AzDtlAutoStartPolicy.md,No examples found
50+
Get-AzDtlVMsPerLabPolicy.md,No examples found
51+
Get-AzDtlVMsPerUserPolicy.md,No examples found
52+
Set-AzDtlAllowedVMSizesPolicy.md,No examples found
53+
Set-AzDtlAutoShutdownPolicy.md,No examples found
54+
Set-AzDtlAutoStartPolicy.md,No examples found
55+
Set-AzDtlVMsPerLabPolicy.md,No examples found
56+
Set-AzDtlVMsPerUserPolicy.md,No examples found
57+
Get-AzLogProfile.md,No examples found
58+
New-AzAutoscaleWebhook.md,No examples found
59+
Remove-AzAutoscaleSetting.md,No examples found
60+
Remove-AzLogProfile.md,No examples found
61+
Add-AzApplicationGatewayAuthenticationCertificate.md,No examples found
62+
Add-AzApplicationGatewayUrlPathMapConfig.md,No examples found
63+
Add-AzLoadBalancerInboundNatPoolConfig.md,No synopsis found
64+
Add-AzLoadBalancerInboundNatPoolConfig.md,No description found
65+
Get-AzApplicationGatewayAuthenticationCertificate.md,No examples found
66+
Get-AzApplicationGatewayBackendAddressPool.md,No description found
67+
Get-AzLoadBalancerInboundNatPoolConfig.md,No synopsis found
68+
Get-AzLoadBalancerInboundNatPoolConfig.md,No description found
69+
Get-AzRouteFilter.md,No examples found
70+
Get-AzRouteFilterRuleConfig.md,No examples found
71+
New-AzApplicationGatewayAuthenticationCertificate.md,No examples found
72+
New-AzLoadBalancerInboundNatPoolConfig.md,No synopsis found
73+
New-AzLoadBalancerInboundNatPoolConfig.md,No description found
74+
New-AzRouteFilter.md,No examples found
75+
New-AzRouteFilterRuleConfig.md,No examples found
76+
Remove-AzApplicationGatewayAuthenticationCertificate.md,No examples found
77+
Remove-AzApplicationGatewayUrlPathMapConfig.md,No examples found
78+
Remove-AzLoadBalancerInboundNatPoolConfig.md,No synopsis found
79+
Remove-AzLoadBalancerInboundNatPoolConfig.md,No description found
80+
Remove-AzRouteFilter.md,No examples found
81+
Remove-AzRouteFilterRuleConfig.md,No examples found
82+
Set-AzApplicationGatewayAuthenticationCertificate.md,No examples found
83+
Set-AzApplicationGatewayUrlPathMapConfig.md,No examples found
84+
Set-AzLoadBalancerInboundNatPoolConfig.md,No synopsis found
85+
Set-AzLoadBalancerInboundNatPoolConfig.md,No description found
86+
Set-AzRouteFilter.md,No examples found
87+
Set-AzRouteFilterRuleConfig.md,No examples found
88+
New-AzNotificationHubKey.md,No examples found
89+
New-AzNotificationHubsNamespaceKey.md,No examples found
90+
Disable-AzOperationalInsightsIISLogCollection.md,No examples found
91+
Disable-AzOperationalInsightsLinuxCustomLogCollection.md,No examples found
92+
Disable-AzOperationalInsightsLinuxPerformanceCollection.md,No examples found
93+
Disable-AzOperationalInsightsLinuxSyslogCollection.md,No examples found
94+
Enable-AzOperationalInsightsIISLogCollection.md,No examples found
95+
Enable-AzOperationalInsightsLinuxCustomLogCollection.md,No examples found
96+
Enable-AzOperationalInsightsLinuxPerformanceCollection.md,No examples found
97+
Enable-AzOperationalInsightsLinuxSyslogCollection.md,No examples found
98+
Get-AzOperationalInsightsDataSource.md,No examples found
99+
New-AzOperationalInsightsAzureActivityLogDataSource.md,No examples found
100+
New-AzOperationalInsightsComputerGroup.md,No examples found
101+
New-AzOperationalInsightsCustomLogDataSource.md,No examples found
102+
New-AzOperationalInsightsLinuxPerformanceObjectDataSource.md,No examples found
103+
New-AzOperationalInsightsLinuxSyslogDataSource.md,No examples found
104+
New-AzOperationalInsightsWindowsEventDataSource.md,No examples found
105+
New-AzOperationalInsightsWindowsPerformanceCounterDataSource.md,No examples found
106+
Remove-AzOperationalInsightsDataSource.md,No examples found
107+
Set-AzOperationalInsightsDataSource.md,No examples found
108+
Get-AzResourceProvider.md,No examples found
109+
Invoke-AzResourceAction.md,No examples found
110+
Remove-AzResourceGroupDeployment.md,No examples found
111+
Test-AzResourceGroupDeployment.md,No examples found
112+
Unregister-AzResourceProvider.md,No examples found
113+
Get-AzSqlDatabaseGeoBackupPolicy.md,No examples found
114+
Get-AzSqlDatabaseReplicationLink.md,No examples found
115+
Get-AzSqlServerBackupLongTermRetentionVault.md,No examples found
116+
Get-AzSqlServerDisasterRecoveryConfiguration.md,No examples found
117+
Get-AzSqlServerDisasterRecoveryConfigurationActivity.md,No examples found
118+
New-AzSqlDatabaseCopy.md,No examples found
119+
New-AzSqlServerDisasterRecoveryConfiguration.md,No examples found
120+
Remove-AzSqlDatabaseSecondary.md,No examples found
121+
Remove-AzSqlServerDisasterRecoveryConfiguration.md,No examples found
122+
Set-AzSqlDatabaseGeoBackupPolicy.md,No examples found
123+
Set-AzSqlDatabaseSecondary.md,No examples found
124+
Set-AzSqlServerBackupLongTermRetentionVault.md,No examples found
125+
Set-AzSqlServerDisasterRecoveryConfiguration.md,No examples found
126+
Edit-AzWebAppBackupConfiguration.md,No synopsis found
127+
Edit-AzWebAppBackupConfiguration.md,No examples found
128+
Get-AzAppServicePlanMetric.md,No synopsis found
129+
Get-AzWebAppBackup.md,No synopsis found
130+
Get-AzWebAppBackupConfiguration.md,No synopsis found
131+
Get-AzWebAppBackupList.md,No synopsis found
132+
New-AzWebAppBackup.md,No synopsis found
133+
New-AzWebAppDatabaseBackupSetting.md,No synopsis found
134+
Remove-AzWebAppBackup.md,No synopsis found
135+
Remove-AzWebAppSlot.md,No synopsis found
136+
Reset-AzWebAppPublishingProfile.md,No synopsis found
137+
Reset-AzWebAppSlotPublishingProfile.md,No synopsis found
138+
Restart-AzWebAppSlot.md,No synopsis found
139+
Restore-AzWebAppBackup.md,No synopsis found
140+
Add-AzHDInsightSecurityProfile.md,No examples found

0 commit comments

Comments
 (0)