Merge Hotfix from 2.7.1 (#1065)

* Add configurable API version support for LoRaWAN Management function

* Make IDE0220 isssue as a warning

* Add unit test to LoRaKeyManagementApiVersion setting

src/.editorconfig

@@ -171,6 +171,7 @@ dotnet_diagnostic.IDE1003.severity=suggestion
 dotnet_diagnostic.IDE1004.severity=suggestion
 dotnet_diagnostic.IDE1007.severity=suggestion
 dotnet_diagnostic.IDE1008.severity=suggestion
+dotnet_diagnostic.IDE0220.severity=warning
 
  # Enforce file header
 dotnet_diagnostic.IDE0073.severity = error

src/AzureIoTHub.Portal.Tests.Unit/Server/DevelopmentConfigHandlerTests.cs

@@ -42,6 +42,7 @@ private DevelopmentConfigHandler CreateDevelopmentConfigHandler()
         [TestCase(ConfigHandler.OIDCApiClientIdKey, nameof(ConfigHandler.OIDCApiClientId))]
         [TestCase(ConfigHandler.LoRaKeyManagementUrlKey, nameof(ConfigHandler.LoRaKeyManagementUrl))]
         [TestCase(ConfigHandler.LoRaKeyManagementCodeKey, nameof(ConfigHandler.LoRaKeyManagementCode))]
+        [TestCase(ConfigHandler.LoRaKeyManagementApiVersionKey, nameof(ConfigHandler.LoRaKeyManagementApiVersion))]
         [TestCase(ConfigHandler.IoTHubConnectionStringKey, nameof(ConfigHandler.IoTHubConnectionString))]
         [TestCase(ConfigHandler.DPSConnectionStringKey, nameof(ConfigHandler.DPSConnectionString))]
         [TestCase(ConfigHandler.StorageAccountConnectionStringKey, nameof(ConfigHandler.StorageAccountConnectionString))]

src/AzureIoTHub.Portal.Tests.Unit/Server/ProductionConfigHandlerTests.cs

@@ -69,6 +69,7 @@ public void SecretsShouldGetValueFromConnectionStrings(string configKey, string
         [TestCase(ConfigHandler.OIDCClientIdKey, nameof(ConfigHandler.OIDCClientId))]
         [TestCase(ConfigHandler.OIDCApiClientIdKey, nameof(ConfigHandler.OIDCApiClientId))]
         [TestCase(ConfigHandler.LoRaKeyManagementUrlKey, nameof(ConfigHandler.LoRaKeyManagementUrl))]
+        [TestCase(ConfigHandler.LoRaKeyManagementApiVersionKey, nameof(ConfigHandler.LoRaKeyManagementApiVersion))]
         public void SettingsShouldGetValueFromAppSettings(string configKey, string configPropertyName)
         {
             // Arrange

src/AzureIoTHub.Portal/Server/ConfigHandler.cs

@@ -36,6 +36,7 @@ public abstract class ConfigHandler
 
         internal const string LoRaKeyManagementUrlKey = "LoRaKeyManagement:Url";
         internal const string LoRaKeyManagementCodeKey = "LoRaKeyManagement:Code";
+        internal const string LoRaKeyManagementApiVersionKey = "LoRaKeyManagement:ApiVersion";
 
         internal const string MetricExporterRefreshIntervalKey = "Metrics:ExporterRefreshIntervalInSeconds";
         internal const string MetricLoaderRefreshIntervalKey = "Metrics:LoaderRefreshIntervalInMinutes";
@@ -100,6 +101,8 @@ internal static ConfigHandler Create(IWebHostEnvironment env, IConfiguration con
 
         internal abstract string LoRaKeyManagementCode { get; }
 
+        internal abstract string LoRaKeyManagementApiVersion { get; }
+
         internal abstract string PortalName { get; }
 
         internal abstract int MetricExporterRefreshIntervalInSeconds { get; }

src/AzureIoTHub.Portal/Server/DevelopmentConfigHandler.cs

@@ -62,6 +62,8 @@ internal DevelopmentConfigHandler(IConfiguration config)
 
         internal override string LoRaKeyManagementCode => this.config[LoRaKeyManagementCodeKey];
 
+        internal override string LoRaKeyManagementApiVersion => this.config[LoRaKeyManagementApiVersionKey];
+
         internal override bool IdeasEnabled => this.config.GetValue(IdeasEnabledKey, false);
         internal override string IdeasUrl => this.config.GetValue(IdeasUrlKey, string.Empty);
         internal override string IdeasAuthenticationHeader => this.config.GetValue(IdeasAuthenticationHeaderKey, "Ocp-Apim-Subscription-Key");

src/AzureIoTHub.Portal/Server/ProductionConfigHandler.cs

@@ -62,6 +62,8 @@ internal ProductionConfigHandler(IConfiguration config)
 
         internal override string LoRaKeyManagementCode => this.config.GetConnectionString(LoRaKeyManagementCodeKey);
 
+        internal override string LoRaKeyManagementApiVersion => this.config[LoRaKeyManagementApiVersionKey];
+
         internal override bool IdeasEnabled => this.config.GetValue(IdeasEnabledKey, false);
         internal override string IdeasUrl => this.config.GetValue(IdeasUrlKey, string.Empty);
         internal override string IdeasAuthenticationHeader => this.config.GetValue(IdeasAuthenticationHeaderKey, "Ocp-Apim-Subscription-Key");

src/AzureIoTHub.Portal/Server/Startup.cs

@@ -141,7 +141,7 @@ public void ConfigureServices(IServiceCollection services)
             {
                 client.BaseAddress = new Uri(configuration.LoRaKeyManagementUrl);
                 client.DefaultRequestHeaders.Add("x-functions-key", configuration.LoRaKeyManagementCode);
-                client.DefaultRequestHeaders.Add("api-version", "2020-10-09");
+                client.DefaultRequestHeaders.Add("api-version", configuration.LoRaKeyManagementApiVersion ?? "2022-03-04");
             })
                 .AddPolicyHandler(transientHttpErrorPolicy);