Remove depends on for productapi template, and depends on previous (#758)

Remove depends on for productapi template, and depends on previous product-api in apis template.

Co-authored-by: Farhad Alizada <falizada@microsoft.com>

Author: f-alizada

src/ArmTemplates/Extractor/EntityExtractors/ProductApisExtractor.cs

@@ -99,17 +99,14 @@ async Task<List<ProductApiTemplateResource>> GenerateMultipleApisTemplateAsync(L
         {
             this.logger.LogInformation("Processing {0} api-names...", multipleApiNames.Count);
 
-            string[] dependsOn = Array.Empty<string>();
             var templateResources = new List<ProductApiTemplateResource>();
             foreach (string apiName in multipleApiNames)
             {
-                var productApiTemplateResources = await this.GenerateProductApiTemplateResourcesAsync(apiName, extractorParameters, dependsOn);
+                var productApiTemplateResources = await this.GenerateProductApiTemplateResourcesAsync(apiName, extractorParameters, null);
 
                 if (!productApiTemplateResources.IsNullOrEmpty())
                 {
                     templateResources.AddRange(productApiTemplateResources);
-                    string apiProductName = templateResources.Last().Name.Split('/', 3)[1];
-                    dependsOn = new string[] { $"[resourceId('Microsoft.ApiManagement/service/products/apis', parameters('{ParameterNames.ApimServiceName}'), '{apiProductName}', '{apiName}')]" };
                 }
             }
 
@@ -119,7 +116,7 @@ async Task<List<ProductApiTemplateResource>> GenerateMultipleApisTemplateAsync(L
         async Task<List<ProductApiTemplateResource>> GenerateProductApiTemplateResourcesAsync(
             string apiName, 
             ExtractorParameters extractorParameters, 
-            string[] dependsOn)
+            string[] dependsOn = null)
         {
             var productApiResources = new List<ProductApiTemplateResource>();
             this.logger.LogInformation("Extracting products from {0} API:", apiName);
@@ -128,7 +125,6 @@ async Task<List<ProductApiTemplateResource>> GenerateProductApiTemplateResources
             {
                 var productApis = await this.productsClient.GetAllLinkedToApiAsync(apiName, extractorParameters);
 
-                string lastProductAPIName = null;
                 foreach (var productApi in productApis)
                 {
                     this.logger.LogInformation("'{0}' Product association found", productApi.OriginalName);
@@ -138,11 +134,13 @@ async Task<List<ProductApiTemplateResource>> GenerateProductApiTemplateResources
                     productApi.Name = $"[concat(parameters('{ParameterNames.ApimServiceName}'), '/{productApi.NewName}/{apiName}')]";
                     productApi.ApiVersion = GlobalConstants.ApiVersion;
                     productApi.Scale = null;
-                    productApi.DependsOn = lastProductAPIName != null ? new string[] { lastProductAPIName } : dependsOn;
-
+                    if (!dependsOn.IsNullOrEmpty())
+                    {
+                        productApi.DependsOn = dependsOn;
+                    }
+                    
                     productApiResources.Add(productApi);
 
-                    lastProductAPIName = $"[resourceId('Microsoft.ApiManagement/service/products/apis', parameters('{ParameterNames.ApimServiceName}'), '{productApi.NewName}', '{apiName}')]";
                 }
             }
             catch (Exception ex) 

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

@@ -67,20 +67,15 @@ public async Task GenerateProductApisTemplates_ProperlyLaysTheInformation()
             productApisTemplate.TypedResources.ProductApis.Count().Should().Be(2);
             productApisTemplate.Resources.Count().Should().Be(2);
 
-            var productApi1 = productApisTemplate.TypedResources.ProductApis.First();
-            productApi1.ApiVersion.Should().Be(GlobalConstants.ApiVersion);
-            productApi1.Name.Should().NotBeNullOrEmpty();
-            productApi1.Type.Should().Be(ResourceTypeConstants.ProductApi);
-            productApi1.Properties.DisplayName.Should().NotBeNullOrEmpty();
-            productApi1.Properties.Description.Should().NotBeNullOrEmpty();
-
-            var productApi2 = productApisTemplate.TypedResources.ProductApis.Last();
-            productApi2.ApiVersion.Should().Be(GlobalConstants.ApiVersion);
-            productApi2.Name.Should().NotBeNullOrEmpty();
-            productApi2.Type.Should().Be(ResourceTypeConstants.ProductApi);
-            productApi2.Properties.DisplayName.Should().NotBeNullOrEmpty();
-            productApi2.Properties.Description.Should().NotBeNullOrEmpty();
-            productApi2.DependsOn.Should().NotBeNullOrEmpty();
+            foreach (var productApi in productApisTemplate.TypedResources.ProductApis)
+            {
+                productApi.ApiVersion.Should().Be(GlobalConstants.ApiVersion);
+                productApi.Name.Should().NotBeNullOrEmpty();
+                productApi.Type.Should().Be(ResourceTypeConstants.ProductApi);
+                productApi.Properties.DisplayName.Should().NotBeNullOrEmpty();
+                productApi.Properties.Description.Should().NotBeNullOrEmpty();
+                productApi.DependsOn.Should().BeNullOrEmpty();
+            }
         }
     }
 }