Merge pull request #17 from Azure/soap-api-issues

Soap api issues

Author: RobertoBorges

docs/README.md

@@ -1,4 +1,3 @@
-
 <img src="assets/images/apim-logo-transparent.png">
 
 #  Code Of Conduct
@@ -61,6 +60,9 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
 contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
+# Supporting Tools
+While the APIOPs tool does not have built-in support for promoting the migration of the APIM Dev Portal, there is another tool available that offers such functionality. We suggest you explore that tool which can be found [here](https://github.com/seenu433/apim-dev-portal-migration).
+
 # Trademarks
 
 This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft 

docs/index.markdown

@@ -1,4 +1,3 @@
-
 <img src="assets/images/apim-logo-transparent.png">
 
 #  Code Of Conduct
@@ -57,6 +56,9 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
 contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
+# Supporting Tools
+While the APIOPs tool does not have built-in support for promoting the migration of the APIM Dev Portal, there is another tool available that offers such functionality. We suggest you explore that tool which can be found [here](https://github.com/seenu433/apim-dev-portal-migration).
+
 # Trademarks
 
 This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft 

tools/code/publisher/Api.cs

@@ -1,4 +1,5 @@
 using common;
+using Flurl;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi;
 using Microsoft.OpenApi.Extensions;
@@ -269,8 +270,16 @@ private static async ValueTask PutApi(ApiName apiName, ApiInformationFile? apiIn
         logger.LogInformation("Putting API {apiName}...", apiName);
 
         var apiUri = GetApiUri(apiName, serviceUri);
+        var putUri = apiUri.Uri;
+
+        // For WSDL files, we need to set the import query parameter to true.
+        if (specificationFile is ApiSpecificationFile.Wsdl)
+        {
+            putUri = putUri.SetQueryParam("import", "true").ToUri();
+        }
+
         var apiJson = await GetApiJson(apiName, apiInformationFile, specificationFile, configurationApiJson, cancellationToken);
-        await putRestResource(apiUri.Uri, apiJson, cancellationToken);
+        await putRestResource(putUri, apiJson, cancellationToken);
 
         // Handle GraphQL specification
         if (specificationFile is ApiSpecificationFile.GraphQl graphQlSpecificationFile)
@@ -310,7 +319,7 @@ private static async ValueTask<JsonObject> GetApiJson(ApiName apiName, ApiInform
 
     private static async ValueTask<JsonObject> GetApiSpecificationJson(ApiSpecificationFile specificationFile, CancellationToken cancellationToken)
     {
-        return new JsonObject
+        var json = new JsonObject
         {
             ["properties"] = new JsonObject
             {
@@ -330,6 +339,13 @@ private static async ValueTask<JsonObject> GetApiSpecificationJson(ApiSpecificat
                 }
             }
         };
+
+        if (specificationFile is ApiSpecificationFile.Wsdl)
+        {
+            json["properties"]!["apiType"] = "soap";
+        }
+
+        return json;
     }
 
     private static async ValueTask<string> GetOpenApiV3SpecificationText(ApiSpecificationFile.OpenApi openApiSpecificationFile)

tools/code/publisher/Product.cs

@@ -1,13 +1,15 @@
 using common;
 using Microsoft.Extensions.Logging;
 using MoreLinq;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.Json.Nodes;
 using System.Threading;
 using System.Threading.Tasks;
-
+using System.Web;
+
 namespace publisher;
 
 internal static class Product
@@ -71,11 +73,15 @@ private static ProductName GetProductName(ProductInformationFile file)
     }
 
     private static async ValueTask Delete(ProductName productName, ServiceUri serviceUri, DeleteRestResource deleteRestResource, ILogger logger, CancellationToken cancellationToken)
-    {
+    {
         var uri = GetProductUri(productName, serviceUri);
 
         logger.LogInformation("Deleting product {productName}...", productName);
-        await deleteRestResource(uri.Uri, cancellationToken);
+        var builder = new UriBuilder(uri.Uri);
+        var query = HttpUtility.ParseQueryString(builder.Query);
+        query["deleteSubscriptions"] = "true";
+        builder.Query = query.ToString();
+        await deleteRestResource(builder.Uri, cancellationToken);
     }
 
     public static ProductUri GetProductUri(ProductName productName, ServiceUri serviceUri)

tools/code/publisher/ProductApi.cs

@@ -30,6 +30,7 @@ await GetArtifactProductApis(files, configurationJson, serviceDirectory)
         var configurationArtifacts = GetConfigurationProductApis(configurationJson);
 
         return GetProductApisFiles(files, serviceDirectory)
+                .Where(file => File.Exists(file.Path.ToString()))
                 .Select(file =>
                 {
                     var productName = GetProductName(file);

tools/code/publisher/ProductGroup.cs

@@ -30,6 +30,7 @@ await GetArtifactProductGroups(files, configurationJson, serviceDirectory)
         var configurationArtifacts = GetConfigurationProductGroups(configurationJson);
 
         return GetProductGroupsFiles(files, serviceDirectory)
+                .Where(file => File.Exists(file.Path.ToString()))
                 .Select(file =>
                 {
                     var productName = GetProductName(file);