Merge pull request #5927 from signalco-io/renovate/pulumiverse-vercel…

…-1.x fix(deps): update dependency @pulumiverse/vercel to v1.14.2
signalco-io · Sep 29, 2024 · a804e6f · a804e6f
2 parents 5cc1257 + 05d2caa
commit a804e6f
Show file tree

Hide file tree

Showing 18 changed files with 153 additions and 212 deletions.
diff --git a/cloud/src/Signal.Core/CoreExtensions.cs b/cloud/src/Signal.Core/CoreExtensions.cs
@@ -12,7 +12,7 @@ public static class CoreExtensions
 {
     public static IServiceCollection AddCore(this IServiceCollection services) =>
         services
-            .AddTransient<INotificationSmtpService, NotificationSmtpService>()
+            .AddTransient<INotificationSmtpService, NotificationEmailService>()
             .AddTransient<INotificationService, NotificationService>()
             .AddTransient<ISharingService, SharingService>()
             .AddTransient<IEntityService, EntityService>()

diff --git a/cloud/src/Signal.Core/Notifications/INotificationSmtpService.cs b/cloud/src/Signal.Core/Notifications/INotificationSmtpService.cs
@@ -9,5 +9,6 @@ Task SendAsync(
         string recipientEmail,
         string title,
         string content,
+        string? sender = "system",
         CancellationToken cancellationToken = default);
 }
diff --git a/cloud/src/Signal.Core/Notifications/NotificationEmailService.cs b/cloud/src/Signal.Core/Notifications/NotificationEmailService.cs
@@ -0,0 +1,40 @@
+using Azure.Communication.Email;
+using Signal.Core.Secrets;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Signal.Core.Notifications;
+
+internal class NotificationEmailService(ISecretsProvider secretsProvider) : INotificationSmtpService
+{
+    public async Task SendAsync(
+        string recipientEmail,
+        string title,
+        string content,
+        string? sender = "system",
+        CancellationToken cancellationToken = default)
+    {
+        var acsConnectionString = await secretsProvider.GetSecretAsync(SecretKeys.AzureCommunicationServices.ConnectionString, cancellationToken);
+        var acsDomain = await secretsProvider.GetSecretAsync(SecretKeys.AzureCommunicationServices.Domain, cancellationToken);
+
+
+        var emailClient = new EmailClient(acsConnectionString);
+        var emailSendOperation = await emailClient.SendAsync(
+            Azure.WaitUntil.Started,
+            $"{sender ?? "system"}@{acsDomain}",
+            recipientEmail,
+            title,
+            content,
+            cancellationToken: cancellationToken);
+
+        while (true)
+        {
+            await emailSendOperation.UpdateStatusAsync(cancellationToken);
+            if (emailSendOperation.HasCompleted)
+            {
+                break;
+            }
+            await Task.Delay(100, cancellationToken);
+        }
+    }
+}
diff --git a/cloud/src/Signal.Core/Notifications/NotificationService.cs b/cloud/src/Signal.Core/Notifications/NotificationService.cs
@@ -31,7 +31,7 @@ await smtpService.SendAsync(
                         throw new InvalidOperationException($"Email not available for user {userId}"),
                         content.Title,
                         content.Content?.ToString() ?? string.Empty,
-                        cancellationToken);
+                        cancellationToken: cancellationToken);
                 }
             }
             catch

diff --git a/cloud/src/Signal.Core/Notifications/NotificationSmtpService.cs b/cloud/src/Signal.Core/Notifications/NotificationSmtpService.cs
diff --git a/cloud/src/Signal.Core/Secrets/SecretKeys.cs b/cloud/src/Signal.Core/Secrets/SecretKeys.cs
@@ -37,6 +37,12 @@ public static class AzureSpeech
         public const string Region = "AzureSpeech--Region";
     }
 
+    public static class AzureCommunicationServices
+    {
+        public const string ConnectionString = "AcsConnectionString";
+        public const string Domain = "AcsDomain";
+    }
+
     public static class SmtpNotification
     {
         public const string Username = "SmtpNotificationUsername";

diff --git a/cloud/src/Signal.Core/Signal.Core.csproj b/cloud/src/Signal.Core/Signal.Core.csproj
@@ -7,6 +7,7 @@
     <PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Azure.Communication.Email" Version="1.0.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.1.0" />

diff --git a/infra/apps/cloud-primary/src/index.ts b/infra/apps/cloud-primary/src/index.ts
@@ -14,8 +14,8 @@ import {
     createFunctionsStorage,
     createLogWorkspace,
     createAppInsights,
+    acsEmails,
 } from '@infra/pulumi/azure';
-import { createSes } from '@infra/pulumi/aws';
 import { apiStatusCheck } from '@infra/pulumi/checkly';
 import { dnsRecord } from '@infra/pulumi/cloudflare';
 import { publishProjectAsync } from '@infra/pulumi/dotnet';
@@ -160,8 +160,22 @@ const up = async () => {
         // Create general storage and prepare tables
         const storage = createStorageAccount(resourceGroup, storagePrefix, shouldProtect);
 
-        // Create AWS SES service
-        const ses = createSes(`ses-${stack}`, 'notification');
+        // ACS (Email)
+        // DomainName can be root (e.g. signalco.io) or subdomain (e.g. next.signalco.io)
+        // ACS Domain name should be the root domain (e.g. signalco.io)
+        // Subdomain is used for the ACS subdomain (e.g. next)
+        const acsDomainName = domainName.split('.').length > 2 ? domainName.split('.').slice(1).join('.') : domainName;
+        const acsSubDomain = domainName.split('.').length > 2 ? domainName.split('.')[0] : null;
+        const { acsPrimaryConnectionString } = await acsEmails(
+            'cp',
+            resourceGroup,
+            acsDomainName,
+            acsSubDomain,
+            stack,
+            [
+                { subdomain: 'notifications', displayName: 'Signalco Notifications' },
+                { subdomain: 'system', displayName: 'Signalco' },
+            ]);
 
         // Create and populate vault
         const vault = createKeyVault(resourceGroup, keyvaultPrefix, shouldProtect, [
@@ -188,10 +202,8 @@ const up = async () => {
         };
 
         const internalEnvVariables = {
-            SmtpNotificationServerUrl: ses.smtpServer,
-            SmtpNotificationFromDomain: ses.smtpFromDomain,
-            SmtpNotificationUsername: ses.smtpUsername,
-            SmtpNotificationPassword: ses.smtpPassword,
+            AcsConnectionString: acsPrimaryConnectionString,
+            AcsDomain: acsDomainName,
             'Auth0_ClientId_Station': config.requireSecret('secret-auth0ClientIdStation'),
             'Auth0_ClientSecret_Station': config.requireSecret('secret-auth0ClientSecretStation'),
             'HCaptcha_Secret': config.requireSecret('secret-hcaptchaSecret'),

diff --git a/infra/apps/remote-browser/package.json b/infra/apps/remote-browser/package.json
@@ -20,7 +20,6 @@
     },
     "dependencies": {
         "@checkly/pulumi": "1.1.4",
-        "@pulumi/aws": "6.54.0",
         "@pulumi/azure-native": "2.63.0",
         "@pulumi/cloudflare": "5.39.1",
         "@pulumi/command": "1.0.1",

diff --git a/infra/apps/uier/package.json b/infra/apps/uier/package.json
@@ -24,7 +24,6 @@
     },
     "dependencies": {
         "@checkly/pulumi": "1.1.4",
-        "@pulumi/aws": "6.54.0",
         "@pulumi/azure-native": "2.63.0",
         "@pulumi/cloudflare": "5.39.1",
         "@pulumi/command": "1.0.1",

diff --git a/infra/apps/workingparty/src/index.ts b/infra/apps/workingparty/src/index.ts
@@ -5,8 +5,7 @@ import { DatabaseAccount, SqlResourceSqlDatabase, SqlResourceSqlContainer, Datab
 import { nextJsApp } from '@infra/pulumi/vercel';
 import { dnsRecord } from '@infra/pulumi/cloudflare';
 import { ProjectDomain, ProjectEnvironmentVariable } from '@pulumiverse/vercel';
-import { CommunicationService, EmailService, Domain, DomainManagement, UserEngagementTracking, SenderUsername, listCommunicationServiceKeysOutput } from '@pulumi/azure-native/communication/index.js';
-import { createStorageAccount } from '@infra/pulumi/azure';
+import { createStorageAccount, acsEmails } from '@infra/pulumi/azure';
 
 const up = async () => {
     const config = new Config();
@@ -114,70 +113,17 @@ const up = async () => {
         queueName: 'email-queue',
     });
 
-    // Create ACS
-    const aes = new EmailService('wp-azure-email-service', {
-        dataLocation: 'Europe',
-        emailServiceName: 'wpemail',
-        location: 'Global',
-        resourceGroupName: resourceGroup.name,
-    });
-    const aesDomain = new Domain('wp-aes-domain', {
-        resourceGroupName: resourceGroup.name,
-        emailServiceName: aes.name,
-        domainManagement: DomainManagement.CustomerManaged,
-        domainName: domainName,
-        location: 'Global',
-        userEngagementTracking: UserEngagementTracking.Disabled,
-    });
-    if (aesDomain.verificationRecords.domain) {
-        const aesDomainVerifyDataName = aesDomain.verificationRecords.domain.apply(domainVerification => domainVerification?.name ?? '');
-        const aesDomainVerifyDataValue = aesDomain.verificationRecords.domain.apply(domainVerification => domainVerification?.value ?? '');
-        dnsRecord('wp-aes-domain-domainverify', aesDomainVerifyDataName, aesDomainVerifyDataValue, 'TXT', false);
-    }
-    if (aesDomain.verificationRecords.sPF) {
-        const aesDomainVerifySpfName = aesDomain.verificationRecords.sPF.apply(dkimVerification => dkimVerification?.name ?? '');
-        const aesDomainVerifySpfValue = aesDomain.verificationRecords.sPF.apply(dkimVerification => dkimVerification?.value ?? '');
-        dnsRecord('wp-aes-domain-spf', aesDomainVerifySpfName, aesDomainVerifySpfValue, 'TXT', false);
-    }
-    if (aesDomain.verificationRecords.dKIM) {
-        const aesDomainVerifyDkimName = aesDomain.verificationRecords.dKIM.apply(dkimVerification => subdomain ? (`${dkimVerification?.name ?? ''}.${subdomain}`) : dkimVerification?.name ?? '');
-        const aesDomainVerifyDkimValue = aesDomain.verificationRecords.dKIM.apply(dkimVerification => dkimVerification?.value ?? '');
-        dnsRecord('wp-aes-domain-dkim', aesDomainVerifyDkimName, aesDomainVerifyDkimValue, 'CNAME', false);
-    }
-    if (aesDomain.verificationRecords.dKIM2) {
-        const aesDomainVerifyDkimName = aesDomain.verificationRecords.dKIM2.apply(dkimVerification => subdomain ? (`${dkimVerification?.name ?? ''}.${subdomain}`) : dkimVerification?.name ?? '');
-        const aesDomainVerifyDkimValue = aesDomain.verificationRecords.dKIM2.apply(dkimVerification => dkimVerification?.value ?? '');
-        dnsRecord('wp-aes-domain-dkim2', aesDomainVerifyDkimName, aesDomainVerifyDkimValue, 'CNAME', false);
-    }
-    // NOTE: Domain needs to be verified manually in Azure Communication Services
-
-    new SenderUsername('wp-aes-sender-notifications', {
-        resourceGroupName: resourceGroup.name,
-        emailServiceName: aes.name,
-        domainName: aesDomain.name,
-        displayName: 'WorkingParty Notifications',
-        senderUsername: 'notifications',
-        username: 'notifications',
-    });
-    new SenderUsername('wp-aes-sender-system', {
-        resourceGroupName: resourceGroup.name,
-        emailServiceName: aes.name,
-        domainName: aesDomain.name,
-        displayName: 'WorkingParty',
-        senderUsername: 'system',
-        username: 'system',
-    });
-    const communicaionService = new CommunicationService('wp-azure-communication-service', {
-        communicationServiceName: `wpacs-${stack}`,
-        dataLocation: 'Europe',
-        location: 'Global',
-        resourceGroupName: resourceGroup.name,
-        linkedDomains: [aesDomain.id],
-    });
-    const acsPrimaryConnectionString = listCommunicationServiceKeysOutput({
-        resourceGroupName: resourceGroup.name,
-        communicationServiceName: communicaionService.name,
-    }).apply(keys => keys.primaryConnectionString ?? '');
+    // ACS (Email)
+    const { acsPrimaryConnectionString } = await acsEmails(
+        'wp',
+        resourceGroup,
+        domainName,
+        subdomain,
+        stack,
+        [
+            { subdomain: 'notifications', displayName: 'WorkingParty Notifications' },
+            { subdomain: 'system', displayName: 'WorkingParty' },
+        ]);
 
     // Vercel setup
     const app = nextJsApp('wp', 'workingparty', 'web/apps/workingparty');

diff --git a/infra/packages/pulumi/package.json b/infra/packages/pulumi/package.json
@@ -10,9 +10,6 @@
         "./azure": {
             "import": "./src/azure/index.ts"
         },
-        "./aws": {
-            "import": "./src/aws/index.ts"
-        },
         "./cloudflare": {
             "import": "./src/cloudflare/index.ts"
         },
@@ -40,7 +37,6 @@
     },
     "dependencies": {
         "@checkly/pulumi": "1.1.4",
-        "@pulumi/aws": "6.54.0",
         "@pulumi/azure-native": "2.63.0",
         "@pulumi/cloudflare": "5.39.1",
         "@pulumi/command": "1.0.1",

diff --git a/infra/packages/pulumi/src/aws/createSes.ts b/infra/packages/pulumi/src/aws/createSes.ts
diff --git a/infra/packages/pulumi/src/aws/index.ts b/infra/packages/pulumi/src/aws/index.ts