Merge branch 'main' into rybickic/sunset-dynamodb

libs/wingsdk/src/simulator/simulator.ts

@@ -99,9 +99,9 @@ export interface ISimulatorContext {
   readonly serverUrl: string;
 
   /**
-   * Find a resource simulation by its handle. Throws if the handle isn't valid.
+   * Obtain a client given a resource's handle.
    */
-  findInstance(handle: string): ISimulatorResourceInstance;
+  getClient(handle: string): unknown;
 
   /**
    * Add a trace. Traces are breadcrumbs of information about resource
@@ -739,8 +739,8 @@ export class Simulator {
       statedir: join(this.statedir, resourceConfig.addr),
       resourcePath: resourceConfig.path,
       serverUrl: this.url,
-      findInstance: (handle: string) => {
-        return this._handles.find(handle);
+      getClient: (handle: string) => {
+        return makeSimulatorClient(this.url, handle);
       },
       addTrace: (trace: Trace) => {
         this.addTrace(trace);

libs/wingsdk/src/target-sim/api.inflight.ts

@@ -177,7 +177,7 @@ export class Api
       const s = {
         functionHandle: subscriber,
         method: r.method,
-        path: r.path,
+        pathPattern: r.pathPattern,
       };
       this.routes.push(s);
       this.populateRoute(s, subscriber);
@@ -202,25 +202,19 @@ export class Api
       | "patch"
       | "connect";
 
-    const fnClient = this.context.findInstance(
-      functionHandle
-    ) as IFunctionClient & ISimulatorResourceInstance;
-    if (!fnClient) {
-      throw new Error("No function client found!");
-    }
-
+    const fnClient = this.context.getClient(functionHandle) as IFunctionClient;
     this.app[method](
-      transformRoutePath(route.path),
+      transformRoutePath(route.pathPattern),
       asyncMiddleware(
         async (
           req: express.Request,
           res: express.Response,
           next: express.NextFunction
         ) => {
           this.addTrace(
-            `Processing "${route.method} ${route.path}" params=${JSON.stringify(
-              req.params
-            )}).`
+            `Processing "${route.method} ${
+              route.pathPattern
+            }" params=${JSON.stringify(req.params)}).`
           );
 
           const apiRequest = transformRequest(req);
@@ -243,7 +237,7 @@ export class Api
             } else {
               res.end();
             }
-            this.addTrace(`${route.method} ${route.path} - ${status}.`);
+            this.addTrace(`${route.method} ${route.pathPattern} - ${status}.`);
           } catch (err) {
             return next(err);
           }

libs/wingsdk/src/target-sim/api.ts

@@ -43,7 +43,7 @@ export class Api extends cloud.Api implements ISimulatorResource {
   private createOrGetFunction(
     inflight: cloud.IApiEndpointHandler,
     props: cloud.FunctionProps,
-    path: string,
+    pathPattern: string,
     method: cloud.HttpMethod
   ): Function {
     let handler = this.handlers[inflight._id];
@@ -52,7 +52,7 @@ export class Api extends cloud.Api implements ISimulatorResource {
       const routes = (handler.mapping.eventProps.subscriptionProps as any)
         .routes as ApiRoute[];
       routes.push({
-        path,
+        pathPattern,
         method,
       });
 
@@ -73,7 +73,7 @@ export class Api extends cloud.Api implements ISimulatorResource {
       props
     ) as Function;
     Node.of(fn).sourceModule = SDK_SOURCE_MODULE;
-    Node.of(fn).title = `${method.toUpperCase()} ${path}`;
+    Node.of(fn).title = `${method.toUpperCase()} ${pathPattern}`;
     Node.of(fn).hidden = true;
 
     const eventMapping = new EventMapping(
@@ -85,7 +85,7 @@ export class Api extends cloud.Api implements ISimulatorResource {
         subscriptionProps: {
           routes: [
             {
-              path,
+              pathPattern,
               method,
             },
           ],

libs/wingsdk/src/target-sim/bucket.inflight.ts

@@ -96,9 +96,9 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
       return;
     }
 
-    const topicClient = this.context.findInstance(
+    const topicClient = this.context.getClient(
       this.topicHandlers[actionType]!
-    ) as ITopicClient & ISimulatorResourceInstance;
+    ) as ITopicClient;
 
     return topicClient.publish(key);
   }

libs/wingsdk/src/target-sim/event-mapping.inflight.ts

@@ -24,13 +24,13 @@ export class EventMapping implements ISimulatorResourceInstance {
   }
 
   public async init(): Promise<EventMappingAttributes> {
-    const client = this.context.findInstance(this.publisher) as IEventPublisher;
+    const client = this.context.getClient(this.publisher) as IEventPublisher;
     await client.addEventSubscription(this.subscriber, this.eventSubscription);
     return {};
   }
 
   public async cleanup(): Promise<void> {
-    const client = this.context.findInstance(this.publisher) as IEventPublisher;
+    const client = this.context.getClient(this.publisher) as IEventPublisher;
     await client.removeEventSubscription(this.subscriber);
   }
 

libs/wingsdk/src/target-sim/on-deploy.inflight.ts

@@ -18,9 +18,9 @@ export class OnDeploy implements IOnDeployClient, ISimulatorResourceInstance {
   }
 
   public async init(): Promise<OnDeployAttributes> {
-    const functionClient = this.context.findInstance(
+    const functionClient = this.context.getClient(
       this.functionHandle
-    ) as IFunctionClient & ISimulatorResourceInstance;
+    ) as IFunctionClient;
     await this.context.withTrace({
       message: "OnDeploy invoked.",
       activity: async () => {

libs/wingsdk/src/target-sim/queue.inflight.ts

@@ -144,9 +144,9 @@ export class Queue
           continue;
         }
 
-        const fnClient = this.context.findInstance(
-          subscriber.functionHandle!
-        ) as IFunctionClient & ISimulatorResourceInstance;
+        const fnClient = this.context.getClient(
+          subscriber.functionHandle
+        ) as IFunctionClient;
         if (!fnClient) {
           throw new Error("No function client found");
         }

libs/wingsdk/src/target-sim/schedule.inflight.ts

@@ -67,9 +67,9 @@ export class Schedule
 
   private runTasks() {
     for (const task of this.tasks) {
-      const fnClient = this.context.findInstance(
-        task.functionHandle!
-      ) as IFunctionClient & ISimulatorResourceInstance;
+      const fnClient = this.context.getClient(
+        task.functionHandle
+      ) as IFunctionClient;
       if (!fnClient) {
         throw new Error("No function client found for task.");
       }

libs/wingsdk/src/target-sim/schema-resources.ts

@@ -52,8 +52,8 @@ export interface ApiAttributes {
 
 /** Schema for cloud.Api.props.routes */
 export interface ApiRoute {
-  /** The path to handle. */
-  readonly path: string;
+  /** The HTTP path pattern to handle. */
+  readonly pathPattern: string;
   /** The HTTP method to handle. */
   readonly method: HttpMethod;
 }

libs/wingsdk/src/target-sim/test-runner.inflight.ts

@@ -34,12 +34,7 @@ export class TestRunner
     if (!functionHandle) {
       throw new Error(`No test found at path "${path}"`);
     }
-    const fnClient = this.context.findInstance(
-      functionHandle
-    ) as IFunctionClient & ISimulatorResourceInstance;
-    if (!fnClient) {
-      throw new Error(`No function client found for test path "${path}"`);
-    }
+    const fnClient = this.context.getClient(functionHandle) as IFunctionClient;
     let pass = false;
     let error: string | undefined;
     const previousTraces = this.context.listTraces().length;

libs/wingsdk/src/target-sim/topic.inflight.ts

@@ -34,14 +34,9 @@ export class Topic
 
   private async publishMessage(message: string) {
     for (const subscriber of this.subscribers) {
-      const fnClient = this.context.findInstance(
-        subscriber.functionHandle!
-      ) as IFunctionClient & ISimulatorResourceInstance;
-
-      if (!fnClient) {
-        throw new Error("No function client found!");
-      }
-
+      const fnClient = this.context.getClient(
+        subscriber.functionHandle
+      ) as IFunctionClient;
       this.context.addTrace({
         type: TraceType.RESOURCE,
         data: {