allow users to specify serviceUrl, type, and description in creator config

Author: lucashuet93

src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/APITemplateResource.cs

@@ -22,6 +22,7 @@ public class APITemplateProperties
         public string apiVersionDescription { get; set; }
         public string apiVersionSetId { get; set; }
         public Nullable<bool> subscriptionRequired { get; set; }
+        public string sourceApiId { get; set; }
         public string displayName { get; set; }
         public string serviceUrl { get; set; }
         public string path { get; set; }

src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/valid.yml

@@ -15,6 +15,9 @@ apiVersionSets:
       versionHeaderName: versionHeader
 apis:
     - name: myAPI
+      type: http
+      description: myFirstAPI
+      serviceUrl: http://myApiBackendUrl.com
       openApiSpec: C:\Users\myUsername\Projects\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFile\OpenApiSpecs\swaggerPetstore.json
       policy: C:\Users\myUsername\Projects\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\apiPolicyHeaders.xml
       suffix: conf
@@ -23,8 +26,8 @@ apis:
       apiVersion: v1
       apiVersionDescription: My first version
       apiVersionSetId: myAPIVersionSetID
-      revision: 1
-      revisionDescription: My first revision
+      apiRevision: 1
+      apiRevisionDescription: My first revision
       operations:
         addPet:
           policy: C:\Users\myUsername\Projects\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFile\XMLPolicies\operationRateLimit.xml

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

@@ -30,23 +30,30 @@ public class APIVersionSetConfig: APIVersionSetProperties
 
     public class APIConfig
     {
+        // used to build displayName and resource name from APITemplateResource schema
         public string name { get; set; }
-        // openApiSpec file location (local or url)
+        public string description { get; set; }
+        public string serviceUrl { get; set; }
+        // used to build type and apiType from APITemplateResource schema
+        public string type { get; set; }
+        // openApiSpec file location (local or url), used to build protocols, value, and format from APITemplateResource schema
         public string openApiSpec { get; set; }
         // policy file location (local or url)
         public string policy { get; set; }
+        // used to buld path from APITemplateResource schema
         public string suffix { get; set; }
         public bool subscriptionRequired { get; set; }
-        public string apiVersion { get; set; }
         public bool isCurrent { get; set; }
+        public string apiVersion { get; set; }
         public string apiVersionDescription { get; set; }
         public string apiVersionSetId { get; set; }
-        public string revision { get; set; }
-        public string revisionDescription { get; set; }
+        public string apiRevision { get; set; }
+        public string apiRevisionDescription { get; set; }
         public Dictionary<string, OperationsConfig> operations { get; set; }
         public APITemplateAuthenticationSettings authenticationSettings { get; set; }
         public string products { get; set; }
         public DiagnosticConfig diagnostic { get; set; }
+        // does not currently include subscriptionKeyParameterNames, sourceApiId, and wsdlSelector from APITemplateResource schema
     }
 
     public class OperationsConfig

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

@@ -108,9 +108,13 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
                 OpenApiDocument doc = await openAPISpecReader.ConvertOpenAPISpecToDoc(api.openApiSpec);
                 // supplied via optional arguments
                 apiTemplateResource.properties.apiVersion = api.apiVersion;
+                apiTemplateResource.properties.serviceUrl = api.serviceUrl;
+                apiTemplateResource.properties.type = api.type;
+                apiTemplateResource.properties.apiType = api.type;
+                apiTemplateResource.properties.description = api.description;
                 apiTemplateResource.properties.subscriptionRequired = api.subscriptionRequired;
-                apiTemplateResource.properties.apiRevision = api.revision;
-                apiTemplateResource.properties.apiRevisionDescription = api.revisionDescription;
+                apiTemplateResource.properties.apiRevision = api.apiRevision;
+                apiTemplateResource.properties.apiRevisionDescription = api.apiRevisionDescription;
                 apiTemplateResource.properties.apiVersionDescription = api.apiVersionDescription;
                 apiTemplateResource.properties.authenticationSettings = api.authenticationSettings;
                 apiTemplateResource.properties.path = api.suffix;

src/APIM_ARMTemplate/apimtemplate/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "apimtemplate": {
       "commandName": "Project",
-      "commandLineArgs": "extract  --sourceApimName LucasBlankLinked  --destinationApimName LucasBlankUnlinked --resourceGroup LucasHuetHudsonInternal --fileFolder C:\\Users\\lucashh\\Desktop\\Projects\\APIM-ARM\\GeneratedTemplates\\Extractor\\Full --linkedBaseUrl https://lucasarmtemplates.blob.core.windows.net/linked-templates "
+      "commandLineArgs": "create --configFile ./Creator/ExampleFiles/YAMLConfigs/validTesting.yml"
     }
   }
 }