Skip to content

Commit 24dbb67

Browse files
authored
Merge pull request Azure#9756 from solankisamir/sasolank_apirevisionfixes
Fix for not setting apirevisiondescription
2 parents 27b73d3 + cf09370 commit 24dbb67

File tree

13 files changed

+306
-289
lines changed

13 files changed

+306
-289
lines changed

src/ApiManagement/ApiManagement.ServiceManagement.Test/ScenarioTests/ApiManagementTests.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3051,6 +3051,7 @@ function ApiRevision-CrudTest {
30513051
$swaggerApiId1 = getAssetName
30523052
$apiRevisionId = "2"
30533053
$apiReleaseId = getAssetName
3054+
$apiRevisionDescription = getAssetName
30543055

30553056
try {
30563057
# import api from file
@@ -3079,9 +3080,11 @@ function ApiRevision-CrudTest {
30793080

30803081
# now lets create an api revision
30813082
$expectedApiId = [string]::Format("{0};rev={1}", $swaggerApiId1, $apiRevisionId)
3082-
$apiRevision = New-AzApiManagementApiRevision -Context $context -ApiId $swaggerApiId1 -ApiRevision $apiRevisionId -SourceApiRevision "1"
3083+
$apiRevision = New-AzApiManagementApiRevision -Context $context -ApiId $swaggerApiId1 -ApiRevision $apiRevisionId -SourceApiRevision "1" -ApiRevisionDescription $apiRevisionDescription
30833084
Assert-AreEqual $expectedApiId $apiRevision.ApiId
30843085
Assert-AreEqual $apiRevisionId $apiRevision.ApiRevision
3086+
Assert-NotNull $apiRevision.ApiRevisionDescription
3087+
Assert-AreEqual $apiRevisionDescription $apiRevision.ApiRevisionDescription
30853088
Assert-AreEqual $path1 $apiRevision.Path
30863089
Assert-False { $apiRevision.IsCurrent }
30873090

src/ApiManagement/ApiManagement.ServiceManagement.Test/SessionRecords/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test.ScenarioTests.ApiManagementTests/ApiRevisionCrudTest.json

Lines changed: 189 additions & 188 deletions
Large diffs are not rendered by default.

src/ApiManagement/ApiManagement.ServiceManagement.Test/SessionRecords/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test.ScenarioTests.ApiManagementTests/AuthorizationServerCrudTest.json

Lines changed: 80 additions & 80 deletions
Large diffs are not rendered by default.

src/ApiManagement/ApiManagement.ServiceManagement/ApiManagementClient.cs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ private static void ConfigureMappings()
350350
.ForMember(dest => dest.CertificateId, opt => opt.MapFrom(src => src.Name));
351351

352352
cfg
353-
.CreateMap<AuthorizationServerContract, PsApiManagementOAuth2AuthrozationServer>()
353+
.CreateMap<AuthorizationServerContract, PsApiManagementOAuth2AuthorizationServer>()
354354
.ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.Id))
355355
.ForMember(dest => dest.ServerId, opt => opt.MapFrom(src => src.Name))
356356
.ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.DisplayName))
@@ -1165,7 +1165,8 @@ public PsApiManagementApi ApiCreateRevision(
11651165
string apiId,
11661166
string revisionId,
11671167
string sourceRevisionId,
1168-
string serviceUrl)
1168+
string serviceUrl,
1169+
string apiRevisiondescription)
11691170
{
11701171
var api = Client.Api.Get(context.ResourceGroupName, context.ServiceName, apiId);
11711172
ApiCreateOrUpdateParameter apiCreateParams;
@@ -1185,6 +1186,11 @@ public PsApiManagementApi ApiCreateRevision(
11851186
apiCreateParams.ServiceUrl = serviceUrl;
11861187
}
11871188

1189+
if (!string.IsNullOrEmpty(apiRevisiondescription))
1190+
{
1191+
apiCreateParams.ApiRevisionDescription = apiRevisiondescription;
1192+
}
1193+
11881194
var getResponse = Client.Api.CreateOrUpdate(
11891195
context.ResourceGroupName,
11901196
context.ServiceName,
@@ -2404,25 +2410,25 @@ public void CertificateRemove(PsApiManagementContext context, string certificate
24042410

24052411
#region Authorization Servers
24062412

2407-
public IList<PsApiManagementOAuth2AuthrozationServer> AuthorizationServerList(string resourceGroupName, string serviceName)
2413+
public IList<PsApiManagementOAuth2AuthorizationServer> AuthorizationServerList(string resourceGroupName, string serviceName)
24082414
{
2409-
var results = ListPagedAndMap<PsApiManagementOAuth2AuthrozationServer, AuthorizationServerContract>(
2415+
var results = ListPagedAndMap<PsApiManagementOAuth2AuthorizationServer, AuthorizationServerContract>(
24102416
() => Client.AuthorizationServer.ListByService(resourceGroupName, serviceName, null),
24112417
nextLink => Client.AuthorizationServer.ListByServiceNext(nextLink));
24122418

24132419
return results;
24142420
}
24152421

2416-
public PsApiManagementOAuth2AuthrozationServer AuthorizationServerById(
2422+
public PsApiManagementOAuth2AuthorizationServer AuthorizationServerById(
24172423
string resourceGroupName, string serviceName, string serverId)
24182424
{
24192425
var response = Client.AuthorizationServer.Get(resourceGroupName, serviceName, serverId);
24202426

2421-
var server = Mapper.Map<PsApiManagementOAuth2AuthrozationServer>(response);
2427+
var server = Mapper.Map<PsApiManagementOAuth2AuthorizationServer>(response);
24222428
return server;
24232429
}
24242430

2425-
public PsApiManagementOAuth2AuthrozationServer AuthorizationServerCreate(
2431+
public PsApiManagementOAuth2AuthorizationServer AuthorizationServerCreate(
24262432
PsApiManagementContext context,
24272433
string serverId,
24282434
string name,
@@ -2481,7 +2487,7 @@ public PsApiManagementOAuth2AuthrozationServer AuthorizationServerCreate(
24812487
serverId,
24822488
serverContract);
24832489

2484-
var server = Mapper.Map<PsApiManagementOAuth2AuthrozationServer>(response);
2490+
var server = Mapper.Map<PsApiManagementOAuth2AuthorizationServer>(response);
24852491

24862492
return server;
24872493
}

src/ApiManagement/ApiManagement.ServiceManagement/Commands/GetAzureApiManagementAuthorizationServer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
1919
using Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models;
2020

2121
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ApiManagementAuthorizationServer", DefaultParameterSetName = ContextParameterSet)]
22-
[OutputType(typeof(PsApiManagementOAuth2AuthrozationServer))]
22+
[OutputType(typeof(PsApiManagementOAuth2AuthorizationServer))]
2323
public class GetAzureApiManagementAuthorizationServer : AzureApiManagementCmdletBase
2424
{
2525
#region ParameterSet
@@ -59,7 +59,7 @@ public override void ExecuteApiManagementCmdlet()
5959

6060
if (ParameterSetName.Equals(ResourceIdParameterSet))
6161
{
62-
var authorizationServer = new PsApiManagementOAuth2AuthrozationServer(ResourceId);
62+
var authorizationServer = new PsApiManagementOAuth2AuthorizationServer(ResourceId);
6363
resourceGroupName = authorizationServer.ResourceGroupName;
6464
serviceName = authorizationServer.ServiceName;
6565
authorizationserverId = authorizationServer.ServerId;

src/ApiManagement/ApiManagement.ServiceManagement/Commands/NewAzureApiManagementApiRevision.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public override void ExecuteApiManagementCmdlet()
7575
ApiId,
7676
ApiRevision,
7777
SourceApiRevision,
78-
ServiceUrl);
78+
ServiceUrl,
79+
ApiRevisionDescription);
7980
WriteObject(newApi);
8081
}
8182
}

src/ApiManagement/ApiManagement.ServiceManagement/Commands/NewAzureApiManagementAuthorizationServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
2020
using System.Management.Automation;
2121

2222
[Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ApiManagementAuthorizationServer")]
23-
[OutputType(typeof(PsApiManagementOAuth2AuthrozationServer))]
23+
[OutputType(typeof(PsApiManagementOAuth2AuthorizationServer))]
2424
public class NewAzureApiManagementAuthorizationServer : AzureApiManagementCmdletBase
2525
{
2626
[Parameter(

src/ApiManagement/ApiManagement.ServiceManagement/Commands/SetAzureApiManagementAuthorizationServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
1919
using System.Management.Automation;
2020

2121
[Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ApiManagementAuthorizationServer")]
22-
[OutputType(typeof(PsApiManagementOAuth2AuthrozationServer))]
22+
[OutputType(typeof(PsApiManagementOAuth2AuthorizationServer))]
2323
public class SetAzureApiManagementAuthorizationServer : AzureApiManagementCmdletBase
2424
{
2525
[Parameter(

src/ApiManagement/ApiManagement.ServiceManagement/Models/PsApiManagementOAuth2AuthrozationServer.cs renamed to src/ApiManagement/ApiManagement.ServiceManagement/Models/PsApiManagementOAuth2AuthorizationServer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models
1818
using System.Collections;
1919
using System.Text.RegularExpressions;
2020

21-
public class PsApiManagementOAuth2AuthrozationServer : PsApiManagementArmResource
21+
public class PsApiManagementOAuth2AuthorizationServer : PsApiManagementArmResource
2222
{
2323
static readonly Regex AuthorizationServerIdRegex = new Regex(@"(.*?)/providers/microsoft.apimanagement/service/(?<serviceName>[^/]+)/authorizationServers/(?<authorizationServerId>[^/]+)", RegexOptions.IgnoreCase);
2424

@@ -57,9 +57,9 @@ public class PsApiManagementOAuth2AuthrozationServer : PsApiManagementArmResourc
5757

5858
public string ResourceOwnerPassword { get; set; }
5959

60-
public PsApiManagementOAuth2AuthrozationServer() { }
60+
public PsApiManagementOAuth2AuthorizationServer() { }
6161

62-
public PsApiManagementOAuth2AuthrozationServer(string armResourceId)
62+
public PsApiManagementOAuth2AuthorizationServer(string armResourceId)
6363
{
6464
this.Id = armResourceId;
6565
var match = AuthorizationServerIdRegex.Match(Id);

src/ApiManagement/ApiManagement/ChangeLog.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,18 @@
1919
-->
2020
## Upcoming Release
2121
* Fixed miscellaneous typos across module
22+
2223
* Fix for issue https://github.com/Azure/azure-powershell/issues/9351
2324
- Update .net nuget version, which does not enforce restrictions on productId, apiId, groupId and userId
2425

25-
* Added support for querying products using Api
26+
* **Get-AzApiManagementProduct** - Added support for querying products using Api.
2627
https://github.com/Azure/azure-powershell/issues/9482
2728

29+
* **New-AzApiManagementApiRevision** - Fix for issue where ApiRevisionDescription was not being set when creating new api revision
30+
https://github.com/Azure/azure-powershell/issues/9752
31+
32+
* Fixed typo in model `PsApiManagementOAuth2AuthrozationServer` to `PsApiManagementOAuth2AuthorizationServer`
33+
2834
## Version 1.2.0
2935

3036
* Fix for issue https://github.com/Azure/azure-powershell/issues/8671

src/ApiManagement/ApiManagement/help/Get-AzApiManagementAuthorizationServer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
116116
117117
## OUTPUTS
118118
119-
### Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOAuth2AuthrozationServer
119+
### Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOAuth2AuthorizationServer
120120
121121
## NOTES
122122

src/ApiManagement/ApiManagement/help/New-AzApiManagementAuthorizationServer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
363363

364364
## OUTPUTS
365365

366-
### Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOAuth2AuthrozationServer
366+
### Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOAuth2AuthorizationServer
367367

368368
## NOTES
369369

src/ApiManagement/ApiManagement/help/Set-AzApiManagementAuthorizationServer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
380380

381381
## OUTPUTS
382382

383-
### Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOAuth2AuthrozationServer
383+
### Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOAuth2AuthorizationServer
384384

385385
## NOTES
386386

0 commit comments

Comments
 (0)