Skip to content

Commit 5111bd2

Browse files
author
Maddie Clayton
authored
Merge pull request #6697 from solankisamir/4_0_3_nuget
Update AzureRm.ApiManagement module to 4.0.3 nuget with bug fixes
2 parents be6a929 + b5bdc9c commit 5111bd2

File tree

45 files changed

+12050
-10305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+12050
-10305
lines changed

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/ApiManagementClient.cs

Lines changed: 106 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,42 @@ private static void ConfigureMappings()
150150
? src.SubscriptionKeyParameterNames.Query
151151
: null));
152152

153+
cfg
154+
.CreateMap<PsApiManagementApi, ApiContract>()
155+
.ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.Id))
156+
.ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.ApiId))
157+
.ForMember(dest => dest.DisplayName, opt => opt.MapFrom(src => src.Name))
158+
.ForMember(dest => dest.Description, opt => opt.MapFrom(src => src.Description))
159+
.ForMember(dest => dest.Path, opt => opt.MapFrom(src => src.Path))
160+
.ForMember(dest => dest.ServiceUrl, opt => opt.MapFrom(src => src.ServiceUrl))
161+
.ForMember(dest => dest.ApiRevision, opt => opt.MapFrom(src => src.ApiRevision))
162+
.ForMember(dest => dest.ApiVersion, opt => opt.MapFrom(src => src.ApiVersion ?? string.Empty))
163+
.ForMember(dest => dest.ApiType, opt => opt.MapFrom(src => src.ApiType ?? ApiType.Http))
164+
.ForMember(dest => dest.IsCurrent, opt => opt.MapFrom(src => src.IsCurrent))
165+
.ForMember(dest => dest.IsOnline, opt => opt.MapFrom(src => src.IsOnline))
166+
.ForMember(dest => dest.Protocols, opt => opt.MapFrom(src => src.Protocols.ToArray()))
167+
.AfterMap((src, dest) =>
168+
dest.AuthenticationSettings = ToAuthenticationSettings(src))
169+
.AfterMap((src, dest) =>
170+
dest.SubscriptionKeyParameterNames = ToSubscriptionKeyParameterNamesContract(src));
171+
172+
cfg
173+
.CreateMap<PsApiManagementApi, ApiCreateOrUpdateParameter>()
174+
.ForMember(dest => dest.DisplayName, opt => opt.MapFrom(src => src.Name))
175+
.ForMember(dest => dest.Description, opt => opt.MapFrom(src => src.Description))
176+
.ForMember(dest => dest.Path, opt => opt.MapFrom(src => src.Path))
177+
.ForMember(dest => dest.ServiceUrl, opt => opt.MapFrom(src => src.ServiceUrl))
178+
.ForMember(dest => dest.ApiRevision, opt => opt.MapFrom(src => src.ApiRevision))
179+
.ForMember(dest => dest.ApiVersion, opt => opt.MapFrom(src => src.ApiVersion ?? string.Empty))
180+
.ForMember(dest => dest.ApiType, opt => opt.MapFrom(src => src.ApiType ?? ApiType.Http))
181+
.ForMember(dest => dest.IsCurrent, opt => opt.MapFrom(src => src.IsCurrent))
182+
.ForMember(dest => dest.IsOnline, opt => opt.MapFrom(src => src.IsOnline))
183+
.ForMember(dest => dest.Protocols, opt => opt.MapFrom(src => src.Protocols.ToArray()))
184+
.AfterMap((src, dest) =>
185+
dest.AuthenticationSettings = ToAuthenticationSettings(src))
186+
.AfterMap((src, dest) =>
187+
dest.SubscriptionKeyParameterNames = ToSubscriptionKeyParameterNamesContract(src));
188+
153189
cfg.CreateMap<ApiContract, ApiCreateOrUpdateParameter>();
154190
cfg.CreateMap<RequestContract, PsApiManagementRequest>();
155191
cfg.CreateMap<ResponseContract, PsApiManagementResponse>();
@@ -590,13 +626,14 @@ public PsApiManagementApi ApiSet(
590626
string subscriptionKeyQueryParamName,
591627
PsApiManagementApi apiObject)
592628
{
593-
ApiContract apiContract;
629+
ApiCreateOrUpdateParameter api;
594630
if (apiObject == null)
595631
{
596-
apiContract = Client.Api.Get(
632+
var apiContract = Client.Api.Get(
597633
resourceGroupName,
598634
servicename,
599635
id);
636+
api = Mapper.Map<ApiCreateOrUpdateParameter>(apiContract);
600637
}
601638
else
602639
{
@@ -605,17 +642,33 @@ public PsApiManagementApi ApiSet(
605642
{
606643
id = apiObject.ApiId.ApiRevisionIdentifier(apiObject.ApiRevision);
607644
}
608-
apiContract = Mapper.Map<ApiContract>(apiObject);
645+
api = Mapper.Map<ApiCreateOrUpdateParameter>(apiObject);
609646
}
610647

611-
var api = new ApiCreateOrUpdateParameter
648+
if (!string.IsNullOrEmpty(name))
612649
{
613-
DisplayName = name ?? apiContract.Name,
614-
Description = description ?? apiContract.Description,
615-
ServiceUrl = serviceUrl ?? apiContract.ServiceUrl,
616-
Path = urlSuffix ?? apiContract.Path,
617-
Protocols = urlSchema != null ? Mapper.Map<IList<Protocol?>>(urlSchema) : apiContract.Protocols
618-
};
650+
api.DisplayName = name;
651+
}
652+
653+
if (!string.IsNullOrEmpty(description))
654+
{
655+
api.Description = description;
656+
}
657+
658+
if (!string.IsNullOrEmpty(serviceUrl))
659+
{
660+
api.ServiceUrl = serviceUrl;
661+
}
662+
663+
if (!string.IsNullOrEmpty(urlSuffix))
664+
{
665+
api.Path = urlSuffix;
666+
}
667+
668+
if (urlSchema != null)
669+
{
670+
api.Protocols = Mapper.Map<IList<Protocol?>>(urlSchema);
671+
}
619672

620673
if (authorizationServerId != null)
621674
{
@@ -628,10 +681,6 @@ public PsApiManagementApi ApiSet(
628681
}
629682
};
630683
}
631-
else
632-
{
633-
api.AuthenticationSettings = apiContract.AuthenticationSettings;
634-
}
635684

636685
if (!string.IsNullOrWhiteSpace(subscriptionKeyHeaderName) || !string.IsNullOrWhiteSpace(subscriptionKeyQueryParamName))
637686
{
@@ -641,10 +690,6 @@ public PsApiManagementApi ApiSet(
641690
Query = subscriptionKeyQueryParamName
642691
};
643692
}
644-
else
645-
{
646-
api.SubscriptionKeyParameterNames = apiContract.SubscriptionKeyParameterNames;
647-
}
648693

649694
var updatedApiContract = Client.Api.CreateOrUpdate(
650695
resourceGroupName,
@@ -923,7 +968,10 @@ public void UpdateApiRelease(
923968
apiId,
924969
releaseId);
925970

926-
apiReleaseContract.Notes = notes;
971+
if (!string.IsNullOrEmpty(notes))
972+
{
973+
apiReleaseContract.Notes = notes;
974+
}
927975

928976
Client.ApiRelease.Update(
929977
resourceGroupName,
@@ -2933,6 +2981,45 @@ static IList<ParameterContract> ToParameterContract(PsApiManagementParameter[] p
29332981
return parameterList;
29342982
}
29352983

2984+
static AuthenticationSettingsContract ToAuthenticationSettings(PsApiManagementApi psApiManagementApi)
2985+
{
2986+
if (psApiManagementApi == null ||
2987+
string.IsNullOrWhiteSpace(psApiManagementApi.AuthorizationServerId) ||
2988+
string.IsNullOrEmpty(psApiManagementApi.AuthorizationScope))
2989+
{
2990+
return null;
2991+
}
2992+
2993+
var settings = new AuthenticationSettingsContract()
2994+
{
2995+
OAuth2 = new OAuth2AuthenticationSettingsContract()
2996+
{
2997+
AuthorizationServerId = psApiManagementApi.AuthorizationServerId,
2998+
Scope = psApiManagementApi.AuthorizationScope
2999+
}
3000+
};
3001+
3002+
return settings;
3003+
}
3004+
3005+
static SubscriptionKeyParameterNamesContract ToSubscriptionKeyParameterNamesContract(PsApiManagementApi psApiManagementApi)
3006+
{
3007+
if (psApiManagementApi == null ||
3008+
(string.IsNullOrWhiteSpace(psApiManagementApi.SubscriptionKeyHeaderName) &&
3009+
string.IsNullOrEmpty(psApiManagementApi.SubscriptionKeyQueryParamName)))
3010+
{
3011+
return null;
3012+
}
3013+
3014+
var subscriptionKeyParameters = new SubscriptionKeyParameterNamesContract()
3015+
{
3016+
Header = psApiManagementApi.SubscriptionKeyHeaderName,
3017+
Query = psApiManagementApi.SubscriptionKeyQueryParamName
3018+
};
3019+
3020+
return subscriptionKeyParameters;
3021+
}
3022+
29363023
static PsApiManagementParameter[] ToParameterContract(IList<ParameterContract> parameters)
29373024
{
29383025
if (parameters == null || !parameters.Any())

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<ItemGroup>
3535
<PackageReference Include="AutoMapper" Version="6.2.2" />
36-
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.2-preview" />
36+
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.3-preview" />
3737
</ItemGroup>
3838

3939
<ItemGroup>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<Private>True</Private>
5353
</Reference>
5454
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.4.0.2-preview\lib\net452\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
55+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.4.0.3-preview\lib\net452\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
5858
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementPolicy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public override void ExecuteApiManagementCmdlet()
162162
return;
163163
}
164164

165-
File.WriteAllText(SaveAs, policyContent, Encoding.UTF8);
165+
File.WriteAllText(SaveAs, policyContent);
166166
}
167167
else
168168
{

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Models/ErrorBody.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public ErrorBody()
3131

3232
}
3333

34-
public ErrorBody(ErrorResponse errorBody)
34+
public ErrorBody(ErrorResponseBody errorBody)
3535
: this()
3636
{
3737
if (errorBody == null)

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AutoMapper" version="6.0.2" targetFramework="net452" />
4-
<package id="Microsoft.Azure.Management.ApiManagement" version="4.0.2-preview" targetFramework="net452" />
4+
<package id="Microsoft.Azure.Management.ApiManagement" version="4.0.3-preview" targetFramework="net452" />
55
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
6-
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />
6+
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />
77
<package id="System.Spatial" version="5.8.2" targetFramework="net452" />
88
<package id="WindowsAzure.Storage" version="8.1.1" targetFramework="net452" />
99
</packages>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.2-preview" />
29+
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.3-preview" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
5353
</Reference>
5454
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.4.0.2-preview\lib\net452\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
55+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.4.0.3-preview\lib\net452\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
5858
<Reference Include="Microsoft.Azure.Management.Authorization">

0 commit comments

Comments
 (0)