@infoxchange/make-it-so 3.1.1-internal-testing-allow-proxy-direct-import-b2e95a1.1 → 3.1.1

package/build.ts

@@ -35,7 +35,12 @@ await esbuild.build({
   // (e.g. "./src/components/index.ts") to avoid esbuild including the imported code in both bundles. To allow these
   // package name imports to work even when the source hasn't been built (and thus the package exports point to
   // non-existent files) these imports also be reflected in tsconfig.json path aliases.
-  entryPoints: ["src/components/index.ts", "src/index.ts"],
+  entryPoints: [
+    "src/index.ts",
+    "src/components/index.ts",
+    "src/deployConfig.ts",
+    "src/lib/proxy/index.ts",
+  ],
   bundle: true,
   platform: "node",
   target: "node21",

package/dist/deployConfig.js

@@ -0,0 +1,74 @@
+// src/deployConfig.ts
+import { z } from "zod";
+var getEnvVars = () => ({
+  isIxDeploy: process.env.IX_DEPLOYMENT?.toLowerCase() === "true",
+  // This needs to start as a bool for the discriminated union
+  appName: process.env.IX_APP_NAME ?? "",
+  environment: process.env.IX_ENVIRONMENT ?? "",
+  workloadGroup: process.env.IX_WORKLOAD_GROUP ?? "",
+  primaryAwsRegion: process.env.IX_PRIMARY_AWS_REGION ?? "",
+  siteDomains: process.env.IX_SITE_DOMAINS ?? "",
+  siteDomainAliases: process.env.IX_SITE_DOMAIN_ALIASES ?? "",
+  isInternalApp: process.env.IX_INTERNAL_APP ?? "",
+  deploymentType: process.env.IX_DEPLOYMENT_TYPE ?? "",
+  sourceCommitRef: process.env.IX_SOURCE_COMMIT_REF ?? "",
+  sourceCommitHash: process.env.IX_SOURCE_COMMIT_HASH ?? "",
+  deployTriggeredBy: process.env.IX_DEPLOY_TRIGGERED_BY ?? "",
+  smtpHost: process.env.SMTP_HOST ?? "",
+  smtpPort: process.env.SMTP_PORT ?? "",
+  clamAVUrl: process.env.CLAMAV_URL ?? "",
+  vpcHttpProxy: process.env.VPC_HTTP_PROXY ?? "",
+  alarmSnsTopic: process.env.IX_ALARM_SNS_TOPIC ?? "",
+  tags: JSON.parse(process.env.IX_TAGS ?? "{}")
+});
+var ixDeployConfigSchema = z.object({
+  isIxDeploy: z.literal(true),
+  appName: z.string().min(1),
+  environment: z.enum(["dev", "test", "uat", "prod"]),
+  workloadGroup: z.enum(["ds", "srs"]),
+  primaryAwsRegion: z.literal("ap-southeast-2"),
+  siteDomains: z.string().transform((val) => val.split(",").map((domain) => domain.trim()).filter(Boolean)),
+  siteDomainAliases: z.string().transform((val) => val.split(",").map((domain) => domain.trim()).filter(Boolean)),
+  isInternalApp: z.coerce.boolean(),
+  deploymentType: z.enum(["docker", "serverless"]),
+  sourceCommitRef: z.string().min(1),
+  sourceCommitHash: z.string().min(1),
+  deployTriggeredBy: z.string().min(1),
+  smtpHost: z.string(),
+  smtpPort: z.coerce.number().int(),
+  clamAVUrl: z.string().url(),
+  vpcHttpProxy: z.string().url(),
+  alarmSnsTopic: z.string().min(1),
+  tags: z.record(z.string(), z.string())
+}).strip();
+var nonIxDeployConfigSchema = z.object({
+  isIxDeploy: z.literal(false),
+  appName: z.string(),
+  environment: z.string(),
+  workloadGroup: z.string(),
+  primaryAwsRegion: z.string(),
+  siteDomains: z.string().transform((val) => val.split(",").map((domain) => domain.trim()).filter(Boolean)),
+  siteDomainAliases: z.string().transform((val) => val.split(",").map((domain) => domain.trim()).filter(Boolean)),
+  isInternalApp: z.string().transform((val) => val ? val.toLowerCase() === "true" : void 0),
+  deploymentType: z.string(),
+  sourceCommitRef: z.string(),
+  sourceCommitHash: z.string(),
+  deployTriggeredBy: z.string(),
+  smtpHost: z.string(),
+  smtpPort: z.string().transform((val) => isNaN(parseInt(val, 10)) ? void 0 : parseInt(val, 10)),
+  clamAVUrl: z.string(),
+  vpcHttpProxy: z.string(),
+  alarmSnsTopic: z.string(),
+  tags: z.record(z.string(), z.string())
+}).strip();
+var schema = z.discriminatedUnion("isIxDeploy", [
+  ixDeployConfigSchema,
+  nonIxDeployConfigSchema
+]);
+var deployConfig = schema.parse(getEnvVars());
+var getDeployConfig = () => schema.parse(getEnvVars());
+export {
+  deployConfig,
+  getDeployConfig
+};
+//# sourceMappingURL=deployConfig.js.map

package/dist/deployConfig.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/deployConfig.ts"],
+  "sourcesContent": ["import { z } from \"zod\";\nconst getEnvVars = () => ({\n    isIxDeploy: process.env.IX_DEPLOYMENT?.toLowerCase() === \"true\", // This needs to start as a bool for the discriminated union\n    appName: process.env.IX_APP_NAME ?? \"\",\n    environment: process.env.IX_ENVIRONMENT ?? \"\",\n    workloadGroup: process.env.IX_WORKLOAD_GROUP ?? \"\",\n    primaryAwsRegion: process.env.IX_PRIMARY_AWS_REGION ?? \"\",\n    siteDomains: process.env.IX_SITE_DOMAINS ?? \"\",\n    siteDomainAliases: process.env.IX_SITE_DOMAIN_ALIASES ?? \"\",\n    isInternalApp: process.env.IX_INTERNAL_APP ?? \"\",\n    deploymentType: process.env.IX_DEPLOYMENT_TYPE ?? \"\",\n    sourceCommitRef: process.env.IX_SOURCE_COMMIT_REF ?? \"\",\n    sourceCommitHash: process.env.IX_SOURCE_COMMIT_HASH ?? \"\",\n    deployTriggeredBy: process.env.IX_DEPLOY_TRIGGERED_BY ?? \"\",\n    smtpHost: process.env.SMTP_HOST ?? \"\",\n    smtpPort: process.env.SMTP_PORT ?? \"\",\n    clamAVUrl: process.env.CLAMAV_URL ?? \"\",\n    vpcHttpProxy: process.env.VPC_HTTP_PROXY ?? \"\",\n    alarmSnsTopic: process.env.IX_ALARM_SNS_TOPIC ?? \"\",\n    tags: JSON.parse(process.env.IX_TAGS ?? \"{}\"),\n}) satisfies Record<string, string | boolean>;\nconst ixDeployConfigSchema = z\n    .object({\n    isIxDeploy: z.literal(true),\n    appName: z.string().min(1),\n    environment: z.enum([\"dev\", \"test\", \"uat\", \"prod\"]),\n    workloadGroup: z.enum([\"ds\", \"srs\"]),\n    primaryAwsRegion: z.literal(\"ap-southeast-2\"),\n    siteDomains: z.string().transform((val) => val\n        .split(\",\")\n        .map((domain) => domain.trim())\n        .filter(Boolean)),\n    siteDomainAliases: z.string().transform((val) => val\n        .split(\",\")\n        .map((domain) => domain.trim())\n        .filter(Boolean)),\n    isInternalApp: z.coerce.boolean(),\n    deploymentType: z.enum([\"docker\", \"serverless\"]),\n    sourceCommitRef: z.string().min(1),\n    sourceCommitHash: z.string().min(1),\n    deployTriggeredBy: z.string().min(1),\n    smtpHost: z.string(),\n    smtpPort: z.coerce.number().int(),\n    clamAVUrl: z.string().url(),\n    vpcHttpProxy: z.string().url(),\n    alarmSnsTopic: z.string().min(1),\n    tags: z.record(z.string(), z.string()),\n} satisfies Record<keyof ReturnType<typeof getEnvVars>, unknown>)\n    .strip();\nconst nonIxDeployConfigSchema = z\n    .object({\n    isIxDeploy: z.literal(false),\n    appName: z.string(),\n    environment: z.string(),\n    workloadGroup: z.string(),\n    primaryAwsRegion: z.string(),\n    siteDomains: z.string().transform((val) => val\n        .split(\",\")\n        .map((domain) => domain.trim())\n        .filter(Boolean)),\n    siteDomainAliases: z.string().transform((val) => val\n        .split(\",\")\n        .map((domain) => domain.trim())\n        .filter(Boolean)),\n    isInternalApp: z\n        .string()\n        .transform((val) => (val ? val.toLowerCase() === \"true\" : undefined)),\n    deploymentType: z.string(),\n    sourceCommitRef: z.string(),\n    sourceCommitHash: z.string(),\n    deployTriggeredBy: z.string(),\n    smtpHost: z.string(),\n    smtpPort: z\n        .string()\n        .transform((val) => isNaN(parseInt(val, 10)) ? undefined : parseInt(val, 10)),\n    clamAVUrl: z.string(),\n    vpcHttpProxy: z.string(),\n    alarmSnsTopic: z.string(),\n    tags: z.record(z.string(), z.string()),\n} satisfies Record<keyof ReturnType<typeof getEnvVars>, unknown>)\n    .strip();\nconst schema = z.discriminatedUnion(\"isIxDeploy\", [\n    ixDeployConfigSchema,\n    nonIxDeployConfigSchema,\n]);\nexport const deployConfig = schema.parse(getEnvVars());\n// process.env values can change at runtime so we provide a way to re-parse the config as needed\nexport const getDeployConfig = () => schema.parse(getEnvVars());\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/lib/proxy/index.js

@@ -0,0 +1,31 @@
+// src/lib/proxy/fetch.ts
+import { setGlobalDispatcher, getGlobalDispatcher, EnvHttpProxyAgent, fetch as undiciFetch } from "undici";
+import { bootstrap } from "global-agent";
+function setupProxyGlobally() {
+  if (getGlobalDispatcher() instanceof EnvHttpProxyAgent)
+    return;
+  if (!process.env.HTTP_PROXY || !process.env.HTTPS_PROXY)
+    return;
+  const envHttpProxyAgent = new EnvHttpProxyAgent();
+  setGlobalDispatcher(envHttpProxyAgent);
+  if (!process.env.GLOBAL_AGENT_HTTP_PROXY) {
+    process.env.GLOBAL_AGENT_HTTP_PROXY = process.env.HTTP_PROXY;
+    process.env.GLOBAL_AGENT_HTTPS_PROXY = process.env.HTTPS_PROXY ?? process.env.HTTP_PROXY;
+  }
+  bootstrap();
+}
+function getProxiedFetch() {
+  const fetch = (input, init = {}) => {
+    if (init.dispatcher) {
+      console.warn("A custom dispatcher was provided to fetch but this is ignored as a proxy agent is being used.");
+    }
+    const envHttpProxyAgent = new EnvHttpProxyAgent();
+    return undiciFetch(input, { ...init, dispatcher: envHttpProxyAgent });
+  };
+  return fetch;
+}
+export {
+  getProxiedFetch,
+  setupProxyGlobally
+};
+//# sourceMappingURL=index.js.map

package/dist/lib/proxy/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/lib/proxy/fetch.ts"],
+  "sourcesContent": ["import { setGlobalDispatcher, getGlobalDispatcher, EnvHttpProxyAgent, fetch as undiciFetch, } from \"undici\";\nimport { bootstrap } from \"global-agent\";\nexport function setupProxyGlobally() {\n    // Make operation idempotent\n    if (getGlobalDispatcher() instanceof EnvHttpProxyAgent)\n        return;\n    if (!process.env.HTTP_PROXY || !process.env.HTTPS_PROXY)\n        return;\n    // To cover libraries that use fetch\n    // See https://nodejs.org/api/globals.html#custom-dispatcher\n    // This might stop being needed at some point: https://github.com/actions/create-github-app-token/pull/143#discussion_r1747641337\n    const envHttpProxyAgent = new EnvHttpProxyAgent();\n    setGlobalDispatcher(envHttpProxyAgent);\n    // To cover libraries that use the http/https object\n    if (!process.env.GLOBAL_AGENT_HTTP_PROXY) {\n        process.env.GLOBAL_AGENT_HTTP_PROXY = process.env.HTTP_PROXY;\n        process.env.GLOBAL_AGENT_HTTPS_PROXY =\n            process.env.HTTPS_PROXY ?? process.env.HTTP_PROXY;\n    }\n    bootstrap();\n}\nexport function getProxiedFetch() {\n    const fetch: typeof undiciFetch = (input, init = {}) => {\n        if (init.dispatcher) {\n            console.warn(\"A custom dispatcher was provided to fetch but this is ignored as a proxy agent is being used.\");\n        }\n        const envHttpProxyAgent = new EnvHttpProxyAgent();\n        return undiciFetch(input, { ...init, dispatcher: envHttpProxyAgent });\n    };\n    return fetch;\n}\n"],
+  "mappings": ";AAAA,SAAS,qBAAqB,qBAAqB,mBAAmB,SAAS,mBAAoB;AACnG,SAAS,iBAAiB;AACnB,SAAS,qBAAqB;AAEjC,MAAI,oBAAoB,aAAa;AACjC;AACJ,MAAI,CAAC,QAAQ,IAAI,cAAc,CAAC,QAAQ,IAAI;AACxC;AAIJ,QAAM,oBAAoB,IAAI,kBAAkB;AAChD,sBAAoB,iBAAiB;AAErC,MAAI,CAAC,QAAQ,IAAI,yBAAyB;AACtC,YAAQ,IAAI,0BAA0B,QAAQ,IAAI;AAClD,YAAQ,IAAI,2BACR,QAAQ,IAAI,eAAe,QAAQ,IAAI;AAAA,EAC/C;AACA,YAAU;AACd;AACO,SAAS,kBAAkB;AAC9B,QAAM,QAA4B,CAAC,OAAO,OAAO,CAAC,MAAM;AACpD,QAAI,KAAK,YAAY;AACjB,cAAQ,KAAK,+FAA+F;AAAA,IAChH;AACA,UAAM,oBAAoB,IAAI,kBAAkB;AAChD,WAAO,YAAY,OAAO,EAAE,GAAG,MAAM,YAAY,kBAAkB,CAAC;AAAA,EACxE;AACA,SAAO;AACX;",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infoxchange/make-it-so",
-  "version": "3.1.1-internal-testing-allow-proxy-direct-import-b2e95a1.1",
+  "version": "3.1.1",
   "description": "Makes deploying services to IX infra easy",
   "repository": "github:infoxchange/make-it-so",
   "publishConfig": {
@@ -22,7 +22,7 @@
   "exports": {
     ".": "./dist/index.js",
     "./components": "./dist/components/index.js",
-    "./proxy": "./dist/proxy/index.js",
+    "./proxy": "./dist/lib/proxy/index.js",
     "./deployConfig": "./dist/deployConfig.js"
   },
   "lint-staged": {
@@ -43,7 +43,6 @@
     "@types/aws-cloudfront-function": "^1.0.6",
     "@types/aws-lambda": "8.10.159",
     "@types/global-agent": "^3.0.0",
-    "@types/jsonwebtoken": "^9.0.10",
     "esbuild": "^0.27.2",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
@@ -65,7 +64,6 @@
   },
   "dependencies": {
     "global-agent": "^3.0.0",
-    "jsonwebtoken": "^9.0.2",
     "undici": "^7.16.0",
     "zod": "^3.24.2"
   }