Merge pull request #234 from code-like-a-carpenter/fix-stack-detection

fix stack detection
code-like-a-carpenter · Feb 13, 2024 · 8901f70 · 8901f70
2 parents fe2b538 + e7674d5
commit 8901f70
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/@code-like-a-carpenter/tool-stack/package.json b/packages/@code-like-a-carpenter/tool-stack/package.json
@@ -33,6 +33,7 @@
     "glob": "^10.3.10",
     "http-proxy": "^1.18.1",
     "lodash.snakecase": "^4.1.1",
+    "undici": "^6.6.2",
     "vhost": "^3.0.2"
   },
   "devDependencies": {

diff --git a/packages/@code-like-a-carpenter/tool-stack/src/proxy.ts b/packages/@code-like-a-carpenter/tool-stack/src/proxy.ts
@@ -1,6 +1,7 @@
 import express from 'express';
 import type Server from 'http-proxy';
 import httpProxy from 'http-proxy';
+import {Agent, fetch} from 'undici';
 import vhost from 'vhost';
 
 import {assert} from '@code-like-a-carpenter/assert';
@@ -84,7 +85,16 @@ export async function startAllProxies({
       stackNames.map(async (stackName) => {
         try {
           const result = await fetch(
-            `http://${stackName}.localhost:${port}/api/v1/ping`
+            `http://${stackName}.localhost:${port}/api/v1/ping`,
+            {
+              dispatcher: new Agent({
+                connect: {
+                  lookup: (hostname, options, callback) => {
+                    callback(null, [{address: '127.0.0.1', family: 4}]);
+                  },
+                },
+              }),
+            }
           );
           if (!result.ok) {
             const error = new Error(`Stack ${stackName} is not available`);

diff --git a/packages/@code-like-a-carpenter/tool-stack/src/stacks.ts b/packages/@code-like-a-carpenter/tool-stack/src/stacks.ts
@@ -37,7 +37,8 @@ export async function findEndpoints(
 }
 
 async function getStackUrl(stackName: string): Promise<string> {
-  if (!process.env.CI) {
+  // If we aleady have an AWS_SECRET_ACCESS_KEY, don't try to to use autoloading
+  if (!process.env.CI && !process.env.AWS_SECRET_ACCESS_KEY) {
     process.env.AWS_REGION = process.env.AWS_REGION ?? 'us-east-1';
     process.env.AWS_PROFILE = process.env.AWS_PROFILE ?? 'webstorm_playground';
     process.env.AWS_SDK_LOAD_CONFIG = process.env.AWS_SDK_LOAD_CONFIG ?? '1';