@infoxchange/make-it-so 2.9.0-internal-testing-set-http-proxy-env-var-2.4 → 2.9.0-internal-testing-set-http-proxy-env-var-3.2

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,EAe7B,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;IAyB5B,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,EAe7B,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;IAkB5B,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

@@ -4,16 +4,13 @@ import { getAliasDomain, getAlternativeDomains, getCustomDomains, getPrimaryCust
 export class IxNextjsSite extends NextjsSite {
     constructor(scope, id, props = {}) {
         if (ixDeployConfig.isIxDeploy) {
-            console.log("props before", props);
             props = setupVpcDetails(scope, id, props);
-            console.log("props after", props);
             props = setupCustomDomain(scope, id, props);
             props = setupCertificate(scope, id, props);
             props = setupDomainAliasRedirect(scope, id, props);
         }
         props = setupDefaultEnvVars(scope, id, props);
         props = applyConditionalEnvironmentVariables(scope, id, props);
-        console.log("parentCompatibleSsrProps(props)", parentCompatibleSsrProps(props));
         super(scope, id, parentCompatibleSsrProps(props));
         if (ixDeployConfig.isIxDeploy) {
             setupDnsRecords(this, scope, id, props);

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

@@ -70,38 +70,34 @@ export function setupDomainAliasRedirect(scope, id, props) {
 }
 export function setupVpcDetails(scope, id, props) {
     const updatedProps = { ...props };
-    const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
-    console.log("updatedProps.cdk", updatedProps.cdk);
-    if (!updatedProps.cdk?.server || !("vpc" in updatedProps.cdk.server)) {
-        console.log("adding vpc for default server");
-        updatedProps.cdk = updatedProps.cdk ?? {};
-        updatedProps.cdk.server = {
-            ...updatedProps.cdk.server,
-            vpc: vpcDetails.vpc,
-        };
-        if (!ixDeployConfig.vpcHttpProxy) {
-            console.warn(`Attempting to add HTTP proxy environment variables to ${id} but the VPC_HTTP_PROXY env var is not configured.`);
-        }
-        // If we're using the AWS runner then the build stage will already be inside the VPC and required the proxy but
-        // the HTTP proxy environment variables will be already set in the environment by the pipeline and so the build
-        // stage will inherit that.
-        updatedProps.environment = {
-            HTTP_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
-            HTTPS_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
-            http_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
-            https_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
-            ...updatedProps.environment,
-        };
+    // Don't make any changes if the user has set the VPC manually in any place
+    if ("vpc" in (updatedProps.cdk?.server || {}) ||
+        "vpc" in (updatedProps.cdk?.revalidation || {})) {
+        return updatedProps;
     }
-    if (!updatedProps.cdk?.revalidation ||
-        !("vpc" in updatedProps.cdk.revalidation)) {
-        console.log("adding vpc for revalidation server");
-        updatedProps.cdk = updatedProps.cdk ?? {};
-        updatedProps.cdk.revalidation = {
-            ...updatedProps.cdk.revalidation,
-            vpc: vpcDetails.vpc,
-        };
+    const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
+    updatedProps.cdk = updatedProps.cdk ?? {};
+    updatedProps.cdk.server = {
+        ...updatedProps.cdk.server,
+        vpc: vpcDetails.vpc,
+    };
+    updatedProps.cdk.revalidation = {
+        ...updatedProps.cdk.revalidation,
+        vpc: vpcDetails.vpc,
+    };
+    if (!ixDeployConfig.vpcHttpProxy) {
+        console.warn(`Attempting to add HTTP proxy environment variables to ${id} but the VPC_HTTP_PROXY env var is not configured.`);
     }
+    // If we're using the AWS runner then the build stage will already be inside the VPC and required the proxy but
+    // the HTTP proxy environment variables will be already set in the environment by the pipeline and so the build
+    // stage will inherit that.
+    updatedProps.environment = {
+        HTTP_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
+        HTTPS_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
+        http_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
+        https_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
+        ...updatedProps.environment,
+    };
     return updatedProps;
 }
 /**
@@ -128,6 +124,7 @@ export function applyConditionalEnvironmentVariables(scope, id, props) {
             ? value.runtime
             : undefined,
     ]));
+    console.log("runtimeSpecificEnvVars", runtimeSpecificEnvVars);
     // Remove runtime excluded env vars from lambda
     updatedProps.cdk = updatedProps.cdk ?? {};
     const oldTransform = updatedProps.cdk.transform;
@@ -138,6 +135,7 @@ export function applyConditionalEnvironmentVariables(scope, id, props) {
                 continue;
             }
             for (const [envVarName, envVarValue] of Object.entries(runtimeSpecificEnvVars)) {
+                console.log(`Setting runtime specific environment variable ${envVarName} to ${envVarValue}`);
                 if (envVarValue !== undefined) {
                     origin.function.environment[envVarName] = envVarValue;
                 }
@@ -146,6 +144,7 @@ export function applyConditionalEnvironmentVariables(scope, id, props) {
                 }
             }
         }
+        console.log("Transformed plan:", JSON.stringify(plan, null, 2));
     };
     // Remove buildtime excluded env vars from environment object which is used during build
     for (const [envVarName, envVarValue] of Object.entries(buildtimeSpecificEnvVars)) {

package/package.json

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

package/src/cdk-constructs/IxNextjsSite.ts

@@ -29,9 +29,7 @@ export class IxNextjsSite extends NextjsSite {
     props: ConstructProps = {},
   ) {
     if (ixDeployConfig.isIxDeploy) {
-      console.log("props before", props);
       props = setupVpcDetails(scope, id, props);
-      console.log("props after", props);
       props = setupCustomDomain(scope, id, props);
       props = setupCertificate(scope, id, props);
       props = setupDomainAliasRedirect(scope, id, props);
@@ -39,11 +37,6 @@ export class IxNextjsSite extends NextjsSite {
     props = setupDefaultEnvVars(scope, id, props);
     props = applyConditionalEnvironmentVariables(scope, id, props);
 
-    console.log(
-      "parentCompatibleSsrProps(props)",
-      parentCompatibleSsrProps(props),
-    );
-
     super(scope, id, parentCompatibleSsrProps(props));
 
     if (ixDeployConfig.isIxDeploy) {

package/src/lib/site/support.ts

@@ -141,44 +141,43 @@ export function setupVpcDetails<Props extends ExtendedNextjsSiteProps>(
   props: Readonly<Props>,
 ): Props {
   const updatedProps: Props = { ...props };
-  const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
-  console.log("updatedProps.cdk", updatedProps.cdk);
-  if (!updatedProps.cdk?.server || !("vpc" in updatedProps.cdk.server)) {
-    console.log("adding vpc for default server");
-    updatedProps.cdk = updatedProps.cdk ?? {};
-    updatedProps.cdk.server = {
-      ...updatedProps.cdk.server,
-      vpc: vpcDetails.vpc,
-    };
-
-    if (!ixDeployConfig.vpcHttpProxy) {
-      console.warn(
-        `Attempting to add HTTP proxy environment variables to ${id} but the VPC_HTTP_PROXY env var is not configured.`,
-      );
-    }
 
-    // If we're using the AWS runner then the build stage will already be inside the VPC and required the proxy but
-    // the HTTP proxy environment variables will be already set in the environment by the pipeline and so the build
-    // stage will inherit that.
-    updatedProps.environment = {
-      HTTP_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
-      HTTPS_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
-      http_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
-      https_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
-      ...updatedProps.environment,
-    };
-  }
+  // Don't make any changes if the user has set the VPC manually in any place
   if (
-    !updatedProps.cdk?.revalidation ||
-    !("vpc" in updatedProps.cdk.revalidation)
+    "vpc" in (updatedProps.cdk?.server || {}) ||
+    "vpc" in (updatedProps.cdk?.revalidation || {})
   ) {
-    console.log("adding vpc for revalidation server");
-    updatedProps.cdk = updatedProps.cdk ?? {};
-    updatedProps.cdk.revalidation = {
-      ...updatedProps.cdk.revalidation,
-      vpc: vpcDetails.vpc,
-    };
+    return updatedProps;
+  }
+
+  const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
+
+  updatedProps.cdk = updatedProps.cdk ?? {};
+  updatedProps.cdk.server = {
+    ...updatedProps.cdk.server,
+    vpc: vpcDetails.vpc,
+  };
+  updatedProps.cdk.revalidation = {
+    ...updatedProps.cdk.revalidation,
+    vpc: vpcDetails.vpc,
+  };
+
+  if (!ixDeployConfig.vpcHttpProxy) {
+    console.warn(
+      `Attempting to add HTTP proxy environment variables to ${id} but the VPC_HTTP_PROXY env var is not configured.`,
+    );
   }
+  // If we're using the AWS runner then the build stage will already be inside the VPC and required the proxy but
+  // the HTTP proxy environment variables will be already set in the environment by the pipeline and so the build
+  // stage will inherit that.
+  updatedProps.environment = {
+    HTTP_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
+    HTTPS_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
+    http_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
+    https_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
+    ...updatedProps.environment,
+  };
+
   return updatedProps;
 }
 
@@ -215,6 +214,8 @@ export function applyConditionalEnvironmentVariables<
       ]),
   );
 
+  console.log("runtimeSpecificEnvVars", runtimeSpecificEnvVars);
+
   // Remove runtime excluded env vars from lambda
   updatedProps.cdk = updatedProps.cdk ?? {};
   const oldTransform = updatedProps.cdk.transform;
@@ -228,6 +229,9 @@ export function applyConditionalEnvironmentVariables<
       for (const [envVarName, envVarValue] of Object.entries(
         runtimeSpecificEnvVars,
       )) {
+        console.log(
+          `Setting runtime specific environment variable ${envVarName} to ${envVarValue}`,
+        );
         if (envVarValue !== undefined) {
           origin.function.environment[envVarName] = envVarValue;
         } else {
@@ -235,6 +239,7 @@ export function applyConditionalEnvironmentVariables<
         }
       }
     }
+    console.log("Transformed plan:", JSON.stringify(plan, null, 2));
   };
 
   // Remove buildtime excluded env vars from environment object which is used during build