Merge pull request #3169 from quadratichq/qa

QA July 2nd

Author: AyushAgrawal-A2

.vscode/settings.json

@@ -28,6 +28,7 @@
     "Cockroachdb",
     "codegen",
     "codingame",
+    "Coip",
     "containerd",
     "COUNTA",
     "COUNTBLANK",
@@ -39,6 +40,7 @@
     "dataframe",
     "dataframes",
     "dbgjs",
+    "dbname",
     "dcell",
     "ddimaria",
     "dearmor",
@@ -116,6 +118,7 @@
     "oryd",
     "parq",
     "peekable",
+    "pgdg",
     "PGUSER",
     "pigz",
     "pixi",

Cargo.toml

@@ -14,7 +14,7 @@ edition = "2024"
 description = "Infinite data grid with Python, JavaScript, and SQL built-in"
 repository = "https://github.com/quadratichq/quadratic"
 license-file = "LICENSE"
-version = "0.13.0"
+version = "0.13.1"
 
 [profile.release]
 # Tell `rustc` to optimize for small code size.

VERSION

@@ -1 +1 @@
-0.13.0
+0.13.1

infra/api/api.ts

@@ -1,18 +1,19 @@
 import * as aws from "@pulumi/aws";
 import * as pulumi from "@pulumi/pulumi";
 
+import { databaseUrl } from "../db/db";
 import { latestAmazonLinuxAmi } from "../helpers/latestAmazonAmi";
 import { runDockerImageBashScript } from "../helpers/runDockerImageBashScript";
 import { instanceProfileIAMContainerRegistry } from "../shared/instanceProfileIAMContainerRegistry";
 import {
   apiAlbSecurityGroup,
   apiEc2SecurityGroup,
-  apiEip1,
-  apiEip2,
   apiPrivateSubnet1,
   apiPrivateSubnet2,
+  apiPrivateSubnet3,
   apiPublicSubnet1,
   apiPublicSubnet2,
+  apiPublicSubnet3,
   apiVPC,
 } from "./api_network";
 
@@ -40,25 +41,25 @@ const requestCountTarget =
 
 // Create an Launch Template
 const launchTemplate = new aws.ec2.LaunchTemplate("api-lt", {
-  name: `api-lt-${apiSubdomain}-${Math.random().toString(36).substring(2, 8)}`,
+  name: `api-lt-${apiSubdomain}`,
   imageId: latestAmazonLinuxAmi.id,
   instanceType: instanceSize,
   iamInstanceProfile: {
     name: instanceProfileIAMContainerRegistry.name,
   },
   vpcSecurityGroupIds: [apiEc2SecurityGroup.id],
-  userData: pulumi
-    .all([apiEip1.publicIp, apiEip2.publicIp])
-    .apply(([eip1, eip2]) => {
-      const script = runDockerImageBashScript(
-        apiECRName,
-        dockerImageTag,
-        apiPulumiEscEnvironmentName,
-        {},
-        true,
-      );
-      return Buffer.from(script).toString("base64");
-    }),
+  userData: pulumi.all([databaseUrl]).apply(([dbUrl]) => {
+    const script = runDockerImageBashScript(
+      apiECRName,
+      dockerImageTag,
+      apiPulumiEscEnvironmentName,
+      {
+        DATABASE_URL: dbUrl,
+      },
+      true,
+    );
+    return Buffer.from(script).toString("base64");
+  }),
   tagSpecifications: [
     {
       resourceType: "instance",
@@ -103,7 +104,7 @@ const targetGroup = new aws.lb.TargetGroup("api-alb-tg", {
   },
 });
 
-// Create Auto Scaling Group with warm pool
+// Create Auto Scaling Group
 const autoScalingGroup = new aws.autoscaling.Group("api-asg", {
   tags: [
     {
@@ -113,7 +114,11 @@ const autoScalingGroup = new aws.autoscaling.Group("api-asg", {
     },
   ],
 
-  vpcZoneIdentifiers: [apiPrivateSubnet1.id, apiPrivateSubnet2.id],
+  vpcZoneIdentifiers: [
+    apiPrivateSubnet1.id,
+    apiPrivateSubnet2.id,
+    apiPrivateSubnet3.id,
+  ],
   launchTemplate: {
     id: launchTemplate.id,
     version: launchTemplate.latestVersion.apply((v) => v.toString()),
@@ -156,7 +161,7 @@ const alb = new aws.lb.LoadBalancer("api-alb", {
   name: `alb-${apiSubdomain}`,
   internal: false,
   loadBalancerType: "application",
-  subnets: [apiPublicSubnet1.id, apiPublicSubnet2.id],
+  subnets: [apiPublicSubnet1.id, apiPublicSubnet2.id, apiPublicSubnet3.id],
   securityGroups: [apiAlbSecurityGroup.id],
   enableHttp2: true,
   enableCrossZoneLoadBalancing: true,

infra/api/api_network.ts

@@ -1,7 +1,5 @@
 import * as aws from "@pulumi/aws";
 
-import { isPreviewEnvironment } from "../helpers/isPreviewEnvironment";
-
 // Create a new VPC
 export const apiVPC = new aws.ec2.Vpc("api-vpc", {
   cidrBlock: "10.0.0.0/16",
@@ -17,11 +15,15 @@ const internetGateway = new aws.ec2.InternetGateway("api-igw", {
 });
 
 // Create Elastic IPs
-export const apiEip1 = new aws.ec2.Eip("api-nat-eip-1", {
+const apiEip1 = new aws.ec2.Eip("api-nat-eip-1", {
+  domain: "vpc",
+});
+
+const apiEip2 = new aws.ec2.Eip("api-nat-eip-2", {
   domain: "vpc",
 });
 
-export const apiEip2 = new aws.ec2.Eip("api-nat-eip-2", {
+const apiEip3 = new aws.ec2.Eip("api-nat-eip-3", {
   domain: "vpc",
 });
 
@@ -42,6 +44,14 @@ export const apiPublicSubnet2 = new aws.ec2.Subnet("api-public-subnet-2", {
   tags: { Name: "api-public-subnet-2" },
 });
 
+export const apiPublicSubnet3 = new aws.ec2.Subnet("api-public-subnet-3", {
+  vpcId: apiVPC.id,
+  cidrBlock: "10.0.5.0/24",
+  availabilityZone: "us-west-2c",
+  mapPublicIpOnLaunch: true,
+  tags: { Name: "api-public-subnet-3" },
+});
+
 // Create a NAT Gateway in each public subnet
 const natGateway1 = new aws.ec2.NatGateway("api-nat-gateway-1", {
   allocationId: apiEip1.id,
@@ -55,6 +65,12 @@ const natGateway2 = new aws.ec2.NatGateway("api-nat-gateway-2", {
   tags: { Name: "api-nat-gateway-2" },
 });
 
+const natGateway3 = new aws.ec2.NatGateway("api-nat-gateway-3", {
+  allocationId: apiEip3.id,
+  subnetId: apiPublicSubnet3.id,
+  tags: { Name: "api-nat-gateway-3" },
+});
+
 // Create private subnets
 export const apiPrivateSubnet1 = new aws.ec2.Subnet("api-private-subnet-1", {
   vpcId: apiVPC.id,
@@ -70,6 +86,13 @@ export const apiPrivateSubnet2 = new aws.ec2.Subnet("api-private-subnet-2", {
   tags: { Name: "api-private-subnet-2" },
 });
 
+export const apiPrivateSubnet3 = new aws.ec2.Subnet("api-private-subnet-3", {
+  vpcId: apiVPC.id,
+  cidrBlock: "10.0.6.0/24",
+  availabilityZone: "us-west-2c",
+  tags: { Name: "api-private-subnet-3" },
+});
+
 // Create route tables
 const publicRouteTable = new aws.ec2.RouteTable("api-public-route-table", {
   vpcId: apiVPC.id,
@@ -104,6 +127,17 @@ const privateRouteTable2 = new aws.ec2.RouteTable("api-private-route-table-2", {
   tags: { Name: "api-private-route-table-2" },
 });
 
+const privateRouteTable3 = new aws.ec2.RouteTable("api-private-route-table-3", {
+  vpcId: apiVPC.id,
+  routes: [
+    {
+      cidrBlock: "0.0.0.0/0",
+      natGatewayId: natGateway3.id,
+    },
+  ],
+  tags: { Name: "api-private-route-table-3" },
+});
+
 // Associate subnets with route tables
 new aws.ec2.RouteTableAssociation("api-public-route-table-association-1", {
   subnetId: apiPublicSubnet1.id,
@@ -115,6 +149,11 @@ new aws.ec2.RouteTableAssociation("api-public-route-table-association-2", {
   routeTableId: publicRouteTable.id,
 });
 
+new aws.ec2.RouteTableAssociation("api-public-route-table-association-3", {
+  subnetId: apiPublicSubnet3.id,
+  routeTableId: publicRouteTable.id,
+});
+
 new aws.ec2.RouteTableAssociation("api-private-route-table-association-1", {
   subnetId: apiPrivateSubnet1.id,
   routeTableId: privateRouteTable1.id,
@@ -125,6 +164,11 @@ new aws.ec2.RouteTableAssociation("api-private-route-table-association-2", {
   routeTableId: privateRouteTable2.id,
 });
 
+new aws.ec2.RouteTableAssociation("api-private-route-table-association-3", {
+  subnetId: apiPrivateSubnet3.id,
+  routeTableId: privateRouteTable3.id,
+});
+
 // Create a Security Group for the Api ALB
 export const apiAlbSecurityGroup = new aws.ec2.SecurityGroup(
   "api-alb-security-group",
@@ -170,13 +214,3 @@ export const apiEc2SecurityGroup = new aws.ec2.SecurityGroup("api-sg-1", {
   ],
   tags: { Name: "api-ec2-security-group" },
 });
-
-if (isPreviewEnvironment)
-  new aws.ec2.SecurityGroupRule(`api-ssh-ingress-rule`, {
-    type: "ingress",
-    fromPort: 22,
-    toPort: 22,
-    protocol: "tcp",
-    cidrBlocks: ["0.0.0.0/0"],
-    securityGroupId: apiEc2SecurityGroup.id,
-  });

infra/connection/connection.ts

@@ -37,7 +37,7 @@ const desiredCapacity = config.getNumber("connection-lb-desired-capacity") ?? 2;
 
 // Create an Launch Template
 const launchTemplate = new aws.ec2.LaunchTemplate("connection-lt", {
-  name: `connection-lt-${connectionSubdomain}-${Math.random().toString(36).substring(2, 8)}`,
+  name: `connection-lt-${connectionSubdomain}`,
   imageId: latestAmazonLinuxAmi.id,
   instanceType: instanceSize,
   iamInstanceProfile: {
@@ -97,6 +97,7 @@ const targetGroup = new aws.lb.TargetGroup("connection-nlb-tg", {
   deregistrationDelay: 30,
 });
 
+// Create Auto Scaling Group
 const autoScalingGroup = new aws.autoscaling.Group("connection-asg", {
   tags: [
     {
@@ -105,6 +106,7 @@ const autoScalingGroup = new aws.autoscaling.Group("connection-asg", {
       propagateAtLaunch: true,
     },
   ],
+
   vpcZoneIdentifiers: [
     connectionPrivateSubnet1.id,
     connectionPrivateSubnet2.id,
@@ -117,13 +119,16 @@ const autoScalingGroup = new aws.autoscaling.Group("connection-asg", {
   maxSize,
   desiredCapacity,
   targetGroupArns: [targetGroup.arn],
+
   instanceRefresh: {
     strategy: "Rolling",
     preferences: {
       minHealthyPercentage: 50,
       instanceWarmup: "60",
     },
   },
+
+  // Add auto-scaling metrics collection
   enabledMetrics: [
     "GroupMinSize",
     "GroupMaxSize",

infra/connection/connection_network.ts

@@ -1,7 +1,5 @@
 import * as aws from "@pulumi/aws";
 
-import { isPreviewEnvironment } from "../helpers/isPreviewEnvironment";
-
 // Create a new VPC
 export const connectionVPC = new aws.ec2.Vpc("connection-vpc", {
   cidrBlock: "10.0.0.0/16",
@@ -173,13 +171,3 @@ export const connectionEc2SecurityGroup = new aws.ec2.SecurityGroup(
     ],
   },
 );
-
-if (isPreviewEnvironment)
-  new aws.ec2.SecurityGroupRule(`connection-ssh-ingress-rule`, {
-    type: "ingress",
-    fromPort: 22,
-    toPort: 22,
-    protocol: "tcp",
-    cidrBlocks: ["0.0.0.0/0"],
-    securityGroupId: connectionEc2SecurityGroup.id,
-  });