add master parameters file

lucashuet93 · lucashuet93 · commit 8063e8f0a075 · 2019-01-15T12:03:46.000-05:00
diff --git a/src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs b/src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs
@@ -66,7 +66,8 @@ public CreateCommand()
                     CreatorFileNames creatorFileNames = fileNameGenerator.GenerateCreatorFileNames();
                     Template apiVersionSetTemplate = creatorConfig.apiVersionSet != null ? apiVersionSetTemplateCreator.CreateAPIVersionSetTemplate(creatorConfig) : null;
                     Template apiTemplate = await apiTemplateCreator.CreateAPITemplateAsync(creatorConfig);
-                    Template masterTemplate = masterTemplateCreator.CreateLinkedMasterTemplate(creatorConfig, apiVersionSetTemplate, apiTemplate, creatorFileNames);
+                    Template masterTemplate = masterTemplateCreator.CreateLinkedMasterTemplate(apiVersionSetTemplate, apiTemplate, creatorFileNames);
+                    Template masterTemplateParameters = masterTemplateCreator.CreateMasterTemplateParameterValues(creatorConfig);
 
                     // write templates to outputLocation
                     if (apiVersionSetTemplate != null)
@@ -75,6 +76,7 @@ public CreateCommand()
                     }
                     armTemplateWriter.WriteJSONToFile(apiTemplate, String.Concat(creatorConfig.outputLocation, creatorFileNames.api));
                     armTemplateWriter.WriteJSONToFile(masterTemplate, String.Concat(creatorConfig.outputLocation, @"/", "master.template.json"));
+                    armTemplateWriter.WriteJSONToFile(masterTemplateParameters, String.Concat(creatorConfig.outputLocation, @"/", "master.parameters.json"));
 
                     ColoredConsole.WriteLine("Templates written to output location");
                 }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Common/Templates/Template.cs b/src/APIM_ARMTemplate/apimtemplate/Common/Templates/Template.cs
@@ -22,7 +22,6 @@ public class TemplateParameterProperties {
         public string[] allowedValues { get; set; }
         public string defaultValue { get; set; }
         public string value { get; set; }
-        public int minLength { get; set; }
     }
 
     public class TemplateParameterMetadata {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidAPI.yml b/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidAPI.yml
@@ -1,7 +1,6 @@
 version: 0.0.1
 apimServiceName: "myService"
 apiVersionSet:
-    id: 1b3dee
     displayName: myAPIVersionSet
     description: a description
     versioningScheme: Query
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidAPIMServiceName.yml b/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidAPIMServiceName.yml
@@ -1,6 +1,5 @@
 version: 0.0.1
 apiVersionSet:
-    id: 1b3dee
     displayName: myAPIVersionSet
     description: a description
     versioningScheme: Query
@@ -10,7 +9,6 @@ api:
   openApiSpec: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\OpenApiSpecs\dataGenAPIDefinition.json
   policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\apiPolicyHeaders.xml
   suffix: conf
-  versionSetId: 1b3dee
   apiVersion: v2
   apiVersionDescription: vDesc
   revision: 2
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidOpenAPISpec.yml b/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidOpenAPISpec.yml
@@ -1,7 +1,6 @@
 version: 0.0.1
 apimServiceName: "myService"
 apiVersionSet:
-    id: 1b3dee
     displayName: myAPIVersionSet
     description: a description
     versioningScheme: Query
@@ -10,7 +9,6 @@ apiVersionSet:
 api:
   policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\apiPolicyHeaders.xml
   suffix: conf
-  versionSetId: 1b3dee
   apiVersion: v2
   apiVersionDescription: vDesc
   revision: 2
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidOutputLocation.yml b/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidOutputLocation.yml
@@ -1,7 +1,6 @@
 version: 0.0.1
 apimServiceName: "myService"
 apiVersionSet:
-    id: 1b3dee
     displayName: myAPIVersionSet
     description: a description
     versioningScheme: Query
@@ -11,7 +10,6 @@ api:
   openApiSpec: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\OpenApiSpecs\dataGenAPIDefinition.json
   policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\apiPolicyHeaders.xml
   suffix: conf
-  versionSetId: 1b3dee
   apiVersion: v2
   apiVersionDescription: vDesc
   revision: 2
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidSuffix.yml b/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidSuffix.yml
@@ -1,7 +1,6 @@
 version: 0.0.1
 apimServiceName: "myService"
 apiVersionSet:
-    id: 1b3dee
     displayName: myAPIVersionSet
     description: a description
     versioningScheme: Query
@@ -10,7 +9,6 @@ apiVersionSet:
 api:
   openApiSpec: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\OpenApiSpecs\dataGenAPIDefinition.json
   policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\apiPolicyHeaders.xml
-  versionSetId: 1b3dee
   apiVersion: v2
   apiVersionDescription: vDesc
   revision: 2
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidVersion.yml b/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/invalidVersion.yml
@@ -1,6 +1,5 @@
 apimServiceName: "myService"
 apiVersionSet:
-    id: 1b3dee
     displayName: myAPIVersionSet
     description: a description
     versioningScheme: Query
@@ -10,7 +9,6 @@ api:
   openApiSpec: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\OpenApiSpecs\dataGenAPIDefinition.json
   policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\apiPolicyHeaders.xml
   suffix: conf
-  versionSetId: 1b3dee
   apiVersion: v2
   apiVersionDescription: vDesc
   revision: 2
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/valid.yml b/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/valid.yml
@@ -1,7 +1,6 @@
 version: 0.0.1
 apimServiceName: "testing-grounds"
 apiVersionSet:
-    id: 1b3dee
     displayName: myAPIVersionSet
     description: a description
     versioningScheme: Query
@@ -11,7 +10,6 @@ api:
   openApiSpec: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\OpenApiSpecs\dataGenAPIDefinition.json
   policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\apiPolicyHeaders.xml
   suffix: conf
-  versionSetId: 1b3dee
   apiVersion: v2
   apiVersionDescription: vDesc
   revision: 2
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs
@@ -13,7 +13,7 @@ public class CreatorConfig
     {
         public string version { get; set; }
         public string apimServiceName { get; set; }
-        public APIVersionSetConfig apiVersionSet { get; set; }
+        public APIVersionSetProperties apiVersionSet { get; set; }
         public APIConfig api { get; set; }
         public string outputLocation { get; set; }
         public bool linked { get; set; }
@@ -26,7 +26,6 @@ public class APIConfig
         // policy file location (local or url)
         public string policy { get; set; }
         public string suffix { get; set; }
-        public string versionSetId { get; set; }
         public string apiVersion { get; set; }
         public string apiVersionDescription { get; set; }
         public string revision { get; set; }
@@ -36,11 +35,6 @@ public class APIConfig
         public string products { get; set; }
     }
 
-    public class APIVersionSetConfig : APIVersionSetProperties
-    {
-        public string id { get; set; }
-    }
-
     public class OperationsConfig
     {
         // policy file location (local or url)
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs
@@ -60,19 +60,22 @@ public APITemplateResource CreateInitialAPITemplateResource(CreatorConfig creato
             {
                 name = "[concat(parameters('ApimServiceName'), '/api')]",
                 type = "Microsoft.ApiManagement/service/apis",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-11-01",
                 properties = new APITemplateProperties()
                 {
                     // supplied via optional arguments
-                    apiVersion = creatorConfig.api.apiVersion ?? "",
-                    apiRevision = creatorConfig.api.revision ?? "",
-                    apiVersionSetId = creatorConfig.api.versionSetId ?? "",
-                    apiRevisionDescription = creatorConfig.api.revisionDescription ?? "",
-                    apiVersionDescription = creatorConfig.api.apiVersionDescription ?? "",
-                    authenticationSettings = creatorConfig.api.authenticationSettings ?? null
+                    apiVersion = creatorConfig.api.apiVersion,
+                    apiRevision = creatorConfig.api.revision,
+                    apiRevisionDescription = creatorConfig.api.revisionDescription,
+                    apiVersionDescription = creatorConfig.api.apiVersionDescription,
+                    authenticationSettings = creatorConfig.api.authenticationSettings
                 },
                 dependsOn = new string[] { }
             };
+            if(creatorConfig.apiVersionSet != null)
+            {
+                apiTemplateResource.properties.apiVersionSetId = "[concat(resourceId('Microsoft.ApiManagement/service', parameters('ApimServiceName')), '/api-version-sets/versionset')]";
+            }
             return apiTemplateResource;
         }
 
@@ -87,7 +90,7 @@ public async Task<APITemplateResource> CreateSubsequentAPITemplateResourceAsync(
             {
                 name = subsequentAPIName,
                 type = subsequentAPIType,
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-11-01",
                 properties = new APITemplateProperties()
                 {
                     contentFormat = "swagger-json",
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APIVersionSetTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APIVersionSetTemplateCreator.cs
@@ -32,7 +32,7 @@ public Template CreateAPIVersionSetTemplate(CreatorConfig creatorConfig)
             {
                 name = "[concat(parameters('ApimServiceName'), '/versionset')]",
                 type = "Microsoft.ApiManagement/service/api-version-sets",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-11-01",
                 properties = new APIVersionSetProperties()
                 {
                     displayName = creatorConfig.apiVersionSet.displayName,
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/MasterTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/MasterTemplateCreator.cs
@@ -18,15 +18,14 @@ public MasterTemplateCreator(TemplateCreator templateCreator, FileNameGenerator
             this.fileNameGenerator = fileNameGenerator;
         }
 
-        public Template CreateLinkedMasterTemplate(CreatorConfig creatorConfig,
-            Template apiVersionSetTemplate,
+        public Template CreateLinkedMasterTemplate(Template apiVersionSetTemplate,
             Template apiTemplate,
             CreatorFileNames creatorFileNames)
         {
             Template masterTemplate = this.templateCreator.CreateEmptyTemplate();
 
             // add parameters
-            masterTemplate.parameters = this.CreateMasterTemplateParameters(creatorConfig);
+            masterTemplate.parameters = this.CreateMasterTemplateParameters();
 
             // add links to all resources
             List<TemplateResource> resources = new List<TemplateResource>();
@@ -53,7 +52,7 @@ public MasterTemplateResource CreateMasterTemplateResource(string name, string u
             {
                 name = name,
                 type = "Microsoft.Resources/deployments",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-11-01",
                 properties = new MasterTemplateProperties()
                 {
                     mode = "Incremental",
@@ -72,12 +71,11 @@ public MasterTemplateResource CreateMasterTemplateResource(string name, string u
             return masterTemplateResource;
         }
 
-        public Dictionary<string, TemplateParameterProperties> CreateMasterTemplateParameters(CreatorConfig creatorConfig)
+        public Dictionary<string, TemplateParameterProperties> CreateMasterTemplateParameters()
         {
             Dictionary<string, TemplateParameterProperties> parameters = new Dictionary<string, TemplateParameterProperties>();
             TemplateParameterProperties repoBaseUrlProperties = new TemplateParameterProperties()
             {
-                value = ".",
                 metadata = new TemplateParameterMetadata()
                 {
                     description = "Base URL of the repository"
@@ -87,7 +85,6 @@ public Dictionary<string, TemplateParameterProperties> CreateMasterTemplateParam
             parameters.Add("repoBaseUrl", repoBaseUrlProperties);
             TemplateParameterProperties apimServiceNameProperties = new TemplateParameterProperties()
             {
-                value = creatorConfig.apimServiceName,
                 metadata = new TemplateParameterMetadata()
                 {
                     description = "Name of the API Management"
@@ -97,5 +94,25 @@ public Dictionary<string, TemplateParameterProperties> CreateMasterTemplateParam
             parameters.Add("ApimServiceName", apimServiceNameProperties);
             return parameters;
         }
+
+        public Template CreateMasterTemplateParameterValues(CreatorConfig creatorConfig)
+        {
+            Template masterTemplate = this.templateCreator.CreateEmptyTemplate();
+
+            // add parameters
+            Dictionary<string, TemplateParameterProperties> parameters = new Dictionary<string, TemplateParameterProperties>();
+            TemplateParameterProperties repoBaseUrlProperties = new TemplateParameterProperties()
+            {
+                value = "."
+            };
+            parameters.Add("repoBaseUrl", repoBaseUrlProperties);
+            TemplateParameterProperties apimServiceNameProperties = new TemplateParameterProperties()
+            {
+                value = creatorConfig.apimServiceName
+            };
+            parameters.Add("ApimServiceName", apimServiceNameProperties);
+            masterTemplate.parameters = parameters;
+            return masterTemplate;
+        }
     }
 }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/PolicyTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/PolicyTemplateCreator.cs
@@ -23,7 +23,7 @@ public async Task<PolicyTemplateResource> CreateAPIPolicyTemplateResourceAsync(C
             {
                 name = "[concat(parameters('ApimServiceName'), '/api/policy')]",
                 type = "Microsoft.ApiManagement/service/apis/policies",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-11-01",
                 properties = new PolicyTemplateProperties()
                 {
                     contentFormat = "rawxml",
@@ -41,7 +41,7 @@ public async Task<PolicyTemplateResource> CreateOperationPolicyTemplateResourceA
             {
                 name = $"[concat(parameters('ApimServiceName'), '/api/{policyPair.Key}/policy')]",
                 type = "Microsoft.ApiManagement/service/apis/operations/policies",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-11-01",
                 properties = new PolicyTemplateProperties()
                 {
                     contentFormat = "rawxml",
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductAPITemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductAPITemplateCreator.cs
@@ -17,7 +17,7 @@ public ProductAPITemplateResource CreateProductAPITemplateResource(string produc
             {
                 name = $"[concat(parameters('ApimServiceName'), '/{productID}/api')]",
                 type = "Microsoft.ApiManagement/service/products/apis",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-11-01",
                 properties = new ProductAPITemplateProperties(),
                 dependsOn = dependsOn
             };

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ public class TemplateParameterProperties {`
`22`	`22`	`public string[] allowedValues { get; set; }`
`23`	`23`	`public string defaultValue { get; set; }`
`24`	`24`	`public string value { get; set; }`
`25`		`- public int minLength { get; set; }`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`public class TemplateParameterMetadata {`