@infoxchange/make-it-so 2.13.0-internal-testing-add-import-time-setup-proxy-globally.2 → 2.13.0-internal-testing-randomise-subnet.2

package/README.md

@@ -302,31 +302,6 @@ const vpcDetails = new IxVpcDetails(scope, "VpcDetails");
 
 </details>
 
-### Configuring Clients To Use the HTTP Proxy
-
-It's not always foolproof due to the lack of standardisation around how http proxy support can be configured at a global
-level but importing the following should hopefully means that any http requests are sent via the proxy:
-
-```typescript
-import "@infoxchange/make-it-so/proxy/setup-globally";
-```
-
-Or if you don't want/need proxy details to be configured before other imports you can use:
-
-```typescript
-import { setupProxyGlobally } from "@infoxchange/make-it-so/proxy";
-
-setupProxyGlobally();
-```
-
-You can also get local fetch instance that's configured to use the proxy:
-
-```typescript
-import { getProxiedFetch } from "@infoxchange/make-it-so/proxy";
-
-const httpProxiedFetch = getProxiedFetch();
-```
-
 ## Example App Using Make It So
 
 To deploy a Next.js based site you would include a `sst.config.ts` file at the root of repo with contents like this:

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

@@ -1 +1 @@
-{"version":3,"file":"IxVpcDetails.d.ts","sourceRoot":"","sources":["../../src/cdk-constructs/IxVpcDetails.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAO,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAGhD,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9D,qBAAa,YAAa,SAAQ,SAAS;IAClC,GAAG,EAAE,IAAI,CAAC;gBAEL,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,WAAW;IAKlD,OAAO,CAAC,MAAM;IAad,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC;CAQ7D"}
+{"version":3,"file":"IxVpcDetails.d.ts","sourceRoot":"","sources":["../../src/cdk-constructs/IxVpcDetails.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAO,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAGhD,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9D,qBAAa,YAAa,SAAQ,SAAS;IAClC,GAAG,EAAE,IAAI,CAAC;gBAEL,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,WAAW;IAKlD,OAAO,CAAC,MAAM;IAad,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC;CAmB7D"}

package/dist/cdk-constructs/IxVpcDetails.js

@@ -21,6 +21,17 @@ export class IxVpcDetails extends Construct {
         });
     }
     static getVpcSubnetIds(scope) {
-        return [1, 2, 3].map((subnetNum) => StringParameter.valueForStringParameter(scope, `/vpc/subnet/private-${ixDeployConfig.workloadGroup}/${subnetNum}/id`));
+        const { workloadGroup, appName } = ixDeployConfig;
+        let suffix = "";
+        if (workloadGroup === "ds") {
+            const possibleSuffixes = ["", "-2"];
+            // Randomly select a suffix to spread workload's IP usage across both sets of subnets. Use the app name as a seed
+            // to ensure consistent selection on redeploys.
+            const hash = appName
+                .split("")
+                .reduce((acc, char) => acc + char.charCodeAt(0), 0);
+            suffix = possibleSuffixes[hash % possibleSuffixes.length];
+        }
+        return [1, 2, 3].map((subnetNum) => StringParameter.valueForStringParameter(scope, `/vpc/subnet/private-${workloadGroup}${suffix}/${subnetNum}/id`));
     }
 }

package/dist/cdk-constructs/SiteOidcAuth/index.js

@@ -165,7 +165,7 @@ export class SiteOidcAuth extends Construct {
             origin: new CloudFrontOrigins.HttpOrigin(CDK.Fn.parseDomainName(authRouteFunctionUrl.url)),
             allowedMethods: CloudFront.AllowedMethods.ALLOW_ALL,
             cachePolicy: new CloudFront.CachePolicy(scope, `${this.id}AllowAllCookiesPolicy`, {
-                cachePolicyName: `${this.id}-AllowAllCookiesPolicy`,
+                cachePolicyName: `${CDK.Stack.of(scope).stackName}-${this.id}-AllowAllCookiesPolicy`,
                 comment: "Cache policy that forwards all cookies",
                 defaultTtl: CDK.Duration.seconds(1),
                 minTtl: CDK.Duration.seconds(1),

package/dist/lib/proxy/{request-client-setup.d.ts → fetch.d.ts}

@@ -1,4 +1,4 @@
 import { fetch as undiciFetch } from "undici";
 export declare function setupProxyGlobally(): void;
 export declare function getProxiedFetch(): typeof undiciFetch;
-//# sourceMappingURL=request-client-setup.d.ts.map
+//# sourceMappingURL=fetch.d.ts.map

package/dist/lib/proxy/fetch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/proxy/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,WAAW,EACrB,MAAM,QAAQ,CAAC;AAGhB,wBAAgB,kBAAkB,SAmBjC;AAED,wBAAgB,eAAe,uBAW9B"}

package/dist/lib/proxy/{request-client-setup.js → fetch.js}

@@ -4,7 +4,7 @@ export function setupProxyGlobally() {
     // Make operation idempotent
     if (getGlobalDispatcher() instanceof EnvHttpProxyAgent)
         return;
-    if (!process.env.HTTP_PROXY && !process.env.HTTPS_PROXY)
+    if (!process.env.HTTP_PROXY || !process.env.HTTPS_PROXY)
         return;
     // To cover libraries that use fetch
     // See https://nodejs.org/api/globals.html#custom-dispatcher

package/dist/lib/proxy/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./request-client-setup.js";
+export * from "./fetch.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/lib/proxy/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/proxy/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/proxy/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC"}

package/dist/lib/proxy/index.js

@@ -1 +1 @@
-export * from "./request-client-setup.js";
+export * from "./fetch.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infoxchange/make-it-so",
-  "version": "2.13.0-internal-testing-add-import-time-setup-proxy-globally.2",
+  "version": "2.13.0-internal-testing-randomise-subnet.2",
   "description": "Makes deploying services to IX infra easy",
   "repository": "github:infoxchange/make-it-so",
   "type": "module",
@@ -18,8 +18,7 @@
     "./cdk-constructs": "./dist/cdk-constructs/index.js",
     "./deployConfig": "./dist/deployConfig.js",
     "./auth": "./dist/lib/auth/index.js",
-    "./proxy": "./dist/lib/proxy/index.js",
-    "./proxy/setup-globally": "./dist/lib/proxy/request-client-global-setup-on-import.js"
+    "./proxy": "./dist/lib/proxy/index.js"
   },
   "lint-staged": {
     "**/*": [

package/src/cdk-constructs/IxVpcDetails.ts

@@ -28,10 +28,21 @@ export class IxVpcDetails extends Construct {
   }
 
   static getVpcSubnetIds(scope: ConstructScope): Array<string> {
+    const { workloadGroup, appName } = ixDeployConfig;
+    let suffix = "";
+    if (workloadGroup === "ds") {
+      const possibleSuffixes = ["", "-2"];
+      // Randomly select a suffix to spread workload's IP usage across both sets of subnets. Use the app name as a seed
+      // to ensure consistent selection on redeploys.
+      const hash = appName
+        .split("")
+        .reduce((acc, char) => acc + char.charCodeAt(0), 0);
+      suffix = possibleSuffixes[hash % possibleSuffixes.length];
+    }
     return [1, 2, 3].map((subnetNum) =>
       StringParameter.valueForStringParameter(
         scope,
-        `/vpc/subnet/private-${ixDeployConfig.workloadGroup}/${subnetNum}/id`,
+        `/vpc/subnet/private-${workloadGroup}${suffix}/${subnetNum}/id`,
       ),
     );
   }

package/src/cdk-constructs/SiteOidcAuth/index.ts

@@ -274,7 +274,7 @@ export class SiteOidcAuth extends Construct {
         scope,
         `${this.id}AllowAllCookiesPolicy`,
         {
-          cachePolicyName: `${this.id}-AllowAllCookiesPolicy`,
+          cachePolicyName: `${CDK.Stack.of(scope).stackName}-${this.id}-AllowAllCookiesPolicy`,
           comment: "Cache policy that forwards all cookies",
           defaultTtl: CDK.Duration.seconds(1),
           minTtl: CDK.Duration.seconds(1),

package/src/lib/proxy/{request-client-setup.ts → fetch.ts}

@@ -10,7 +10,7 @@ export function setupProxyGlobally() {
   // Make operation idempotent
   if (getGlobalDispatcher() instanceof EnvHttpProxyAgent) return;
 
-  if (!process.env.HTTP_PROXY && !process.env.HTTPS_PROXY) return;
+  if (!process.env.HTTP_PROXY || !process.env.HTTPS_PROXY) return;
 
   // To cover libraries that use fetch
   // See https://nodejs.org/api/globals.html#custom-dispatcher

package/src/lib/proxy/index.ts

@@ -1 +1 @@
-export * from "./request-client-setup.js";
+export * from "./fetch.js";

package/dist/lib/proxy/request-client-global-setup-on-import.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=request-client-global-setup-on-import.d.ts.map

package/dist/lib/proxy/request-client-global-setup-on-import.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"request-client-global-setup-on-import.d.ts","sourceRoot":"","sources":["../../../src/lib/proxy/request-client-global-setup-on-import.ts"],"names":[],"mappings":""}

package/dist/lib/proxy/request-client-global-setup-on-import.js

@@ -1,2 +0,0 @@
-import { setupProxyGlobally } from "./request-client-setup.js";
-setupProxyGlobally();

package/dist/lib/proxy/request-client-setup.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"request-client-setup.d.ts","sourceRoot":"","sources":["../../../src/lib/proxy/request-client-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,WAAW,EACrB,MAAM,QAAQ,CAAC;AAGhB,wBAAgB,kBAAkB,SAmBjC;AAED,wBAAgB,eAAe,uBAW9B"}

package/src/lib/proxy/request-client-global-setup-on-import.ts

@@ -1,3 +0,0 @@
-import { setupProxyGlobally } from "./request-client-setup.js";
-
-setupProxyGlobally();