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

Commit 3c89846

Browse files
f-alizadaFarhad Alizada
andauthored
Remove dependsOn property from apiTags template (#754)
Co-authored-by: Farhad Alizada <falizada@microsoft.com>
1 parent f3a8a9c commit 3c89846

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

src/ArmTemplates/Extractor/EntityExtractors/TagAPIExtractor.cs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public async Task<Template<TagApiTemplateResources>> GenerateApiTagsTemplateAsyn
5050

5151
if (!string.IsNullOrEmpty(singleApiName))
5252
{
53-
tagApiTemplate.TypedResources = await this.GenerateSingleApiTagResourceAsync(singleApiName, extractorParameters, Array.Empty<string>());
53+
tagApiTemplate.TypedResources = await this.GenerateSingleApiTagResourceAsync(singleApiName, extractorParameters);
5454
}
5555
else if (!multipleApiNames.IsNullOrEmpty())
5656
{
@@ -73,40 +73,31 @@ async Task<TagApiTemplateResources> GenerateMultipleApisTemplateAsync(List<strin
7373
this.logger.LogDebug("Processing {0} api-names...", multipleApiNames.Count);
7474

7575
var overallResources = new TagApiTemplateResources();
76-
string[] dependsOn = Array.Empty<string>();
7776
foreach (string apiName in multipleApiNames)
7877
{
79-
var tagApiResources = await this.GenerateSingleApiTagResourceAsync(apiName, extractorParameters, dependsOn);
78+
var tagApiResources = await this.GenerateSingleApiTagResourceAsync(apiName, extractorParameters);
8079

8180
if (tagApiResources.HasContent())
8281
{
8382
overallResources.AddDataResources(tagApiResources);
84-
85-
// Extract the tag name from the last resource
86-
string[] lastTagName = tagApiResources.Tags.Last().Name.Replace("')]", "").Split('/');
87-
dependsOn = new string[] { $"[resourceId('Microsoft.ApiManagement/service/apis/tags', parameters('{ParameterNames.ApimServiceName}'), '{apiName}', '{lastTagName[2]}')]" };
8883
}
8984
}
9085

9186
return overallResources;
9287
}
9388

94-
async Task<TagApiTemplateResources> GenerateSingleApiTagResourceAsync(string apiName, ExtractorParameters extractorParameters, string[] dependsOn)
89+
async Task<TagApiTemplateResources> GenerateSingleApiTagResourceAsync(string apiName, ExtractorParameters extractorParameters)
9590
{
9691
var templateResources = new TagApiTemplateResources();
9792

9893
var apiTags = await this.tagClient.GetAllTagsLinkedToApiAsync(apiName, extractorParameters);
99-
var dependencyChain = dependsOn;
10094
foreach (var apiTag in apiTags)
10195
{
10296
var apiTagOriginalName = apiTag.Name;
10397

10498
apiTag.Name = $"[concat(parameters('{ParameterNames.ApimServiceName}'), '/{apiName}/{apiTagOriginalName}')]";
10599
apiTag.ApiVersion = GlobalConstants.ApiVersion;
106100
apiTag.Scale = null;
107-
apiTag.DependsOn = dependencyChain;
108-
dependencyChain = new string[] { $"[resourceId('Microsoft.ApiManagement/service/apis/tags', parameters('{ParameterNames.ApimServiceName}'), '{apiName}', '{apiTagOriginalName}')]" };
109-
110101
templateResources.Tags.Add(apiTag);
111102
}
112103

tests/ArmTemplates.Tests/Extractor/Scenarios/TagApiExtractorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public async Task GenerateTagApiTemplates_ProperlyLaysTheInformation()
7272
resources.Tags.Any(x => x.Name.Contains(MockTagClient.TagName1)).Should().BeTrue();
7373
resources.Tags.Any(x => x.Name.Contains(MockTagClient.TagName2)).Should().BeTrue();
7474
resources.Tags.All(x => x.ApiVersion == GlobalConstants.ApiVersion).Should().BeTrue();
75-
resources.Tags.All(x => !x.DependsOn.IsNullOrEmpty() && !string.IsNullOrEmpty(x.DependsOn.First())).Should().BeTrue();
75+
resources.Tags.All(x => x.DependsOn.IsNullOrEmpty()).Should().BeTrue();
7676
}
7777
}
7878
}

0 commit comments

Comments
 (0)