Injectable SetAdminCustomDomains and SetApiCustomDomains Services

extensions/MyAdminPulumiHandler.ts

@@ -0,0 +1,24 @@
+import { Ui } from "webiny/infra";
+import { AdminPulumi, SetAdminCustomDomains } from "webiny/infra/admin";
+
+class MyAdminPulumiHandlerImpl implements AdminPulumi.Interface {
+    constructor(
+        private ui: Ui.Interface,
+        private setAdminCustomDomains: SetAdminCustomDomains.Interface
+    ) {}
+
+    execute(app: any) {
+        this.setAdminCustomDomains.execute(app.resources.cloudfront, {
+            domains: ["webiny.adriaweb.xyz"],
+            sslMethod: "sni-only",
+            certificateArn:
+                "arn:aws:acm:us-east-1:674320871285:certificate/6c45daa6-a531-4ce8-97b0-477e77dc68f5"
+        });
+        this.ui.info("🔮 Executing MyAdminPulumiHandler with environment:", app.env);
+    }
+}
+
+export default AdminPulumi.createImplementation({
+    implementation: MyAdminPulumiHandlerImpl,
+    dependencies: [Ui, SetAdminCustomDomains]
+});

packages/project-aws/src/abstractions/features/pulumi/SetAdminCustomDomains.ts

@@ -0,0 +1,18 @@
+import { createAbstraction } from "@webiny/project/abstractions/createAbstraction.js";
+import type * as aws from "@pulumi/aws";
+import type { PulumiAppResource } from "@webiny/pulumi";
+import type { CustomDomainParams } from "~/pulumi/apps/customDomain.js";
+
+export interface ISetAdminCustomDomains {
+    execute(
+        cloudfront: PulumiAppResource<typeof aws.cloudfront.Distribution>,
+        params: CustomDomainParams
+    ): void;
+}
+
+export const SetAdminCustomDomains =
+    createAbstraction<ISetAdminCustomDomains>("SetAdminCustomDomains");
+
+export namespace SetAdminCustomDomains {
+    export type Interface = ISetAdminCustomDomains;
+}

packages/project-aws/src/abstractions/features/pulumi/SetApiCustomDomains.ts

@@ -0,0 +1,17 @@
+import { createAbstraction } from "@webiny/project/abstractions/createAbstraction.js";
+import type * as aws from "@pulumi/aws";
+import type { PulumiAppResource } from "@webiny/pulumi";
+import type { CustomDomainParams } from "~/pulumi/apps/customDomain.js";
+
+export interface ISetApiCustomDomains {
+    execute(
+        cloudfront: PulumiAppResource<typeof aws.cloudfront.Distribution>,
+        params: CustomDomainParams
+    ): void;
+}
+
+export const SetApiCustomDomains = createAbstraction<ISetApiCustomDomains>("SetApiCustomDomains");
+
+export namespace SetApiCustomDomains {
+    export type Interface = ISetApiCustomDomains;
+}

packages/project-aws/src/abstractions/features/pulumi/index.ts

@@ -1,3 +1,5 @@
 export * from "./CorePulumi.js";
 export * from "./ApiPulumi.js";
 export * from "./AdminPulumi.js";
+export * from "./SetAdminCustomDomains.js";
+export * from "./SetApiCustomDomains.js";

packages/project-aws/src/exports/infra/admin.ts

@@ -1,2 +1,3 @@
 export { AdminPulumi } from "~/abstractions/features/pulumi/AdminPulumi.js";
 export { AdminStackOutputService as GetAdminStackOutput } from "~/abstractions/services/AdminStackOutputService.js";
+export { SetAdminCustomDomains } from "~/abstractions/features/pulumi/SetAdminCustomDomains.js";

packages/project-aws/src/exports/infra/api.ts

@@ -1,2 +1,3 @@
 export { ApiPulumi } from "~/abstractions/features/pulumi/ApiPulumi.js";
 export { ApiStackOutputService as GetApiStackOutput } from "~/abstractions/services/ApiStackOutputService.js";
+export { SetApiCustomDomains } from "~/abstractions/features/pulumi/SetApiCustomDomains.js";

packages/project-aws/src/extensions/ProjectAws.tsx

@@ -38,6 +38,16 @@ export const ProjectAws = () => {
             <ProjectImplementation src={p("../features/InvokeLambdaFunction.js")} singleton />
             <ProjectImplementation src={p("../features/ApiGqlClient.js")} singleton />
 
+            {/* Default custom domain services */}
+            <ProjectImplementation
+                src={p("../pulumi/features/SetAdminCustomDomains/DefaultSetAdminCustomDomains.js")}
+                singleton
+            />
+            <ProjectImplementation
+                src={p("../pulumi/features/SetApiCustomDomains/DefaultSetApiCustomDomains.js")}
+                singleton
+            />
+
             <AdminAfterDeploy src={p("ProjectAws/UploadAdminAppToS3.js")} />
 
             <ApiAfterDeploy src={p("ProjectAws/AutoInstall/AutoInstallAfterApiDeploy.js")} />

packages/project-aws/src/pulumi/apps/admin/createAdminPulumiApp.ts

@@ -2,14 +2,15 @@ import { createReactPulumiApp } from "~/pulumi/apps/index.js";
 import { getProjectSdk } from "@webiny/project";
 import { AdminPulumi } from "~/abstractions/features/pulumi/index.js";
 import { adminPulumi } from "~/pulumi/features/AdminPulumi/index.js";
-import { AdminCustomDomains as adminCustomDomainsExt } from "~/pulumi/extensions/AdminCustomDomains.js";
 import { withServiceManifest } from "~/pulumi/index.js";
+import { AdminCustomDomains as adminCustomDomainsExt } from "~/pulumi/extensions/AdminCustomDomains.js";
 
 export type AdminPulumiApp = ReturnType<typeof createReactPulumiApp>;
 
 export const createAdminPulumiApp = async () => {
     const sdk = await getProjectSdk();
     const projectConfig = await sdk.getProjectConfig();
+
     const baseApp = createReactPulumiApp({
         name: "admin",
         folder: "apps/admin",
@@ -20,22 +21,19 @@ export const createAdminPulumiApp = async () => {
                 const { domains, sslMethod, certificateArn } = adminDomains.params;
                 return {
                     domains,
-                    sslSupportMethod: sslMethod,
-                    acmCertificateArn: certificateArn
+                    sslMethod,
+                    certificateArn
                 };
             }
 
             return undefined;
         },
         pulumi: async app => {
-            // Overrides must be applied via a handler, registered at the very start of the program.
-            // By doing this, we're ensuring user's adjustments are not applied to late.
             sdk.getContainer().registerComposite(adminPulumi);
             const pulumiHandlers = sdk.getContainer().resolve(AdminPulumi);
 
-            app.addHandler(() => {
-                return pulumiHandlers.execute(app as AdminPulumiApp);
-            });
+            // Execute directly so implementations run before the CloudFront resource is created.
+            await pulumiHandlers.execute(app as AdminPulumiApp);
         }
     });
 

packages/project-aws/src/pulumi/apps/api/createApiPulumiApp.ts

@@ -139,15 +139,6 @@ export const createApiPulumiApp = () => {
             });
             // <-------------------- Enterprise end -------------------->
 
-            // Overrides must be applied via a handler, registered at the very start of the program.
-            // By doing this, we're ensuring user's adjustments are not applied to late.
-            sdk.getContainer().registerComposite(apiPulumi);
-            const pulumiHandlers = sdk.getContainer().resolve(ApiPulumi);
-
-            app.addHandler(() => {
-                return pulumiHandlers.execute(app as ApiPulumiApp);
-            });
-
             const isProduction = app.env.isProduction;
 
             // Register core output as a module available to all the other modules
@@ -248,13 +239,14 @@ export const createApiPulumiApp = () => {
             const [apiCustomDomains] = projectConfig.extensionsByType(apiCustomDomainsExt);
             if (apiCustomDomains) {
                 const { domains, sslMethod, certificateArn } = apiCustomDomains.params;
-                applyCustomDomain(cloudfront, {
-                    domains,
-                    sslSupportMethod: sslMethod,
-                    acmCertificateArn: certificateArn
-                });
+                applyCustomDomain(cloudfront, { domains, sslMethod, certificateArn });
             }
 
+            // Execute directly so implementations run before the CloudFront resource is created.
+            sdk.getContainer().registerComposite(apiPulumi);
+            const pulumiHandlers = sdk.getContainer().resolve(ApiPulumi);
+            await pulumiHandlers.execute(app as ApiPulumiApp);
+
             app.addOutputs({
                 awsAccountId: getAwsAccountId(app),
                 region: aws.config.region,

packages/project-aws/src/pulumi/apps/blueGreen/createBlueGreenPulumiApp.ts

@@ -111,8 +111,8 @@ export function createBlueGreenPulumiApp() {
 
             applyCustomDomain(cloudfront.cloudFront, {
                 domains: domainNames,
-                sslSupportMethod: attachedDomains.sslSupportMethod,
-                acmCertificateArn: attachedDomains.acmCertificateArn
+                sslMethod: attachedDomains.sslSupportMethod,
+                certificateArn: attachedDomains.acmCertificateArn
             });
 
             attachDomainsToOutput({

packages/project-aws/src/pulumi/apps/customDomain.ts

@@ -4,8 +4,8 @@ import { type PulumiAppResource } from "@webiny/pulumi";
 
 export interface CustomDomainParams {
     domains: Input<string[]>;
-    acmCertificateArn: Input<string>;
-    sslSupportMethod?: Input<string>;
+    certificateArn: Input<string>;
+    sslMethod?: Input<string>;
 }
 
 export function applyCustomDomain(
@@ -15,7 +15,7 @@ export function applyCustomDomain(
     cloudfront.config.aliases(params.domains);
 
     cloudfront.config.viewerCertificate({
-        acmCertificateArn: params.acmCertificateArn,
-        sslSupportMethod: params.sslSupportMethod ?? "sni-only"
+        acmCertificateArn: params.certificateArn,
+        sslSupportMethod: params.sslMethod ?? "sni-only"
     });
 }

packages/project-aws/src/pulumi/extensions/index.ts

@@ -7,7 +7,6 @@ import { BlueGreenDeployments } from "~/pulumi/extensions/BlueGreenDeployments.j
 import { CorePulumi } from "./CorePulumi.js";
 import { ApiPulumi } from "./ApiPulumi.js";
 import { AdminPulumi } from "./AdminPulumi.js";
-
 export { AwsTags };
 export { Vpc };
 export { OpenSearch };

packages/project-aws/src/pulumi/features/SetAdminCustomDomains/DefaultSetAdminCustomDomains.ts

@@ -0,0 +1,18 @@
+import type * as aws from "@pulumi/aws";
+import type { PulumiAppResource } from "@webiny/pulumi";
+import { SetAdminCustomDomains } from "~/abstractions/features/pulumi/index.js";
+import { applyCustomDomain, type CustomDomainParams } from "~/pulumi/apps/customDomain.js";
+
+class DefaultSetAdminCustomDomainsImpl implements SetAdminCustomDomains.Interface {
+    execute(
+        cloudfront: PulumiAppResource<typeof aws.cloudfront.Distribution>,
+        params: CustomDomainParams
+    ): void {
+        applyCustomDomain(cloudfront, params);
+    }
+}
+
+export const DefaultSetAdminCustomDomains = SetAdminCustomDomains.createImplementation({
+    implementation: DefaultSetAdminCustomDomainsImpl,
+    dependencies: []
+});

packages/project-aws/src/pulumi/features/SetAdminCustomDomains/index.ts

@@ -0,0 +1 @@
+export * from "./DefaultSetAdminCustomDomains.js";

packages/project-aws/src/pulumi/features/SetApiCustomDomains/DefaultSetApiCustomDomains.ts

@@ -0,0 +1,18 @@
+import type * as aws from "@pulumi/aws";
+import type { PulumiAppResource } from "@webiny/pulumi";
+import { SetApiCustomDomains } from "~/abstractions/features/pulumi/index.js";
+import { applyCustomDomain, type CustomDomainParams } from "~/pulumi/apps/customDomain.js";
+
+class DefaultSetApiCustomDomainsImpl implements SetApiCustomDomains.Interface {
+    execute(
+        cloudfront: PulumiAppResource<typeof aws.cloudfront.Distribution>,
+        params: CustomDomainParams
+    ): void {
+        applyCustomDomain(cloudfront, params);
+    }
+}
+
+export const DefaultSetApiCustomDomains = SetApiCustomDomains.createImplementation({
+    implementation: DefaultSetApiCustomDomainsImpl,
+    dependencies: []
+});

packages/project-aws/src/pulumi/features/SetApiCustomDomains/index.ts

@@ -0,0 +1 @@
+export * from "./DefaultSetApiCustomDomains.js";

packages/project-aws/src/pulumi/features/index.ts

@@ -1,3 +1,5 @@
 export * from "./CorePulumi/index.js";
 export * from "./ApiPulumi/index.js";
 export * from "./AdminPulumi/index.js";
+export * from "./SetAdminCustomDomains/index.js";
+export * from "./SetApiCustomDomains/index.js";

packages/webiny/package.json

@@ -138,5 +138,5 @@
     "./extensions": "./extensions.js",
     "./api/tenant-manager": "./api/tenant-manager.js"
   },
-  "exportGenerationHash": "f117d5544b5f3f9ffe3bacaad79a372d4690fdd5f960980f452385e740e06d6a"
+  "exportGenerationHash": "38f9725bf3c7c9891f5716e57fb0c190dc9ff4b1d44effb201de7f281e223538"
 }

packages/webiny/src/infra/admin.ts

@@ -5,3 +5,4 @@ export { AdminBeforeDeploy as AdminBeforeDeployHook } from "@webiny/project/abst
 export { AdminBeforeWatch as AdminBeforeWatchHook } from "@webiny/project/abstractions/features/hooks/AdminBeforeWatch.js";
 export { AdminPulumi } from "@webiny/project-aws/abstractions/features/pulumi/AdminPulumi.js";
 export { AdminStackOutputService as GetAdminStackOutput } from "@webiny/project-aws/abstractions/services/AdminStackOutputService.js";
+export { SetAdminCustomDomains } from "@webiny/project-aws/abstractions/features/pulumi/SetAdminCustomDomains.js";

packages/webiny/src/infra/api.ts

@@ -5,3 +5,4 @@ export { ApiBeforeDeploy as ApiBeforeDeployHook } from "@webiny/project/abstract
 export { ApiBeforeWatch as ApiBeforeWatchHook } from "@webiny/project/abstractions/features/hooks/ApiBeforeWatch.js";
 export { ApiPulumi } from "@webiny/project-aws/abstractions/features/pulumi/ApiPulumi.js";
 export { ApiStackOutputService as GetApiStackOutput } from "@webiny/project-aws/abstractions/services/ApiStackOutputService.js";
+export { SetApiCustomDomains } from "@webiny/project-aws/abstractions/features/pulumi/SetApiCustomDomains.js";

webiny.config.tsx

@@ -21,6 +21,7 @@ export const Extensions = () => {
             <Infra.PulumiResourceNamePrefix prefix={"myproj-"} />
             <Infra.ProductionEnvironments environments={["prod", "staging"]} />
             <Infra.Core.Pulumi src={"/extensions/MyCorePulumiHandler.ts"} />
+            {/*<Infra.Admin.Pulumi src={"/extensions/MyAdminPulumiHandler.ts"} />*/}
             <Infra.Vpc enabled={false} />
             <Infra.OpenSearch enabled={false} />