Prefix Azure specific parameters (#2157)

* Hide certificates when getting the magic ommand * Prefix Azure specific parameters * Prefix Azure specific parameters * fix test --------- Co-authored-by: Kevin BEAUGRAND <contact@kbeaugrand.fr>
CGI-FR · Jun 20, 2023 · e9d5a4b · e9d5a4b
1 parent b680791
commit e9d5a4b
Show file tree

Hide file tree

Showing 23 changed files with 120 additions and 120 deletions.
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/ConnectionStringDialog.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/ConnectionStringDialog.razor
@@ -35,7 +35,7 @@
                     }
                     else
                     {
-                        @if (Credentials.CertificateCredentials != null && string.IsNullOrEmpty(EnrollementScriptCommand))
+                        @if (Credentials.CertificateCredentials != null && !string.IsNullOrEmpty(EnrollementScriptCommand))
                         {
                             <MudItem xs="12">
                                 <MudText Style="text-decoration:underline"><b>Certificate Pem</b></MudText>

diff --git a/src/AzureIoTHub.Portal.Domain/ConfigHandler.cs b/src/AzureIoTHub.Portal.Domain/ConfigHandler.cs
@@ -5,19 +5,19 @@ namespace AzureIoTHub.Portal.Domain
 {
     public abstract class ConfigHandler
     {
-        public abstract string IoTHubConnectionString { get; }
+        public abstract string AzureIoTHubConnectionString { get; }
 
-        public abstract string IoTHubEventHubEndpoint { get; }
+        public abstract string AzureIoTHubEventHubEndpoint { get; }
 
-        public abstract string IoTHubEventHubConsumerGroup { get; }
+        public abstract string AzureIoTHubEventHubConsumerGroup { get; }
 
-        public abstract string DPSConnectionString { get; }
+        public abstract string AzureDPSConnectionString { get; }
 
-        public abstract string DPSEndpoint { get; }
+        public abstract string AzureDPSEndpoint { get; }
 
-        public abstract string DPSScopeID { get; }
+        public abstract string AzureDPSScopeID { get; }
 
-        public abstract string StorageAccountConnectionString { get; }
+        public abstract string AzureStorageAccountConnectionString { get; }
 
         public abstract int StorageAccountDeviceModelImageMaxAge { get; }
 
@@ -45,13 +45,13 @@ public abstract class ConfigHandler
 
         public abstract bool OIDCValidateTokenReplay { get; }
 
-        public abstract bool IsLoRaEnabled { get; }
+        public abstract bool AzureIsLoRaEnabled { get; }
 
-        public abstract string LoRaKeyManagementUrl { get; }
+        public abstract string AzureLoRaKeyManagementUrl { get; }
 
-        public abstract string LoRaKeyManagementCode { get; }
+        public abstract string AzureLoRaKeyManagementCode { get; }
 
-        public abstract string LoRaKeyManagementApiVersion { get; }
+        public abstract string AzureLoRaKeyManagementApiVersion { get; }
 
         public abstract string PortalName { get; }
 

diff --git a/src/AzureIoTHub.Portal.Infrastructure/ConfigHandlerBase.cs b/src/AzureIoTHub.Portal.Infrastructure/ConfigHandlerBase.cs
@@ -8,12 +8,12 @@ namespace AzureIoTHub.Portal.Infrastructure
     internal abstract class ConfigHandlerBase : ConfigHandler
     {
         internal const string PortalNameKey = "PortalName";
-        internal const string IoTHubConnectionStringKey = "IoTHub:ConnectionString";
-        internal const string IoTHubEventHubEndpointKey = "IoTHub:EventHub:Endpoint";
-        internal const string IoTHubEventHubConsumerGroupKey = "IoTHub:EventHub:ConsumerGroup";
-        internal const string DPSConnectionStringKey = "IoTDPS:ConnectionString";
-        internal const string DPSServiceEndpointKey = "IoTDPS:ServiceEndpoint";
-        internal const string DPSIDScopeKey = "IoTDPS:IDScope";
+        internal const string AzureIoTHubConnectionStringKey = "Azure:IoTHub:ConnectionString";
+        internal const string AzureIoTHubEventHubEndpointKey = "Azure:IoTHub:EventHub:Endpoint";
+        internal const string AzureIoTHubEventHubConsumerGroupKey = "Azure:IoTHub:EventHub:ConsumerGroup";
+        internal const string AzureDPSConnectionStringKey = "Azure:IoTDPS:ConnectionString";
+        internal const string AzureDPSServiceEndpointKey = "Azure:IoTDPS:ServiceEndpoint";
+        internal const string AzureDPSIDScopeKey = "Azure:IoTDPS:IDScope";
         internal const string UseSecurityHeadersKey = "UseSecurityHeaders";
         internal const string PostgreSQLConnectionStringKey = "PostgreSQL:ConnectionString";
         internal const string MySQLConnectionStringKey = "MySQL:ConnectionString";
@@ -31,14 +31,14 @@ internal abstract class ConfigHandlerBase : ConfigHandler
         internal const string OIDCValidateActorKey = "OIDC:ValidateActor";
         internal const string OIDCValidateTokenReplayKey = "OIDC:ValidateTokenReplay";
 
-        internal const string IsLoRaFeatureEnabledKey = "LoRaFeature:Enabled";
+        internal const string AzureIsLoRaFeatureEnabledKey = "Azure:LoRaFeature:Enabled";
 
-        internal const string StorageAccountConnectionStringKey = "StorageAccount:ConnectionString";
+        internal const string AzureStorageAccountConnectionStringKey = "Azure:StorageAccount:ConnectionString";
         internal const string StorageAccountDeviceModelImageMaxAgeKey = "StorageAccount:DeviceModel:Image:MaxAgeInSeconds";
 
-        internal const string LoRaKeyManagementUrlKey = "LoRaKeyManagement:Url";
-        internal const string LoRaKeyManagementCodeKey = "LoRaKeyManagement:Code";
-        internal const string LoRaKeyManagementApiVersionKey = "LoRaKeyManagement:ApiVersion";
+        internal const string AzureLoRaKeyManagementUrlKey = "Azure:LoRaKeyManagement:Url";
+        internal const string AzureLoRaKeyManagementCodeKey = "Azure:LoRaKeyManagement:Code";
+        internal const string AzureLoRaKeyManagementApiVersionKey = "Azure:LoRaKeyManagement:ApiVersion";
 
         internal const string MetricExporterRefreshIntervalKey = "Metrics:ExporterRefreshIntervalInSeconds";
         internal const string MetricLoaderRefreshIntervalKey = "Metrics:LoaderRefreshIntervalInMinutes";

diff --git a/src/AzureIoTHub.Portal.Infrastructure/DevelopmentConfigHandler.cs b/src/AzureIoTHub.Portal.Infrastructure/DevelopmentConfigHandler.cs
@@ -24,19 +24,19 @@ internal DevelopmentConfigHandler(IConfiguration config)
 
         public override int MetricLoaderRefreshIntervalInMinutes => this.config.GetValue(MetricLoaderRefreshIntervalKey, 10);
 
-        public override string IoTHubConnectionString => this.config[IoTHubConnectionStringKey]!;
+        public override string AzureIoTHubConnectionString => this.config[AzureIoTHubConnectionStringKey]!;
 
-        public override string IoTHubEventHubEndpoint => this.config.GetValue(IoTHubEventHubEndpointKey, string.Empty)!;
+        public override string AzureIoTHubEventHubEndpoint => this.config.GetValue(AzureIoTHubEventHubEndpointKey, string.Empty)!;
 
-        public override string IoTHubEventHubConsumerGroup => this.config.GetValue(IoTHubEventHubConsumerGroupKey, "iothub-portal")!;
+        public override string AzureIoTHubEventHubConsumerGroup => this.config.GetValue(AzureIoTHubEventHubConsumerGroupKey, "iothub-portal")!;
 
-        public override string DPSConnectionString => this.config[DPSConnectionStringKey]!;
+        public override string AzureDPSConnectionString => this.config[AzureDPSConnectionStringKey]!;
 
-        public override string DPSEndpoint => this.config[DPSServiceEndpointKey]!;
+        public override string AzureDPSEndpoint => this.config[AzureDPSServiceEndpointKey]!;
 
-        public override string DPSScopeID => this.config[DPSIDScopeKey]!;
+        public override string AzureDPSScopeID => this.config[AzureDPSIDScopeKey]!;
 
-        public override string StorageAccountConnectionString => this.config[StorageAccountConnectionStringKey]!;
+        public override string AzureStorageAccountConnectionString => this.config[AzureStorageAccountConnectionStringKey]!;
 
         public override int StorageAccountDeviceModelImageMaxAge => this.config.GetValue(StorageAccountDeviceModelImageMaxAgeKey, 86400);
 
@@ -64,13 +64,13 @@ internal DevelopmentConfigHandler(IConfiguration config)
 
         public override bool OIDCValidateTokenReplay => this.config.GetValue(OIDCValidateTokenReplayKey, false);
 
-        public override bool IsLoRaEnabled => bool.Parse(this.config[IsLoRaFeatureEnabledKey] ?? "true");
+        public override bool AzureIsLoRaEnabled => bool.Parse(this.config[AzureIsLoRaFeatureEnabledKey] ?? "true");
 
-        public override string LoRaKeyManagementUrl => this.config[LoRaKeyManagementUrlKey]!;
+        public override string AzureLoRaKeyManagementUrl => this.config[AzureLoRaKeyManagementUrlKey]!;
 
-        public override string LoRaKeyManagementCode => this.config[LoRaKeyManagementCodeKey]!;
+        public override string AzureLoRaKeyManagementCode => this.config[AzureLoRaKeyManagementCodeKey]!;
 
-        public override string LoRaKeyManagementApiVersion => this.config[LoRaKeyManagementApiVersionKey]!;
+        public override string AzureLoRaKeyManagementApiVersion => this.config[AzureLoRaKeyManagementApiVersionKey]!;
 
         public override bool IdeasEnabled => this.config.GetValue(IdeasEnabledKey, false);
         public override string IdeasUrl => this.config.GetValue(IdeasUrlKey, string.Empty)!;

diff --git a/src/AzureIoTHub.Portal.Infrastructure/Jobs/SyncLoRaDeviceTelemetryJob.cs b/src/AzureIoTHub.Portal.Infrastructure/Jobs/SyncLoRaDeviceTelemetryJob.cs
@@ -43,8 +43,8 @@ public async Task Execute(IJobExecutionContext context)
 
             var processor = new EventProcessorClient(
                 storageClient,
-                this.configHandler.IoTHubEventHubConsumerGroup,
-                this.configHandler.IoTHubEventHubEndpoint);
+                this.configHandler.AzureIoTHubEventHubConsumerGroup,
+                this.configHandler.AzureIoTHubEventHubEndpoint);
 
             try
             {

diff --git a/src/AzureIoTHub.Portal.Infrastructure/ProductionAWSConfigHandler.cs b/src/AzureIoTHub.Portal.Infrastructure/ProductionAWSConfigHandler.cs
@@ -23,19 +23,19 @@ internal ProductionAWSConfigHandler(IConfiguration config)
 
         public override int MetricLoaderRefreshIntervalInMinutes => this.config.GetValue(MetricLoaderRefreshIntervalKey, 10);
 
-        public override string IoTHubConnectionString => this.config[IoTHubConnectionStringKey]!;
+        public override string AzureIoTHubConnectionString => this.config[AzureIoTHubConnectionStringKey]!;
 
-        public override string IoTHubEventHubEndpoint => this.config.GetValue(IoTHubEventHubEndpointKey, string.Empty)!;
+        public override string AzureIoTHubEventHubEndpoint => this.config.GetValue(AzureIoTHubEventHubEndpointKey, string.Empty)!;
 
-        public override string IoTHubEventHubConsumerGroup => this.config.GetValue(IoTHubEventHubConsumerGroupKey, "iothub-portal")!;
+        public override string AzureIoTHubEventHubConsumerGroup => this.config.GetValue(AzureIoTHubEventHubConsumerGroupKey, "iothub-portal")!;
 
-        public override string DPSConnectionString => this.config[DPSConnectionStringKey]!;
+        public override string AzureDPSConnectionString => this.config[AzureDPSConnectionStringKey]!;
 
-        public override string DPSEndpoint => this.config[DPSServiceEndpointKey]!;
+        public override string AzureDPSEndpoint => this.config[AzureDPSServiceEndpointKey]!;
 
-        public override string DPSScopeID => this.config[DPSIDScopeKey]!;
+        public override string AzureDPSScopeID => this.config[AzureDPSIDScopeKey]!;
 
-        public override string StorageAccountConnectionString => throw new NotImplementedException();
+        public override string AzureStorageAccountConnectionString => throw new NotImplementedException();
 
         public override int StorageAccountDeviceModelImageMaxAge => this.config.GetValue(StorageAccountDeviceModelImageMaxAgeKey, 86400);
 
@@ -63,13 +63,13 @@ internal ProductionAWSConfigHandler(IConfiguration config)
 
         public override bool OIDCValidateTokenReplay => this.config.GetValue(OIDCValidateTokenReplayKey, false);
 
-        public override bool IsLoRaEnabled => bool.Parse(this.config[IsLoRaFeatureEnabledKey] ?? "true");
+        public override bool AzureIsLoRaEnabled => bool.Parse(this.config[AzureIsLoRaFeatureEnabledKey] ?? "true");
 
-        public override string LoRaKeyManagementUrl => this.config[LoRaKeyManagementUrlKey]!;
+        public override string AzureLoRaKeyManagementUrl => this.config[AzureLoRaKeyManagementUrlKey]!;
 
-        public override string LoRaKeyManagementCode => this.config[LoRaKeyManagementCodeKey]!;
+        public override string AzureLoRaKeyManagementCode => this.config[AzureLoRaKeyManagementCodeKey]!;
 
-        public override string LoRaKeyManagementApiVersion => this.config[LoRaKeyManagementApiVersionKey]!;
+        public override string AzureLoRaKeyManagementApiVersion => this.config[AzureLoRaKeyManagementApiVersionKey]!;
 
         public override bool IdeasEnabled => this.config.GetValue(IdeasEnabledKey, false);
         public override string IdeasUrl => this.config.GetValue(IdeasUrlKey, string.Empty)!;

diff --git a/src/AzureIoTHub.Portal.Infrastructure/ProductionAzureConfigHandler.cs b/src/AzureIoTHub.Portal.Infrastructure/ProductionAzureConfigHandler.cs
@@ -24,19 +24,19 @@ internal ProductionAzureConfigHandler(IConfiguration config)
 
         public override int MetricLoaderRefreshIntervalInMinutes => this.config.GetValue(MetricLoaderRefreshIntervalKey, 10);
 
-        public override string IoTHubConnectionString => this.config.GetConnectionString(IoTHubConnectionStringKey)!;
+        public override string AzureIoTHubConnectionString => this.config.GetConnectionString(AzureIoTHubConnectionStringKey)!;
 
-        public override string IoTHubEventHubEndpoint => this.config.GetConnectionString(IoTHubEventHubEndpointKey)!;
+        public override string AzureIoTHubEventHubEndpoint => this.config.GetConnectionString(AzureIoTHubEventHubEndpointKey)!;
 
-        public override string IoTHubEventHubConsumerGroup => this.config.GetValue(IoTHubEventHubConsumerGroupKey, "iothub-portal")!;
+        public override string AzureIoTHubEventHubConsumerGroup => this.config.GetValue(AzureIoTHubEventHubConsumerGroupKey, "iothub-portal")!;
 
-        public override string DPSConnectionString => this.config.GetConnectionString(DPSConnectionStringKey)!;
+        public override string AzureDPSConnectionString => this.config.GetConnectionString(AzureDPSConnectionStringKey)!;
 
-        public override string DPSEndpoint => this.config[DPSServiceEndpointKey]!;
+        public override string AzureDPSEndpoint => this.config[AzureDPSServiceEndpointKey]!;
 
-        public override string DPSScopeID => this.config[DPSIDScopeKey]!;
+        public override string AzureDPSScopeID => this.config[AzureDPSIDScopeKey]!;
 
-        public override string StorageAccountConnectionString => this.config.GetConnectionString(StorageAccountConnectionStringKey)!;
+        public override string AzureStorageAccountConnectionString => this.config.GetConnectionString(AzureStorageAccountConnectionStringKey)!;
 
         public override string PostgreSQLConnectionString => this.config.GetConnectionString(PostgreSQLConnectionStringKey)!;
 
@@ -70,13 +70,13 @@ internal ProductionAzureConfigHandler(IConfiguration config)
 
         public override bool OIDCValidateTokenReplay => this.config.GetValue(OIDCValidateTokenReplayKey, false);
 
-        public override bool IsLoRaEnabled => bool.Parse(this.config[IsLoRaFeatureEnabledKey] ?? "true");
+        public override bool AzureIsLoRaEnabled => bool.Parse(this.config[AzureIsLoRaFeatureEnabledKey] ?? "true");
 
-        public override string LoRaKeyManagementUrl => this.config[LoRaKeyManagementUrlKey]!;
+        public override string AzureLoRaKeyManagementUrl => this.config[AzureLoRaKeyManagementUrlKey]!;
 
-        public override string LoRaKeyManagementCode => this.config.GetConnectionString(LoRaKeyManagementCodeKey)!;
+        public override string AzureLoRaKeyManagementCode => this.config.GetConnectionString(AzureLoRaKeyManagementCodeKey)!;
 
-        public override string LoRaKeyManagementApiVersion => this.config[LoRaKeyManagementApiVersionKey]!;
+        public override string AzureLoRaKeyManagementApiVersion => this.config[AzureLoRaKeyManagementApiVersionKey]!;
 
         public override bool IdeasEnabled => this.config.GetValue(IdeasEnabledKey, false);
         public override string IdeasUrl => this.config.GetValue(IdeasUrlKey, string.Empty)!;

diff --git a/src/AzureIoTHub.Portal.Infrastructure/Providers/AzureDeviceRegistryProvider.cs b/src/AzureIoTHub.Portal.Infrastructure/Providers/AzureDeviceRegistryProvider.cs
@@ -141,8 +141,8 @@ public async Task<DeviceCredentials> GetEnrollmentCredentialsAsync(string device
                 {
                     SymmetricKey = symmetricKey,
                     RegistrationID = deviceId,
-                    ScopeID = this.config.DPSScopeID,
-                    ProvisioningEndpoint = $"https://{this.config.DPSEndpoint}"
+                    ScopeID = this.config.AzureDPSScopeID,
+                    ProvisioningEndpoint = $"https://{this.config.AzureDPSEndpoint}"
                 }
             };
         }

diff --git a/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelCommandSeeder.cs b/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelCommandSeeder.cs
@@ -14,7 +14,7 @@ internal static class DeviceModelCommandSeeder
     {
         public static async Task MigrateDeviceModelCommands(this PortalDbContext ctx, ConfigHandler config)
         {
-            var table = new TableClientFactory(config.StorageAccountConnectionString)
+            var table = new TableClientFactory(config.AzureStorageAccountConnectionString)
                                 .GetDeviceCommands();
 
             var set = ctx.Set<DeviceModelCommand>();

diff --git a/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelPropertySeeder.cs b/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelPropertySeeder.cs
@@ -13,7 +13,7 @@ internal static class DeviceModelPropertySeeder
     {
         public static async Task MigrateDeviceModelProperties(this PortalDbContext ctx, ConfigHandler config)
         {
-            var table = new TableClientFactory(config.StorageAccountConnectionString)
+            var table = new TableClientFactory(config.AzureStorageAccountConnectionString)
                                 .GetDeviceTemplateProperties();
 
             var set = ctx.Set<DeviceModelProperty>();

diff --git a/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelSeeder.cs b/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelSeeder.cs
@@ -14,7 +14,7 @@ internal static class DeviceModelSeeder
     {
         public static async Task MigrateDeviceModels(this PortalDbContext ctx, ConfigHandler config)
         {
-            var table = new TableClientFactory(config.StorageAccountConnectionString)
+            var table = new TableClientFactory(config.AzureStorageAccountConnectionString)
                                 .GetDeviceTemplates();
 
             var set = ctx.Set<DeviceModel>();

diff --git a/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceTagSeeder.cs b/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceTagSeeder.cs
@@ -13,7 +13,7 @@ internal static class DeviceTagSeeder
     {
         public static async Task MigrateDeviceTags(this PortalDbContext ctx, ConfigHandler config)
         {
-            var table = new TableClientFactory(config.StorageAccountConnectionString)
+            var table = new TableClientFactory(config.AzureStorageAccountConnectionString)
                                 .GetDeviceTagSettings();
 
             var set = ctx.Set<DeviceTag>();

diff --git a/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelCommandSeeder.cs b/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelCommandSeeder.cs
@@ -13,7 +13,7 @@ internal static class EdgeDeviceModelCommandSeeder
     {
         public static async Task MigrateEdgeDeviceModelCommands(this PortalDbContext ctx, ConfigHandler config)
         {
-            var table = new TableClientFactory(config.StorageAccountConnectionString)
+            var table = new TableClientFactory(config.AzureStorageAccountConnectionString)
                                 .GetEdgeModuleCommands();
 
             var set = ctx.Set<EdgeDeviceModelCommand>();

diff --git a/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelSeeder.cs b/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelSeeder.cs
@@ -13,7 +13,7 @@ internal static class EdgeDeviceModelSeeder
     {
         public static async Task MigrateEdgeDeviceModels(this PortalDbContext ctx, ConfigHandler config)
         {
-            var table = new TableClientFactory(config.StorageAccountConnectionString)
+            var table = new TableClientFactory(config.AzureStorageAccountConnectionString)
                                 .GetEdgeDeviceTemplates();
 
             var set = ctx.Set<EdgeDeviceModel>();