Skip to content
This repository was archived by the owner on Feb 23, 2024. It is now read-only.

Commit 9e9a91d

Browse files
lucashuet93lucashuet93
committed
rename all async methods, update awaits where necessary
1 parent 91be0e4 commit 9e9a91d

File tree

13 files changed

+104
-106
lines changed

13 files changed

+104
-106
lines changed

‎src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/APITemplateCreatorTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Test
99
public class APITemplateCreatorTests
1010
{
1111
[Fact]
12-
public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
12+
public void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
1313
{
1414
// arrange
1515
APITemplateCreator apiTemplateCreator = APITemplateCreatorFactory.GenerateAPITemplateCreator();
@@ -46,7 +46,7 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
4646
creatorConfig.apis.Add(api);
4747

4848
// act
49-
APITemplateResource apiTemplateResource = await apiTemplateCreator.CreateAPITemplateResourceAsync(api, true, true);
49+
APITemplateResource apiTemplateResource = apiTemplateCreator.CreateAPITemplateResource(api, true, true);
5050

5151
// assert
5252
Assert.Equal($"[concat(parameters('ApimServiceName'), '/{api.name}')]", apiTemplateResource.name);
@@ -70,7 +70,7 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
7070
}
7171

7272
[Fact]
73-
public async void ShouldCreateSubsequentlAPITemplateResourceFromCreatorConfigWithCorrectContent()
73+
public void ShouldCreateSubsequentlAPITemplateResourceFromCreatorConfigWithCorrectContent()
7474
{
7575
// arrange
7676
APITemplateCreator apiTemplateCreator = APITemplateCreatorFactory.GenerateAPITemplateCreator();
@@ -83,7 +83,7 @@ public async void ShouldCreateSubsequentlAPITemplateResourceFromCreatorConfigWit
8383
creatorConfig.apis.Add(api);
8484

8585
// act
86-
APITemplateResource apiTemplateResource = await apiTemplateCreator.CreateAPITemplateResourceAsync(api, true, false);
86+
APITemplateResource apiTemplateResource = apiTemplateCreator.CreateAPITemplateResource(api, true, false);
8787

8888
// assert
8989
Assert.Equal($"[concat(parameters('ApimServiceName'), '/{api.name}')]", apiTemplateResource.name);
@@ -92,7 +92,7 @@ public async void ShouldCreateSubsequentlAPITemplateResourceFromCreatorConfigWit
9292
}
9393

9494
[Fact]
95-
public async void ShouldCreateUnifiedAPITemplateResourceFromCreatorConfig()
95+
public void ShouldCreateUnifiedAPITemplateResourceFromCreatorConfig()
9696
{
9797
// arrange
9898
APITemplateCreator apiTemplateCreator = APITemplateCreatorFactory.GenerateAPITemplateCreator();
@@ -129,7 +129,7 @@ public async void ShouldCreateUnifiedAPITemplateResourceFromCreatorConfig()
129129
creatorConfig.apis.Add(api);
130130

131131
// act
132-
APITemplateResource apiTemplateResource = await apiTemplateCreator.CreateAPITemplateResourceAsync(api, false, true);
132+
APITemplateResource apiTemplateResource = apiTemplateCreator.CreateAPITemplateResource(api, false, true);
133133

134134
// assert
135135
Assert.Equal($"[concat(parameters('ApimServiceName'), '/{api.name}')]", apiTemplateResource.name);
@@ -155,7 +155,7 @@ public async void ShouldCreateUnifiedAPITemplateResourceFromCreatorConfig()
155155
}
156156

157157
[Fact]
158-
public async void ShouldAppendRevisionToAPIName()
158+
public void ShouldAppendRevisionToAPIName()
159159
{
160160
// arrange
161161
APITemplateCreator apiTemplateCreator = APITemplateCreatorFactory.GenerateAPITemplateCreator();
@@ -173,7 +173,7 @@ public async void ShouldAppendRevisionToAPIName()
173173

174174
// act
175175
// the above api config will create a unified api template with a single resource
176-
List<Template> apiTemplates = await apiTemplateCreator.CreateAPITemplatesAsync(api);
176+
List<Template> apiTemplates = apiTemplateCreator.CreateAPITemplates(api);
177177
APITemplateResource apiTemplateResource = apiTemplates.FirstOrDefault().resources[0] as APITemplateResource;
178178

179179
// assert

‎src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using McMaster.Extensions.CommandLineUtils;
2-
using Colors.Net;
32
using System;
43
using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common;
54
using System.Collections.Generic;
@@ -75,7 +74,7 @@ public CreateCommand()
7574
foreach (APIConfig api in creatorConfig.apis)
7675
{
7776
// create api templates from provided api config - if the api config contains a supplied apiVersion, split the templates into 2 for metadata and swagger content, otherwise create a unified template
78-
List<Template> apiTemplateSet = await apiTemplateCreator.CreateAPITemplatesAsync(api);
77+
List<Template> apiTemplateSet = apiTemplateCreator.CreateAPITemplates(api);
7978
apiTemplates.AddRange(apiTemplateSet);
8079
// create the relevant info that will be needed to properly link to the api template(s) from the master template
8180
apiInformation.Add(new LinkedMasterTemplateAPIInformation()
@@ -84,9 +83,9 @@ public CreateCommand()
8483
isSplit = apiTemplateCreator.isSplitAPI(api),
8584
dependsOnVersionSets = api.apiVersionSetId != null,
8685
dependsOnProducts = api.products != null,
87-
dependsOnLoggers = await masterTemplateCreator.DetermineIfAPIDependsOnLogger(api, fileReader),
86+
dependsOnLoggers = await masterTemplateCreator.DetermineIfAPIDependsOnLoggerAsync(api, fileReader),
8887
dependsOnAuthorizationServers = api.authenticationSettings != null && api.authenticationSettings.oAuth2 != null && api.authenticationSettings.oAuth2.authorizationServerId != null,
89-
dependsOnBackends = await masterTemplateCreator.DetermineIfAPIDependsOnBackend(api, fileReader)
88+
dependsOnBackends = await masterTemplateCreator.DetermineIfAPIDependsOnBackendAsync(api, fileReader)
9089
});
9190
}
9291

‎src/APIM_ARMTemplate/apimtemplate/Commands/Extract.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using McMaster.Extensions.CommandLineUtils;
33
using System.Collections.Generic;
4-
using System.IO;
54
using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common;
65
using System.Linq;
76

@@ -73,15 +72,15 @@ public ExtractCommand()
7372
MasterTemplateExtractor masterTemplateExtractor = new MasterTemplateExtractor();
7473

7574
// extract templates from apim service
76-
Template apiTemplate = await apiExtractor.GenerateAPIsARMTemplate(sourceApim, resourceGroup, singleApiName, policyXMLBaseUrl, fileFolder);
75+
Template apiTemplate = await apiExtractor.GenerateAPIsARMTemplateAsync(sourceApim, resourceGroup, singleApiName, policyXMLBaseUrl, fileFolder);
7776
List<TemplateResource> apiTemplateResources = apiTemplate.resources.ToList();
78-
Template apiVersionSetTemplate = await apiVersionSetExtractor.GenerateAPIVersionSetsARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
79-
Template authorizationServerTemplate = await authorizationServerExtractor.GenerateAuthorizationServersARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
80-
Template loggerTemplate = await loggerExtractor.GenerateLoggerTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
81-
Template productTemplate = await productExtractor.GenerateProductsARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl, fileFolder);
82-
Template namedValueTemplate = await propertyExtractor.GenerateNamedValuesTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
77+
Template apiVersionSetTemplate = await apiVersionSetExtractor.GenerateAPIVersionSetsARMTemplateAsync(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
78+
Template authorizationServerTemplate = await authorizationServerExtractor.GenerateAuthorizationServersARMTemplateAsync(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
79+
Template loggerTemplate = await loggerExtractor.GenerateLoggerTemplateAsync(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
80+
Template productTemplate = await productExtractor.GenerateProductsARMTemplateAsync(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl, fileFolder);
81+
Template namedValueTemplate = await propertyExtractor.GenerateNamedValuesTemplateAsync(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
8382
List<TemplateResource> namedValueResources = namedValueTemplate.resources.ToList();
84-
Template backendTemplate = await backendExtractor.GenerateBackendsARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, namedValueResources, policyXMLBaseUrl);
83+
Template backendTemplate = await backendExtractor.GenerateBackendsARMTemplateAsync(sourceApim, resourceGroup, singleApiName, apiTemplateResources, namedValueResources, policyXMLBaseUrl);
8584

8685
// create parameters file
8786
Template templateParameters = masterTemplateExtractor.CreateMasterTemplateParameterValues(destinationApim, linkedBaseUrl, policyXMLBaseUrl);

‎src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public APITemplateCreator(FileReader fileReader, PolicyTemplateCreator policyTem
2323
this.releaseTemplateCreator = releaseTemplateCreator;
2424
}
2525

26-
public async Task<List<Template>> CreateAPITemplatesAsync(APIConfig api)
26+
public List<Template> CreateAPITemplates(APIConfig api)
2727
{
2828
// determine if api needs to be split into multiple templates
2929
bool isSplit = isSplitAPI(api);
@@ -43,18 +43,18 @@ public async Task<List<Template>> CreateAPITemplatesAsync(APIConfig api)
4343
if (isSplit == true)
4444
{
4545
// create 2 templates, an initial template with metadata and a subsequent template with the swagger content
46-
apiTemplates.Add(await CreateAPITemplateAsync(api, isSplit, true));
47-
apiTemplates.Add(await CreateAPITemplateAsync(api, isSplit, false));
46+
apiTemplates.Add(CreateAPITemplate(api, isSplit, true));
47+
apiTemplates.Add(CreateAPITemplate(api, isSplit, false));
4848
}
4949
else
5050
{
5151
// create a unified template that includes both the metadata and swagger content
52-
apiTemplates.Add(await CreateAPITemplateAsync(api, isSplit, false));
52+
apiTemplates.Add(CreateAPITemplate(api, isSplit, false));
5353
}
5454
return apiTemplates;
5555
}
5656

57-
public async Task<Template> CreateAPITemplateAsync(APIConfig api, bool isSplit, bool isInitial)
57+
public Template CreateAPITemplate(APIConfig api, bool isSplit, bool isInitial)
5858
{
5959
// create empty template
6060
Template apiTemplate = CreateEmptyTemplate();
@@ -67,7 +67,7 @@ public async Task<Template> CreateAPITemplateAsync(APIConfig api, bool isSplit,
6767

6868
List<TemplateResource> resources = new List<TemplateResource>();
6969
// create api resource
70-
APITemplateResource apiTemplateResource = await this.CreateAPITemplateResourceAsync(api, isSplit, isInitial);
70+
APITemplateResource apiTemplateResource = this.CreateAPITemplateResource(api, isSplit, isInitial);
7171
resources.Add(apiTemplateResource);
7272
// add the api child resources (api policies, diagnostics, etc) if this is the unified or subsequent template
7373
if (!isSplit || !isInitial)
@@ -102,7 +102,7 @@ public List<TemplateResource> CreateChildResourceTemplates(APIConfig api)
102102
return resources;
103103
}
104104

105-
public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig api, bool isSplit, bool isInitial)
105+
public APITemplateResource CreateAPITemplateResource(APIConfig api, bool isSplit, bool isInitial)
106106
{
107107
// create api resource
108108
APITemplateResource apiTemplateResource = new APITemplateResource()

‎src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/MasterTemplateCreator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public Template CreateMasterTemplateParameterValues(CreatorConfig creatorConfig)
207207
return masterTemplate;
208208
}
209209

210-
public async Task<bool> DetermineIfAPIDependsOnLogger(APIConfig api, FileReader fileReader)
210+
public async Task<bool> DetermineIfAPIDependsOnLoggerAsync(APIConfig api, FileReader fileReader)
211211
{
212212
if (api.diagnostic != null && api.diagnostic.loggerId != null)
213213
{
@@ -235,7 +235,7 @@ public async Task<bool> DetermineIfAPIDependsOnLogger(APIConfig api, FileReader
235235
return false;
236236
}
237237

238-
public async Task<bool> DetermineIfAPIDependsOnBackend(APIConfig api, FileReader fileReader)
238+
public async Task<bool> DetermineIfAPIDependsOnBackendAsync(APIConfig api, FileReader fileReader)
239239
{
240240
string apiPolicy = api.policy != null ? await fileReader.RetrieveFileContentsAsync(api.policy) : "";
241241
if (apiPolicy.Contains("set-backend-service"))

0 commit comments

Comments
 (0)