@infoxchange/make-it-so 2.8.1 → 2.9.0-internal-testing-set-http-proxy-env-var.2

package/README.md

@@ -67,7 +67,12 @@ If `isIxManagedDomain` is true (which is the case if `customDomain` is set autom
 
 Also if `isIxManagedDomain` is true DNS records will be automatically created for them.
 
-It will also automatically attach the site to the standard IX VPC created in each workload account (unless you explicitly pass other VPC details or set the VPC-related props (see the SST doco) to `undefined`).
+It will also automatically attach the site to the standard IX VPC created in each workload account (unless you
+explicitly pass other VPC details or set the VPC-related props (see the SST doco) to `undefined`) and set the env vars
+`HTTP_PROXY`, `http_proxy`, `HTTPS_PROXY` and `https_proxy` to the HTTP Proxy for the VPC.
+
+Unlike SST's NextjsSite, any environment variables set with `stackOrApp.setDefaultFunctionProps()` or
+`stackOrApp.addDefaultFunctionEnv()` will be inherited by the IxNextjsSite lambda functions.
 
 #### Options:
 

package/dist/cdk-constructs/IxNextjsSite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IxNextjsSite.d.ts","sourceRoot":"","sources":["../../src/cdk-constructs/IxNextjsSite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EACL,KAAK,uBAAuB,EAY7B,MAAM,wBAAwB,CAAC;AAEhC,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAClE,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/D,KAAK,cAAc,GAAG,uBAAuB,CAAC;AAE9C,qBAAa,YAAa,SAAQ,UAAU;gBAExC,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,WAAW,EACf,KAAK,GAAE,cAAmB;IAgB5B,IAAW,aAAa,IAAI,MAAM,EAAE,CAEnC;IAED,IAAW,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAE9C;IAED,IAAW,WAAW,IAAI,MAAM,GAAG,IAAI,CAEtC;IAED,IAAW,kBAAkB,IAAI,MAAM,EAAE,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;CACF"}
+{"version":3,"file":"IxNextjsSite.d.ts","sourceRoot":"","sources":["../../src/cdk-constructs/IxNextjsSite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EACL,KAAK,uBAAuB,EAa7B,MAAM,wBAAwB,CAAC;AAEhC,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAClE,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/D,KAAK,cAAc,GAAG,uBAAuB,CAAC;AAE9C,qBAAa,YAAa,SAAQ,UAAU;gBAExC,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,WAAW,EACf,KAAK,GAAE,cAAmB;IAiB5B,IAAW,aAAa,IAAI,MAAM,EAAE,CAEnC;IAED,IAAW,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAE9C;IAED,IAAW,WAAW,IAAI,MAAM,GAAG,IAAI,CAEtC;IAED,IAAW,kBAAkB,IAAI,MAAM,EAAE,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;CACF"}

package/dist/cdk-constructs/IxNextjsSite.js

@@ -1,9 +1,10 @@
 import { NextjsSite } from "sst/constructs";
 import ixDeployConfig from "../deployConfig.js";
-import { getAliasDomain, getAlternativeDomains, getCustomDomains, getPrimaryCustomDomain, getPrimaryDomain, getPrimaryOrigin, setupCertificate, setupCustomDomain, setupDnsRecords, setupDomainAliasRedirect, setupVpcDetails, } from "../lib/site/support.js";
+import { getAliasDomain, getAlternativeDomains, getCustomDomains, getPrimaryCustomDomain, getPrimaryDomain, getPrimaryOrigin, setupCertificate, setupCustomDomain, setupDnsRecords, setupDomainAliasRedirect, setupVpcDetails, setupDefaultEnvVars, } from "../lib/site/support.js";
 export class IxNextjsSite extends NextjsSite {
     constructor(scope, id, props = {}) {
         if (ixDeployConfig.isIxDeploy) {
+            props = setupDefaultEnvVars(scope, id, props);
             props = setupVpcDetails(scope, id, props);
             props = setupCustomDomain(scope, id, props);
             props = setupCertificate(scope, id, props);

package/dist/deployConfig.d.ts

@@ -14,6 +14,7 @@ declare const _default: {
     smtpHost: string;
     smtpPort: number;
     clamAVUrl: string;
+    vpcHttpProxy: string;
 } | {
     isIxDeploy: false;
     appName: string;
@@ -28,6 +29,7 @@ declare const _default: {
     deployTriggeredBy: string;
     smtpHost: string;
     clamAVUrl: string;
+    vpcHttpProxy: string;
     isInternalApp?: boolean | undefined;
     smtpPort?: number | undefined;
 };

package/dist/deployConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployConfig.d.ts","sourceRoot":"","sources":["../src/deployConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+EA,wBAAqC"}
+{"version":3,"file":"deployConfig.d.ts","sourceRoot":"","sources":["../src/deployConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkFA,wBAAqC"}

package/dist/deployConfig.js

@@ -15,6 +15,7 @@ const envVars = {
     smtpHost: process.env.SMTP_HOST ?? "",
     smtpPort: process.env.SMTP_PORT ?? "",
     clamAVUrl: process.env.CLAMAV_URL ?? "",
+    vpcHttpProxy: process.env.VPC_HTTP_PROXY ?? "",
 };
 const ixDeployConfigSchema = z
     .object({
@@ -37,6 +38,7 @@ const ixDeployConfigSchema = z
     smtpHost: z.string().min(1),
     smtpPort: z.coerce.number().int(),
     clamAVUrl: z.string().url(),
+    vpcHttpProxy: z.string().url(),
 })
     .strip();
 const nonIxDeployConfigSchema = z
@@ -64,6 +66,7 @@ const nonIxDeployConfigSchema = z
         .string()
         .transform((val) => isNaN(parseInt(val, 10)) ? undefined : parseInt(val, 10)),
     clamAVUrl: z.string(),
+    vpcHttpProxy: z.string(),
 })
     .strip();
 const schema = z.discriminatedUnion("isIxDeploy", [

package/dist/lib/site/support.d.ts

@@ -1,5 +1,5 @@
 import { Construct } from "constructs";
-import { NextjsSite, NextjsSiteProps, StaticSite, StaticSiteProps } from "sst/constructs";
+import { NextjsSite, NextjsSiteProps, Stack, StaticSite, StaticSiteProps } from "sst/constructs";
 import { type DistributionDomainProps } from "sst/constructs/Distribution.js";
 export type ExtendedCustomDomains = DistributionDomainProps & {
     isIxManagedDomain?: boolean;
@@ -15,6 +15,14 @@ export declare function setupCustomDomain<Props extends ExtendedStaticSiteProps
 export declare function setupCertificate<Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(scope: Construct, id: string, props: Readonly<Props>): Props;
 export declare function setupDomainAliasRedirect<Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(scope: Construct, id: string, props: Readonly<Props>): Props;
 export declare function setupVpcDetails<Props extends ExtendedNextjsSiteProps>(scope: Construct, id: string, props: Readonly<Props>): Props;
+/**
+ * Adds HTTP proxy environment variables to the provided site props.
+ *
+ * We can't simply add them to `props.environment` because those are used during the build step which may happen outside
+ * the vpc. Instead we have to add them to all the places `props.environment` is used, accept for the build step.
+ */
+export declare function addHttpProxyEnvVars<Props extends ExtendedNextjsSiteProps>(scope: Construct, id: string, props: Readonly<Props>, proxyEnvVars?: Record<string, string>): Props;
+export declare function setupDefaultEnvVars<Props extends ExtendedNextjsSiteProps>(scope: Construct | Stack, id: string, props: Readonly<Props>): Props;
 export declare function setupDnsRecords<Instance extends NextjsSite | StaticSite, Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(instance: Instance, scope: Construct, id: string, props: Readonly<Props>): void;
 export declare function getCustomDomains<Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(props: Readonly<Props>): string[];
 export declare function getPrimaryDomain<Instance extends NextjsSite | StaticSite, Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps>(instance: Instance, props: Readonly<Props>): string | null;

package/dist/lib/site/support.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../../src/lib/site/support.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../../src/lib/site/support.ts"],"names":[],"mappings":"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"}

package/dist/lib/site/support.js

@@ -69,7 +69,7 @@ export function setupDomainAliasRedirect(scope, id, props) {
     };
 }
 export function setupVpcDetails(scope, id, props) {
-    const updatedProps = { ...props };
+    let updatedProps = { ...props };
     const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
     if (!updatedProps.cdk?.server || !("vpc" in updatedProps.cdk.server)) {
         updatedProps.cdk = updatedProps.cdk ?? {};
@@ -77,6 +77,7 @@ export function setupVpcDetails(scope, id, props) {
             ...updatedProps.cdk.server,
             vpc: vpcDetails.vpc,
         };
+        updatedProps = addHttpProxyEnvVars(scope, id, updatedProps);
     }
     if (!updatedProps.cdk?.revalidation ||
         !("vpc" in updatedProps.cdk.revalidation)) {
@@ -88,6 +89,72 @@ export function setupVpcDetails(scope, id, props) {
     }
     return updatedProps;
 }
+/**
+ * Adds HTTP proxy environment variables to the provided site props.
+ *
+ * We can't simply add them to `props.environment` because those are used during the build step which may happen outside
+ * the vpc. Instead we have to add them to all the places `props.environment` is used, accept for the build step.
+ */
+export function addHttpProxyEnvVars(scope, id, props, proxyEnvVars) {
+    const updatedProps = { ...props };
+    updatedProps.cdk = updatedProps.cdk ?? {};
+    const oldTransform = updatedProps.cdk.transform;
+    updatedProps.cdk.transform = (plan) => {
+        oldTransform?.(plan);
+        if (!proxyEnvVars) {
+            if (!ixDeployConfig.vpcHttpProxy) {
+                console.warn(`Attempting to add HTTP proxy environment variables to ${id} but the VPC_HTTP_PROXY env var is not configured.`);
+                return;
+            }
+            proxyEnvVars = {
+                HTTP_PROXY: ixDeployConfig.vpcHttpProxy,
+                HTTPS_PROXY: ixDeployConfig.vpcHttpProxy,
+                http_proxy: ixDeployConfig.vpcHttpProxy,
+                https_proxy: ixDeployConfig.vpcHttpProxy,
+            };
+        }
+        for (const origin of Object.values(plan.origins)) {
+            if (!("function" in origin) || !origin.function.environment) {
+                continue;
+            }
+            Object.assign(origin.function.environment, proxyEnvVars);
+        }
+    };
+    return updatedProps;
+}
+export function setupDefaultEnvVars(scope, id, props) {
+    let updatedProps = { ...props };
+    // NextjsSite functions to not use default env var unfortunately so we have to
+    // explicitly set them ourselves https://github.com/sst/sst/issues/2359
+    if ("defaultFunctionProps" in scope) {
+        for (const funcProps of scope.defaultFunctionProps) {
+            const defaultFunctionEnvVars = { ...funcProps.environment };
+            // Remove any HTTP proxy related env vars and set them in a separate call to addHttpProxyEnvVars
+            // to avoid them being used during the build step.
+            const defaultFunctionHttpProxyEnvVars = {};
+            for (const proxyEnvVar of [
+                "HTTP_PROXY",
+                "HTTPS_PROXY",
+                "http_proxy",
+                "https_proxy",
+            ]) {
+                if (proxyEnvVar in defaultFunctionEnvVars) {
+                    defaultFunctionHttpProxyEnvVars[proxyEnvVar] =
+                        defaultFunctionEnvVars[proxyEnvVar];
+                    delete defaultFunctionEnvVars[proxyEnvVar];
+                }
+            }
+            if (Object.keys(defaultFunctionHttpProxyEnvVars).length) {
+                updatedProps = addHttpProxyEnvVars(scope, id, updatedProps, defaultFunctionHttpProxyEnvVars);
+            }
+            updatedProps.environment = {
+                ...defaultFunctionEnvVars,
+                ...updatedProps.environment,
+            };
+        }
+    }
+    return updatedProps;
+}
 export function setupDnsRecords(instance, scope, id, props) {
     if (!instance.cdk?.distribution ||
         typeof props.customDomain !== "object" ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infoxchange/make-it-so",
-  "version": "2.8.1",
+  "version": "2.9.0-internal-testing-set-http-proxy-env-var.2",
   "description": "Makes deploying services to IX infra easy",
   "repository": "github:infoxchange/make-it-so",
   "type": "module",

package/src/cdk-constructs/IxNextjsSite.ts

@@ -13,6 +13,7 @@ import {
   setupDnsRecords,
   setupDomainAliasRedirect,
   setupVpcDetails,
+  setupDefaultEnvVars,
 } from "../lib/site/support.js";
 
 type ConstructScope = ConstructorParameters<typeof NextjsSite>[0];
@@ -26,6 +27,7 @@ export class IxNextjsSite extends NextjsSite {
     props: ConstructProps = {},
   ) {
     if (ixDeployConfig.isIxDeploy) {
+      props = setupDefaultEnvVars(scope, id, props);
       props = setupVpcDetails(scope, id, props);
       props = setupCustomDomain(scope, id, props);
       props = setupCertificate(scope, id, props);

package/src/deployConfig.ts

@@ -16,6 +16,7 @@ const envVars = {
   smtpHost: process.env.SMTP_HOST ?? "",
   smtpPort: process.env.SMTP_PORT ?? "",
   clamAVUrl: process.env.CLAMAV_URL ?? "",
+  vpcHttpProxy: process.env.VPC_HTTP_PROXY ?? "",
 } satisfies Record<string, string | boolean>;
 
 const ixDeployConfigSchema = z
@@ -39,6 +40,7 @@ const ixDeployConfigSchema = z
     smtpHost: z.string().min(1),
     smtpPort: z.coerce.number().int(),
     clamAVUrl: z.string().url(),
+    vpcHttpProxy: z.string().url(),
   } satisfies Record<keyof typeof envVars, unknown>)
   .strip();
 
@@ -69,6 +71,7 @@ const nonIxDeployConfigSchema = z
         isNaN(parseInt(val, 10)) ? undefined : parseInt(val, 10),
       ),
     clamAVUrl: z.string(),
+    vpcHttpProxy: z.string(),
   } satisfies Record<keyof typeof envVars, unknown>)
   .strip();
 

package/src/lib/site/support.ts

@@ -2,6 +2,7 @@ import { Construct } from "constructs";
 import {
   NextjsSite,
   NextjsSiteProps,
+  Stack,
   StaticSite,
   StaticSiteProps,
 } from "sst/constructs";
@@ -13,6 +14,7 @@ import { IxDnsRecord } from "../../cdk-constructs/IxDnsRecord.js";
 import { CloudFrontTarget } from "aws-cdk-lib/aws-route53-targets";
 import { convertToBase62Hash } from "../utils/hash.js";
 import { type DistributionDomainProps } from "sst/constructs/Distribution.js";
+import type { Plan as SSTPlan } from "sst/constructs/SsrSite.js";
 
 export type ExtendedCustomDomains = DistributionDomainProps & {
   isIxManagedDomain?: boolean;
@@ -111,7 +113,7 @@ export function setupVpcDetails<Props extends ExtendedNextjsSiteProps>(
   id: string,
   props: Readonly<Props>,
 ): Props {
-  const updatedProps: Props = { ...props };
+  let updatedProps: Props = { ...props };
   const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
   if (!updatedProps.cdk?.server || !("vpc" in updatedProps.cdk.server)) {
     updatedProps.cdk = updatedProps.cdk ?? {};
@@ -119,6 +121,7 @@ export function setupVpcDetails<Props extends ExtendedNextjsSiteProps>(
       ...updatedProps.cdk.server,
       vpc: vpcDetails.vpc,
     };
+    updatedProps = addHttpProxyEnvVars(scope, id, updatedProps) as Props;
   }
   if (
     !updatedProps.cdk?.revalidation ||
@@ -133,6 +136,96 @@ export function setupVpcDetails<Props extends ExtendedNextjsSiteProps>(
   return updatedProps;
 }
 
+/**
+ * Adds HTTP proxy environment variables to the provided site props.
+ *
+ * We can't simply add them to `props.environment` because those are used during the build step which may happen outside
+ * the vpc. Instead we have to add them to all the places `props.environment` is used, accept for the build step.
+ */
+export function addHttpProxyEnvVars<Props extends ExtendedNextjsSiteProps>(
+  scope: Construct,
+  id: string,
+  props: Readonly<Props>,
+  proxyEnvVars?: Record<string, string>,
+): Props {
+  const updatedProps: Props = { ...props };
+
+  updatedProps.cdk = updatedProps.cdk ?? {};
+  const oldTransform = updatedProps.cdk.transform;
+  updatedProps.cdk.transform = (plan: SSTPlan) => {
+    oldTransform?.(plan);
+
+    if (!proxyEnvVars) {
+      if (!ixDeployConfig.vpcHttpProxy) {
+        console.warn(
+          `Attempting to add HTTP proxy environment variables to ${id} but the VPC_HTTP_PROXY env var is not configured.`,
+        );
+        return;
+      }
+
+      proxyEnvVars = {
+        HTTP_PROXY: ixDeployConfig.vpcHttpProxy,
+        HTTPS_PROXY: ixDeployConfig.vpcHttpProxy,
+        http_proxy: ixDeployConfig.vpcHttpProxy,
+        https_proxy: ixDeployConfig.vpcHttpProxy,
+      };
+    }
+
+    for (const origin of Object.values(plan.origins)) {
+      if (!("function" in origin) || !origin.function.environment) {
+        continue;
+      }
+      Object.assign(origin.function.environment, proxyEnvVars);
+    }
+  };
+  return updatedProps;
+}
+
+export function setupDefaultEnvVars<Props extends ExtendedNextjsSiteProps>(
+  scope: Construct | Stack,
+  id: string,
+  props: Readonly<Props>,
+): Props {
+  let updatedProps: Props = { ...props };
+  // NextjsSite functions to not use default env var unfortunately so we have to
+  // explicitly set them ourselves https://github.com/sst/sst/issues/2359
+  if ("defaultFunctionProps" in scope) {
+    for (const funcProps of scope.defaultFunctionProps) {
+      const defaultFunctionEnvVars = { ...funcProps.environment };
+
+      // Remove any HTTP proxy related env vars and set them in a separate call to addHttpProxyEnvVars
+      // to avoid them being used during the build step.
+      const defaultFunctionHttpProxyEnvVars: Record<string, string> = {};
+      for (const proxyEnvVar of [
+        "HTTP_PROXY",
+        "HTTPS_PROXY",
+        "http_proxy",
+        "https_proxy",
+      ]) {
+        if (proxyEnvVar in defaultFunctionEnvVars) {
+          defaultFunctionHttpProxyEnvVars[proxyEnvVar] =
+            defaultFunctionEnvVars[proxyEnvVar];
+          delete defaultFunctionEnvVars[proxyEnvVar];
+        }
+      }
+      if (Object.keys(defaultFunctionHttpProxyEnvVars).length) {
+        updatedProps = addHttpProxyEnvVars(
+          scope,
+          id,
+          updatedProps,
+          defaultFunctionHttpProxyEnvVars,
+        ) as Props;
+      }
+
+      updatedProps.environment = {
+        ...defaultFunctionEnvVars,
+        ...updatedProps.environment,
+      };
+    }
+  }
+  return updatedProps;
+}
+
 export function setupDnsRecords<
   Instance extends NextjsSite | StaticSite,
   Props extends ExtendedStaticSiteProps | ExtendedNextjsSiteProps,