@awsless/awsless 0.0.138 → 0.0.140

package/dist/bin.js

@@ -572,6 +572,9 @@ var Stack = class {
   find(resourceType) {
     return [...this.resources].filter((resource) => resource instanceof resourceType);
   }
+  findByLogicalId(id) {
+    return [...this.resources].find((resource) => resource.logicalId === id);
+  }
   [Symbol.iterator]() {
     return this.resources.values();
   }
@@ -3547,21 +3550,27 @@ var httpPlugin = definePlugin({
     if (Object.keys(config2.app.defaults?.http || {}).length === 0) {
       return;
     }
-    const vpcId = bootstrap2.get("vpc-id");
+    const vpc = bootstrap2.findByLogicalId("MainEc2Vpc");
+    const subnet1 = bootstrap2.findByLogicalId("Public0Ec2Subnet");
+    const subnet2 = bootstrap2.findByLogicalId("Public1Ec2Subnet");
+    if (!vpc || !subnet1 || !subnet2) {
+      throw new TypeError("The HTTP plugin needs a global vpc to be defined.");
+    }
     const securityGroup = new SecurityGroup("http", {
       description: "http security group",
-      vpcId
-    });
-    securityGroup.addIngressRule(Peer.anyIpv4(), Port.tcp(443));
-    securityGroup.addIngressRule(Peer.anyIpv6(), Port.tcp(443));
+      vpcId: vpc.id
+    }).dependsOn(vpc);
+    const port = Port.tcp(443);
+    securityGroup.addIngressRule(Peer.anyIpv4(), port);
+    securityGroup.addIngressRule(Peer.anyIpv6(), port);
     bootstrap2.add(securityGroup);
     for (const [id, props] of Object.entries(config2.app.defaults?.http || {})) {
       const loadBalancer = new LoadBalancer(id, {
         name: `${config2.app.name}-${id}`,
         type: "application",
         securityGroups: [securityGroup.id],
-        subnets: [bootstrap2.get("public-subnet-1"), bootstrap2.get("public-subnet-2")]
-      }).dependsOn(securityGroup);
+        subnets: [subnet1.id, subnet2.id]
+      }).dependsOn(securityGroup, subnet1, subnet2);
       const listener = new Listener(id, {
         loadBalancerArn: loadBalancer.arn,
         port: 443,
@@ -3813,7 +3822,7 @@ var IotEventSource = class extends Group {
   }
 };
 
-// src/plugins/pubsub/pubsub.ts
+// src/plugins/pubsub/index.ts
 var pubsubPlugin = definePlugin({
   name: "pubsub",
   onApp({ bind }) {
@@ -3838,7 +3847,7 @@ var pubsubPlugin = definePlugin({
   }
 });
 
-// src/plugins/queue/queue.ts
+// src/plugins/queue/index.ts
 import { camelCase as camelCase4, constantCase as constantCase10 } from "change-case";
 import { relative as relative4 } from "path";
 var typeGenCode3 = `
@@ -4074,7 +4083,7 @@ var ApiMapping = class extends Resource {
   }
 };
 
-// src/plugins/rest/rest.ts
+// src/plugins/rest/index.ts
 var restPlugin = definePlugin({
   name: "rest",
   onApp({ config: config2, app, bootstrap: bootstrap2 }) {
@@ -4169,7 +4178,7 @@ var Collection = class extends Resource {
   }
 };
 
-// src/plugins/search/search.ts
+// src/plugins/search/index.ts
 var searchPlugin = definePlugin({
   name: "search",
   async onTypeGen({ config: config2, write }) {
@@ -4820,7 +4829,7 @@ var sitePlugin = definePlugin({
   }
 });
 
-// src/plugins/store/store.ts
+// src/plugins/store/index.ts
 var storePlugin = definePlugin({
   name: "store",
   async onTypeGen({ config: config2, write }) {
@@ -5009,7 +5018,7 @@ var DynamoDBEventSource = class extends Group {
   }
 };
 
-// src/plugins/table/table.ts
+// src/plugins/table/index.ts
 var tablePlugin = definePlugin({
   name: "table",
   async onTypeGen({ config: config2, write }) {
@@ -5386,6 +5395,8 @@ var vpcPlugin = definePlugin({
 
 // src/plugins/index.ts
 var plugins = [
+  // The VPC needs to be defined.
+  vpcPlugin,
   authPlugin,
   cachePlugin,
   configPlugin,
@@ -5404,8 +5415,7 @@ var plugins = [
   storePlugin,
   tablePlugin,
   testPlugin,
-  topicPlugin,
-  vpcPlugin
+  topicPlugin
 ];
 
 // src/formation/app.ts

package/dist/index.d.ts

@@ -9155,6 +9155,7 @@ declare class Stack {
     import(name: string): string;
     tag(name: string, value: string): this;
     find<T>(resourceType: ConstructorOf<T>): T[];
+    findByLogicalId<T = Resource>(id: string): T | undefined;
     [Symbol.iterator](): IterableIterator<Resource>;
     get size(): number;
     toJSON(): {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.138",
+  "version": "0.0.140",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -29,10 +29,10 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.15",
-    "@awsless/redis": "^0.0.10",
     "@awsless/sns": "^0.0.7",
-    "@awsless/sqs": "^0.0.7",
+    "@awsless/redis": "^0.0.10",
     "@awsless/ssm": "^0.0.7",
+    "@awsless/sqs": "^0.0.7",
     "@awsless/validate": "^0.0.10",
     "@awsless/weak-cache": "^0.0.1"
   },
@@ -87,8 +87,8 @@
     "wrap-ansi": "^8.1.0",
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
-    "@awsless/code": "^0.0.10",
-    "@awsless/graphql": "^0.0.6"
+    "@awsless/graphql": "^0.0.6",
+    "@awsless/code": "^0.0.10"
   },
   "scripts": {
     "test": "pnpm code test",