add api version set id to creator config api property for existing version set linking

Author: lucashuet93

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

@@ -1,31 +1,27 @@
 version: 0.0.1   # Required
-apimServiceName: testapimlucas   # Required, must match name of an apim service deployed in the specified resource group
+apimServiceName: LucasUnlinked2   # Required, must match name of an apim service deployed in the specified resource group
 apiVersionSet:   # Optional
     displayName: myAPIVersionSet
     description: a description
     versioningScheme: Query
     versionQueryName: versionQuery
     versionHeaderName: versionHeader
 api:
-  name: myAPI   # Required
+  name: myAPI2   # Required
   openApiSpec: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\OpenApiSpecs\swaggerPetstore.json    # Required, can be url or local file
   policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\apiPolicyHeaders.xml   # Optional, can be url or local file
   suffix: conf   # Required
   apiVersion: v1   # Optional
   apiVersionDescription: My first version   # Optional
+  #apiVersionSetId: myID    # Optional, must match the resource id on an existing version set
   revision: 1   # Optional
   revisionDescription: My first revision   # Optional
   operations:   # Optional
     addPet: # Must match the operationId property of a path's operations
       policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\operationRateLimit.xml   # Optional, can be url or local file
     deletePet:  # Must match the operationId property of a path's operations
       policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\operationRateLimit.xml   # Optional, can be url or local file
-  authenticationSettings:   # Optional
-    subscriptionKeyRequired: false
-    oAuth2:
-        authorizationServerId: serverId
-        scope: scope
   products: starter, platinum    # Optional, adds api to the specified products
 outputLocation: C:\Users\lucashh\Desktop\Projects\APIM-ARM\GeneratedTemplates   # Required, folder the creator will write the templates to
-linked: true   # Optional
+linked: false   # Optional
 linkedTemplatesBaseUrl : https://lucasyamlblob.blob.core.windows.net/yaml   # Required if 'linked' property is set to true

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

@@ -28,6 +28,7 @@ public class APIConfig
         public string suffix { 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 Dictionary<string, OperationsConfig> operations { get; set; }

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

@@ -76,12 +76,21 @@ public async Task<APITemplateResource> CreateInitialAPITemplateResource(CreatorC
                     protocols = this.CreateProtocols(doc)
                 },
                 // if the template is not linked the depends on for the apiVersionSet needs to be inlined here
-                dependsOn = creatorConfig.linked == true ? new string[] { } : new string[] { $"[resourceId('Microsoft.ApiManagement/service/api-version-sets', parameters('ApimServiceName'), 'versionset')]" }
+                dependsOn = new string[] { }
             };
+            if (creatorConfig.linked == false && creatorConfig.apiVersionSet != null)
+            {
+                apiTemplateResource.dependsOn = new string[] { $"[resourceId('Microsoft.ApiManagement/service/api-version-sets', parameters('ApimServiceName'), 'versionset')]" };
+            }
             if (creatorConfig.apiVersionSet != null)
             {
                 apiTemplateResource.properties.apiVersionSetId = "[resourceId('Microsoft.ApiManagement/service/api-version-sets', parameters('ApimServiceName'), 'versionset')]";
             }
+            else if (creatorConfig.api.apiVersionSetId != null)
+            {
+                apiTemplateResource.properties.apiVersionSetId = $"{creatorConfig.api.apiVersionSetId}";
+
+            }
             return apiTemplateResource;
         }