Update deployement parameters (#2155)

CGI-FR · Jun 18, 2023 · 22a42c7 · 22a42c7
1 parent d7cbb0c
commit 22a42c7
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 59 deletions.
diff --git a/src/AzureIoTHub.Portal.Domain/ConfigHandler.cs b/src/AzureIoTHub.Portal.Domain/ConfigHandler.cs
@@ -81,5 +81,6 @@ public abstract class ConfigHandler
         public abstract string AWSS3StorageConnectionString { get; }
         public abstract string AWSBucketName { get; }
         public abstract string AWSAccountId { get; }
+        public abstract IEnumerable<string> AWSGreengrassRequiredRoles { get; }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/ConfigHandlerBase.cs b/src/AzureIoTHub.Portal.Infrastructure/ConfigHandlerBase.cs
@@ -58,6 +58,7 @@ internal abstract class ConfigHandlerBase : ConfigHandler
         internal const string AWSS3StorageConnectionStringKey = "AWS:S3Storage:ConnectionString";
         internal const string AWSBucketNameKey = "AWS:BucketName";
         internal const string AWSAccountIdKey = "AWS:AccountId";
+        internal const string AWSGreengrassRequiredRolesKey = "AWS:GreengrassRequiredRoles";
 
     }
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/DevelopmentConfigHandler.cs b/src/AzureIoTHub.Portal.Infrastructure/DevelopmentConfigHandler.cs
@@ -3,6 +3,7 @@
 
 namespace AzureIoTHub.Portal.Infrastructure
 {
+    using System.Collections.Generic;
     using AzureIoTHub.Portal.Domain.Shared.Constants;
     using Microsoft.Extensions.Configuration;
 
@@ -90,5 +91,6 @@ internal DevelopmentConfigHandler(IConfiguration config)
         public override string AWSS3StorageConnectionString => this.config[AWSS3StorageConnectionStringKey]!;
         public override string AWSBucketName => this.config[AWSBucketNameKey]!;
         public override string AWSAccountId => this.config[AWSAccountIdKey]!;
+        public override IEnumerable<string> AWSGreengrassRequiredRoles => this.config.GetSection(AWSGreengrassRequiredRolesKey).Get<string[]>()!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/ProductionAWSConfigHandler.cs b/src/AzureIoTHub.Portal.Infrastructure/ProductionAWSConfigHandler.cs
@@ -90,6 +90,8 @@ internal ProductionAWSConfigHandler(IConfiguration config)
         public override string AWSS3StorageConnectionString => this.config[AWSS3StorageConnectionStringKey]!;
         public override string AWSBucketName => this.config[AWSBucketNameKey]!;
         public override string AWSAccountId => this.config[AWSAccountIdKey]!;
+        public override IEnumerable<string> AWSGreengrassRequiredRoles => this.config.GetSection(AWSGreengrassRequiredRolesKey).Get<string[]>()!;
+
 
     }
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/ProductionAzureConfigHandler.cs b/src/AzureIoTHub.Portal.Infrastructure/ProductionAzureConfigHandler.cs
@@ -3,6 +3,7 @@
 
 namespace AzureIoTHub.Portal.Infrastructure
 {
+    using System.Collections.Generic;
     using AzureIoTHub.Portal.Domain.Shared.Constants;
     using Microsoft.Extensions.Configuration;
 
@@ -94,5 +95,6 @@ internal ProductionAzureConfigHandler(IConfiguration config)
         public override string AWSBucketName => throw new NotImplementedException();
         public override string AWSAccountId => throw new NotImplementedException();
 
+        public override IEnumerable<string> AWSGreengrassRequiredRoles => throw new NotImplementedException();
     }
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Services/AwsExternalDeviceService.cs b/src/AzureIoTHub.Portal.Infrastructure/Services/AwsExternalDeviceService.cs
@@ -208,17 +208,14 @@ public async Task<DeviceCredentials> GetEdgeDeviceCredentials(IoTEdgeDevice devi
             {
                 var createCertificateTuple = await GenerateCertificate(device.DeviceName);
 
-                _ = await this.amazonIoTClient.AttachPolicyAsync(new AttachPolicyRequest
+                foreach (var item in this.configHandler.AWSGreengrassRequiredRoles)
                 {
-                    PolicyName = "GreengrassV2IoTThingPolicy",
-                    Target = createCertificateTuple.Item2
-                });
-
-                _ = await this.amazonIoTClient.AttachPolicyAsync(new AttachPolicyRequest
-                {
-                    PolicyName = "GreengrassCoreTokenExchangeRoleAliasPolicy",
-                    Target = createCertificateTuple.Item2
-                });
+                    _ = await this.amazonIoTClient.AttachPolicyAsync(new AttachPolicyRequest
+                    {
+                        PolicyName = item,
+                        Target = createCertificateTuple.Item2
+                    });
+                }
 
                 return createCertificateTuple.Item1;
             }

diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/DevelopmentConfigHandlerTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/DevelopmentConfigHandlerTests.cs
@@ -54,6 +54,7 @@ private DevelopmentConfigHandler CreateDevelopmentConfigHandler()
         [TestCase(ConfigHandlerBase.AWSS3StorageConnectionStringKey, nameof(ConfigHandlerBase.AWSS3StorageConnectionString))]
         [TestCase(ConfigHandlerBase.CloudProviderKey, nameof(ConfigHandlerBase.CloudProvider))]
         [TestCase(ConfigHandlerBase.AWSBucketNameKey, nameof(ConfigHandlerBase.AWSBucketName))]
+        [TestCase(ConfigHandlerBase.AWSAccountIdKey, nameof(ConfigHandlerBase.AWSAccountId))]
         public void SettingsShouldGetValueFromAppSettings(string configKey, string configPropertyName)
         {
             // Arrange
@@ -74,6 +75,36 @@ public void SettingsShouldGetValueFromAppSettings(string configKey, string confi
             this.mockRepository.VerifyAll();
         }
 
+        [TestCase(ConfigHandlerBase.AWSGreengrassRequiredRolesKey, nameof(ConfigHandlerBase.AWSGreengrassRequiredRoles))]
+        public void SettingsShouldGetSectionFromAppSettings(string configKey, string configPropertyName)
+        {
+            // Arrange
+            var mockSection = this.mockRepository.Create<IConfigurationSection>();
+
+            _ = mockSection.SetupGet(c => c.Value)
+                    .Returns(Guid.NewGuid().ToString());
+
+            _ = mockSection.SetupGet(c => c.Path)
+                .Returns(configKey);
+
+            _ = mockSection.Setup(c => c.GetChildren())
+                .Returns(Array.Empty<IConfigurationSection>());
+
+            var configHandler = CreateDevelopmentConfigHandler();
+
+            _ = this.mockConfiguration.Setup(c => c.GetSection(It.Is<string>(x => x == configKey)))
+                .Returns(mockSection.Object);
+
+            // Act
+            var result = configHandler
+                                .GetType()
+                                .GetProperty(configPropertyName)
+                                .GetValue(configHandler, null);
+
+            // Assert
+            this.mockRepository.VerifyAll();
+        }
+
         [TestCase(ConfigHandlerBase.OIDCValidateAudienceKey, nameof(ConfigHandlerBase.OIDCValidateAudience))]
         [TestCase(ConfigHandlerBase.OIDCValidateIssuerKey, nameof(ConfigHandlerBase.OIDCValidateIssuer))]
         [TestCase(ConfigHandlerBase.OIDCValidateIssuerSigningKeyKey, nameof(ConfigHandlerBase.OIDCValidateIssuerSigningKey))]

diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/ProductionAWSConfigHandlerTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/ProductionAWSConfigHandlerTests.cs
@@ -54,6 +54,7 @@ private ProductionAWSConfigHandler CreateProductionAWSConfigHandler()
         [TestCase(ConfigHandlerBase.AWSS3StorageConnectionStringKey, nameof(ConfigHandlerBase.AWSS3StorageConnectionString))]
         [TestCase(ConfigHandlerBase.CloudProviderKey, nameof(ConfigHandlerBase.CloudProvider))]
         [TestCase(ConfigHandlerBase.AWSBucketNameKey, nameof(ConfigHandlerBase.AWSBucketName))]
+        [TestCase(ConfigHandlerBase.AWSAccountIdKey, nameof(ConfigHandlerBase.AWSAccountId))]
 
         public void SettingsShouldGetValueFromAppSettings(string configKey, string configPropertyName)
         {
@@ -75,6 +76,36 @@ public void SettingsShouldGetValueFromAppSettings(string configKey, string confi
             this.mockRepository.VerifyAll();
         }
 
+        [TestCase(ConfigHandlerBase.AWSGreengrassRequiredRolesKey, nameof(ConfigHandlerBase.AWSGreengrassRequiredRoles))]
+        public void SettingsShouldGetSectionFromAppSettings(string configKey, string configPropertyName)
+        {
+            // Arrange
+            var mockSection = this.mockRepository.Create<IConfigurationSection>();
+
+            _ = mockSection.SetupGet(c => c.Value)
+                    .Returns(Guid.NewGuid().ToString());
+
+            _ = mockSection.SetupGet(c => c.Path)
+                .Returns(configKey);
+
+            _ = mockSection.Setup(c => c.GetChildren())
+                .Returns(Array.Empty<IConfigurationSection>());
+
+            var configHandler = CreateProductionAWSConfigHandler();
+
+            _ = this.mockConfiguration.Setup(c => c.GetSection(It.Is<string>(x => x == configKey)))
+                .Returns(mockSection.Object);
+
+            // Act
+            var result = configHandler
+                                .GetType()
+                                .GetProperty(configPropertyName)
+                                .GetValue(configHandler, null);
+
+            // Assert
+            this.mockRepository.VerifyAll();
+        }
+
         [TestCase(nameof(ConfigHandlerBase.StorageAccountConnectionString))]
         [TestCase(nameof(ConfigHandlerBase.StorageAccountDeviceModelImageMaxAge))]
         public void SettingsShouldThrowError(string configPropertyName)