parameters-template & master-template refactoring (#677)

* parameters-template separation

* prettify master template

* get rid of entity-extractor-base (legacy) completely!!!

* remove statics in master template extractor

* remove static method and move to constructor

* create type as an explicit

* return static

Co-authored-by: Dmitrii Korolev <[email protected]>

Author: DeagleGross

src/ArmTemplates/Commands/Applications/ExtractApplicationCommand.cs

@@ -63,10 +63,6 @@ public async Task ExecuteCommandAsync(ExtractorParameters parameters)
                 await this.extractorExecutor.ExecuteGenerationBasedOnConfiguration();
 
                 this.logger.LogInformation("Templates written to output location");
-                this.logger.LogInformation("Press any key to exit process:");
-#if DEBUG
-                Console.ReadKey();
-#endif
             }
             catch (Exception ex)
             {

src/ArmTemplates/Commands/Executors/ExtractorExecutor.cs

@@ -18,7 +18,7 @@ public static class GlobalConstants
         public const string azAccessToken = "account get-access-token --query \"accessToken\" --output json";
         public const string azSubscriptionId = "account show --query id -o json";
 
-        public const string BaseManagementAzureUrl = "https://management.azure.com";
+        public static string BaseManagementAzureUrl = "https://management.azure.com";
     }
 
     public static class ParameterNames

src/ArmTemplates/Common/Constants/GlobalConstants.cs

@@ -28,5 +28,7 @@ public static class ResourceTypeConstants
         public const string Tag = "Microsoft.ApiManagement/service/tags";
         public const string Gateway = "Microsoft.ApiManagement/service/gateways";
         public const string GatewayApi = "Microsoft.ApiManagement/service/gateways/apis";
+
+        public const string ArmDeployments = "Microsoft.Resources/deployments";
     }
 }

src/ArmTemplates/Common/Constants/ResourceTypeConstants.cs

@@ -30,8 +30,8 @@ public static FileNames GenerateFileNames(string baseFileName)
                 Gateway = $@"{baseFileName}gateways.template.json",
                 GatewayApi = $@"{baseFileName}gateways-apis.template.json",
                 TagApi = $@"{baseFileName}apiTags.template.json",
-                Parameters = $@"\{baseFileName}parameters.json",
-                LinkedMaster = $@"\{baseFileName}master.template.json",
+                Parameters = $@"{baseFileName}parameters.json",
+                LinkedMaster = $@"{baseFileName}master.template.json",
                 Apis = "/Apis",
                 SplitAPIs = "/SplitAPIs",
                 VersionSetMasterFolder = "/VersionSetMasterFolder",

src/ArmTemplates/Common/FileHandlers/FileNameGenerator.cs

@@ -2,6 +2,6 @@
 {
     public class TemplateObjectParameterProperties : TemplateParameterProperties
     {
-        public new object value { get; set; }
+        public new object Value { get; set; }
     }
 }

src/ArmTemplates/Common/TemplateModels/MasterTemplateResource.cs

@@ -2,6 +2,6 @@
 {
     public class TemplateParameterMetadata
     {
-        public string description { get; set; }
+        public string Description { get; set; }
     }
 }

src/ArmTemplates/Common/Templates/Abstractions/TemplateObjectParameterProperties.cs

@@ -1,11 +1,26 @@
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Templates.Abstractions
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Commands.Applications;
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Templates.Abstractions
 {
     public class TemplateParameterProperties
     {
-        public string type { get; set; }
-        public TemplateParameterMetadata metadata { get; set; }
-        public string[] allowedValues { get; set; }
-        public string defaultValue { get; set; }
-        public string value { get; set; }
+        public string Type { get; set; }
+        public TemplateParameterMetadata Metadata { get; set; }
+        public string[] AllowedValues { get; set; }
+        public string DefaultValue { get; set; }
+        public string Value { get; set; }
+
+        public TemplateParameterProperties()
+        {
+        }
+
+        public TemplateParameterProperties(string metadataDescription, string type)
+        {
+            this.Metadata = new TemplateParameterMetadata()
+            {
+                Description = metadataDescription,
+            };
+            this.Type = type;
+        }  
     }
 }

src/ArmTemplates/Common/Templates/Abstractions/TemplateParameterMetadata.cs

@@ -43,7 +43,7 @@ public TemplateBuilder GenerateTemplateWithApimServiceNameProperty()
             this.template.Parameters = new Dictionary<string, TemplateParameterProperties>
             {
                 {
-                    ParameterNames.ApimServiceName, new TemplateParameterProperties() { type = "string" }
+                    ParameterNames.ApimServiceName, new TemplateParameterProperties() { Type = "string" }
                 }
             };
 
@@ -78,7 +78,7 @@ public TemplateBuilder AddPolicyProperties(ExtractorParameters extractorParamete
             {
                 TemplateParameterProperties policyTemplateSasTokenParameterProperties = new TemplateParameterProperties()
                 {
-                    type = "string"
+                    Type = "string"
                 };
 
                 this.template.Parameters.Add(ParameterNames.PolicyXMLSasToken, policyTemplateSasTokenParameterProperties);
@@ -88,7 +88,7 @@ public TemplateBuilder AddPolicyProperties(ExtractorParameters extractorParamete
             {
                 TemplateParameterProperties policyTemplateBaseUrlParameterProperties = new TemplateParameterProperties()
                 {
-                    type = "string"
+                    Type = "string"
                 };
                 this.template.Parameters.Add(ParameterNames.PolicyXMLBaseUrl, policyTemplateBaseUrlParameterProperties);
             }
@@ -102,7 +102,7 @@ public TemplateBuilder AddParameterizeServiceUrlProperty(ExtractorParameters ext
             {
                 TemplateParameterProperties serviceUrlParamProperty = new TemplateParameterProperties()
                 {
-                    type = "object"
+                    Type = "object"
                 };
                 this.template.Parameters.Add(ParameterNames.ServiceUrl, serviceUrlParamProperty);
             }
@@ -116,7 +116,7 @@ public TemplateBuilder AddParameterizeApiLoggerIdProperty(ExtractorParameters ex
             {
                 TemplateParameterProperties apiLoggerProperty = new TemplateParameterProperties()
                 {
-                    type = "object"
+                    Type = "object"
                 };
                 this.template.Parameters.Add(ParameterNames.ApiLoggerId, apiLoggerProperty);
             }
@@ -130,7 +130,7 @@ public TemplateBuilder AddParameterizeNamedValueParameters(ExtractorParameters e
             {
                 TemplateParameterProperties namedValueParameterProperties = new TemplateParameterProperties()
                 {
-                    type = "object"
+                    Type = "object"
                 };
                 this.template.Parameters.Add(ParameterNames.NamedValues, namedValueParameterProperties);
             }
@@ -144,7 +144,7 @@ public TemplateBuilder AddParameterizeNamedValuesKeyVaultSecretParameters(Extrac
             {
                 TemplateParameterProperties keyVaultNamedValueParameterProperties = new TemplateParameterProperties()
                 {
-                    type = "object"
+                    Type = "object"
                 };
                 this.template.Parameters.Add(ParameterNames.NamedValueKeyVaultSecrets, keyVaultNamedValueParameterProperties);
             }
@@ -158,7 +158,7 @@ public TemplateBuilder AddParameterizeLogResourceIdProperty(ExtractorParameters
             {
                 TemplateParameterProperties loggerResourceIdParameterProperties = new TemplateParameterProperties()
                 {
-                    type = "object"
+                    Type = "object"
                 };
                 this.template.Parameters.Add(ParameterNames.LoggerResourceId, loggerResourceIdParameterProperties);
             }
@@ -172,7 +172,7 @@ public TemplateBuilder AddParameterizeBackendProperty(ExtractorParameters extrac
             {
                 TemplateParameterProperties extractBackendParametersProperties = new TemplateParameterProperties()
                 {
-                    type = "object"
+                    Type = "object"
                 };
                 this.template.Parameters.Add(ParameterNames.BackendSettings, extractBackendParametersProperties);
             }