merge conflicts, rm unnecessary test

Author: lucashuet93

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

@@ -39,7 +39,8 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
                     },
                     subscriptionKeyRequired = true
                 },
-                openApiSpec = "https://petstore.swagger.io/v2/swagger.json"
+                openApiSpec = "https://petstore.swagger.io/v2/swagger.json",
+                protocols = "https"
             };
             creatorConfig.apis.Add(api);
 
@@ -51,6 +52,7 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
             Assert.Equal(api.name, apiTemplateResource.properties.displayName);
             Assert.Equal(api.apiVersion, apiTemplateResource.properties.apiVersion);
             Assert.Equal(api.apiVersionDescription, apiTemplateResource.properties.apiVersionDescription);
+            Assert.Equal(new string[] { api.protocols }, apiTemplateResource.properties.protocols);
             Assert.Equal($"[resourceId('Microsoft.ApiManagement/service/apiVersionSets', parameters('ApimServiceName'), '{api.apiVersionSetId}')]", apiTemplateResource.properties.apiVersionSetId);
             Assert.Equal(api.apiRevision, apiTemplateResource.properties.apiRevision);
             Assert.Equal(api.apiRevisionDescription, apiTemplateResource.properties.apiRevisionDescription);
@@ -116,6 +118,7 @@ public async void ShouldCreateUnifiedAPITemplateResourceFromCreatorConfig()
                     subscriptionKeyRequired = true
                 },
                 openApiSpec = "https://petstore.swagger.io/v2/swagger.json",
+                protocols = "https"
             };
             creatorConfig.apis.Add(api);
 
@@ -126,6 +129,7 @@ public async void ShouldCreateUnifiedAPITemplateResourceFromCreatorConfig()
             Assert.Equal($"[concat(parameters('ApimServiceName'), '/{api.name}')]", apiTemplateResource.name);
             Assert.Equal(api.name, apiTemplateResource.properties.displayName);
             Assert.Equal(api.apiVersion, apiTemplateResource.properties.apiVersion);
+            Assert.Equal(new string[] { api.protocols }, apiTemplateResource.properties.protocols);
             Assert.Equal(api.apiVersionDescription, apiTemplateResource.properties.apiVersionDescription);
             Assert.Equal($"[resourceId('Microsoft.ApiManagement/service/apiVersionSets', parameters('ApimServiceName'), '{api.apiVersionSetId}')]", apiTemplateResource.properties.apiVersionSetId);
             Assert.Equal(api.apiRevision, apiTemplateResource.properties.apiRevision);
@@ -166,27 +170,6 @@ public async void ShouldAppendRevisionToAPIName()
             // assert
             Assert.Contains(";rev", apiTemplateResource.name);
         }
-
-        [Fact]
-        public void ShouldCreateProtocolsFromOpenApiDocument()
-        {
-            // arrange
-            APITemplateCreator apiTemplateCreator = APITemplateCreatorFactory.GenerateAPITemplateCreator();
-            OpenApiDocument openApiDocument = new OpenApiDocument();
-            int count = 2;
-            for (int i = 0; i < count; i++)
-            {
-                openApiDocument.Servers.Add(new OpenApiServer()
-                {
-                    Url = $"{i}:{i}"
-                });
-            }
-
-            // act
-            string[] protocols = apiTemplateCreator.CreateProtocols(openApiDocument);
-
-            // assert
-            Assert.Equal(count, protocols.Length);
-        }
     }
+
 }

src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs

@@ -52,6 +52,7 @@ public class APIConfig
         public Dictionary<string, OperationsConfig> operations { get; set; }
         public APITemplateAuthenticationSettings authenticationSettings { get; set; }
         public string products { get; set; }
+        public string protocols { get; set; }
         public DiagnosticConfig diagnostic { get; set; }
         // does not currently include subscriptionKeyParameterNames, sourceApiId, and wsdlSelector from APITemplateResource schema
     }

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

@@ -136,7 +136,7 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
                 apiTemplateResource.properties.path = api.suffix;
                 apiTemplateResource.properties.isCurrent = api.isCurrent;
                 apiTemplateResource.properties.displayName = api.name;
-                apiTemplateResource.properties.protocols = this.CreateProtocols(doc);
+                apiTemplateResource.properties.protocols = this.CreateProtocols(api);
                 // set the version set id
                 if (api.apiVersionSetId != null)
                 {
@@ -166,19 +166,18 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
             return apiTemplateResource;
         }
 
-        public string[] CreateProtocols(OpenApiDocument doc)
+        public string[] CreateProtocols(APIConfig api)
         {
-            // pull protocols from swagger OpenApiDocument
-            List<string> protocols = new List<string>();
-            foreach (OpenApiServer server in doc.Servers)
+            string[] protocols;
+            if (api.protocols != null)
             {
-                string protocol = server.Url.Split(":")[0];
-                if (protocols.Exists(p => p == protocol) == false)
-                {
-                    protocols.Add(protocol);
-                }
+                protocols = api.protocols.Split(", ");
+            }
+            else
+            {
+                protocols = new string[1] { "https" };
             }
-            return protocols.ToArray();
+            return protocols;
         }
 
         public bool isSplitAPI(APIConfig apiConfig)