diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..68f5069 --- /dev/null +++ b/.gitignore @@ -0,0 +1,115 @@ +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib +bin/ + +# Go specific +*.o +*.a +*.test +*.out +go.work + +# Mac OS specific +.DS_Store +.AppleDouble +.LSOverride +._* + +# Linux specific +*~ +.fuse_hidden* +.directory +.Trash-* +.nfs* + +# Windows specific +Thumbs.db +ehthumbs.db +Desktop.ini +$RECYCLE.BIN/ +*.cab +*.msi +*.msm +*.msp +*.lnk + +# Editor directories and files +.idea/ +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.sublime-workspace +*.swp +*.swo +*~ +.project +.classpath +.c9/ +*.launch +.settings/ + +# Environment files +.env +.env.* +!.env.example + +# Build and package artifacts +mkfcenv.tar.gz +*.tar.gz +*.tar +*.zip +dist/ +build/ + +# Dependency directories +vendor/ +node_modules/ +jspm_packages/ +.pnp/ +.pnp.js + +# Logs +logs/ +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* + +# Database files +.db +*.db +*.sqlite +*.sqlite3 + +# Temporary files +.tmp/ +.temp/ +tmp/ +temp/ +*.tmp + +# Docker +.docker/ +docker-compose.override.yml + +# Terraform +.terraform/ +*.tfstate +*.tfstate.* +.terraformrc +terraform.rc +terraform.tfvars +*.tfvars.json + +# Packer +packer_cache/ + +# Project specific +.shared \ No newline at end of file diff --git a/README.md b/README.md index 0e18189..e8fa57b 100644 --- a/README.md +++ b/README.md @@ -6,17 +6,12 @@ E2B on AWS provides a secure, scalable, and customizable environment for running AI agent sandboxes in your own AWS account. This project addresses the growing need for organizations to maintain control over their AI infrastructure while leveraging the power of E2B's sandbox technology for AI agent development, testing, and deployment. -This project is built based on version [c746fd93d5f1260315c893dbd5d7290c0a41e52a](https://github.com/e2b-dev/infra/commit/c746fd93d5f1260315c893dbd5d7290c0a41e52a) (Mar 2), with newer versions still undergoing modifications. This E2B deployment can be used for testing purposes. If you encounter any issues, please contact the relevant team members or submit a PR directly. We would like to express our special thanks to all contributors involved in the project transformation. +This project is built based on version [0c35ed5c3b8492f96d1e0bbfb91fff96541a8c74](https://github.com/e2b-dev/infra/commit/0c35ed5c3b8492f96d1e0bbfb91fff96541a8c74) (Jul 1). This E2B deployment can be used for testing purposes. If you encounter any issues, please contact the relevant team members or submit a PR directly. We would like to express our special thanks to all contributors involved in the project transformation. ## Table of Contents - [Prerequisites](#prerequisites) -- [Deployment Steps](#deployment-steps) - - [1. Setup E2B Landing Zone](#1-setup-e2b-landing-zone) - - [2. Setup E2B Infrastructure](#2-setup-e2b-infrastructure) - - [3. Deploy E2B Applications](#3-deploy-e2b-applications) - - [4. Configure E2B Monitoring (Optional)](#4-configure-e2b-monitoring-optional) - - [5. Test by E2B SDK](#5-test-by-e2b-sdk) +- [How to Deploy](#deployment) - [Using E2B CLI](#using-e2b-cli) - [E2B SDK Cookbook](#e2b-sdk-cookbook) - [Troubleshooting](#troubleshooting) @@ -27,7 +22,8 @@ This project is built based on version [c746fd93d5f1260315c893dbd5d7290c0a41e52a ## Prerequisites - An AWS account with appropriate permissions -- A domain name that you own(Cloudflare is recommended, or using a private dns for internal connection only) +- A domain name that you own(Cloudflare is recommended) + - Recommended for monitoring and logging - Grafana Account & Stack (see Step 15 for detailed notes) - Posthog Account (optional) @@ -41,99 +37,47 @@ This project is built based on version [c746fd93d5f1260315c893dbd5d7290c0a41e52a > - `S3_BUCKET_LOGGING_ENABLED` > - `EC2 Metadata service configuration` -## Deployment Steps - -### 1. Setup E2B Landing Zone - +## Deployment +### 1. E2B Deployment 1. **Deploy CloudFormation Stack** + - Git Clone the project - Open AWS CloudFormation console and create a new stack - - Upload the `e2b-setup-env.yml` template file + - Upload the `e2b-setup-env.yml` file - Configure the following parameters: - **Stack Name**: Enter a name for the stack, **must be lowercase**(e.g., `e2b-infra`) - - **Domain Configuration**: Enter a domain you own (e.g., `example.com`), for using private host, check [Configure Private Hosted Zone] part + - **VPC Configuration**: Deployed new VPC environment configuration + - **Environment Configuration**: Choose an Environment (Support dev and prod, prod has a more stringent resource protection mechanism) + - **Architecture Configuration**: Choose CPU architecture (Support x64 and Graviton) + - **Domain Configuration**: Enter a domain you own(e.g., `example.com`) - **EC2 Key Pair**: Select an existing key pair for SSH access - **AllowRemoteSSHIPs**: Adjust IP range for SSH access (default restricts to private networks for security) - - **Database Settings**: Configure RDS parameters following password requirements(must be 8-30 characters with only letters and numbers, **special characters are not allowed**) + - **Database Settings**: Configure RDS parameters following password requirements(must be 8-30 characters with letters and numbers) - Complete all required fields and launch the stack 2. **Validate Domain Certificate** - Navigate to Amazon Certificate Manager (ACM) - Find your domain certificate and note the required CNAME record - Add the CNAME record to your domain's DNS settings(Cloudflare DNS settings) - - Wait for domain validation (typically 5-10 minutes) - -3. **Monitor Stack Creation** - - Return to CloudFormation console - - Wait for stack creation to complete successfully + - Wait for domain validation (typically in **5 minutes**) -### 2. Setup E2B Infrastructure - -1. **Connect to Deployment Machine** +3. **Connect to Bastion Machine** - Use SSH with your EC2 key pair: `ssh -i your-key.pem ubuntu@` - Or use AWS Session Manager from the EC2 console for browser-based access -2. Execute the following commands: +4. **Watch Deployment Logs** ```bash # Switch to root user for administrative privileges required for infrastructure setup sudo su root -# Enter the working directory. -cd /opt/infra/sample-e2b-on-aws - -# Initialize the environment by setting up AWS metadata, CloudFormation outputs, -# and creating the configuration file at /opt/config.properties - -bash infra-iac/init.sh - -# Build custom AMI images using Packer for the E2B infrastructure -# This creates optimized machine images with pre-installed dependencies -# This may take a while, please be patient -bash infra-iac/packer/packer.sh - -# Deploy the complete E2B infrastructure using Terraform -# This provisions AWS resources including VPC, EC2 instances, RDS, ALB, etc. -# Wait until the terraform deployment completes -bash infra-iac/terraform/start.sh +tail -f /tmp/e2b.log ``` -3. Setup Database: -```bash -bash infra-iac/db/init-db.sh - -# Save the following token information for later use: -# User: xxx -# Team ID: -# Access Token: -# Team API Key: -``` -4. Configure E2B DNS records(in Cloudflare): +5. **Configure E2B DNS records(in Cloudflare)** - **Setup Wildcard DNS**: Add a CNAME record for `*` (wildcard) pointing to the DNS name of the automatically created Application Load Balancer (ALB). This enables all E2B subdomains to route through the load balancer. - **Access Nomad Dashboard**: Navigate to `https://nomad.` in your browser and authenticate using the retrieved token to monitor and manage the Nomad cluster workloads. - - **Retrieve Nomad Access Token**: Execute `more /opt/config.properties | grep NOMAD` to extract the Nomad cluster management token from the configuration file. - -### 3. Deploy E2B Applications - -#### Application Image Configuration + - **Retrieve Nomad Access Token**: Execute `cat /opt/config.properties` to extract the Nomad cluster management token from the configuration file. -**Custom Image Building** -- **Build Custom Images**: Execute `bash packages/build.sh` to build custom E2B images and push them to your private ECR registry - -#### Deploy Nomad Applications - -```bash -# Load Nomad environment variables and configuration settings -source nomad/nomad.sh - -# Prepare the Nomad cluster and configure job templates -bash nomad/prepare.sh - -# Deploy all E2B applications to the Nomad cluster -bash nomad/deploy.sh - -# There are 10 applications in total -``` - -### 4. Configure E2B Monitoring (Optional) +### 2. Configure E2B Monitoring (Optional) 1. Login to https://grafana.com/ (register if needed) 2. Access your settings page at https://grafana.com/orgs/ @@ -166,22 +110,28 @@ bash nomad/deploy.sh otel-collector 8. Open Grafana Cloud Dashboard to view metrics, traces, and logs（Optional） - -### 5. Test by E2B SDK +### 3. E2B Test 1. Create a template: ```bash +# There are three ways to create E2B templates: # Create a template from e2bdev/code-interpreter bash packages/create_template.sh # Create a template from a Dockerfile bash packages/create_template.sh --docker-file +# Example for create a template of Desktop +bash packages/create_template.sh --docker-file test_use_case/Docckerfile/e2b.Dockerfile.Desktop + +# Example for create a template of BrowserUse +bash packages/create_template.sh --docker-file test_use_case/Docckerfile/e2b.Dockerfile.BrowserUse + # Create a template from an ECR image that in your own account bash packages/create_template.sh --ecr-image ``` -2. Create a sandbox(Get the value of e2b_API to execute commands--- more ../infra-iac/db/config.json): +2. Create a sandbox(Get the value of e2b_API to execute commands --- more ../infra-iac/db/config.json): ```bash curl -X POST \ https://api./sandboxes \ @@ -235,98 +185,6 @@ vim .env poetry run start ``` -## Configure Private Hosted Zone - -To avoid using external domain names and configure a private hosted zone for internal access, follow these steps: - -### 1. Create Private Hosted Zone in Route53 - -1. **Navigate to Route53 Console** - - - Go to AWS Route53 console - - Click "Create Hosted Zone" -2. **Configure Hosted Zone Settings** - - - **Domain name**: Enter your domain (e.g., `xiamingyang.site`) - - **Type**: Select "Private hosted zone" - - **VPC**: Select the region and VPC where your E2B infrastructure is deployed - - Click "Create hosted zone" - -### 2. Configure DNS Records - -After completing the `bash infra-iac/terraform/start.sh` step, an Application Load Balancer (ALB) will be created. You need to configure a CNAME record in your private hosted zone: - -1. **Create Wildcard CNAME Record** - - **Record name**: `*` (wildcard) - - **Record type**: `CNAME` - - **Value**: Enter the DNS name of the ALB (e.g., `e2btest-public-alb-1491434189.us-west-2.elb.amazonaws.com`) - - **TTL**: 300 (default) - - Click "Create records" - -### 3. Test the Configuration - -You can test the private hosted zone configuration using the following methods: - -**Test DNS Resolution:** - -```bash -dig test. -``` - -**Example output:** - -``` -; <<>> DiG 9.18.30-0ubuntu0.22.04.2-Ubuntu <<>> test.xiamingyang.site -;; global options: +cmd -;; Got answer: -;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 29956 -;; flags: qr rd ra; QUERY: 1, ANSWER: 3, AUTHORITY: 0, ADDITIONAL: 1 - -;; OPT PSEUDOSECTION: -; EDNS: version: 0, flags:; udp: 65494 -;; QUESTION SECTION: -;test.xiamingyang.site. IN A - -;; ANSWER SECTION: -test.xiamingyang.site. 300 IN CNAME e2btest-public-alb-1491434189.us-west-2.elb.amazonaws.com. -e2btest-public-alb-1491434189.us-west-2.elb.amazonaws.com. 60 IN A 52.39.63.230 -e2btest-public-alb-1491434189.us-west-2.elb.amazonaws.com. 60 IN A 52.39.227.199 - -;; Query time: 3 msec -;; SERVER: 127.0.0.53#53(127.0.0.53) (UDP) -;; WHEN: Tue Jun 24 10:25:29 UTC 2025 -;; MSG SIZE rcvd: 153 -``` - -**Test HTTPS Access:** - -```bash -curl -v https://nomad. -``` - -This should successfully connect to your Nomad dashboard through the ALB endpoint, confirming that the private hosted zone is working correctly. - -### 4. Important Notes - -- **E2B CLI Installation**: If you encounter Node.js version issues when installing E2B CLI on the deployment machine, you may need to upgrade Node.js: - - ```bash - # Add NodeSource repository for Node.js 18 - curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - - - # Install Node.js - sudo apt-get install -y nodejs - - # Verify version - node -v - - # Reinstall E2B CLI - sudo npm uninstall -g @e2b/cli - sudo npm install -g @e2b/cli - ``` -- **External Domain Requirements**: For E2B CLI usage on macOS or external machines, you may still need to configure external domain access through your public DNS provider (e.g., Cloudflare). -- **VPC Access**: The private hosted zone only works within the specified VPC. Ensure your client machines are within the same VPC or have appropriate VPC connectivity. - ## Troubleshooting 1. **No nodes were eligible for evaluation error when deploying applications** @@ -371,4 +229,4 @@ See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more inform This project is licensed under the Apache-2.0 License. -#### Application Image Configuration +#### Application Image Configuration \ No newline at end of file diff --git a/e2b-setup-env.yml b/e2b-setup-env.yml index b30f1f8..fadf437 100644 --- a/e2b-setup-env.yml +++ b/e2b-setup-env.yml @@ -1,4 +1,4 @@ -AWSTemplateFormatVersion: '2010-09-09' +AWSTemplateFormatVersion: "2010-09-09" Description: >- E2B Infrastructure CloudFormation Template - Deploys core infrastructure components for E2B platform including VPC, Terraform Bastion, IAM Roles, PostgreSQL Database, and S3 Buckets. @@ -9,10 +9,6 @@ Description: >- Metadata: AWS::CloudFormation::Interface: ParameterGroups: - - Label: - default: Domain Configuration - Parameters: - - BaseDomain - Label: default: VPC Configuration Parameters: @@ -21,26 +17,55 @@ Metadata: - PublicSubnet2Block - PrivateSubnet1Block - PrivateSubnet2Block - - Label: - default: Bastion Configuration - Parameters: - - KeyName - Label: default: Security Configuration Parameters: - AllowRemoteSSHIPs + - Label: + default: E2B Environment + Parameters: + - Environment + - Label: + default: Architecture Configuration + Parameters: + - Architecture + - Label: + default: Domain Configuration + Parameters: + - BaseDomain + - Label: + default: Bastion Configuration + Parameters: + - KeyName - Label: default: Database Configuration Parameters: - DBInstanceIdentifier - DBName + - DBUsername - DBPassword - - DBUsername # =================================================================================================== # Parameters - Input values required for the E2B infrastructure deployment # =================================================================================================== Parameters: + # Architecture Configuration - Choose CPU architecture + Environment: + Description: "E2B Environment" + Type: String + AllowedValues: + - prod + - dev + Default: prod + + # Architecture Configuration - Choose CPU architecture + Architecture: + Description: "Choose between x86_64 (Intel/AMD compatible) and arm64 (AWS Graviton) processor architectures." + Type: String + AllowedValues: + - x86_64 + - arm64 + # Domain Configuration - Settings for SSL certificate and DNS BaseDomain: Type: String @@ -49,14 +74,13 @@ Parameters: Wildcard certificate will be issued for *.{BaseDomain} AllowedPattern: '^([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$' ConstraintDescription: Must be a valid domain (e.g. sub.domain.com) - Default: domain.com - + # VPC Configuration - Network address space for the entire infrastructure VpcBlock: Type: String Default: 10.0.0.0/16 Description: The CIDR range for the VPC. Must be a valid private (RFC 1918) CIDR range with sufficient IP addresses for all components. - + # Public Subnets - Network segments with internet access for load balancers and bastion hosts PublicSubnet1Block: Type: String @@ -66,7 +90,7 @@ Parameters: Type: String Default: 10.0.16.0/20 Description: CIDR block for public subnet in Availability Zone 2 (provides 4,096 IP addresses for internet-facing resources) - + # Private Subnets - Isolated network segments for databases and application servers PrivateSubnet1Block: Type: String @@ -76,44 +100,46 @@ Parameters: Type: String Default: 10.0.48.0/20 Description: CIDR block for private subnet in Availability Zone 2 (provides 4,096 IP addresses for internal resources) - + # Bastion Configuration - Settings for the deployment and management server KeyName: Description: EC2 Key Pair name for SSH access to the bastion host (deployment server) Type: AWS::EC2::KeyPair::KeyName ConstraintDescription: Must be the name of an existing EC2 KeyPair in this region. - + # Security Configuration - Access control settings AllowRemoteSSHIPs: Description: IP address range allowed for SSH (port 22) access to the bastion host (CIDR format), if you want to allow all IPs, please set it to '0.0.0.0/0' Type: String - Default: '10.0.0.0/0' + Default: "10.0.0.0/0" # Database Configuration - PostgreSQL settings for E2B platform DBInstanceIdentifier: Type: String - Default: e2b-postgres-db - Description: Unique identifier for the PostgreSQL database instance + Default: e2b-aurora-db + Description: Unique identifier for the Aurora PostgreSQL database cluster DBName: Type: String - #Default: postgres - Description: Initial database name for E2B application data + Default: e2b + Description: Initial database name for E2B application data (must be characters with letters and numbers) DBUsername: Type: String - NoEcho: true + NoEcho: true Description: Master username for PostgreSQL database (will not be displayed in console) DBPassword: Type: String NoEcho: true Description: Master password for PostgreSQL database (must be 8-30 characters with letters and numbers) - AllowedPattern: ^(?=.*[a-zA-Z])(?=.*\d)(?!.*\s).{8,30}$ + AllowedPattern: ^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z0-9]{8,30}$ ConstraintDescription: Password must be 8-30 characters and contain at least one letter and one number - # =================================================================================================== # Conditions - Conditional logic for resource creation (none used in this template) # =================================================================================================== -Conditions: {} +Conditions: + IsX64: !Equals [!Ref Architecture, x86_64] + IsGraviton: !Equals [!Ref Architecture, Graviton] + IsProd: !Equals [!Ref Environment, prod] # =================================================================================================== # Resources - AWS resources to be provisioned for the E2B infrastructure @@ -131,14 +157,14 @@ Resources: Tags: - Key: Name Value: !Sub "vpc-${AWS::StackName}" - + InternetGateway: Type: AWS::EC2::InternetGateway Properties: Tags: - Key: Name Value: !Sub "${AWS::StackName}-igw" - + VPCGatewayAttachment: Type: AWS::EC2::VPCGatewayAttachment Properties: @@ -152,7 +178,7 @@ Resources: Comment: Public subnet in first availability zone for internet-facing resources Properties: AvailabilityZone: !Select - - '0' + - "0" - !GetAZs Ref: AWS::Region CidrBlock: !Ref PublicSubnet1Block @@ -163,7 +189,7 @@ Resources: Value: !Sub ${AWS::StackName}-public-1 - Key: kubernetes.io/role/elb Value: "1" - + # Public Subnet in AZ2 - Network segment with direct internet access in second availability zone PublicSubnet2: Type: AWS::EC2::Subnet @@ -171,7 +197,7 @@ Resources: Comment: Public subnet in second availability zone for internet-facing resources Properties: AvailabilityZone: !Select - - '1' + - "1" - !GetAZs Ref: AWS::Region CidrBlock: !Ref PublicSubnet2Block @@ -182,7 +208,7 @@ Resources: Value: !Sub ${AWS::StackName}-public-2 - Key: kubernetes.io/role/elb Value: "1" - + # Private Subnet in AZ1 - Isolated network segment in first availability zone for backend services PrivateSubnet1: Type: AWS::EC2::Subnet @@ -190,7 +216,7 @@ Resources: Comment: Private subnet in first availability zone for secure resources Properties: AvailabilityZone: !Select - - '0' + - "0" - !GetAZs Ref: AWS::Region CidrBlock: !Ref PrivateSubnet1Block @@ -200,7 +226,7 @@ Resources: Value: !Sub ${AWS::StackName}-private-1 - Key: kubernetes.io/role/internal-elb Value: "1" - + # Private Subnet in AZ2 - Isolated network segment in second availability zone for backend services PrivateSubnet2: Type: AWS::EC2::Subnet @@ -208,7 +234,7 @@ Resources: Comment: Private subnet in second availability zone for secure resources Properties: AvailabilityZone: !Select - - '1' + - "1" - !GetAZs Ref: AWS::Region CidrBlock: !Ref PrivateSubnet2Block @@ -218,7 +244,7 @@ Resources: Value: !Sub ${AWS::StackName}-private-2 - Key: kubernetes.io/role/internal-elb Value: "1" - + # Route Table for Public Subnets - Defines routing rules for internet-accessible subnets PublicRouteTable: Type: AWS::EC2::RouteTable @@ -227,7 +253,7 @@ Resources: Tags: - Key: Name Value: !Sub ${AWS::StackName}-public-route - + # Route Table for Private Subnets - Defines routing rules for internal-only subnets PrivateRouteTable: Type: AWS::EC2::RouteTable @@ -236,7 +262,7 @@ Resources: Tags: - Key: Name Value: !Sub ${AWS::StackName}-private-route - + # Default Route to Internet Gateway - Enables outbound internet access for public subnets PublicRoute: DependsOn: VPCGatewayAttachment @@ -252,25 +278,25 @@ Resources: Properties: SubnetId: !Ref PublicSubnet1 RouteTableId: !Ref PublicRouteTable - + PublicSubnet2RouteTableAssociation: Type: AWS::EC2::SubnetRouteTableAssociation Properties: SubnetId: !Ref PublicSubnet2 RouteTableId: !Ref PublicRouteTable - + PrivateSubnet1RouteTableAssociation: Type: AWS::EC2::SubnetRouteTableAssociation Properties: SubnetId: !Ref PrivateSubnet1 RouteTableId: !Ref PrivateRouteTable - + PrivateSubnet2RouteTableAssociation: Type: AWS::EC2::SubnetRouteTableAssociation Properties: SubnetId: !Ref PrivateSubnet2 RouteTableId: !Ref PrivateRouteTable - + # S3 VPC Endpoint - Provides private access to S3 without traversing the public internet S3VPCEndpoint: Type: AWS::EC2::VPCEndpoint @@ -292,12 +318,12 @@ Resources: VpcId: !Ref VPC SecurityGroupIngress: - IpProtocol: tcp - FromPort: '22' - ToPort: '22' + FromPort: "22" + ToPort: "22" CidrIp: !Ref AllowRemoteSSHIPs SecurityGroupEgress: - - IpProtocol: '-1' - CidrIp: '0.0.0.0/0' + - IpProtocol: "-1" + CidrIp: "0.0.0.0/0" Tags: - Key: Name Value: !Sub "${AWS::StackName}-bastion-sg" @@ -312,13 +338,13 @@ Resources: ToPort: 5432 CidrIp: !Ref VpcBlock SecurityGroupEgress: - - IpProtocol: '-1' - CidrIp: '0.0.0.0/0' - VpcId: !Ref VPC + - IpProtocol: "-1" + CidrIp: "0.0.0.0/0" + VpcId: !Ref VPC Tags: - Key: Name Value: !Sub "${AWS::StackName}-db-sg" - + RedisSecurityGroup: Type: AWS::EC2::SecurityGroup Properties: @@ -329,9 +355,9 @@ Resources: ToPort: 6379 CidrIp: !Ref VpcBlock SecurityGroupEgress: - - IpProtocol: '-1' - CidrIp: '0.0.0.0/0' - VpcId: !Ref VPC + - IpProtocol: "-1" + CidrIp: "0.0.0.0/0" + VpcId: !Ref VPC Tags: - Key: Name Value: !Sub "${AWS::StackName}-redis-sg" @@ -343,7 +369,7 @@ Resources: Type: AWS::IAM::Role Properties: AssumeRolePolicyDocument: - Version: '2012-10-17' + Version: "2012-10-17" Statement: - Effect: Allow Principal: @@ -355,7 +381,7 @@ Resources: - arn:aws:iam::aws:policy/PowerUserAccess - arn:aws:iam::aws:policy/IAMFullAccess Description: IAM role granting EC2 instances permissions to manage E2B infrastructure resources - + EC2InstanceProfile: Type: AWS::IAM::InstanceProfile Properties: @@ -369,23 +395,23 @@ Resources: DBPasswordParameter: Type: AWS::SSM::Parameter Properties: - Name: !Sub "${AWS::StackName}-db-password" - Type: String + Name: !Sub "${AWS::StackName}-db-password" + Type: String Value: !Ref DBPassword Description: PostgreSQL database password stored securely in AWS Systems Manager Parameter Store - + # ------------------------------------------------------------------------------------------------ # Certificate - SSL/TLS certificate for secure HTTPS communication # ------------------------------------------------------------------------------------------------ WildcardCertificate: Type: AWS::CertificateManager::Certificate Properties: - DomainName: !Sub '*.${BaseDomain}' + DomainName: !Sub "*.${BaseDomain}" ValidationMethod: DNS DomainValidationOptions: - - DomainName: !Sub '*.${BaseDomain}' - ValidationDomain: !Ref BaseDomain - + - DomainName: !Sub "*.${BaseDomain}" + ValidationDomain: !Ref BaseDomain + # ------------------------------------------------------------------------------------------------ # S3 Buckets - Object storage for Terraform state files and software artifacts # ------------------------------------------------------------------------------------------------ @@ -394,7 +420,7 @@ Resources: Properties: BucketName: !Sub "terraform-${AWS::StackName}-${AWS::Region}-${AWS::AccountId}" VersioningConfiguration: - Status: Enabled + Status: Suspended BucketEncryption: ServerSideEncryptionConfiguration: - ServerSideEncryptionByDefault: @@ -408,13 +434,13 @@ Resources: Tags: - Key: Name Value: !Sub "${AWS::StackName}-terraform-bucket" - + SoftwareS3Bucket: Type: AWS::S3::Bucket Properties: BucketName: !Sub "software-${AWS::StackName}-${AWS::Region}-${AWS::AccountId}" VersioningConfiguration: - Status: Enabled + Status: Suspended BucketEncryption: ServerSideEncryptionConfiguration: - ServerSideEncryptionByDefault: @@ -443,39 +469,49 @@ Resources: - Key: Name Value: !Sub "${AWS::StackName}-postgres-subnet-group" - DBParameterGroup: - Type: AWS::RDS::DBParameterGroup - Properties: - Description: "Parameter group defining PostgreSQL 16 configuration settings for E2B database" - Family: postgres16 - Tags: - - Key: Name - Value: !Sub "${AWS::StackName}-postgres-param-group" - - PostgreSQLDB: - Type: AWS::RDS::DBInstance + AuroraCluster: + Type: AWS::RDS::DBCluster Properties: - Engine: postgres + Engine: aurora-postgresql EngineVersion: 16.8 - DBInstanceIdentifier: !Ref DBInstanceIdentifier - DBParameterGroupName: !Ref DBParameterGroup + Port: 5432 + DBClusterIdentifier: + Fn::Join: + - "-" + - - Ref: "AWS::StackName" + - Ref: "DBInstanceIdentifier" + DBClusterParameterGroupName: default.aurora-postgresql16 DBSubnetGroupName: !Ref DBSubnetGroup - DBName: !Ref DBName + DatabaseName: !Ref DBName MasterUsername: !Ref DBUsername MasterUserPassword: !Ref DBPassword - AllocatedStorage: 20 - StorageType: gp3 - DBInstanceClass: db.t4g.micro - PubliclyAccessible: false - MultiAZ: true + ServerlessV2ScalingConfiguration: + MinCapacity: 0.5 + MaxCapacity: 4 StorageEncrypted: true - DeletionProtection: true - VPCSecurityGroups: + DeletionProtection: !If [IsProd, true, false] + VpcSecurityGroupIds: - !GetAtt DBSecurityGroup.GroupId Tags: - Key: Name - Value: !Sub "${AWS::StackName}-postgres" - + Value: !Sub "${AWS::StackName}-aurora" + + AuroraInstance: + Type: AWS::RDS::DBInstance + Properties: + Engine: aurora-postgresql + DBInstanceIdentifier: + Fn::Join: + - "-" + - - Ref: "AWS::StackName" + - Ref: "DBInstanceIdentifier" + DBClusterIdentifier: !Ref AuroraCluster + DBInstanceClass: db.serverless + PubliclyAccessible: false + Tags: + - Key: Name + Value: !Sub "${AWS::StackName}-aurora-instance" + # ------------------------------------------------------------------------------------------------ # ElastiCache Redis - Redis cache for E2B platform # ------------------------------------------------------------------------------------------------ @@ -489,8 +525,8 @@ Resources: Tags: - Key: Name Value: !Sub "${AWS::StackName}-redis-subnet-group" - - RedisServerlessCache: + + RedisServerless: Type: AWS::ElastiCache::ServerlessCache Properties: Engine: redis @@ -510,20 +546,26 @@ Resources: BastionInstance: Type: AWS::EC2::Instance Metadata: - Comment: 'Terraform Bastion Host for deploying and managing E2B infrastructure components' + Comment: "Terraform Bastion Host for deploying and managing E2B infrastructure components" Properties: - InstanceType: m5.2xlarge + InstanceType: !If + - IsX64 + - c7i.xlarge + - c7g.xlarge KeyName: !Ref KeyName IamInstanceProfile: !Ref EC2InstanceProfile SubnetId: !Ref PublicSubnet1 - SourceDestCheck: 'false' + SourceDestCheck: "false" EbsOptimized: true Monitoring: true - ImageId: "{{resolve:ssm:/aws/service/canonical/ubuntu/server/22.04/stable/current/amd64/hvm/ebs-gp2/ami-id}}" + ImageId: !If + - IsX64 + - "{{resolve:ssm:/aws/service/canonical/ubuntu/server/22.04/stable/current/amd64/hvm/ebs-gp2/ami-id}}" + - "{{resolve:ssm:/aws/service/canonical/ubuntu/server/22.04/stable/current/arm64/hvm/ebs-gp2/ami-id}}" BlockDeviceMappings: - - DeviceName: /dev/sda1 + - DeviceName: /dev/sda1 Ebs: - VolumeSize: 100 + VolumeSize: 40 VolumeType: gp3 Encrypted: true SecurityGroupIds: @@ -533,64 +575,123 @@ Resources: Value: !Sub "${AWS::StackName}-bastion" UserData: !Base64 Fn::Join: - - '' + - "" - - | #!/bin/bash -v + set -e - | # Update system packages to latest versions - apt update -y + apt update -y - | # Install Go programming language for building E2B components snap install go --classic - | # Install essential development and deployment tools - apt install unzip docker.io make jq postgresql-client-common -y + apt install unzip docker.io make jq postgresql-client-common -y - | # Install PostgreSQL client for database management - apt install postgresql-client -y + apt install postgresql-client -y - | # Setup Docker buildx for multi-architecture container builds - mkdir -p /root/.docker/cli-plugins - - | - wget -O /root/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-amd64 - - | - chmod +x /root/.docker/cli-plugins/docker-buildx - - | - cd /opt - - | - # Install AWS CLI for infrastructure management - wget https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip - - | - unzip awscli-exe-linux-x86_64.zip + mkdir -p /root/.docker/cli-plugins + - !If + - IsX64 + - | + wget -O /root/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-amd64 + wget -O /opt/awscli.zip https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip + wget -O /opt/packer.zip https://releases.hashicorp.com/packer/1.12.0/packer_1.12.0_linux_amd64.zip + wget -O /opt/terraform.zip https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_linux_amd64.zip + wget -O /opt/nomad.zip https://releases.hashicorp.com/nomad/1.6.2/nomad_1.6.2_linux_amd64.zip + - | + wget -O /root/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm64 + wget -O /opt/awscli.zip https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip + wget -O /opt/packer.zip https://releases.hashicorp.com/packer/1.12.0/packer_1.12.0_linux_arm64.zip + wget -O /opt/terraform.zip https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_linux_arm64.zip + wget -O /opt/nomad.zip https://releases.hashicorp.com/nomad/1.6.2/nomad_1.6.2_linux_arm64.zip - | - rm awscli-exe-linux-x86_64.zip + chmod +x /root/.docker/cli-plugins/docker-buildx - | - ./aws/install + cd /opt - | + # Install AWS CLI for infrastructure management + unzip awscli.zip && ./aws/install && rm awscli.zip + - !Sub | # Configure AWS CLI default region - !Sub "aws configure set region ${AWS::Region}" + aws configure set region ${AWS::Region} - | - # Install HashiCorp Packer for creating machine images - wget https://releases.hashicorp.com/packer/1.12.0/packer_1.12.0_linux_amd64.zip - unzip packer_1.12.0_linux_amd64.zip - mv packer /usr/local/bin/packer - rm packer_1.12.0_linux_amd64.zip + # Install HashiCorp Packer for creating machine images + unzip packer.zip && mv packer /usr/local/bin/packer && rm packer.zip - | # Install HashiCorp Terraform for infrastructure as code - wget https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_linux_amd64.zip - unzip terraform_1.5.7_linux_amd64.zip - mv terraform /usr/local/bin/terraform - rm terraform_1.5.7_linux_amd64.zip + unzip terraform.zip && mv terraform /usr/local/bin/terraform && rm terraform.zip - | # Install HashiCorp Nomad for workload orchestration - wget https://releases.hashicorp.com/nomad/1.6.2/nomad_1.6.2_linux_amd64.zip - unzip nomad_1.6.2_linux_amd64.zip - mv nomad /usr/local/bin/ - rm nomad_1.6.2_linux_amd64.zip + unzip nomad.zip && mv nomad /usr/local/bin/ && rm nomad.zip - | # Create directory for E2B infrastructure code mkdir -p /opt/infra/ && cd /opt/infra/ - git clone https://github.com/aws-samples/sample-e2b-on-aws.git + git clone https://github.com/aws-samples/sample-e2b-on-aws.git && cd sample-e2b-on-aws + - !Sub | + # Initialize Configuration + touch /tmp/e2b.log + echo "StackName=${AWS::StackName}" >> /tmp/e2b.log + BUILD=$(git rev-parse --short HEAD) + echo "BUILD=$BUILD" >> /tmp/e2b.log + while true; do + STACK_STATUS=$(aws cloudformation describe-stacks --stack-name ${AWS::StackName} --query "Stacks[0].StackStatus" --output text) + echo "$(date '+%Y-%m-%d %H:%M:%S') - Stack current state: $STACK_STATUS" >> /tmp/e2b.log + case $STACK_STATUS in + CREATE_COMPLETE) + echo "========================================" >> /tmp/e2b.log + echo "Start to execute init.sh" >> /tmp/e2b.log + echo "========================================" >> /tmp/e2b.log + bash infra-iac/init.sh >> /tmp/e2b.log 2>&1 + echo "========================================" >> /tmp/e2b.log + echo "Start to execute packer.sh" >> /tmp/e2b.log + echo "========================================" >> /tmp/e2b.log + HOME=/root bash -l infra-iac/packer/packer.sh >> /tmp/e2b.log 2>&1 + echo "========================================" >> /tmp/e2b.log + echo "Start to execute terraform" >> /tmp/e2b.log + echo "========================================" >> /tmp/e2b.log + bash infra-iac/terraform/start.sh >> /tmp/e2b.log 2>&1 + echo "========================================" >> /tmp/e2b.log + echo "Start to execute init-db.sh" >> /tmp/e2b.log + echo "========================================" >> /tmp/e2b.log + bash infra-iac/db/init-db.sh >> /tmp/e2b.log 2>&1 + echo "========================================" >> /tmp/e2b.log + echo "Start to execute build.sh" >> /tmp/e2b.log + echo "========================================" >> /tmp/e2b.log + HOME=/root bash packages/build.sh >> /tmp/e2b.log 2>&1 + echo "========================================" >> /tmp/e2b.log + echo "Start to execute nomad.sh" >> /tmp/e2b.log + echo "========================================" >> /tmp/e2b.log + source nomad/nomad.sh >> /tmp/e2b.log 2>&1 + echo "========================================" >> /tmp/e2b.log + echo "Start to execute prepare.sh" >> /tmp/e2b.log + echo "========================================" >> /tmp/e2b.log + bash nomad/prepare.sh >> /tmp/e2b.log 2>&1 + echo "========================================" >> /tmp/e2b.log + echo "Start to execute deploy.sh" >> /tmp/e2b.log + echo "========================================" >> /tmp/e2b.log + bash nomad/deploy.sh >> /tmp/e2b.log 2>&1 + echo "========================================" >> /tmp/e2b.log + echo "Start to execute create_template.sh" >> /tmp/e2b.log + echo "========================================" >> /tmp/e2b.log + bash packages/create_template.sh >> /tmp/e2b.log 2>&1 + echo "========================================" >> /tmp/e2b.log + echo "E2B Deploy Done!" >> /tmp/e2b.log + echo "========================================" >> /tmp/e2b.log + break + ;; + CREATE_FAILED|ROLLBACK_COMPLETE|ROLLBACK_FAILED|UPDATE_ROLLBACK_COMPLETE|UPDATE_ROLLBACK_FAILED|DELETE_FAILED) + echo "exit with error cloudformation state: $STACK_STATUS" >> /tmp/e2b.log + exit 1 + ;; + *) + sleep 10 + ;; + esac + done # =================================================================================================== # Outputs - Values exported after stack creation for reference by other stacks @@ -600,7 +701,7 @@ Outputs: CFNAZ1: Description: First Availability Zone used for high availability deployment Value: !Select - - '0' + - "0" - !GetAZs Ref: AWS::Region Export: @@ -609,7 +710,7 @@ Outputs: CFNAZ2: Description: Second Availability Zone used for high availability deployment Value: !Select - - '1' + - "1" - !GetAZs Ref: AWS::Region Export: @@ -617,8 +718,12 @@ Outputs: # Database outputs DBEndpoint: - Description: PostgreSQL database connection endpoint address - Value: !GetAtt PostgreSQLDB.Endpoint.Address + Description: Aurora PostgreSQL database connection endpoint address + Value: !GetAtt AuroraCluster.Endpoint.Address + + DBReaderEndpoint: + Description: Aurora PostgreSQL database reader endpoint address + Value: !GetAtt AuroraCluster.ReadEndpoint.Address # Stack information CFNSTACKNAME: @@ -688,9 +793,9 @@ Outputs: # Database connection string CFNDBURL: Description: Complete PostgreSQL connection string for application configuration - Value: !Sub + Value: !Sub - "postgresql://${DBUsername}:${DBPassword}@${DBEndpoint}/${DBName}" - - DBEndpoint: !GetAtt PostgreSQLDB.Endpoint.Address + - DBEndpoint: !GetAtt AuroraCluster.Endpoint.Address Export: Name: CFNDBURL @@ -706,26 +811,49 @@ Outputs: Value: !Ref WildcardCertificate Export: Name: CFNCERTARN - + # Redis outputs - RedisName: + REDISNAME: Description: Redis cache name Value: !Sub "${AWS::StackName}-redis" Export: Name: CFNREDISNAME - - - RedisConnectionString: + + REDISENDPOINT: Description: Complete Redis connection string for application configuration - Value: !Sub "${AWS::StackName}-redis.serverless.${AWS::Region}.cache.amazonaws.com:6379" + Value: !GetAtt RedisServerless.Endpoint.Address Export: Name: CFNREDISURL + ENVIRONMENT: + Description: E2B Environment + Value: !Ref Environment + Export: + Name: CFNENVIRONMENT + + ARCHITECTURE: + Description: E2B Cluster CPU Architecture + Value: !Ref Architecture + Export: + Name: CFNARCHITECTURE + + REGION: + Description: E2B Cluster Deployment Region + Value: !Ref AWS::Region + Export: + Name: AWSREGION + + STACKNAME: + Description: CloudFormation Stack Name + Value: !Ref AWS::StackName + Export: + Name: AWSSTACKNAME + # Bastion Host information - BastionPublicDNS: + BASTIONPUBLICDNS: Description: Public DNS name of the Bastion Host for SSH access Value: !GetAtt BastionInstance.PublicDnsName - BastionPublicIP: + BASTIONPUBLICIP: Description: Public IP address of the Bastion Host for SSH access Value: !GetAtt BastionInstance.PublicIp diff --git a/infra-iac/db/.migration.sql b/infra-iac/db/.migration.sql index 779ed9e..69937ef 100644 --- a/infra-iac/db/.migration.sql +++ b/infra-iac/db/.migration.sql @@ -164,7 +164,7 @@ INSERT INTO public.tiers ( disk_mb, concurrent_instances ) -VALUES ('base_v1', 'Base tier', 2, 512, 8192, 20); +VALUES ('base_v1', 'Base tier', 2, 512, 8192, 1000000); -- Create user for triggers CREATE USER trigger_user; GRANT trigger_user TO postgres; @@ -284,7 +284,7 @@ SET DEFAULT 'vmlinux-5.10.186'; ALTER TABLE "public"."tiers" ADD COLUMN "max_length_hours" bigint NULL; UPDATE "public"."tiers" -SET "max_length_hours" = 1; +SET "max_length_hours" = 24; ALTER TABLE "public"."tiers" ALTER COLUMN "max_length_hours" SET NOT NULL; @@ -667,4 +667,116 @@ ALTER COLUMN slug SET NOT NULL; ALTER TABLE "public"."snapshots" ADD CONSTRAINT "snapshots_envs_env_id" FOREIGN KEY ("env_id") REFERENCES "public"."envs" ("id") ON UPDATE NO ACTION ON DELETE CASCADE, - ADD CONSTRAINT "snapshots_envs_base_env_id" FOREIGN KEY ("base_env_id") REFERENCES "public"."envs" ("id") ON UPDATE NO ACTION ON DELETE CASCADE; +ADD CONSTRAINT "snapshots_envs_base_env_id" FOREIGN KEY ("base_env_id") REFERENCES "public"."envs" ("id") ON UPDATE NO ACTION ON DELETE CASCADE; + + +-- Add new columns to team_api_keys table +ALTER TABLE team_api_keys + ADD COLUMN IF NOT EXISTS api_key_hash TEXT UNIQUE, + ADD COLUMN IF NOT EXISTS api_key_mask VARCHAR(44); + +-- Add new columns to access_tokens table +ALTER TABLE access_tokens + ADD COLUMN IF NOT EXISTS id UUID DEFAULT gen_random_uuid(), + ADD COLUMN IF NOT EXISTS access_token_hash TEXT UNIQUE, + ADD COLUMN IF NOT EXISTS access_token_mask TEXT, + ADD COLUMN IF NOT EXISTS name TEXT NOT NULL DEFAULT 'Unnamed Access Token'; + +-- Mark sensitive columns as sensitive +COMMENT ON COLUMN team_api_keys.api_key_hash IS 'sensitive'; +COMMENT ON COLUMN access_tokens.access_token_hash IS 'sensitive'; + + +CREATE INDEX IF NOT EXISTS idx_envs_builds_envs ON public.env_builds (env_id); +CREATE INDEX IF NOT EXISTS idx_envs_envs_aliases ON public.env_aliases (env_id); +CREATE INDEX IF NOT EXISTS idx_users_access_tokens ON public.access_tokens (user_id); +CREATE INDEX IF NOT EXISTS idx_teams_envs ON public.envs (team_id); +CREATE INDEX IF NOT EXISTS idx_team_team_api_keys ON public.team_api_keys (team_id); +CREATE INDEX IF NOT EXISTS idx_teams_user_teams ON public.users_teams (team_id); +CREATE INDEX IF NOT EXISTS idx_users_user_teams ON public.users_teams (user_id); + +ALTER TABLE "public"."snapshots" + ADD COLUMN IF NOT EXISTS "sandbox_started_at" timestamp with time zone NOT NULL + DEFAULT TIMESTAMP WITH TIME ZONE '1970-01-01 00:00:00 UTC'; + +DO $$ +BEGIN + IF EXISTS ( + SELECT 1 FROM information_schema.schemata WHERE schema_name = 'billing' + ) AND EXISTS ( + SELECT 1 FROM information_schema.tables + WHERE table_schema = 'billing' AND table_name = 'sandbox_logs' + ) THEN + UPDATE public.snapshots s + SET sandbox_started_at = latest_starts.started_at + FROM ( + SELECT sandbox_id, MAX(started_at) as started_at + FROM billing.sandbox_logs + GROUP BY sandbox_id + ) latest_starts + WHERE s.sandbox_id = latest_starts.sandbox_id; + END IF; +END $$; + +-- Remove the default constraint after populating data +ALTER TABLE "public"."snapshots" +ALTER COLUMN "sandbox_started_at" DROP DEFAULT; + +ALTER TABLE snapshots +ADD COLUMN env_secure boolean NOT NULL DEFAULT false; + +CREATE INDEX CONCURRENTLY idx_env_builds_status ON public.env_builds(status); + +ALTER TABLE tiers + ADD COLUMN "max_vcpu" bigint NOT NULL default '8'::bigint, + ADD COLUMN "max_ram_mb" bigint NOT NULL DEFAULT '8096'::bigint; + +ALTER TABLE tiers + ALTER COLUMN "max_ram_mb" SET DEFAULT '8192'::bigint; +UPDATE tiers SET "max_ram_mb" = 8192 WHERE "max_ram_mb" = 8096; + +ALTER TABLE public.users_teams ADD COLUMN created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP; +ALTER TABLE public.env_builds + ADD COLUMN ready_cmd TEXT; + +-- Add new columns to team_api_keys table +ALTER TABLE team_api_keys + ADD COLUMN IF NOT EXISTS api_key_prefix VARCHAR(10), + ADD COLUMN IF NOT EXISTS api_key_length INTEGER, + ADD COLUMN IF NOT EXISTS api_key_mask_prefix VARCHAR(5), + ADD COLUMN IF NOT EXISTS api_key_mask_suffix VARCHAR(5); + +-- Add new columns to access_tokens table +ALTER TABLE access_tokens + ADD COLUMN IF NOT EXISTS access_token_prefix VARCHAR(10), + ADD COLUMN IF NOT EXISTS access_token_length INTEGER, + ADD COLUMN IF NOT EXISTS access_token_mask_prefix VARCHAR(5), + ADD COLUMN IF NOT EXISTS access_token_mask_suffix VARCHAR(5); + +CREATE TABLE IF NOT EXISTS clusters ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + endpoint TEXT NOT NULL, + endpoint_tls BOOLEAN NOT NULL DEFAULT TRUE, + token TEXT NOT NULL +); + +ALTER TABLE teams + ADD COLUMN IF NOT EXISTS cluster_id UUID NULL + REFERENCES clusters(id); + +CREATE INDEX IF NOT EXISTS teams_cluster_id_uq + ON teams (cluster_id) + WHERE cluster_id IS NOT NULL; + +ALTER TABLE "public"."clusters" ENABLE ROW LEVEL SECURITY; + +ALTER TABLE envs + ADD COLUMN IF NOT EXISTS cluster_id UUID NULL + REFERENCES clusters(id); + +CREATE INDEX IF NOT EXISTS envs_cluster_id + ON envs (cluster_id) + WHERE cluster_id IS NOT NULL; + +ALTER TABLE env_builds + ADD COLUMN IF NOT EXISTS cluster_node_id TEXT NULL; \ No newline at end of file diff --git a/infra-iac/db/init-config.sh b/infra-iac/db/init-config.sh index 7791d0d..6eeccf6 100644 --- a/infra-iac/db/init-config.sh +++ b/infra-iac/db/init-config.sh @@ -68,7 +68,7 @@ accessToken=$ACCESS_TOKEN teamApiKey=$TEAM_API_KEY EOF -echo "JSON配置文件已生成为config.json" -echo "teamId: $TEAM_ID" -echo "accessToken: $ACCESS_TOKEN" -echo "teamApiKey: $TEAM_API_KEY" +DOMAIN=$(grep "^CFNDOMAIN=" /opt/config.properties | cut -d= -f2) +echo "export E2B_DOMAIN=$DOMAIN" +echo "export E2B_API_KEY=$TEAM_API_KEY" +echo "export E2B_ACCESS_TOKEN=$ACCESS_TOKEN" \ No newline at end of file diff --git a/infra-iac/destroy-cnf.sh b/infra-iac/destroy-cnf.sh new file mode 100644 index 0000000..9604a48 --- /dev/null +++ b/infra-iac/destroy-cnf.sh @@ -0,0 +1,200 @@ +#!/bin/bash + +# Check if AWS CLI is installed +if ! command -v aws &> /dev/null; then + echo "AWS CLI is not installed. Please install it first." >&2 + exit 1 +fi + +# Check if the file exists +if [ ! -f "/opt/config.properties" ]; then + echo "File /opt/config.properties does not exist" >&2 + exit 1 +fi + +# Extract the AWS region from the config file +REGION=$(grep "^AWSREGION=" /opt/config.properties | cut -d= -f2) + +if [ -z "$REGION" ]; then + echo "Could not determine AWS region from config file. Using default." >&2 + REGION="us-west-2" # Default region if not found in config +fi + +# Extract the stack name from the config file +STACK_NAME=$(grep "^CFNSTACKNAME=" /opt/config.properties | cut -d= -f2) + +if [ -z "$STACK_NAME" ]; then + echo "Could not determine CloudFormation stack name from config file." >&2 + exit 1 +fi + +echo "Using stack name: $STACK_NAME" +echo "Using AWS region: $REGION" + +# List of bucket variables to process +BUCKET_VARS_CNF=( + "CFNTERRAFORMBUCKET" + "CFNSOFTWAREBUCKET" +) + +echo "Starting to empty CNF S3 buckets..." + +# Process each bucket +for BUCKET_VAR in "${BUCKET_VARS_CNF[@]}"; do + # Extract the bucket name from the config file + BUCKET_NAME=$(grep "^$BUCKET_VAR=" /opt/config.properties | cut -d= -f2) + + if [ -n "$BUCKET_NAME" ]; then + echo "Emptying bucket: $BUCKET_NAME" + + # Check if the bucket exists + if aws s3api head-bucket --bucket "$BUCKET_NAME" --region "$REGION" >/dev/null 2>&1; then + # Empty the bucket + aws s3 rm "s3://$BUCKET_NAME" --recursive --region "$REGION" >/dev/null 2>&1 + echo "Successfully emptied bucket: $BUCKET_NAME" + else + echo "Bucket $BUCKET_NAME does not exist or you don't have access to it. Skipping." + fi + else + echo "Could not find bucket name for variable $BUCKET_VAR. Skipping." + fi +done + +echo "Starting to delete CNF S3 buckets..." + +# Delete each bucket after emptying +for BUCKET_VAR in "${BUCKET_VARS_CNF[@]}"; do + # Extract the bucket name from the config file + BUCKET_NAME=$(grep "^$BUCKET_VAR=" /opt/config.properties | cut -d= -f2) + + if [ -n "$BUCKET_NAME" ]; then + echo "Deleting bucket: $BUCKET_NAME" + + # Check if the bucket exists + if aws s3api head-bucket --bucket "$BUCKET_NAME" --region "$REGION" >/dev/null 2>&1; then + # Delete the bucket + aws s3api delete-bucket --bucket "$BUCKET_NAME" --region "$REGION" >/dev/null 2>&1 + if [ $? -eq 0 ]; then + echo "Successfully deleted bucket: $BUCKET_NAME" + else + echo "Failed to delete bucket: $BUCKET_NAME. It may still contain objects or have other dependencies." + fi + else + echo "Bucket $BUCKET_NAME does not exist or you don't have access to it. Skipping deletion." + fi + else + echo "Could not find bucket name for variable $BUCKET_VAR. Skipping deletion." + fi +done + +TERRAFORM_BUCKET=$(grep "^CFNTERRAFORMBUCKET=" /opt/config.properties | cut -d= -f2) + +# Check if bucket exists +if aws s3api head-bucket --bucket "$TERRAFORM_BUCKET" 2>/dev/null; then + # Check if versioning is enabled + VERSIONING_STATUS=$(aws s3api get-bucket-versioning --bucket "$TERRAFORM_BUCKET" --query "Status" --output text 2>/dev/null) + + if [ "$VERSIONING_STATUS" = "Enabled" ] || [ "$VERSIONING_STATUS" = "Suspended" ]; then + echo "Bucket has versioning. Removing all versions and delete markers..." + + # Delete all versions (including delete markers) + VERSIONS=$(aws s3api list-object-versions --bucket "$TERRAFORM_BUCKET" --output json) + + # Delete non-current versions + echo "$VERSIONS" | jq -r '.Versions[]? | "\(.Key) \(.VersionId)"' 2>/dev/null | while read KEY VERSION_ID; do + if [ ! -z "$KEY" ] && [ ! -z "$VERSION_ID" ]; then + echo "Deleting object: $KEY (version $VERSION_ID)" + aws s3api delete-object --bucket "$TERRAFORM_BUCKET" --key "$KEY" --version-id "$VERSION_ID" > /dev/null 2>&1 + fi + done + + # Delete delete markers + echo "$VERSIONS" | jq -r '.DeleteMarkers[]? | "\(.Key) \(.VersionId)"' 2>/dev/null | while read KEY VERSION_ID; do + if [ ! -z "$KEY" ] && [ ! -z "$VERSION_ID" ]; then + echo "Removing delete marker: $KEY (version $VERSION_ID)" + aws s3api delete-object --bucket "$TERRAFORM_BUCKET" --key "$KEY" --version-id "$VERSION_ID" > /dev/null 2>&1 + fi + done + fi + + # Delete all objects (current versions or non-versioned) + echo "Removing all current objects..." + aws s3 rm "s3://$TERRAFORM_BUCKET" --recursive > /dev/null 2>&1 + + # Disable bucket policy if exists + echo "Removing bucket policy..." + aws s3api delete-bucket-policy --bucket "$TERRAFORM_BUCKET" > /dev/null 2>&1 + + # Disable bucket encryption if exists + echo "Removing bucket encryption..." + aws s3api delete-bucket-encryption --bucket "$TERRAFORM_BUCKET" > /dev/null 2>&1 + + # Remove public access block + echo "Removing public access block..." + aws s3api delete-public-access-block --bucket "$TERRAFORM_BUCKET" > /dev/null 2>&1 +fi + +echo "Completed emptying CNF S3 buckets and modifying ELB deletion protection." + +# Disable deletion protection for RDS instances matching the stack name +echo "Looking for RDS instances associated with stack name: $STACK_NAME" + +# Get all RDS instances +RDS_INSTANCES=$(aws rds describe-db-instances --region "$REGION" --query "DBInstances[].DBInstanceIdentifier" --output text 2>/dev/null) + +if [ -n "$RDS_INSTANCES" ]; then + for DB_INSTANCE in $RDS_INSTANCES; do + # Check if the DB instance name contains the stack name + if [[ "$DB_INSTANCE" == *"$STACK_NAME"* ]]; then + echo "Found RDS instance: $DB_INSTANCE" + + # Always attempt to disable deletion protection without interactive output + echo "Disabling deletion protection for RDS instance: $DB_INSTANCE" + aws rds modify-db-instance \ + --region "$REGION" \ + --db-instance-identifier "$DB_INSTANCE" \ + --no-deletion-protection \ + --apply-immediately \ + --output json > /dev/null 2>&1 + + echo "Deletion protection disabled for RDS instance: $DB_INSTANCE" + fi + done +else + echo "No RDS instances found in region: $REGION" +fi + +# Disable deletion protection for RDS clusters matching the stack name +echo "Looking for RDS clusters associated with stack name: $STACK_NAME" + +# Get all RDS clusters +RDS_CLUSTERS=$(aws rds describe-db-clusters --region "$REGION" --query "DBClusters[].DBClusterIdentifier" --output text 2>/dev/null) + +if [ -n "$RDS_CLUSTERS" ]; then + for DB_CLUSTER in $RDS_CLUSTERS; do + # Check if the DB cluster name contains the stack name + if [[ "$DB_CLUSTER" == *"$STACK_NAME"* ]]; then + echo "Found RDS cluster: $DB_CLUSTER" + + # Always attempt to disable deletion protection without interactive output + echo "Disabling deletion protection for RDS cluster: $DB_CLUSTER" + aws rds modify-db-cluster \ + --region "$REGION" \ + --db-cluster-identifier "$DB_CLUSTER" \ + --no-deletion-protection \ + --apply-immediately \ + --output json > /dev/null 2>&1 + + echo "Deletion protection disabled for RDS cluster: $DB_CLUSTER" + fi + done +else + echo "No RDS clusters found in region: $REGION" +fi + +# Delete the CloudFormation stack +echo "Deleting CloudFormation stack: $STACK_NAME" +aws cloudformation delete-stack --stack-name "$STACK_NAME" --region "$REGION" + +echo "CloudFormation stack deletion initiated for: $STACK_NAME" +echo "Note: Stack deletion may take some time to complete. You can check the status in the AWS CloudFormation console." diff --git a/infra-iac/destroy.sh b/infra-iac/destroy.sh new file mode 100644 index 0000000..2c9e421 --- /dev/null +++ b/infra-iac/destroy.sh @@ -0,0 +1,295 @@ +#!/bin/bash + +# Check if AWS CLI is installed +if ! command -v aws &> /dev/null; then + echo "AWS CLI is not installed. Please install it first." >&2 + exit 1 +fi + +# Check if the file exists +if [ ! -f "/opt/config.properties" ]; then + echo "File /opt/config.properties does not exist" >&2 + exit 1 +fi + +# Extract the AWS region from the config file +REGION=$(grep "^AWSREGION=" /opt/config.properties | cut -d= -f2) + +if [ -z "$REGION" ]; then + echo "Could not determine AWS region from config file. Using default." >&2 + REGION="us-west-2" # Default region if not found in config +fi + +# Extract the stack name from the config file +STACK_NAME=$(grep "^CFNSTACKNAME=" /opt/config.properties | cut -d= -f2) + +if [ -z "$STACK_NAME" ]; then + echo "Could not determine CloudFormation stack name from config file." >&2 + exit 1 +fi + +echo "Using stack name: $STACK_NAME" +echo "Using AWS region: $REGION" + +# Disable deletion protection for ELBs matching the stack name +echo "Looking for ELBs associated with stack name: $STACK_NAME" + +# Find and modify Application Load Balancers +echo "Checking Application Load Balancers..." +ALB_ARNS=$(aws elbv2 describe-load-balancers --region "$REGION" --query "LoadBalancers[?Type=='application' && contains(LoadBalancerName, '$STACK_NAME')].LoadBalancerArn" --output text 2>/dev/null) + +if [ -n "$ALB_ARNS" ]; then + for ALB_ARN in $ALB_ARNS; do + ALB_NAME=$(aws elbv2 describe-load-balancers --region "$REGION" --load-balancer-arns "$ALB_ARN" --query "LoadBalancers[0].LoadBalancerName" --output text 2>/dev/null) + echo "Found ALB: $ALB_NAME" + + # Check current deletion protection status + PROTECTION_ENABLED=$(aws elbv2 describe-load-balancer-attributes --region "$REGION" --load-balancer-arn "$ALB_ARN" --query "Attributes[?Key=='deletion_protection.enabled'].Value" --output text 2>/dev/null) + + if [ "$PROTECTION_ENABLED" = "true" ]; then + echo "Disabling deletion protection for ALB: $ALB_NAME" + # Use --output json and redirect to /dev/null to suppress output + aws elbv2 modify-load-balancer-attributes \ + --region "$REGION" \ + --load-balancer-arn "$ALB_ARN" \ + --attributes Key=deletion_protection.enabled,Value=false \ + --output json > /dev/null 2>&1 + + echo "Deletion protection disabled for ALB: $ALB_NAME" + else + echo "Deletion protection is already disabled for ALB: $ALB_NAME" + fi + done +else + echo "No Application Load Balancers found matching stack name: $STACK_NAME" +fi + + + + + +# List of bucket variables to process +BUCKET_VARS=( + "BUCKET_DOCKER_CONTEXTS" + "BUCKET_ENVS_DOCKER_CONTEXT" + "BUCKET_FC_ENV_PIPELINE" + "BUCKET_FC_KERNELS" + "BUCKET_FC_TEMPLATE" + "BUCKET_FC_VERSIONS" + "BUCKET_LOKI_STORAGE" + "BUCKET_SETUP" +) + +echo "Starting to empty S3 buckets..." + +# Process each bucket +for BUCKET_VAR in "${BUCKET_VARS[@]}"; do + # Extract the bucket name from the config file + BUCKET_NAME=$(grep "^$BUCKET_VAR=" /opt/config.properties | cut -d= -f2) + + if [ -n "$BUCKET_NAME" ]; then + echo "Emptying bucket: $BUCKET_NAME" + + # Check if the bucket exists + if aws s3api head-bucket --bucket "$BUCKET_NAME" --region "$REGION" >/dev/null 2>&1; then + # Empty the bucket + aws s3 rm "s3://$BUCKET_NAME" --recursive --region "$REGION" >/dev/null 2>&1 + echo "Successfully emptied bucket: $BUCKET_NAME" + else + echo "Bucket $BUCKET_NAME does not exist or you don't have access to it. Skipping." + fi + else + echo "Could not find bucket name for variable $BUCKET_VAR. Skipping." + fi +done + +echo "Completed emptying S3 buckets and modifying ELB deletion protection." + +# Now proceed with Terraform destroy +TERRAFORM_DIR="/opt/infra/sample-e2b-on-aws/infra-iac/terraform" + +echo "Changing directory to $TERRAFORM_DIR to execute terraform destroy..." + +# Check if the directory exists +if [ ! -d "$TERRAFORM_DIR" ]; then + echo "Directory $TERRAFORM_DIR does not exist. Cannot proceed with terraform destroy." >&2 + # Continue execution despite this error + echo "Continuing with the rest of the script..." +else + # Change to the terraform directory + cd "$TERRAFORM_DIR" || { + echo "Failed to change directory to $TERRAFORM_DIR" >&2 + # Continue execution despite this error + echo "Continuing with the rest of the script..." + } + + echo "Current directory: $(pwd)" + echo "Checking for terraform installation..." + + # Check if terraform is installed + if ! command -v terraform &> /dev/null; then + echo "Terraform is not installed. Cannot proceed with terraform destroy." >&2 + # Continue execution despite this error + echo "Continuing with the rest of the script..." + else + echo "Running terraform destroy..." + + # Run terraform destroy with auto-approve + terraform destroy -auto-approve + + # Check if terraform destroy was successful, but continue regardless + if [ $? -eq 0 ]; then + echo "Terraform destroy completed successfully." + else + echo "Terraform destroy encountered issues, but continuing with the script." >&2 + fi + fi +fi + +echo "Infrastructure cleanup process completed." + + +# # List of bucket variables to process +# BUCKET_VARS_CNF=( +# "CFNTERRAFORMBUCKET" +# "CFNSOFTWAREBUCKET" +# ) + +# echo "Starting to empty CNF S3 buckets..." + +# # Process each bucket +# for BUCKET_VAR in "${BUCKET_VARS_CNF[@]}"; do +# # Extract the bucket name from the config file +# BUCKET_NAME=$(grep "^$BUCKET_VAR=" /opt/config.properties | cut -d= -f2) + +# if [ -n "$BUCKET_NAME" ]; then +# echo "Emptying bucket: $BUCKET_NAME" + +# # Check if the bucket exists +# if aws s3api head-bucket --bucket "$BUCKET_NAME" --region "$REGION" >/dev/null 2>&1; then +# # Empty the bucket +# aws s3 rm "s3://$BUCKET_NAME" --recursive --region "$REGION" >/dev/null 2>&1 +# echo "Successfully emptied bucket: $BUCKET_NAME" +# else +# echo "Bucket $BUCKET_NAME does not exist or you don't have access to it. Skipping." +# fi +# else +# echo "Could not find bucket name for variable $BUCKET_VAR. Skipping." +# fi +# done + +# TERRAFORM_BUCKET=$(grep "^CFNTERRAFORMBUCKET=" /opt/config.properties | cut -d= -f2) + + +# # Check if bucket exists +# if aws s3api head-bucket --bucket "$TERRAFORM_BUCKET" 2>/dev/null; then +# # Check if versioning is enabled +# VERSIONING_STATUS=$(aws s3api get-bucket-versioning --bucket "$TERRAFORM_BUCKET" --query "Status" --output text 2>/dev/null) + +# if [ "$VERSIONING_STATUS" = "Enabled" ] || [ "$VERSIONING_STATUS" = "Suspended" ]; then +# echo "Bucket has versioning. Removing all versions and delete markers..." + +# # Delete all versions (including delete markers) +# VERSIONS=$(aws s3api list-object-versions --bucket "$TERRAFORM_BUCKET" --output json) + +# # Delete non-current versions +# echo "$VERSIONS" | jq -r '.Versions[]? | "\(.Key) \(.VersionId)"' 2>/dev/null | while read KEY VERSION_ID; do +# if [ ! -z "$KEY" ] && [ ! -z "$VERSION_ID" ]; then +# echo "Deleting object: $KEY (version $VERSION_ID)" +# aws s3api delete-object --bucket "$TERRAFORM_BUCKET" --key "$KEY" --version-id "$VERSION_ID" > /dev/null 2>&1 +# fi +# done + +# # Delete delete markers +# echo "$VERSIONS" | jq -r '.DeleteMarkers[]? | "\(.Key) \(.VersionId)"' 2>/dev/null | while read KEY VERSION_ID; do +# if [ ! -z "$KEY" ] && [ ! -z "$VERSION_ID" ]; then +# echo "Removing delete marker: $KEY (version $VERSION_ID)" +# aws s3api delete-object --bucket "$TERRAFORM_BUCKET" --key "$KEY" --version-id "$VERSION_ID" > /dev/null 2>&1 +# fi +# done +# fi + +# # Delete all objects (current versions or non-versioned) +# echo "Removing all current objects..." +# aws s3 rm "s3://$TERRAFORM_BUCKET" --recursive > /dev/null 2>&1 + +# # Disable bucket policy if exists +# echo "Removing bucket policy..." +# aws s3api delete-bucket-policy --bucket "$TERRAFORM_BUCKET" > /dev/null 2>&1 + +# # Disable bucket encryption if exists +# echo "Removing bucket encryption..." +# aws s3api delete-bucket-encryption --bucket "$TERRAFORM_BUCKET" > /dev/null 2>&1 + +# # Remove public access block +# echo "Removing public access block..." +# aws s3api delete-public-access-block --bucket "$TERRAFORM_ + +# echo "Completed emptying CNF S3 buckets and modifying ELB deletion protection." + +# # Disable deletion protection for RDS instances matching the stack name +# echo "Looking for RDS instances associated with stack name: $STACK_NAME" + +# # Get all RDS instances +# RDS_INSTANCES=$(aws rds describe-db-instances --region "$REGION" --query "DBInstances[].DBInstanceIdentifier" --output text 2>/dev/null) + +# if [ -n "$RDS_INSTANCES" ]; then +# for DB_INSTANCE in $RDS_INSTANCES; do +# # Check if the DB instance name contains the stack name +# if [[ "$DB_INSTANCE" == *"$STACK_NAME"* ]]; then +# echo "Found RDS instance: $DB_INSTANCE" + +# # Always attempt to disable deletion protection without interactive output +# echo "Disabling deletion protection for RDS instance: $DB_INSTANCE" +# aws rds modify-db-instance \ +# --region "$REGION" \ +# --db-instance-identifier "$DB_INSTANCE" \ +# --no-deletion-protection \ +# --apply-immediately \ +# --output json > /dev/null 2>&1 + +# echo "Deletion protection disabled for RDS instance: $DB_INSTANCE" +# fi +# done +# else +# echo "No RDS instances found in region: $REGION" +# fi + +# # Disable deletion protection for RDS clusters matching the stack name +# echo "Looking for RDS clusters associated with stack name: $STACK_NAME" + +# # Get all RDS clusters +# RDS_CLUSTERS=$(aws rds describe-db-clusters --region "$REGION" --query "DBClusters[].DBClusterIdentifier" --output text 2>/dev/null) + +# if [ -n "$RDS_CLUSTERS" ]; then +# for DB_CLUSTER in $RDS_CLUSTERS; do +# # Check if the DB cluster name contains the stack name +# if [[ "$DB_CLUSTER" == *"$STACK_NAME"* ]]; then +# echo "Found RDS cluster: $DB_CLUSTER" + +# # Always attempt to disable deletion protection without interactive output +# echo "Disabling deletion protection for RDS cluster: $DB_CLUSTER" +# aws rds modify-db-cluster \ +# --region "$REGION" \ +# --db-cluster-identifier "$DB_CLUSTER" \ +# --no-deletion-protection \ +# --apply-immediately \ +# --output json > /dev/null 2>&1 + +# echo "Deletion protection disabled for RDS cluster: $DB_CLUSTER" +# fi +# done +# else +# echo "No RDS clusters found in region: $REGION" +# fi + +# # Delete the CloudFormation stack +# echo "Deleting CloudFormation stack: $STACK_NAME" +# aws cloudformation delete-stack --stack-name "$STACK_NAME" --region "$REGION" + +# echo "CloudFormation stack deletion initiated for: $STACK_NAME" +# echo "Note: Stack deletion may take some time to complete. You can check the status in the AWS CloudFormation console." + + + + diff --git a/infra-iac/init.sh b/infra-iac/init.sh index 1ec0512..54acdd9 100644 --- a/infra-iac/init.sh +++ b/infra-iac/init.sh @@ -1,39 +1,11 @@ #!/bin/bash -# ================================================== -# AWS Metadata Operations -# ================================================== -get_metadata_token() { - curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600" -} - -get_instance_metadata() { - local metadata_path=$1 - curl -H "X-aws-ec2-metadata-token: $TOKEN" -s "http://169.254.169.254/latest/meta-data/${metadata_path}" -} - # ================================================== # Environment Configuration Section # ================================================== setup_environment() { - # Get basic metadata - export TOKEN=$(get_metadata_token) - export REGION=$(curl -s -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/dynamic/instance-identity/document | jq -r .region) - export INSTANCE_ID=$(get_instance_metadata "instance-id") - echo - - # Configure AWS region - aws configure set region "$REGION" - # Get CloudFormation stack ID - export STACK_ID=$(aws ec2 describe-tags \ - --filters "Name=resource-id,Values=$INSTANCE_ID" \ - "Name=key,Values=aws:cloudformation:stack-id" \ - --query "Tags[0].Value" \ - --output text) - - # Validate stack existence - [[ -z "$STACK_ID" ]] && { echo "Error: Failed to get CloudFormation Stack ID"; exit 1; } - + STACK_ID=$(grep "^StackName=" /tmp/e2b.log | cut -d'=' -f2) + # Dynamic export of CFN outputs declare -A CFN_OUTPUTS while IFS=$'\t' read -r key value; do @@ -56,11 +28,12 @@ setup_environment() { echo "$key=${CFN_OUTPUTS[$key]}" >> /opt/config.properties done + REGION=$(aws configure get region) echo "AWSREGION=$REGION" >> /opt/config.properties # Verification output echo "=== Exported Variables ===" - printenv | grep -E '^CFN' + cat /opt/config.properties } # ================================================== diff --git a/infra-iac/packer/main.pkr.hcl b/infra-iac/packer/main.pkr.hcl index 96a1d50..c58a63f 100644 --- a/infra-iac/packer/main.pkr.hcl +++ b/infra-iac/packer/main.pkr.hcl @@ -10,15 +10,16 @@ packer { source "amazon-ebs" "orch" { ami_name = "e2b-ubuntu-ami-${formatdate("YYYY-MM-DD-hh-mm-ss", timestamp())}" - instance_type = var.aws_instance_type + instance_type = var.architecture == "x86_64" ? "t3.xlarge" : "t4g.xlarge" region = var.aws_region source_ami_filter { filters = { - name = "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*" + name = var.architecture == "x86_64" ? "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*" : "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-*" root-device-type = "ebs" virtualization-type = "hvm" - state = "available" + state = "available" + architecture = var.architecture } owners = ["amazon"] // 或实际拥有此 AMI 的 AWS 账户 ID most_recent = true @@ -48,7 +49,7 @@ build { "sudo apt-get clean", "sudo apt-get update -y", "sudo apt-get upgrade -y", - "sudo apt-get install -y ca-certificates curl" + "sudo DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates curl git" ] } @@ -85,7 +86,7 @@ build { provisioner "shell" { inline = [ "sudo apt-get update", - "sudo apt-get install -y unzip jq net-tools qemu-utils make build-essential openssh-client openssh-server", # TODO: openssh-server is updated to prevent security vulnerabilities + "sudo DEBIAN_FRONTEND=noninteractive apt-get install -y unzip jq net-tools qemu-utils make build-essential openssh-client openssh-server", # TODO: openssh-server is updated to prevent security vulnerabilities ] } @@ -93,17 +94,22 @@ build { only = ["amazon-ebs.orch"] inline = [ "sudo apt-get update && sudo apt-get upgrade -y", - "sudo curl 'https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip' -o 'awscliv2.zip'", + "if [ \"${var.architecture}\" = \"x86_64\" ]; then", + " sudo curl 'https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip' -o 'awscliv2.zip'", + "else", + " sudo curl 'https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip' -o 'awscliv2.zip'", + "fi", "sudo apt-get install -y zip", "sudo unzip awscliv2.zip", "sudo ./aws/install", - "sudo apt-get install -y s3fs-fuse || echo 'Failed to install s3fs-fuse, will install from source'" + "sudo DEBIAN_FRONTEND=noninteractive apt-get install -y s3fs-fuse || echo 'Failed to install s3fs-fuse'", + "sudo DEBIAN_FRONTEND=noninteractive apt-get install -y s3fs || echo 'Failed to install s3fs'" ] } provisioner "shell" { inline = [ - "sudo snap install go --classic" + "sudo DEBIAN_FRONTEND=noninteractive snap install go --classic" ] } @@ -142,8 +148,12 @@ build { only = ["amazon-ebs.orch"] inline = [ "sudo mkdir -p /opt/aws/amazon-cloudwatch-agent/bin/", - "sudo wget https://amazoncloudwatch-agent.s3.amazonaws.com/ubuntu/amd64/latest/amazon-cloudwatch-agent.deb -O /tmp/amazon-cloudwatch-agent.deb", - "sudo dpkg -i /tmp/amazon-cloudwatch-agent.deb || sudo apt-get install -f -y", + "if [ \"${var.architecture}\" = \"x86_64\" ]; then", + " sudo wget https://amazoncloudwatch-agent.s3.amazonaws.com/ubuntu/amd64/latest/amazon-cloudwatch-agent.deb -O /tmp/amazon-cloudwatch-agent.deb", + "else", + " sudo wget https://amazoncloudwatch-agent.s3.amazonaws.com/ubuntu/arm64/latest/amazon-cloudwatch-agent.deb -O /tmp/amazon-cloudwatch-agent.deb", + "fi", + "sudo dpkg -i /tmp/amazon-cloudwatch-agent.deb || sudo DEBIAN_FRONTEND=noninteractive apt-get install -f -y", "sudo systemctl enable amazon-cloudwatch-agent" ] } diff --git a/infra-iac/packer/packer.sh b/infra-iac/packer/packer.sh index 0b04a02..0efd0e8 100644 --- a/infra-iac/packer/packer.sh +++ b/infra-iac/packer/packer.sh @@ -8,6 +8,7 @@ CONFIG_FILE="/opt/config.properties" if [ -f "$CONFIG_FILE" ]; then # Parse the config file and extract AWSREGION AWSREGION=$(grep "^AWSREGION=" "$CONFIG_FILE" | cut -d'=' -f2) + ARCHITECTURE=$(grep "^CFNARCHITECTURE=" "$CONFIG_FILE" | cut -d'=' -f2) fi # Get Region from params or env or config file @@ -19,15 +20,26 @@ if [ -z "${AWS_REGION}" ]; then exit 1 fi +# Validate architecture +if [ "$ARCHITECTURE" != "x86_64" ] && [ "$ARCHITECTURE" != "arm64" ]; then + echo "Error: Invalid architecture specified. Please use 'x86_64' or 'arm64'." + exit 1 +fi + echo "Using AWS Region: ${AWS_REGION}" +echo "Building for architecture: ${ARCHITECTURE}" # Check if Packer is installed if ! command -v packer &> /dev/null; then echo "Packer not found. Installing Packer 1.12.0..." - wget https://releases.hashicorp.com/packer/1.12.0/packer_1.12.0_linux_amd64.zip - unzip packer_1.12.0_linux_amd64.zip - mv packer /usr/local/bin/packer - rm packer_1.12.0_linux_amd64.zip + # Choose the right architecture for Packer + if [ "${ARCHITECTURE}" = "arm64" ]; then + PACKER_URL="https://releases.hashicorp.com/packer/1.12.0/packer_1.12.0_linux_arm64.zip" + else + PACKER_URL="https://releases.hashicorp.com/packer/1.12.0/packer_1.12.0_linux_amd64.zip" + fi + wget $PACKER_URL -O packer.zip + unzip packer.zip && sudo mv packer /usr/local/bin/packer && rm packer.zip echo "Packer installed successfully." fi @@ -36,4 +48,6 @@ packer init -upgrade . sleep 10 -packer build -only=amazon-ebs.orch -var "aws_region=${AWS_REGION}" . \ No newline at end of file +echo "Starting Packer build with architecture: ${ARCHITECTURE}" + +packer build -only=amazon-ebs.orch -var "aws_region=${AWS_REGION}" -var "architecture=${ARCHITECTURE}" . \ No newline at end of file diff --git a/infra-iac/packer/setup/install-consul.sh b/infra-iac/packer/setup/install-consul.sh index c1e4767..af0b3e4 100644 --- a/infra-iac/packer/setup/install-consul.sh +++ b/infra-iac/packer/setup/install-consul.sh @@ -106,9 +106,24 @@ function create_consul_install_paths { function fetch_binary { local -r version="$1" local download_url="$2" + local arch=$(arch) + log_info "Auto-detected architecture: $arch" + + local consul_arch="amd64" + # Map architecture to Consul's naming convention + if [[ "$arch" == "aarch64" || "$arch" == "arm64" ]]; then + consul_arch="arm64" + elif [[ "$arch" == "x86_64" ]]; then + consul_arch="amd64" + else + log_error "Unsupported architecture: $arch" + exit 1 + fi + + log_info "Using Consul architecture: $consul_arch" if [[ -z "$download_url" && -n "$version" ]]; then - download_url="https://releases.hashicorp.com/consul/${version}/consul_${version}_linux_amd64.zip" + download_url="https://releases.hashicorp.com/consul/${version}/consul_${version}_linux_${consul_arch}.zip" fi retry \ diff --git a/infra-iac/packer/setup/install-nomad.sh b/infra-iac/packer/setup/install-nomad.sh index f20e71d..21a8e4a 100644 --- a/infra-iac/packer/setup/install-nomad.sh +++ b/infra-iac/packer/setup/install-nomad.sh @@ -134,8 +134,25 @@ function install_binaries { local readonly path="$2" local readonly username="$3" - local readonly url="https://releases.hashicorp.com/nomad/${version}/nomad_${version}_linux_amd64.zip" - local readonly download_path="/tmp/nomad_${version}_linux_amd64.zip" + # Detect system architecture + local arch=$(arch) + log_info "Auto-detected architecture: $arch" + + local nomad_arch="amd64" + # Map architecture to Nomad's naming convention + if [[ "$arch" == "aarch64" || "$arch" == "arm64" ]]; then + nomad_arch="arm64" + elif [[ "$arch" == "x86_64" ]]; then + nomad_arch="amd64" + else + log_error "Unsupported architecture: $arch" + exit 1 + fi + + log_info "Using Nomad architecture: $nomad_arch" + + local readonly url="https://releases.hashicorp.com/nomad/${version}/nomad_${version}_linux_${nomad_arch}.zip" + local readonly download_path="/tmp/nomad_${version}_linux.zip" local readonly bin_dir="$path/bin" local readonly nomad_dest_path="$bin_dir/nomad" diff --git a/infra-iac/packer/variables.pkr.hcl b/infra-iac/packer/variables.pkr.hcl index cf72f9b..4356784 100644 --- a/infra-iac/packer/variables.pkr.hcl +++ b/infra-iac/packer/variables.pkr.hcl @@ -17,12 +17,18 @@ variable "aws_region" { variable "gcp_instance_type" { type = string default = "" - } variable "aws_instance_type" { type = string - default = "t3.xlarge" + default = "" # Empty default, will be determined dynamically in main.pkr.hcl + description = "AWS instance type to use for building the AMI" +} + +variable "architecture" { + type = string + default = "x86_64" + description = "CPU architecture (x86_64 or arm64)" } variable "image_family" { diff --git a/infra-iac/terraform/main.tf b/infra-iac/terraform/main.tf index f5d1d5b..225a8cf 100644 --- a/infra-iac/terraform/main.tf +++ b/infra-iac/terraform/main.tf @@ -41,9 +41,9 @@ locals { # Define common resource tags to be applied to all resources common_tags = { - Environment = "Production" + Environment = var.environment Project = "E2B" - Owner = "DevOps" + Owner = "AWS" ManagedBy = "Terraform" } @@ -51,28 +51,32 @@ locals { clusters = { # Server nodes run Consul and Nomad servers server = { - instance_type = "t3.xlarge" + instance_type_x86 = "t3.xlarge" + instance_type_arm = "t4g.xlarge" desired_capacity = 3 max_size = 3 min_size = 3 } # Client nodes run workloads and containers client = { - instance_type = "c6i.metal" + instance_type_x86 = "c5.metal" + instance_type_arm = "c7g.metal" desired_capacity = 1 max_size = 5 min_size = 0 } # API nodes run the API service api = { - instance_type = "t3.xlarge" - desired_capacity = 2 - max_size = 5 - min_size = 2 + instance_type_x86 = "t3.xlarge" + instance_type_arm = "t4g.xlarge" + desired_capacity = 1 + max_size = 1 + min_size = 1 } # Build nodes for environment building (currently not active) build = { - instance_type = "t3.xlarge" + instance_type_x86 = "t3.xlarge" + instance_type_arm = "t4g.xlarge" desired_capacity = 0 max_size = 0 min_size = 0 @@ -104,30 +108,35 @@ data "aws_ami" "e2b" { # Bucket for Loki log storage resource "aws_s3_bucket" "loki_storage_bucket" { bucket = "${var.prefix}-loki-storage-${local.account_id}" + force_destroy = var.environment == "prod" ? false : true tags = local.common_tags } # Bucket for Docker contexts used by environments resource "aws_s3_bucket" "envs_docker_context" { bucket = "${var.prefix}-envs-docker-context-${local.account_id}" + force_destroy = var.environment == "prod" ? false : true tags = local.common_tags } # Bucket for cluster setup scripts and configuration resource "aws_s3_bucket" "setup_bucket" { bucket = "${var.prefix}-cluster-setup-${local.account_id}" + force_destroy = var.environment == "prod" ? false : true tags = local.common_tags } # Bucket for Firecracker kernels resource "aws_s3_bucket" "fc_kernels_bucket" { bucket = "${var.prefix}-fc-kernels-${local.account_id}" + force_destroy = var.environment == "prod" ? false : true tags = local.common_tags } # Bucket for Firecracker versions resource "aws_s3_bucket" "fc_versions_bucket" { bucket = "${var.prefix}-fc-versions-${local.account_id}" + force_destroy = var.environment == "prod" ? false : true tags = local.common_tags } @@ -400,8 +409,8 @@ resource "aws_launch_template" "server" { name_prefix = "${var.prefix}-server-" update_default_version = true image_id = data.aws_ami.e2b.id - instance_type = local.clusters.server.instance_type - key_name = null + instance_type = var.architecture == "x86_64" ? local.clusters.server.instance_type_x86 : local.clusters.server.instance_type_arm + key_name = var.sshkey iam_instance_profile { name = aws_iam_instance_profile.ec2_instance_profile.name @@ -411,7 +420,7 @@ resource "aws_launch_template" "server" { device_name = "/dev/sda1" ebs { - volume_size = 200 + volume_size = 100 volume_type = "gp3" encrypted = true delete_on_termination = true @@ -434,9 +443,6 @@ resource "aws_launch_template" "server" { CONSUL_GOSSIP_ENCRYPTION_KEY = aws_secretsmanager_secret_version.consul_gossip_encryption_key.secret_string AWS_REGION = local.aws_region AWS_ACCOUNT_ID = local.account_id - # Legacy GCP variables provided as dummy values for compatibility during AWS migration - GCP_REGION = local.aws_region - GOOGLE_SERVICE_ACCOUNT_KEY = "dummy-aws-migration" })) tag_specifications { @@ -533,7 +539,8 @@ resource "aws_launch_template" "client" { name_prefix = "${var.prefix}-client-" update_default_version = true image_id = data.aws_ami.e2b.id - instance_type = local.clusters.client.instance_type + instance_type = var.architecture == "x86_64" ? local.clusters.client.instance_type_x86 : local.clusters.client.instance_type_arm + key_name = var.sshkey iam_instance_profile { name = aws_iam_instance_profile.ec2_instance_profile.name } @@ -587,9 +594,6 @@ resource "aws_launch_template" "client" { RUN_NOMAD_FILE_HASH = local.file_hash["scripts/run-nomad.sh"] CONSUL_GOSSIP_ENCRYPTION_KEY = aws_secretsmanager_secret_version.consul_gossip_encryption_key.secret_string CONSUL_DNS_REQUEST_TOKEN = aws_secretsmanager_secret_version.consul_dns_request_token.secret_string - # Legacy GCP variables provided as dummy values for compatibility during AWS migration - GCP_REGION = local.aws_region - GOOGLE_SERVICE_ACCOUNT_KEY = "dummy-aws-migration" })) tag_specifications { @@ -715,7 +719,7 @@ resource "aws_lb" "publicalb" { load_balancer_type = "application" security_groups = [aws_security_group.public_alb_sg.id] subnets = var.VPC.public_subnets - enable_deletion_protection = true + enable_deletion_protection = var.environment == "prod" ? true : false tags = merge( local.common_tags, @@ -971,8 +975,8 @@ resource "aws_launch_template" "api" { name_prefix = "${var.prefix}-api-" update_default_version = true image_id = data.aws_ami.e2b.id - instance_type = local.clusters.api.instance_type - key_name = null + instance_type = var.architecture == "x86_64" ? local.clusters.api.instance_type_x86 : local.clusters.api.instance_type_arm + key_name = var.sshkey iam_instance_profile { name = aws_iam_instance_profile.ec2_instance_profile.name @@ -982,7 +986,7 @@ resource "aws_launch_template" "api" { device_name = "/dev/sda1" ebs { - volume_size = 200 + volume_size = 100 volume_type = "gp3" encrypted = true delete_on_termination = true @@ -1009,9 +1013,6 @@ resource "aws_launch_template" "api" { RUN_NOMAD_FILE_HASH = local.file_hash["scripts/run-api-nomad.sh"] CONSUL_GOSSIP_ENCRYPTION_KEY = aws_secretsmanager_secret_version.consul_gossip_encryption_key.secret_string CONSUL_DNS_REQUEST_TOKEN = aws_secretsmanager_secret_version.consul_dns_request_token.secret_string - # Legacy GCP variables provided as dummy values for compatibility during AWS migration - GCP_REGION = local.aws_region - GOOGLE_SERVICE_ACCOUNT_KEY = "dummy-aws-migration" })) tag_specifications { @@ -1122,8 +1123,8 @@ resource "aws_launch_template" "build" { name_prefix = "${var.prefix}-build-" update_default_version = true image_id = data.aws_ami.e2b.id - instance_type = local.clusters.build.instance_type - key_name = null + instance_type = var.architecture == "x86_64" ? local.clusters.build.instance_type_x86 : local.clusters.build.instance_type_arm + key_name = var.sshkey iam_instance_profile { name = aws_iam_instance_profile.ec2_instance_profile.name @@ -1133,7 +1134,7 @@ resource "aws_launch_template" "build" { device_name = "/dev/sda1" ebs { - volume_size = 200 + volume_size = 100 volume_type = "gp3" encrypted = true delete_on_termination = true @@ -1160,9 +1161,6 @@ resource "aws_launch_template" "build" { RUN_NOMAD_FILE_HASH = local.file_hash["scripts/run-build-cluster-nomad.sh"] CONSUL_GOSSIP_ENCRYPTION_KEY = aws_secretsmanager_secret_version.consul_gossip_encryption_key.secret_string CONSUL_DNS_REQUEST_TOKEN = aws_secretsmanager_secret_version.consul_dns_request_token.secret_string - # Legacy GCP variables provided as dummy values for compatibility during AWS migration - GCP_REGION = local.aws_region - GOOGLE_SERVICE_ACCOUNT_KEY = "dummy-aws-migration" })) tag_specifications { @@ -1211,8 +1209,6 @@ resource "aws_autoscaling_group" "build" { } } - - # Create CloudWatch logs group for cluster resource "aws_cloudwatch_log_group" "cluster_logs" { name = "${var.prefix}-cluster-logs" diff --git a/infra-iac/terraform/scripts/run-nomad.sh b/infra-iac/terraform/scripts/run-nomad.sh index 7ad40e4..1886a23 100755 --- a/infra-iac/terraform/scripts/run-nomad.sh +++ b/infra-iac/terraform/scripts/run-nomad.sh @@ -225,11 +225,10 @@ plugin_dir = "/opt/nomad/plugins" plugin "docker" { config { - volumes { - enabled = true - } auth { - config = "/root/docker/config.json" + # Nomad will prepend "docker-credential-" to the helper value and call + # that script name. + helper = "ecr-login" } } } diff --git a/infra-iac/terraform/scripts/start-client.sh b/infra-iac/terraform/scripts/start-client.sh index cd4ccd9..10553b1 100755 --- a/infra-iac/terraform/scripts/start-client.sh +++ b/infra-iac/terraform/scripts/start-client.sh @@ -11,6 +11,9 @@ PS4='[\D{%Y-%m-%d %H:%M:%S}] ' # Enable command tracing set -x +sudo apt-get update +sudo apt-get install -y amazon-ecr-credential-helper + # Send the log output from this script to user-data.log, syslog, and the console # Inspired by https://alestic.com/2010/12/ec2-user-data-output/ exec > >(tee /var/log/user-data.log | logger -t user-data -s 2>/dev/console) 2>&1 diff --git a/infra-iac/terraform/scripts/start-server.sh b/infra-iac/terraform/scripts/start-server.sh index f1aea59..ccaf370 100644 --- a/infra-iac/terraform/scripts/start-server.sh +++ b/infra-iac/terraform/scripts/start-server.sh @@ -12,6 +12,9 @@ exec > >(tee /var/log/user-data.log | logger -t user-data -s 2>/dev/console) 2>& ulimit -n 65536 export GOMAXPROCS='nproc' +sudo apt-get update +sudo apt-get install -y amazon-ecr-credential-helper + aws s3 cp "s3://${SCRIPTS_BUCKET}/run-consul-${RUN_CONSUL_FILE_HASH}.sh" /opt/consul/bin/run-consul.sh aws s3 cp "s3://${SCRIPTS_BUCKET}/run-nomad-${RUN_NOMAD_FILE_HASH}.sh" /opt/nomad/bin/run-nomad.sh diff --git a/infra-iac/terraform/start.sh b/infra-iac/terraform/start.sh index 806fd7a..3b1ea96 100644 --- a/infra-iac/terraform/start.sh +++ b/infra-iac/terraform/start.sh @@ -5,25 +5,27 @@ cd "$(dirname "$0")" # terraform-output-to-config.sh - Convert Terraform outputs to configuration and append to file -# Default config file path +# Default values CONFIG_FILE="/opt/config.properties" +ENVIRONMENT=$(grep "^CFNENVIRONMENT=" "$CONFIG_FILE" | cut -d'=' -f2) # Parse command line arguments while [[ $# -gt 0 ]]; do - case \$1 in + case $1 in -c|--config-file) - CONFIG_FILE=\$2 + CONFIG_FILE=$2 shift 2 ;; -h|--help) - echo "Usage: \$0 [options]" + echo "Usage: $0 [options]" echo "Options:" echo " -c, --config-file FILE Specify the config file to append to (default: /opt/config.properties)" + echo " -e, --env ENV Specify the environment to deploy (default: dev)" echo " -h, --help Show this help message" exit 0 ;; *) - echo "Error: Unknown parameter \$1" + echo "Error: Unknown parameter $1" exit 1 ;; esac @@ -46,11 +48,11 @@ else echo "prepare.sh executed successfully" fi -# Execute terraform plan and apply -echo "Creating Terraform plan..." -terraform plan -out=tfplan +# Execute terraform plan and apply with environment variable +echo "Creating Terraform plan for environment: $ENVIRONMENT..." +terraform plan -var="environment=$ENVIRONMENT" -out=tfplan -echo "Applying Terraform plan..." +echo "Applying Terraform plan for environment: $ENVIRONMENT..." terraform apply tfplan # Check if apply was successful @@ -138,7 +140,7 @@ echo "" >> "$CONFIG_FILE" echo "# Additional parameters" >> "$CONFIG_FILE" echo "account_id=$(aws sts get-caller-identity --query Account --output text)" >> "$CONFIG_FILE" echo "build_id=latest" >> "$CONFIG_FILE" -echo "environment=dev" >> "$CONFIG_FILE" +echo "environment=$ENVIRONMENT" >> "$CONFIG_FILE" # Extract AWSREGION value from the config file AWSREGION=$(grep "^AWSREGION=" "$CONFIG_FILE" | cut -d'=' -f2) diff --git a/infra-iac/terraform/var.tf.tpl b/infra-iac/terraform/var.tf.tpl index 474d1c2..38f83cf 100644 --- a/infra-iac/terraform/var.tf.tpl +++ b/infra-iac/terraform/var.tf.tpl @@ -2,6 +2,12 @@ # This file defines all variables used in the Terraform configuration # Placeholder values will be replaced by the prepare.sh script using values from config.properties +# Terraform Environment +variable "environment" { + type = string + default = "${CFNENVIRONMENT}" +} + # Resource Prefix # Used to name and tag all resources created by Terraform variable "prefix" { @@ -51,3 +57,11 @@ variable "VPC" { public_subnets = ["${CFNPUBLICSUBNET1}", "${CFNPUBLICSUBNET2}"] # Public subnet ID placeholders } } + +# Architecture +# CPU architecture to use for EC2 instances (x86_64 or arm64) +variable "architecture" { + description = "CPU architecture to use for EC2 instances" + type = string + default = "${CFNARCHITECTURE}" +} diff --git a/nomad/deploy.sh b/nomad/deploy.sh index fdcabe4..2b95a4f 100644 --- a/nomad/deploy.sh +++ b/nomad/deploy.sh @@ -8,8 +8,7 @@ declare -A jobs_minimal=( # ["redis"]="deploy/redis-deploy.hcl" ["api"]="deploy/api-deploy.hcl" ["orchestrator"]="deploy/orchestrator-deploy.hcl" - ["client-proxy"]="deploy/client-proxy-deploy.hcl" - ["session-proxy"]="deploy/session-proxy-deploy.hcl" + ["client-proxy"]="deploy/edge-deploy.hcl" ["template-manager"]="deploy/template-manager-deploy.hcl" # ["docker-reverse-proxy"]="deploy/docker-reverse-proxy-deploy.hcl" ) @@ -21,7 +20,7 @@ declare -A jobs_all=( # ["redis"]="deploy/redis-deploy.hcl" ["api"]="deploy/api-deploy.hcl" ["orchestrator"]="deploy/orchestrator-deploy.hcl" - ["client-proxy"]="deploy/client-proxy-deploy.hcl" + ["client-proxy"]="deploy/edge-deploy.hcl" ["session-proxy"]="deploy/session-proxy-deploy.hcl" ["template-manager"]="deploy/template-manager-deploy.hcl" # ["docker-reverse-proxy"]="deploy/docker-reverse-proxy-deploy.hcl" diff --git a/nomad/origin/api.hcl b/nomad/origin/api.hcl index 3f1e02f..9bb668f 100644 --- a/nomad/origin/api.hcl +++ b/nomad/origin/api.hcl @@ -8,9 +8,6 @@ job "api" { port "api" { static = "50001" } - port "dns" { - static = "5353" - } } constraint { @@ -20,7 +17,7 @@ job "api" { service { name = "api" - port = "api" + port = "50001" task = "start" check { @@ -29,7 +26,7 @@ job "api" { path = "/health" interval = "3s" timeout = "3s" - port = "api" + port = "50001" } } @@ -50,9 +47,14 @@ job "api" { env { ORCHESTRATOR_PORT = 5008 - TEMPLATE_MANAGER_ADDRESS = "http://template-manager.service.consul:5009" + TEMPLATE_MANAGER_HOST = "template-manager.service.consul:5009" AWS_ENABLED = "true" - CFNDBURL = "${CFNDBURL}" + POSTGRES_CONNECTION_STRING = "${CFNDBURL}" + SUPABASE_JWT_SECRETS = "${CFNDBURL}" + CLICKHOUSE_CONNECTION_STRING = "" + CLICKHOUSE_USERNAME = "" + CLICKHOUSE_PASSWORD = "" + CLICKHOUSE_DATABASE = "" DB_HOST = "${postgres_host}" DB_USER = "${postgres_user}" DB_PASSWORD = "${postgres_password}" @@ -67,8 +69,9 @@ job "api" { CONSUL_HTTP_TOKEN = "${consul_http_token}" OTEL_COLLECTOR_GRPC_ENDPOINT = "localhost:4317" ADMIN_TOKEN = "${admin_token}" - REDIS_URL = "redis://${REDIS_ENDPOINT}:6379" + REDIS_URL = "${REDIS_ENDPOINT}:6379" DNS_PORT = 5353 + SANDBOX_ACCESS_TOKEN_HASH_SEED = "${admin_token}" # This is here just because it is required in some part of our code which is transitively imported TEMPLATE_BUCKET_NAME = "skip" } @@ -76,7 +79,7 @@ job "api" { config { network_mode = "host" image = "${account_id}.dkr.ecr.${AWSREGION}.amazonaws.com/e2b-orchestration/api:latest" - ports = ["api", "dns"] + ports = ["api"] args = [ "--port", "50001", ] diff --git a/nomad/origin/client-proxy.hcl b/nomad/origin/client-proxy.hcl deleted file mode 100644 index 4f12e49..0000000 --- a/nomad/origin/client-proxy.hcl +++ /dev/null @@ -1,63 +0,0 @@ -job "client-proxy" { - datacenters = ["${aws_az1}", "${aws_az2}"] - priority = 80 - node_pool = "api" - - group "client-proxy" { - network { - port "client-proxy" { - static = 3002 - } - - port "health" { - static = 3001 - } - } - - service { - name = "proxy" - port = "client-proxy" - - check { - type = "http" - name = "health" - path = "/" - interval = "3s" - timeout = "3s" - port = "health" - } - } - - update { - max_parallel = 1 - canary = 1 - min_healthy_time = "10s" - healthy_deadline = "30s" - auto_promote = true - progress_deadline = "24h" - } - - task "start" { - driver = "docker" - kill_timeout = "24h" - kill_signal = "SIGTERM" - - resources { - memory_max = 4096 - memory = 1024 - cpu = 1000 - } - - env { - OTEL_COLLECTOR_GRPC_ENDPOINT = "localhost:4317" - } - - config { - network_mode = "host" - image = "${account_id}.dkr.ecr.${AWSREGION}.amazonaws.com/e2b-orchestration/client-proxy:latest" - ports = ["client-proxy"] - args = ["--port", "3002"] - } - } - } -} \ No newline at end of file diff --git a/nomad/origin/docker-reverse-proxy.hcl b/nomad/origin/docker-reverse-proxy.hcl index cf2feeb..5842cc0 100644 --- a/nomad/origin/docker-reverse-proxy.hcl +++ b/nomad/origin/docker-reverse-proxy.hcl @@ -34,18 +34,24 @@ job "docker-reverse-proxy" { } env { + # POSTGRES_CONNECTION_STRING = "${CFNDBURL}" + # CFNDBURL = "${CFNDBURL}" + # AWS_REGION = "${AWSREGION}" + # AWS_ACCOUNT_ID = "${account_id}" + # AWS_ECR_REPOSITORY = "e2bdev/base" + # DOMAIN_NAME = "${CFNDOMAIN}" + # LOG_LEVEL = "debug" + + CLOUD_PROVIDER = "aws" POSTGRES_CONNECTION_STRING = "${CFNDBURL}" - CFNDBURL = "${CFNDBURL}" - AWS_REGION = "${AWSREGION}" - AWS_ACCOUNT_ID = "${account_id}" - AWS_ECR_REPOSITORY = "e2bdev/base" DOMAIN_NAME = "${CFNDOMAIN}" + AWS_ECR_REPOSITORY_NAME = "e2bdev/base" LOG_LEVEL = "debug" } config { network_mode = "host" - image = "${account_id}.dkr.ecr.${AWSREGION}.amazonaws.com/e2b-orchestration/docker-reverse-proxy:latest" + image = "${account_id}.dkr.ecr.${AWSREGION}.amazonaws.com/docker-reverse-proxy:latest" ports = ["docker-reverse-proxy"] args = ["--port", "5000"] force_pull = true diff --git a/nomad/origin/edge.hcl b/nomad/origin/edge.hcl new file mode 100644 index 0000000..a034f61 --- /dev/null +++ b/nomad/origin/edge.hcl @@ -0,0 +1,100 @@ +job "client-proxy" { + datacenters = ["${aws_az1}", "${aws_az2}"] + node_pool = "api" + + priority = 80 + + group "client-proxy" { + //count = ${count} + + constraint { + operator = "distinct_hosts" + value = "true" + } + + network { + port "session" { + static = "3002" + } + + port "edge-api" { + static = "3001" + } + } + + service { + name = "proxy" + port = "session" + + check { + type = "http" + name = "health" + path = "/health/traffic" + interval = "3s" + timeout = "3s" + port = "edge-api" + } + } + + service { + name = "edge-api" + port = "3001" + + check { + type = "http" + name = "health" + path = "/health" + interval = "3s" + timeout = "3s" + port = "edge-api" + } + } + + task "start" { + driver = "docker" + # If we need more than 30s we will need to update the max_kill_timeout in nomad + # https://developer.hashicorp.com/nomad/docs/configuration/client#max_kill_timeout + kill_signal = "SIGTERM" + + resources { + memory_max = 4096 + memory = 1024 + cpu = 1000 + } + + env { + NODE_ID = "$${node.unique.id}" + NODE_IP = "$${attr.unique.network.ip-address}" + + EDGE_PORT = 3001 + EDGE_SECRET = "${admin_token}" + PROXY_PORT = 3002 + ORCHESTRATOR_PORT = 5008 + + SERVICE_DISCOVERY_ORCHESTRATOR_PROVIDER = "DNS" + SERVICE_DISCOVERY_ORCHESTRATOR_DNS_RESOLVER_ADDRESS = "127.0.0.1:8600" // consul dns resolver + SERVICE_DISCOVERY_ORCHESTRATOR_DNS_QUERY = "orchestrator.service.consul,template-manager.service.consul" + + SERVICE_DISCOVERY_EDGE_PROVIDER = "DNS" + SERVICE_DISCOVERY_EDGE_DNS_RESOLVER_ADDRESS = "127.0.0.1:8600" // consul dns resolver + SERVICE_DISCOVERY_EDGE_DNS_QUERY = "edge-api.service.consul" + + ENVIRONMENT = "dev" + + // use legacy dns resolution for orchestrator services + USE_PROXY_CATALOG_RESOLUTION = "false" + + OTEL_COLLECTOR_GRPC_ENDPOINT = "localhost:4317" + LOGS_COLLECTOR_ADDRESS = "analytics_collector_host" + REDIS_URL = "${REDIS_ENDPOINT}:6379" + LOKI_URL = "http://loki.service.consul:3100" + } + + config { + network_mode = "host" + image = "${account_id}.dkr.ecr.${AWSREGION}.amazonaws.com/e2b-orchestration/client-proxy:latest" + ports = ["session", "edge-api"] + } + } + } +} \ No newline at end of file diff --git a/nomad/origin/orchestrator.hcl b/nomad/origin/orchestrator.hcl index 1e7ee1e..51578c5 100644 --- a/nomad/origin/orchestrator.hcl +++ b/nomad/origin/orchestrator.hcl @@ -33,7 +33,7 @@ job "orchestrator" { CONSUL_TOKEN = "${consul_http_token}" OTEL_TRACING_PRINT = false LOGS_COLLECTOR_ADDRESS = "http://localhost:30006" - LOGS_COLLECTOR_PUBLIC_IP = "http://127.0.0.1:8080" + LOGS_COLLECTOR_PUBLIC_IP = "http://127.0.0.1" ENVIRONMENT = "${environment}" TEMPLATE_BUCKET_NAME = "${BUCKET_FC_TEMPLATE}" OTEL_COLLECTOR_GRPC_ENDPOINT = "localhost:4317" @@ -41,11 +41,14 @@ job "orchestrator" { TEMPLATE_AWS_BUCKET_NAME = "${BUCKET_FC_TEMPLATE}" AWS_REGION = "${AWSREGION}" USE_FIRECRACKER_NATIVE_DIFF = true + STORAGE_PROVIDER = "AWSBucket" + ARTIFACTS_REGISTRY_PROVIDER = "AWS_ECR" + ORCHESTRATOR_SERVICES = "orchestrator" } config { command = "/bin/bash" - args = ["-c", " chmod +x local/orchestrator && local/orchestrator --port 5008"] + args = ["-c", " chmod +x local/orchestrator && local/orchestrator --port 5008 --proxy-port 5007"] } artifact { diff --git a/nomad/origin/session-proxy.hcl b/nomad/origin/session-proxy.hcl deleted file mode 100644 index 070e7e6..0000000 --- a/nomad/origin/session-proxy.hcl +++ /dev/null @@ -1,248 +0,0 @@ -variable "load_balancer_conf" { - type = string - default = <\d+)-" ":$p"; -} - -map $host $dbk_session_id { - default ""; - "~-(?\w+)-" $s; -} - -map $http_upgrade $conn_upgrade { - default ""; - "websocket" "Upgrade"; -} - -map $http_user_agent $is_browser { - default 0; - "~*mozilla|chrome|safari|opera|edge" 1; -} - -log_format logger-json escape=json -'{' -'"source": "session-proxy",' -'"time": "$time_iso8601",' -'"resp_body_size": $body_bytes_sent,' -'"host": "$http_host",' -'"address": "$remote_addr",' -'"request_length": $request_length,' -'"method": "$request_method",' -'"uri": "$request_uri",' -'"status": $status,' -'"user_agent": "$http_user_agent",' -'"resp_time": $request_time,' -'"upstream_addr": "$upstream_addr",' -'"session_id": "$dbk_session_id",' -'"session_port": "$dbk_port"' -'}'; -access_log /var/log/nginx/access.log logger-json; - -server { - listen 3003; - - # DNS server resolved addreses as to - resolver 127.0.0.4 valid=0s; - resolver_timeout 5s; - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $conn_upgrade; - - proxy_hide_header x-frame-options; - - proxy_http_version 1.1; - - client_body_timeout 86400s; - client_header_timeout 10s; - - proxy_read_timeout 600s; - proxy_send_timeout 86400s; - - proxy_cache_bypass 1; - proxy_no_cache 1; - - proxy_cache off; - - client_max_body_size 1024m; - - proxy_buffering off; - proxy_request_buffering off; - - tcp_nodelay on; - tcp_nopush on; - sendfile on; - - # send_timeout 600s; - - proxy_connect_timeout 5s; - keepalive_requests 8192; - keepalive_timeout 630s; - # gzip off; - - error_page 502 = @upstream_error; - - location @upstream_error { - default_type text/html; - absolute_redirect off; - - if ($is_browser = 1) { - return 502; - } - - rewrite ^ /error-json last; - } - - location /error-json { - default_type application/json; - return 502 '{"error": "The sandbox is running but port is not open", "sandboxId": "$dbk_session_id", "port": "$dbk_port"}'; - } - - location / { - if ($dbk_session_id = "") { - # If you set any text, the header will be set to `application/octet-stream` and then browser won't be able to render the content - return 400; - } - - proxy_cache_bypass 1; - proxy_no_cache 1; - - proxy_cache off; - - proxy_pass $scheme://$dbk_session_id$dbk_port$request_uri; - } -} - -server { - listen 3004; - - location /health { - access_log off; - add_header 'Content-Type' 'application/json'; - return 200 '{"status":"UP"}'; - } - - location /status { - access_log off; - stub_status; - allow all; - } -} -EOF -} - -variable "nginx_conf" { - type = string - default = < github.com/prometheus/prometheus v0. // https://github.com/grafana/loki/issues/2826 replace github.com/grafana/loki/pkg/push => github.com/grafana/loki/pkg/push v0.0.0-20231124145642-d62d4e37d1f3 + +tool ( + github.com/air-verse/air + github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen +) diff --git a/packages/api/go.sum b/packages/api/go.sum index d664a7c..8e51b3e 100644 --- a/packages/api/go.sum +++ b/packages/api/go.sum @@ -15,16 +15,12 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= -cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -36,18 +32,21 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -connectrpc.com/connect v1.16.2/go.mod h1:n2kgwskMHXC+lVqb18wngEpF95ldBHXjZYJussz5FRc= +dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= +dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= entgo.io/ent v0.12.5 h1:KREM5E4CSoej4zeGa88Ou/gfturAnpUv0mzAjch1sj4= entgo.io/ent v0.12.5/go.mod h1:Y3JVAjtlIk8xVZYSn3t3mf8xlZIn5SAOXZQxD6kKI+Q= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 h1:E+OJmp2tPvt1W+amx48v1eqbjDYsgN+RzP4q16yV5eM= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 h1:U2rTu3Ef+7w9FHKIAXM6ZyqF3UOWJZ12zIm8zECAFfg= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hwh2aUj8KXjIGLxjHeYNNo= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 h1:nyQWyZvwGTvunIMxi1Y9uXkcyr+I7TeNrr/foo4Kpk8= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0/go.mod h1:l38EPgmsp71HHLq9j7De57JcKOWPyhrsW1Awm1JS6K0= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY= +github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg= +github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.29 h1:I4+HL/JDvErx2LjyzaVxllw2lRDB5/BT2Bm4g20iqYw= @@ -66,9 +65,15 @@ github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUM github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= +github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU= +github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/ClickHouse/ch-go v0.65.1 h1:SLuxmLl5Mjj44/XbINsK2HFvzqup0s6rwKLFH347ZhU= github.com/ClickHouse/ch-go v0.65.1/go.mod h1:bsodgURwmrkvkBe5jw1qnGDgyITsYErfONKAHn05nv4= +github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0= +github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= +github.com/ClickHouse/clickhouse-go/v2 v2.33.1 h1:Z5nO/AnmUywcw0AvhAD0M1C2EaMspnXRK9vEOLxgmI0= github.com/ClickHouse/clickhouse-go/v2 v2.33.1/go.mod h1:cb1Ss8Sz8PZNdfvEBwkMAdRhoyB6/HiB6o3We5ZIcE4= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= @@ -82,20 +87,21 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OneOfOne/xxhash v1.2.6 h1:U68crOE3y3MPttCMQGywZOLrTeF5HHJ3/vDBCJn9/bA= -github.com/OneOfOne/xxhash v1.2.6/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= +github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8= github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= github.com/Workiva/go-datastructures v1.1.0 h1:hu20UpgZneBhQ3ZvwiOGlqJSKIosin2Rd5wAKUHEO/k= github.com/Workiva/go-datastructures v1.1.0/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= +github.com/air-verse/air v1.61.7 h1:MtOZs6wYoYYXm+S4e+ORjkq9BjvyEamKJsHcvko8LrQ= +github.com/air-verse/air v1.61.7/go.mod h1:QW4HkIASdtSnwaYof1zgJCSxd41ebvix10t5ubtm9cg= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E= +github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -108,6 +114,7 @@ github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGn github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI= github.com/alicebob/miniredis/v2 v2.30.4 h1:8S4/o1/KoUArAGbGwPxcwf0krlzceva2XVOSchFS7Eo= github.com/alicebob/miniredis/v2 v2.30.4/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg= +github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= @@ -120,67 +127,55 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c h1:651/eoCRnQ7YtSjAnSzRucrJz+3iGEFt+ysraELS81M= +github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.44.321 h1:iXwFLxWjZPjYqjPq0EcCs46xX7oDLEELte1+BzgpKk8= -github.com/aws/aws-sdk-go v1.44.321/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE= github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= -github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM= -github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 h1:zAybnyUQXIZ5mok5Jqwlf58/TFE7uvd3IAsa1aF9cXs= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10/go.mod h1:qqvMj6gHLR/EXWZw4ZbqlPbQUyenf4h82UQUlKc+l14= -github.com/aws/aws-sdk-go-v2/config v1.29.9 h1:Kg+fAYNaJeGXp1vmjtidss8O2uXIsXwaRqsQJKXVr+0= -github.com/aws/aws-sdk-go-v2/config v1.29.9/go.mod h1:oU3jj2O53kgOU4TXq/yipt6ryiooYjlkqqVaZk7gY/U= -github.com/aws/aws-sdk-go-v2/credentials v1.17.62 h1:fvtQY3zFzYJ9CfixuAQ96IxDrBajbBWGqjNTCa79ocU= -github.com/aws/aws-sdk-go-v2/credentials v1.17.62/go.mod h1:ElETBxIQqcxej++Cs8GyPBbgMys5DgQPTwo7cUPDKt8= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.66 h1:MTLivtC3s89de7Fe3P8rzML/8XPNRfuyJhlRTsCEt0k= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.66/go.mod h1:NAuQ2s6gaFEsuTIb2+P5t6amB1w5MhvJFxppoezGWH0= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q= -github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= -github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 h1:ZNTqv4nIdE/DiBfUUfXcLZ/Spcuz+RjeziUtNJackkM= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34/go.mod h1:zf7Vcd1ViW7cPqYWEHLHJkS50X0JS2IKz9Cgaj6ugrs= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 h1:lguz0bmOoGzozP9XfRJR1QIayEYo+2vP/No3OfLF0pU= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2 h1:jIiopHEV22b4yQP2q36Y0OmwLbsxNWdWwfZRR5QRRO4= -github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2/go.mod h1:U5SNqwhXB3Xe6F47kXvWihPl/ilGaEDe8HD/50Z9wxc= -github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 h1:8JdC7Gr9NROg1Rusk25IcZeTO59zLxsKgE0gkh5O6h0= -github.com/aws/aws-sdk-go-v2/service/sso v1.25.1/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 h1:KwuLovgQPcdjNMfFt9OhUd9a2OwcOKhxfvF4glTzLuA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs= -github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 h1:PZV5W8yk4OtH1JAuhV2PXwwO9v5G5Aoj+eMCn4T+1Kc= -github.com/aws/aws-sdk-go-v2/service/sts v1.33.17/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4= -github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ= -github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bep/clocks v0.5.0 h1:hhvKVGLPQWRVsBP/UB7ErrHYIO42gINVbvqxvYTPVps= +github.com/bep/clocks v0.5.0/go.mod h1:SUq3q+OOq41y2lRQqH5fsOoxN8GbxSiT6jvoVVLCVhU= +github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY= +github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0= +github.com/bep/gitmap v1.6.0 h1:sDuQMm9HoTL0LtlrfxjbjgAg2wHQd4nkMup2FInYzhA= +github.com/bep/gitmap v1.6.0/go.mod h1:n+3W1f/rot2hynsqEGxGMErPRgT41n9CkGuzPvz9cIw= +github.com/bep/goat v0.5.0 h1:S8jLXHCVy/EHIoCY+btKkmcxcXFd34a0Q63/0D4TKeA= +github.com/bep/goat v0.5.0/go.mod h1:Md9x7gRxiWKs85yHlVTvHQw9rg86Bm+Y4SuYE8CTH7c= +github.com/bep/godartsass/v2 v2.3.2 h1:meuc76J1C1soSCAnlnJRdGqJ5S4m6/GW+8hmOe9tOog= +github.com/bep/godartsass/v2 v2.3.2/go.mod h1:Qe5WOS9nVJy7G0jHssXPd3c+Pqk/f7+Tm6k/vahbVgs= +github.com/bep/golibsass v1.2.0 h1:nyZUkKP/0psr8nT6GR2cnmt99xS93Ji82ZD9AgOK6VI= +github.com/bep/golibsass v1.2.0/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3eJ1MA= +github.com/bep/gowebp v0.4.0 h1:QihuVnvIKbRoeBNQkN0JPMM8ClLmD6V2jMftTFwSK3Q= +github.com/bep/gowebp v0.4.0/go.mod h1:95gtYkAA8iIn1t3HkAPurRCVGV/6NhgaHJ1urz0iIwc= +github.com/bep/imagemeta v0.8.3 h1:68XqpYXjWW9mFjdGurutDmAKBJa9y2aknEBHwY/+3zw= +github.com/bep/imagemeta v0.8.3/go.mod h1:5piPAq5Qomh07m/dPPCLN3mDJyFusvUG7VwdRD/vX0s= +github.com/bep/lazycache v0.7.0 h1:VM257SkkjcR9z55eslXTkUIX8QMNKoqQRNKV/4xIkCY= +github.com/bep/lazycache v0.7.0/go.mod h1:NmRm7Dexh3pmR1EignYR8PjO2cWybFQ68+QgY3VMCSc= +github.com/bep/logg v0.4.0 h1:luAo5mO4ZkhA5M1iDVDqDqnBBnlHjmtZF6VAyTp+nCQ= +github.com/bep/logg v0.4.0/go.mod h1:Ccp9yP3wbR1mm++Kpxet91hAZBEQgmWgFgnXX3GkIV0= +github.com/bep/overlayfs v0.9.2 h1:qJEmFInsW12L7WW7dOTUhnMfyk/fN9OCDEO5Gr8HSDs= +github.com/bep/overlayfs v0.9.2/go.mod h1:aYY9W7aXQsGcA7V9x/pzeR8LjEgIxbtisZm8Q7zPz40= +github.com/bep/tmc v0.5.1 h1:CsQnSC6MsomH64gw0cT5f+EwQDcvZz4AazKunFwTpuI= +github.com/bep/tmc v0.5.1/go.mod h1:tGYHN8fS85aJPhDLgXETVKp+PR382OvFi2+q2GkGsq0= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bits-and-blooms/bitset v1.17.0 h1:1X2TS7aHz1ELcC0yU1y2stUs/0ig5oMU6STFZGrhvHI= -github.com/bits-and-blooms/bitset v1.17.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= +github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= +github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= +github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= +github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= -github.com/bytedance/sonic v1.12.4 h1:9Csb3c9ZJhfUWeMtpCDCq6BUoH5ogfDFLUgQ/jG+R0k= -github.com/bytedance/sonic v1.12.4/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= +github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ= +github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= -github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iCjjJv3+E= -github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY= +github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b h1:6+ZFm0flnudZzdSE0JxlhR2hKnGPcNB35BjQf4RYQDY= github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= @@ -189,7 +184,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -198,15 +192,20 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= +github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME= +github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= +github.com/cli/safeexec v1.0.1 h1:e/C79PbXF4yYTN/wauC4tviMxEV13BwljGj0N9j+N00= +github.com/cli/safeexec v1.0.1/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= -github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= -github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PY/k9Os/UFtwERei2/XzGemhpGnBKNg= +github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= +github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= +github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20 h1:N+3sFI5GUjRKBi+i0TxYVST9h4Ie192jJWpHvthBBgg= -github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= +github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 h1:Om6kYQYDUk5wWbT0t0q6pvyM49i9XZAv9dDrkDA7gjk= +github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -214,6 +213,8 @@ github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0= +github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -224,16 +225,25 @@ github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dhui/dktest v0.4.4 h1:+I4s6JRE1yGuqflzwqG+aIaMdgXIorCf5P98JnaAWa8= +github.com/dhui/dktest v0.4.4/go.mod h1:4+22R4lgsdAXrDyaH4Nqx2JEz2hLp49MqQmm9HLCQhM= github.com/digitalocean/godo v1.99.0 h1:gUHO7n9bDaZFWvbzOum4bXE0/09ZuYA9yA8idQHX57E= github.com/digitalocean/godo v1.99.0/go.mod h1:SsS2oXo2rznfM/nORlZ/6JaUJZFhmKTib1YhopUc8NA= -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= -github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/disintegration/gift v1.2.1 h1:Y005a1X4Z7Uc+0gLpSAsKhWi4qLtsdEcMIbbdvdZ6pc= +github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo= +github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I= +github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960/go.mod h1:9HQzr9D/0PGwMEbC3d5AB7oi67+h4TsQqItC1GVYG58= +github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 h1:PRxIJD8XjimM5aTknUK9w6DHLDox2r2M3DI4i2pnd3w= +github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936/go.mod h1:ttYvX5qlB+mlV1okblJqcSMtR4c52UKxDiX9GRBS8+Q= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= @@ -245,47 +255,52 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.13.0 h1:HzkeUz1Knt+3bK+8LG1bxOO/jzWZmdxpwC51i202les= -github.com/envoyproxy/go-control-plane v0.13.0/go.mod h1:GRaKG3dwvFoTg4nj7aXdZnvMg4d7nvT/wl9WgVXn3Q8= +github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M= +github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A= +github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM= -github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4= +github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8= +github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU= +github.com/evanw/esbuild v0.24.0 h1:GZ78naTLp7FKr+K7eNuM/SLs5maeiHYRPsTg6kmdsSE= +github.com/evanw/esbuild v0.24.0/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48= github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb h1:IT4JYU7k4ikYg1SCxNI1/Tieq/NFvh6dzLdgi7eu0tM= github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/go.mod h1:bH6Xx7IW64qjjJq8M2u4dxNaBiDfKK+z/3eGDpXEQhc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/flowchartsman/retry v1.2.0 h1:qDhlw6RNufXz6RGr+IiYimFpMMkt77SUSHY5tgFaUCU= github.com/flowchartsman/retry v1.2.0/go.mod h1:+sfx8OgCCiAr3t5jh2Gk+T0fRTI+k52edaYxURQxY64= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= +github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= -github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= -github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= -github.com/getkin/kin-openapi v0.122.0 h1:WB9Jbl0Hp/T79/JF9xlSW5Kl9uYdk/AWD0yAd9HOM10= -github.com/getkin/kin-openapi v0.122.0/go.mod h1:PCWw/lfBrJY4HcdqE3jj+QFkaFK8ABoqo7PvqVhXXqw= -github.com/getkin/kin-openapi v0.131.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= +github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= +github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= +github.com/getkin/kin-openapi v0.132.0 h1:3ISeLMsQzcb5v26yeJrBcdTCEQTag36ZjaGk7MIRUwk= +github.com/getkin/kin-openapi v0.132.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/cors v1.6.0 h1:0Z7D/bVhE6ja07lI8CTjTonp6SB07o8bNuFyRbsBUQg= -github.com/gin-contrib/cors v1.6.0/go.mod h1:cI+h6iOAyxKRtUtC6iF/Si1KSFvGm/gK+kshxlCi8ro= -github.com/gin-contrib/size v0.0.0-20230212012657-e14a14094dc4 h1:Z9J0PVIt1PuibOShaOw1jH8hUYz+Ak8NLsR/GI0Hv5I= -github.com/gin-contrib/size v0.0.0-20230212012657-e14a14094dc4/go.mod h1:CEPcgZiz8998l9E8fDm16h8UfHRL7b+5oG0j/0koeVw= -github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-contrib/zap v1.1.4/go.mod h1:7lgEpe91kLbeJkwBTPgtVBy4zMa6oSBEcvj662diqKQ= -github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= -github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= -github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/gin-contrib/cors v1.7.5 h1:cXC9SmofOrRg0w9PigwGlHG3ztswH6bqq4vJVXnvYMk= +github.com/gin-contrib/cors v1.7.5/go.mod h1:4q3yi7xBEDDWKapjT2o1V7mScKDDr8k+jZ0fSquGoy0= +github.com/gin-contrib/size v1.0.2 h1:rW5bgj7+SwDmnOlZ9lJV8lDYWTrllQAspi3WP8GtqHE= +github.com/gin-contrib/size v1.0.2/go.mod h1:kKbz/Ervg8tpnrhrBpTO5m4wuQNTVlEqTb1MgkRrmFY= +github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E= +github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0= +github.com/gin-contrib/zap v1.1.5 h1:qKwhWb4DQgPriCl1AHLLob6hav/KUIctKXIjTmWIN3I= +github.com/gin-contrib/zap v1.1.5/go.mod h1:lAchUtGz9M2K6xDr1rwtczyDrThmSx6c9F384T45iOE= +github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ= +github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= +github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -306,70 +321,36 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= -github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc= -github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo= +github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU= github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo= -github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.20.4 h1:unTcVm6PispJsMECE3zWgvG4xTiKda1LIR5rCRWLG6M= -github.com/go-openapi/errors v0.20.4/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk= +github.com/go-openapi/errors v0.22.0 h1:c4xY/OLxUBSTiepAg3j/MHuAv5mJhnf53LLMWFB+u/w= github.com/go-openapi/errors v0.22.0/go.mod h1:J3DmZScxCDufmIMsdOuDHxJbdOGC0xtUynjIx092vXE= github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4= github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonpointer v0.20.0 h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ= -github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= -github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= -github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= -github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= -github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= -github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= -github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8enro= -github.com/go-openapi/loads v0.21.2/go.mod h1:Jq58Os6SSGz0rzh62ptiu8Z31I+OTHqmULx5e/gJbNw= +github.com/go-openapi/loads v0.22.0 h1:ECPGd4jX1U6NApCGG1We+uEozOAvXvJSF4nnwHZ8Aco= github.com/go-openapi/loads v0.22.0/go.mod h1:yLsaTCS92mnSAZX5WWoxszLj0u+Ojl+Zs5Stn1oF+rs= -github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= -github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= -github.com/go-openapi/spec v0.20.9 h1:xnlYNQAwKd2VQRRfwTEI0DcK+2cbuvI/0c7jx3gA8/8= -github.com/go-openapi/spec v0.20.9/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= +github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY= github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk= -github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= -github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= -github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= -github.com/go-openapi/strfmt v0.21.7 h1:rspiXgNWgeUzhjo1YU01do6qsahtJNByjLVbPLNHb8k= -github.com/go-openapi/strfmt v0.21.7/go.mod h1:adeGTkxE44sPyLk0JV235VQAO/ZXUr8KAzYjclFs3ew= +github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c= github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= -github.com/go-openapi/validate v0.22.1 h1:G+c2ub6q47kfX1sOBLwIQwzBVt8qmOAARyo/9Fqs9NU= -github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= +github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58= github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= -github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= -github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= -github.com/go-redis/cache/v8 v8.4.4 h1:Rm0wZ55X22BA2JMqVtRQNHYyzDd0I5f+Ec/C9Xx3mXY= -github.com/go-redis/cache/v8 v8.4.4/go.mod h1:JM6CkupsPvAu/LYEVGQy6UB4WDAzQSXkR0lUCbeIcKc= +github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k= +github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= +github.com/go-redis/cache/v9 v9.0.0 h1:0thdtFo0xJi0/WXbRVu8B066z8OvVymXTJGaXrVWnN0= github.com/go-redis/cache/v9 v9.0.0/go.mod h1:cMwi1N8ASBOufbIvk7cdXe2PbPjK/WMRL95FFHWsSgI= -github.com/go-redis/redis/v8 v8.11.3/go.mod h1:xNJ9xDG09FsIPwh3bWdk+0oDWHbtF9rPN0F/oD9XeKc= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY= @@ -380,33 +361,12 @@ github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg= github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= -github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= -github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= -github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= -github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= -github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= -github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= -github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= -github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= -github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= -github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= -github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= -github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= -github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= -github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= -github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= -github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= -github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= -github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/gobuffalo/flect v1.0.3 h1:xeWBM2nui+qnVvNM4S3foBhCAL2XgPU+a7FdpelbTq4= +github.com/gobuffalo/flect v1.0.3/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs= +github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= +github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= +github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.0 h1:zgVt4UpGxcqVOw97aRGxT4svlcmdK35fynLNctY32zI= @@ -417,11 +377,27 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg= github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= -github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= -github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/gohugoio/go-i18n/v2 v2.1.3-0.20230805085216-e63c13218d0e h1:QArsSubW7eDh8APMXkByjQWvuljwPGAGQpJEFn0F0wY= +github.com/gohugoio/go-i18n/v2 v2.1.3-0.20230805085216-e63c13218d0e/go.mod h1:3Ltoo9Banwq0gOtcOwxuHG6omk+AwsQPADyw2vQYOJQ= +github.com/gohugoio/hashstructure v0.1.0 h1:kBSTMLMyTXbrJVAxaKI+wv30MMJJxn9Q8kfQtJaZ400= +github.com/gohugoio/hashstructure v0.1.0/go.mod h1:8ohPTAfQLTs2WdzB6k9etmQYclDUeNsIHGPAFejbsEA= +github.com/gohugoio/httpcache v0.7.0 h1:ukPnn04Rgvx48JIinZvZetBfHaWE7I01JR2Q2RrQ3Vs= +github.com/gohugoio/httpcache v0.7.0/go.mod h1:fMlPrdY/vVJhAriLZnrF5QpN3BNAcoBClgAyQd+lGFI= +github.com/gohugoio/hugo v0.139.4 h1:KvHVT234Kyd3WrjZ83TWuFT3VEf95k2ahqeTV+Z635c= +github.com/gohugoio/hugo v0.139.4/go.mod h1:GPiZJZy5jCGiJ6Jtg0KdhE1JdpBTqhgtsbhpc1n8d5s= +github.com/gohugoio/hugo-goldmark-extensions/extras v0.2.0 h1:MNdY6hYCTQEekY0oAfsxWZU1CDt6iH+tMLgyMJQh/sg= +github.com/gohugoio/hugo-goldmark-extensions/extras v0.2.0/go.mod h1:oBdBVuiZ0fv9xd8xflUgt53QxW5jOCb1S+xntcN4SKo= +github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.3.0 h1:7PY5PIJ2mck7v6R52yCFvvYHvsPMEbulgRviw3I9lP4= +github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.3.0/go.mod h1:r8g5S7bHfdj0+9ShBog864ufCsVODKQZNjYYY8OnJpM= +github.com/gohugoio/locales v0.14.0 h1:Q0gpsZwfv7ATHMbcTNepFd59H7GoykzWJIxi113XGDc= +github.com/gohugoio/locales v0.14.0/go.mod h1:ip8cCAv/cnmVLzzXtiTpPwgJ4xhKZranqNqtoIu0b/4= +github.com/gohugoio/localescompressed v1.0.1 h1:KTYMi8fCWYLswFyJAeOtuk/EkXR/KPTHHNN9OS+RTxo= +github.com/gohugoio/localescompressed v1.0.1/go.mod h1:jBF6q8D7a0vaEmcWPNcAjUZLJaIVNiwvM3WlmTvooB0= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-migrate/migrate/v4 v4.18.2 h1:2VSCMz7x7mjyTXx3m2zPokOY82LTRgxK1yQYKo6wWQ8= github.com/golang-migrate/migrate/v4 v4.18.2/go.mod h1:2CM6tJvn2kqPXwnXO/d3rAQYiyoIm180VsO8PRX6Rpk= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -458,8 +434,7 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= -github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= @@ -473,11 +448,9 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= @@ -506,8 +479,8 @@ github.com/gophercloud/gophercloud v1.5.0 h1:cDN6XFCLKiiqvYpjQLq9AiM7RDRbIC9450W github.com/gophercloud/gophercloud v1.5.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= -github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= -github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grafana/dskit v0.0.0-20231120170505-765e343eda4f h1:gyojr97YeWZ70pKNakWv5/tKwBHuLy3icnIeCo9gQr4= github.com/grafana/dskit v0.0.0-20231120170505-765e343eda4f/go.mod h1:8dsy5tQOkeNQyjXpm5mQsbCu3H5uzeBD35MzRQFznKU= github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586 h1:/of8Z8taCPftShATouOrBVy6GaTTjgQd/VfNiZp/VXQ= @@ -520,19 +493,20 @@ github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= +github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 h1:FbSCl+KggFl+Ocym490i/EyXF4lPgLoUtcSWquBM0Rs= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= -github.com/hashicorp/consul/api v1.26.1 h1:5oSXOO5fboPZeW5SN+TdGFP/BILDgBm19OrPZ/pICIM= -github.com/hashicorp/consul/api v1.26.1/go.mod h1:B4sQTeaSO16NtynqrAdwOlahJ7IUDZM9cj2420xYL8A= -github.com/hashicorp/consul/api v1.32.1/go.mod h1:mXUWLnxftwTmDv4W3lzxYCPD199iNLLUyLfLGFJbtl4= -github.com/hashicorp/consul/sdk v0.15.0 h1:2qK9nDrr4tiJKRoxPGhm6B7xJjLVIQqkjiab2M4aKjU= -github.com/hashicorp/consul/sdk v0.15.0/go.mod h1:r/OmRRPbHOe0yxNahLw7G9x5WG17E1BIECMtCjcPSNo= +github.com/hairyhenderson/go-codeowners v0.6.1 h1:2OLPpLWFMxkCf9hkYzOexnCGD+kj853OqeoKq7S+9us= +github.com/hairyhenderson/go-codeowners v0.6.1/go.mod h1:RFWbGcjlXhRKNezt7AQHmJucY0alk4osN0+RKOsIAa8= +github.com/hashicorp/consul/api v1.30.0 h1:ArHVMMILb1nQv8vZSGIwwQd2gtc+oSQZ6CalyiyH2XQ= +github.com/hashicorp/consul/api v1.30.0/go.mod h1:B2uGchvaXVW2JhFoS8nqTxMD5PBykr4ebY4JWHTTeLM= +github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg= +github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s= github.com/hashicorp/cronexpr v1.1.2 h1:wG/ZYIKT+RT3QkOdgYc+xsKWVRgnxJ1OJtjjy84fJ9A= github.com/hashicorp/cronexpr v1.1.2/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -541,8 +515,7 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I= -github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= @@ -567,13 +540,14 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= -github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4= -github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI= github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -595,23 +569,24 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY= -github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= github.com/ionos-cloud/sdk-go/v6 v6.1.8 h1:493wE/BkZxJf7x79UCE0cYGPZoqQcPiEBALvt7uVGY0= github.com/ionos-cloud/sdk-go/v6 v6.1.8/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.7.4 h1:9wKznZrhWa2QiHL+NjTSPP6yjl3451BX3imWDnokYlg= github.com/jackc/pgx/v5 v5.7.4/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= -github.com/jellydator/ttlcache/v3 v3.1.0 h1:0gPFG0IHHP6xyUyXq+JaD8fwkDCqgqwohXNJBcYE71g= -github.com/jellydator/ttlcache/v3 v3.1.0/go.mod h1:hi7MGFdMAwZna5n2tuvh63DvFLzVKySzCVW6+0gA2n4= +github.com/jdkato/prose v1.2.1 h1:Fp3UnJmLVISmlc57BgKUzdjr0lOtjqTZicL3PaYy6cU= +github.com/jdkato/prose v1.2.1/go.mod h1:AiRHgVagnEx2JbQRQowVBKjG0bcs/vtkGCH1dYAL1rA= +github.com/jellydator/ttlcache/v3 v3.3.1-0.20250207140243-aefc35918359 h1:uzTOUCYbGERlXB3wX2/u9AsMeXnZCd8yLl2DMAY1Wxs= github.com/jellydator/ttlcache/v3 v3.3.1-0.20250207140243-aefc35918359/go.mod h1:aqa3CYl8S7MwpMXtFH3uNIEEfOjcn1MUNO+bQIGbFAQ= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= @@ -629,27 +604,22 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= -github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= -github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= +github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= +github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00= github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -659,44 +629,44 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/kyokomi/emoji/v2 v2.2.13 h1:GhTfQa67venUUvmleTNFnb+bi7S3aocF7ZCXU9fSO7U= +github.com/kyokomi/emoji/v2 v2.2.13/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/linode/linodego v1.19.0 h1:n4WJrcr9+30e9JGZ6DI0nZbm5SdAj1kSwvvt/998YUw= github.com/linode/linodego v1.19.0/go.mod h1:XZFR+yJ9mm2kwf6itZ6SCpu+6w3KnIevV0Uu5HNWJgQ= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= -github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= +github.com/makeworld-the-better-one/dither/v2 v2.4.0 h1:Az/dYXiTcwcRSe59Hzw4RI1rSnAZns+1msaCXetrMFE= +github.com/makeworld-the-better-one/dither/v2 v2.4.0/go.mod h1:VBtN8DXO7SNtyGmLiGA7IsFeKrBkQPze1/iAeM95arc= +github.com/marekm4/color-extractor v1.2.1 h1:3Zb2tQsn6bITZ8MBVhc33Qn1k5/SEuZ18mrXGUqIwn0= +github.com/marekm4/color-extractor v1.2.1/go.mod h1:90VjmiHI6M8ez9eYUaXLdcKnS+BAOp7w+NpwBdkJmpA= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= -github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6BbAxPY= github.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo= -github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY= +github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY= github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= @@ -711,13 +681,15 @@ github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUb github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 h1:BpfhmLKZf+SjVanKKhCgf3bg+511DmU9eDQTen7LLbY= -github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= +github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= +github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= +github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ= +github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -728,25 +700,39 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/muesli/smartcrop v0.3.0 h1:JTlSkmxWg/oQ1TcLDoypuirdE8Y/jzNirQeLkxpA6Oc= +github.com/muesli/smartcrop v0.3.0/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= +github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/niklasfasching/go-org v1.7.0 h1:vyMdcMWWTe/XmANk19F4k8XGBYg0GQ/gJGMimOjGMek= +github.com/niklasfasching/go-org v1.7.0/go.mod h1:WuVm4d45oePiE0eX25GqTDQIt/qPW1T9DGkRscqLW5o= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oapi-codegen/gin-middleware v1.0.1 h1:903hkcyMcM/h6ooHS7t/2ad973BY0xvsRNP0EN1B65g= -github.com/oapi-codegen/gin-middleware v1.0.1/go.mod h1:JDMxGX/rErQs2VV0XAVo1sD6sA0EVUMvFSPhgOLt9mE= -github.com/oapi-codegen/runtime v1.1.0 h1:rJpoNUawn5XTvekgfkvSZr0RqEnoYpFkyvrzfWeFKWM= -github.com/oapi-codegen/runtime v1.1.0/go.mod h1:BeSfBkWWWnAnGdyS+S/GnlbmHKzf8/hwkvelJZDeKA8= +github.com/oapi-codegen/gin-middleware v1.0.2 h1:/H99UzvHQAUxXK8pzdcGAZgjCVeXdFDAUUWaJT0k0eI= +github.com/oapi-codegen/gin-middleware v1.0.2/go.mod h1:2HJDQjH8jzK2/k/VKcWl+/T41H7ai2bKa6dN3AA2GpA= +github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 h1:ykgG34472DWey7TSjd8vIfNykXgjOgYJZoQbKfEeY/Q= +github.com/oapi-codegen/oapi-codegen/v2 v2.4.1/go.mod h1:N5+lY1tiTDV3V1BeHtOxeWXHoPVeApvsvjJqegfoaz8= +github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro= github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= +github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//JalHPu/3yz+De2J+4aLtSRlHiY= github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw= +github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c= github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= @@ -758,9 +744,9 @@ github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8Ay github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw= github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= @@ -769,18 +755,16 @@ github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM= -github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= -github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= -github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= +github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU= +github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= +github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e h1:4cPxUYdgaGzZIT5/j0IfqOrrXmq6bG8AwvwisMXpdrg= github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= +github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w= github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= -github.com/opentracing-contrib/go-stdlib v1.1.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w= -github.com/opentracing-contrib/go-stdlib v1.1.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= @@ -791,21 +775,22 @@ github.com/ovh/go-ovh v1.4.1/go.mod h1:6bL6pPyUT7tBfI0pqOegJgRjgjuO+mOo+MyXd1EEC github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU= github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= -github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= -github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= -github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= +github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0= +github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= +github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= -github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -819,6 +804,7 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/posthog/posthog-go v0.0.0-20230801140217-d607812dee69 h1:01dHVodha5BzrMtVmcpPeA4VYbZEsTXQ6m4123zQXJk= github.com/posthog/posthog-go v0.0.0-20230801140217-d607812dee69/go.mod h1:migYMxlAqcnQy+3eN8mcL0b2tpKy6R+8Zc0lxwk4dKM= +github.com/pressly/goose/v3 v3.24.2 h1:c/ie0Gm8rnIVKvnDQ/scHErv46jrDv9b4I0WRcFJzYU= github.com/pressly/goose/v3 v3.24.2/go.mod h1:kjefwFB0eR4w30Td2Gj2Mznyw94vSP+2jJYkOVNbD1k= github.com/prometheus/alertmanager v0.26.0 h1:uOMJWfIwJguc3NaM3appWNbbrh6G/OjvaHMk22aBBYc= github.com/prometheus/alertmanager v0.26.0/go.mod h1:rVcnARltVjavgVaNnmevxK7kOn7IZavyf0KNgHkbEpU= @@ -828,23 +814,20 @@ github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= -github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= -github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y= -github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= @@ -855,24 +838,22 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM= github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg= github.com/prometheus/prometheus v0.47.2-0.20231010075449-4b9c19fe5510 h1:6ksZ7t1hNOzGPPs8DK7SvXQf6UfWzi+W5Z7PCBl8gx4= github.com/prometheus/prometheus v0.47.2-0.20231010075449-4b9c19fe5510/go.mod h1:UC0TwJiF90m2T3iYPQBKnGu8gv3s55dF/EgpTq8gyvo= github.com/redis/go-redis/v9 v9.0.0-rc.4/go.mod h1:Vo3EsyWnicKnSKCA7HhgnvnyA74wOA69Cd2Meli5mmA= -github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA= +github.com/redis/go-redis/v9 v9.8.0 h1:q3nRvjrlge/6UD7eTu/DSg2uYiU2mCL0G/uzBWqhicI= +github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= -github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= -github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -880,24 +861,23 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20 h1:a9hSJdJcd16e0HoMsnFvaHvxB3 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/sercand/kuberesolver/v5 v5.1.1 h1:CYH+d67G0sGBj7q5wLK61yzqJJ8gLLC8aeprPTHb6yY= github.com/sercand/kuberesolver/v5 v5.1.1/go.mod h1:Fs1KbKhVRnB2aDWN12NjKCB+RgYMWZJ294T3BtmVCpQ= -github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah2SE= github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas= github.com/shoenig/test v1.7.0 h1:eWcHtTXa6QLnBvm0jgEabMRN/uJ4DMV3M8xUGgRkZmk= github.com/shoenig/test v1.7.0/go.mod h1:UxJ6u/x2v/TNs/LoLxBNJRV9DiwBBKYxXSyczsBHFoI= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= -github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= @@ -907,13 +887,15 @@ github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/speakeasy-api/openapi-overlay v0.9.0 h1:Wrz6NO02cNlLzx1fB093lBlYxSI54VRhy1aSutx0PQg= +github.com/speakeasy-api/openapi-overlay v0.9.0/go.mod h1:f5FloQrHA7MsxYg9djzMD5h6dxrHjVVByWKh7an8TRc= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/cast v1.8.0 h1:gEN9K4b8Xws4EX0+a0reLmhq8moKn7ntRlQYgjPeCDk= +github.com/spf13/cast v1.8.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -931,8 +913,18 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tdewolff/minify/v2 v2.20.37 h1:Q97cx4STXCh1dlWDlNHZniE8BJ2EBL0+2b0n92BJQhw= +github.com/tdewolff/minify/v2 v2.20.37/go.mod h1:L1VYef/jwKw6Wwyk5A+T0mBjjn3mMPgmjjA688RNsxU= +github.com/tdewolff/parse/v2 v2.7.15 h1:hysDXtdGZIRF5UZXwpfn3ZWRbm+ru4l53/ajBRGpCTw= +github.com/tdewolff/parse/v2 v2.7.15/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= +github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= +github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I= +github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= @@ -943,8 +935,6 @@ github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaO github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= @@ -955,6 +945,8 @@ github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9 github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/vmware-labs/yaml-jsonpath v0.3.2 h1:/5QKeCBGdsInyDCyVNLbXyilb61MXGi9NP674f9Hobk= +github.com/vmware-labs/yaml-jsonpath v0.3.2/go.mod h1:U6whw1z03QyqgWdgXxvVnQ90zN1BWz5V+51Ewf8k+rQ= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE= @@ -962,12 +954,9 @@ github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX8Wdm2/JPA= github.com/willf/bloom v2.0.3+incompatible/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= -github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= -github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= -github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= +github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -977,12 +966,15 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= +github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= +github.com/yuin/goldmark-emoji v1.0.4 h1:vCwMkPZSNefSUnOW2ZKRUjBSD5Ok3W78IXhGxxAEF90= +github.com/yuin/goldmark-emoji v1.0.4/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U= github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE= github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0= go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ= go.etcd.io/etcd/api/v3 v3.5.4 h1:OHVyt3TopwtUQ2GKdd5wu3PmmipR4FTwCqoEjSyRdIc= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= @@ -990,64 +982,54 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4 h1:lrneYvz923dvC14R54XcA7FXoZ3mlGZAgmwhfm7H go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4 h1:p83BUL3tAYS0OT/r0qglgc3M1JjhM0diV8DSWAhVXv4= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= -go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= -go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= -go.mongodb.org/mongo-driver v1.12.1 h1:nLkghSU8fQNaK7oUmDhQFsnrtcoNy7Z6LVFKsEecqgE= -go.mongodb.org/mongo-driver v1.12.1/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ= +go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM= go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 h1:8PzrQFk3oKiT1Sd5EmNEcagdMyt1KcBy5/OyF5He5gY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0015/go.mod h1:I1PqyHJlsXjANC73tp43nDId7/jiv82NoZZ6uS0xdwM= go.opentelemetry.io/collector/semconv v0.81.0 h1:lCYNNo3powDvFIaTPP2jDKIrBiV1T92NK4QgL/aHYXw= go.opentelemetry.io/collector/semconv v0.81.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= +go.opentelemetry.io/contrib/bridges/otelzap v0.9.0 h1:f+xpAfhQTjR8beiSMe1bnT/25PkeyWmOcI+SjXWguNw= go.opentelemetry.io/contrib/bridges/otelzap v0.9.0/go.mod h1:T1Z1jyS5FttgQoF6UcGhnM+gF9wU32B4lHO69nXw4FE= go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.57.0 h1:1wEousrQOXTAhk16quIMIo1gSaUp1J3PEVlsiEAtmeU= go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.57.0/go.mod h1:rUWyQu4HfRAG0jkr1TixDHP9IERQ/iEq/YwFoU73ddo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0/go.mod h1:Y+Pop1Q6hCOnETWTW4NROK/q1hv50hM7yDaUTjG8lp8= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 h1:doUP+ExOpH3spVTLS0FcWGLnQrPct/hD/bCPbDRUEAU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0/go.mod h1:wZcGmeVO9nzP67aYSLDqXNWK87EZWhi7JWj1v7ZXf94= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 h1:PS8wXpbyaDJQ2VDHHncMe9Vct0Zn1fEjpsjrLxGJoSc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0/go.mod h1:HDBUsEjOuRC0EzKZ1bSaRGZWUBAzo+MhAcUUORSr4D0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= go.opentelemetry.io/contrib/propagators/b3 v1.32.0 h1:MazJBz2Zf6HTN/nK/s3Ru1qme+VhWU5hm83QxEP+dvw= go.opentelemetry.io/contrib/propagators/b3 v1.32.0/go.mod h1:B0s70QHYPrJwPOwD1o3V/R8vETNOG9N3qZf4LDYvA30= -go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= -go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= -go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y= +go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= +go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 h1:5dTKu4I5Dn4P2hxyW3l3jTaZx9ACgg0ECos1eAVrheY= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0/go.mod h1:P5HcUI8obLrCCmM3sbVBohZFH34iszk/+CPWuakZWL8= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 h1:jd0+5t/YynESZqsSyPz+7PAFdEop0dlN0+PkyHYo8oI= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0/go.mod h1:U707O40ee1FpQGyhvqnzmCJm1Wh6OX6GGBVn0E6Uyyk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 h1:ajl4QczuJVA2TU9W9AGw++86Xga/RKt//16z/yxPgdk= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0/go.mod h1:Vn3/rlOJ3ntf/Q3zAI0V5lDnTbHGaUsNUeF6nZmm7pA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 h1:IJFEoHiytixx8cMiVAO+GmHR6Frwu+u5Ur8njpFO6Ac= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0/go.mod h1:3rHrKNtLIoS0oZwkY2vxi+oJcwFRWdtUyRII+so45p8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 h1:9kV11HXBHZAvuPUZxmMWrH8hZn/6UnHX4K0mu36vNsU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0/go.mod h1:JyA0FHXe22E1NeNiHmVp7kFHglnexDQ7uRWDiiJ1hKQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 h1:dNzwXjZKpMpE2JhmO+9HsPl42NIXFIFSUSSs0fiqra0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0/go.mod h1:90PoxvaEB5n6AOdZvi+yWJQoE95U8Dhhw2bSyRqnTD0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE= +go.opentelemetry.io/otel/log v0.10.0 h1:1CXmspaRITvFcjA4kyVszuG4HjA61fPDxMb7q3BuyF0= go.opentelemetry.io/otel/log v0.10.0/go.mod h1:PbVdm9bXKku/gL0oFfUF4wwsQsOPlpo4VEqjvxih+FM= -go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= -go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= -go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE= -go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= -go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= -go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= +go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= +go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= +go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs= +go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY= +go.opentelemetry.io/otel/sdk/log v0.10.0 h1:lR4teQGWfeDVGoute6l0Ou+RpFqQ9vaPdrNJlST0bvw= go.opentelemetry.io/otel/sdk/log v0.10.0/go.mod h1:A+V1UTWREhWAittaQEG4bYm4gAZa6xnvVu+xKrIRkzo= -go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= -go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= -go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= -go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= -go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= -go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= -go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= -go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= -go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= +go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o= +go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w= +go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= +go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= +go.opentelemetry.io/proto/otlp v1.6.0 h1:jQjP+AQyTf+Fe7OKj/MfkDrmK4MNVtw2NpXsf9fefDI= +go.opentelemetry.io/proto/otlp v1.6.0/go.mod h1:cicgGehlFuNdgZkcALOCh3VE6K/u2tAjzlRhDwmVpZc= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= @@ -1059,23 +1041,19 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= -go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= go4.org/netipx v0.0.0-20230125063823-8449b0a6169f h1:ketMxHg+vWm3yccyYiq+uK8D3fRmna2Fcj+awpQp84s= go4.org/netipx v0.0.0-20230125063823-8449b0a6169f/go.mod h1:tgPU4N2u9RByaTN3NC2p9xOzyFpte4jYwsIIRF7XlSc= -golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4= -golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/arch v0.16.0 h1:foMtLTdyOmIniqWCHjY6+JxuC54XP1fDwx4N0ASyW+U= +golang.org/x/arch v0.16.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= @@ -1095,12 +1073,13 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= -golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= -golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8= +golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b h1:QoALfVG9rhQ/M7vYDScfPdWjGL9dlsVVM5VGh7aKoAA= +golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.22.0 h1:UtK5yLUzilVrkjMAZAZ34DXGpASN8i8pj8g+O+yd10g= +golang.org/x/image v0.22.0/go.mod h1:9hPFhljd4zZ1GNSIZJ49sqbp45GKK9t6w+iXvGqZUz4= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1125,8 +1104,7 @@ golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1166,7 +1144,6 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -1178,23 +1155,20 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= +golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= +golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= -golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= -golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= +golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1214,13 +1188,10 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1257,13 +1228,12 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1274,13 +1244,11 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1299,18 +1267,15 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1321,14 +1286,10 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -1371,9 +1332,8 @@ golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s= +golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= +golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1437,12 +1397,10 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g= -google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4= -google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 h1:Kog3KlB4xevJlAcbbbzPfRG0+X9fdoGM+UBRKVz6Wr0= +google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237/go.mod h1:ezi0AVyMKDWy5xAncvjLWH7UcLBB5n7y2fQ8MzjJcto= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 h1:cJfm9zPbe1e873mHJzmQ1nwVEeRDU/T1wXDK2kUSU34= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1459,9 +1417,8 @@ google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= -google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= -google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec= +google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA= +google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1476,8 +1433,7 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1503,11 +1459,9 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1530,6 +1484,14 @@ k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5Ohx k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= k8s.io/utils v0.0.0-20230711102312-30195339c3c7 h1:ZgnF1KZsYxWIifwSNZFZgNtWE89WI5yiP5WwlfDoIyc= k8s.io/utils v0.0.0-20230711102312-30195339c3c7/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +modernc.org/libc v1.62.1 h1:s0+fv5E3FymN8eJVmnk0llBe6rOxCu/DEU+XygRbS8s= +modernc.org/libc v1.62.1/go.mod h1:iXhATfJQLjG3NWy56a6WVU73lWOcdYVxsvwCgoPljuo= +modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= +modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= +modernc.org/memory v1.9.1 h1:V/Z1solwAVmMW1yttq3nDdZPJqV1rM05Ccq6KMSZ34g= +modernc.org/memory v1.9.1/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI= +modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= @@ -1540,6 +1502,5 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h6 sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk= sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/packages/api/internal/analytics_collector/analytics.go b/packages/api/internal/analytics_collector/analytics.go index 3efc040..e151854 100644 --- a/packages/api/internal/analytics_collector/analytics.go +++ b/packages/api/internal/analytics_collector/analytics.go @@ -24,15 +24,14 @@ const ( type PosthogClient struct { client posthog.Client - logger *zap.SugaredLogger } -func NewPosthogClient(logger *zap.SugaredLogger) (*PosthogClient, error) { +func NewPosthogClient() (*PosthogClient, error) { posthogAPIKey := os.Getenv("POSTHOG_API_KEY") posthogLogger := posthog.StdLogger(log.New(os.Stderr, "posthog ", log.LstdFlags)) if strings.TrimSpace(posthogAPIKey) == "" { - logger.Info("No Posthog API key provided, silencing logs") + zap.L().Info("No Posthog API key provided, silencing logs") writer := &utils.NoOpWriter{} posthogLogger = posthog.StdLogger(log.New(writer, "posthog ", log.LstdFlags)) @@ -44,14 +43,12 @@ func NewPosthogClient(logger *zap.SugaredLogger) (*PosthogClient, error) { Verbose: false, Logger: posthogLogger, }) - if err != nil { - logger.Fatalf("error initializing Posthog client: %v\n", err) + zap.L().Fatal("error initializing Posthog client", zap.Error(err)) } return &PosthogClient{ client: client, - logger: logger, }, nil } @@ -69,7 +66,7 @@ func (p *PosthogClient) IdentifyAnalyticsTeam(teamID string, teamName string) { }, ) if err != nil { - p.logger.Errorf("error when setting group property in Posthog: %v", err) + zap.L().Error("error when setting group property in Posthog", zap.Error(err)) } } @@ -82,7 +79,7 @@ func (p *PosthogClient) CreateAnalyticsTeamEvent(teamID, event string, propertie Set("team", teamID), }) if err != nil { - p.logger.Errorf("error when sending event to Posthog: %v", err) + zap.L().Error("error when sending event to Posthog", zap.Error(err)) } } @@ -95,7 +92,7 @@ func (p *PosthogClient) CreateAnalyticsUserEvent(userID string, teamID string, e Set("team", teamID), }) if err != nil { - p.logger.Errorf("error when sending event to Posthog: %v", err) + zap.L().Error("error when sending event to Posthog", zap.Error(err)) } } diff --git a/packages/api/internal/analytics_collector/client.go b/packages/api/internal/analytics_collector/client.go index 16bf2be..b1c0cf6 100644 --- a/packages/api/internal/analytics_collector/client.go +++ b/packages/api/internal/analytics_collector/client.go @@ -1,33 +1,67 @@ package analyticscollector import ( + "context" + "crypto/tls" + "crypto/x509" "fmt" "os" + "strings" + "go.uber.org/zap" "google.golang.org/grpc" - - e2bgrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc" + "google.golang.org/grpc/credentials" + "google.golang.org/protobuf/types/known/emptypb" ) -var host = os.Getenv("ANALYTICS_COLLECTOR_HOST") +var host = strings.TrimSpace(os.Getenv("ANALYTICS_COLLECTOR_HOST")) type Analytics struct { - Client AnalyticsCollectorClient - connection e2bgrpc.ClientConnInterface + client AnalyticsCollectorClient + connection *grpc.ClientConn } func NewAnalytics() (*Analytics, error) { - conn, err := e2bgrpc.GetConnection(host, true, grpc.WithPerRPCCredentials(&gRPCApiKey{})) - if err != nil { - return nil, fmt.Errorf("failed to establish GRPC connection: %w", err) - } + var client AnalyticsCollectorClient + var connection *grpc.ClientConn + + if host == "" { + zap.L().Info("Running dummy implementation of analytics collector client, no host provided") + } else { + systemRoots, err := x509.SystemCertPool() + if err != nil { + errMsg := fmt.Errorf("failed to read system root certificate pool: %w", err) + + return nil, errMsg + } + + cred := credentials.NewTLS(&tls.Config{ + RootCAs: systemRoots, + MinVersion: tls.VersionTLS13, + }) - client := NewAnalyticsCollectorClient(conn) + conn, err := grpc.NewClient( + fmt.Sprintf("%s:443", host), + grpc.WithPerRPCCredentials(&gRPCApiKey{}), + grpc.WithAuthority(host), + grpc.WithTransportCredentials(cred), + ) + if err != nil { + return nil, fmt.Errorf("failed to create GRPC client: %w", err) + } - return &Analytics{Client: client, connection: conn}, nil + connection = conn + client = NewAnalyticsCollectorClient(connection) + } + + return &Analytics{client: client, connection: connection}, nil } func (a *Analytics) Close() error { + if a.connection == nil { + return nil + } + err := a.connection.Close() if err != nil { return fmt.Errorf("failed to close connection: %w", err) @@ -35,3 +69,27 @@ func (a *Analytics) Close() error { return nil } + +func (a *Analytics) InstanceStarted(ctx context.Context, in *InstanceStartedEvent, opts ...grpc.CallOption) (*emptypb.Empty, error) { + if a.client == nil { + return nil, nil + } + + return a.client.InstanceStarted(ctx, in, opts...) +} + +func (a *Analytics) RunningInstances(ctx context.Context, in *RunningInstancesEvent, opts ...grpc.CallOption) (*emptypb.Empty, error) { + if a.client == nil { + return nil, nil + } + + return a.client.RunningInstances(ctx, in, opts...) +} + +func (a *Analytics) InstanceStopped(ctx context.Context, in *InstanceStoppedEvent, opts ...grpc.CallOption) (*emptypb.Empty, error) { + if a.client == nil { + return nil, nil + } + + return a.client.InstanceStopped(ctx, in, opts...) +} diff --git a/packages/api/internal/analytics_collector/collector.pb.go b/packages/api/internal/analytics_collector/collector.pb.go index d18dec7..54cf1d5 100644 --- a/packages/api/internal/analytics_collector/collector.pb.go +++ b/packages/api/internal/analytics_collector/collector.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v4.25.3 +// protoc v5.29.3 // source: collector.proto package analyticscollector @@ -32,6 +32,10 @@ type InstanceStartedEvent struct { EnvironmentId string `protobuf:"bytes,3,opt,name=environment_id,json=environmentId,proto3" json:"environment_id,omitempty"` InstanceId string `protobuf:"bytes,4,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"` BuildId string `protobuf:"bytes,5,opt,name=build_id,json=buildId,proto3" json:"build_id,omitempty"` + ExecutionId string `protobuf:"bytes,6,opt,name=execution_id,json=executionId,proto3" json:"execution_id,omitempty"` + CpuCount int64 `protobuf:"varint,7,opt,name=cpu_count,json=cpuCount,proto3" json:"cpu_count,omitempty"` + RamMb int64 `protobuf:"varint,8,opt,name=ram_mb,json=ramMb,proto3" json:"ram_mb,omitempty"` + DiskSizeMb int64 `protobuf:"varint,9,opt,name=disk_size_mb,json=diskSizeMb,proto3" json:"disk_size_mb,omitempty"` } func (x *InstanceStartedEvent) Reset() { @@ -101,13 +105,42 @@ func (x *InstanceStartedEvent) GetBuildId() string { return "" } +func (x *InstanceStartedEvent) GetExecutionId() string { + if x != nil { + return x.ExecutionId + } + return "" +} + +func (x *InstanceStartedEvent) GetCpuCount() int64 { + if x != nil { + return x.CpuCount + } + return 0 +} + +func (x *InstanceStartedEvent) GetRamMb() int64 { + if x != nil { + return x.RamMb + } + return 0 +} + +func (x *InstanceStartedEvent) GetDiskSizeMb() int64 { + if x != nil { + return x.DiskSizeMb + } + return 0 +} + type RunningInstancesEvent struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` - InstanceIds []string `protobuf:"bytes,2,rep,name=instance_ids,json=instanceIds,proto3" json:"instance_ids,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + InstanceIds []string `protobuf:"bytes,2,rep,name=instance_ids,json=instanceIds,proto3" json:"instance_ids,omitempty"` + ExecutionIds []string `protobuf:"bytes,3,rep,name=execution_ids,json=executionIds,proto3" json:"execution_ids,omitempty"` } func (x *RunningInstancesEvent) Reset() { @@ -156,6 +189,13 @@ func (x *RunningInstancesEvent) GetInstanceIds() []string { return nil } +func (x *RunningInstancesEvent) GetExecutionIds() []string { + if x != nil { + return x.ExecutionIds + } + return nil +} + type InstanceStoppedEvent struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -166,6 +206,10 @@ type InstanceStoppedEvent struct { EnvironmentId string `protobuf:"bytes,3,opt,name=environment_id,json=environmentId,proto3" json:"environment_id,omitempty"` InstanceId string `protobuf:"bytes,4,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"` Duration float32 `protobuf:"fixed32,5,opt,name=duration,proto3" json:"duration,omitempty"` + ExecutionId string `protobuf:"bytes,6,opt,name=execution_id,json=executionId,proto3" json:"execution_id,omitempty"` + CpuCount int64 `protobuf:"varint,7,opt,name=cpu_count,json=cpuCount,proto3" json:"cpu_count,omitempty"` + RamMb int64 `protobuf:"varint,8,opt,name=ram_mb,json=ramMb,proto3" json:"ram_mb,omitempty"` + DiskSizeMb int64 `protobuf:"varint,9,opt,name=disk_size_mb,json=diskSizeMb,proto3" json:"disk_size_mb,omitempty"` } func (x *InstanceStoppedEvent) Reset() { @@ -235,6 +279,34 @@ func (x *InstanceStoppedEvent) GetDuration() float32 { return 0 } +func (x *InstanceStoppedEvent) GetExecutionId() string { + if x != nil { + return x.ExecutionId + } + return "" +} + +func (x *InstanceStoppedEvent) GetCpuCount() int64 { + if x != nil { + return x.CpuCount + } + return 0 +} + +func (x *InstanceStoppedEvent) GetRamMb() int64 { + if x != nil { + return x.RamMb + } + return 0 +} + +func (x *InstanceStoppedEvent) GetDiskSizeMb() int64 { + if x != nil { + return x.DiskSizeMb + } + return 0 +} + var File_collector_proto protoreflect.FileDescriptor var file_collector_proto_rawDesc = []byte{ @@ -243,7 +315,7 @@ var file_collector_proto_rawDesc = []byte{ 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0xcc, 0x01, 0x0a, 0x14, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x74, 0x61, 0x72, + 0xc5, 0x02, 0x0a, 0x14, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, @@ -255,47 +327,64 @@ var file_collector_proto_rawDesc = []byte{ 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x22, 0x74, - 0x0a, 0x15, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x73, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, - 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, - 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, - 0x70, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, - 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x49, 0x64, 0x73, 0x22, 0xcd, 0x01, 0x0a, 0x14, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, - 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x74, 0x69, - 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x5f, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64, - 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, - 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, - 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x32, 0xe2, 0x01, 0x0a, 0x12, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x74, 0x69, - 0x63, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x42, 0x0a, 0x0f, 0x49, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x12, 0x15, - 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, - 0x45, 0x76, 0x65, 0x6e, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, - 0x44, 0x0a, 0x10, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x73, 0x12, 0x16, 0x2e, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x0f, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x12, 0x15, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x1a, - 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x43, 0x5a, 0x41, 0x68, 0x74, 0x74, - 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x65, 0x32, 0x62, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x61, 0x6e, 0x61, 0x6c, 0x79, 0x74, 0x69, 0x63, - 0x73, 0x2d, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2f, 0x61, 0x6e, 0x61, 0x6c, - 0x79, 0x74, 0x69, 0x63, 0x73, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x21, + 0x0a, 0x0c, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x49, + 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x70, 0x75, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x63, 0x70, 0x75, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x15, + 0x0a, 0x06, 0x72, 0x61, 0x6d, 0x5f, 0x6d, 0x62, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x72, 0x61, 0x6d, 0x4d, 0x62, 0x12, 0x20, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x73, 0x69, + 0x7a, 0x65, 0x5f, 0x6d, 0x62, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x64, 0x69, 0x73, + 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x4d, 0x62, 0x22, 0x99, 0x01, 0x0a, 0x15, 0x52, 0x75, 0x6e, 0x6e, + 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x45, 0x76, 0x65, 0x6e, + 0x74, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, + 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x21, 0x0a, 0x0c, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x73, 0x12, 0x23, + 0x0a, 0x0d, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x73, 0x18, + 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x49, 0x64, 0x73, 0x22, 0xc6, 0x02, 0x0a, 0x14, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x09, + 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x74, 0x69, 0x6d, + 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x5f, 0x69, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x12, + 0x25, 0x0a, 0x0e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x69, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, + 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x0c, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x65, 0x78, 0x65, 0x63, 0x75, + 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x70, 0x75, 0x5f, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x63, 0x70, 0x75, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x15, 0x0a, 0x06, 0x72, 0x61, 0x6d, 0x5f, 0x6d, 0x62, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x61, 0x6d, 0x4d, 0x62, 0x12, 0x20, 0x0a, 0x0c, 0x64, 0x69, + 0x73, 0x6b, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x6d, 0x62, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x4d, 0x62, 0x32, 0xe2, 0x01, 0x0a, + 0x12, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x74, 0x69, 0x63, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, + 0x74, 0x6f, 0x72, 0x12, 0x42, 0x0a, 0x0f, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x53, + 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x12, 0x15, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x1a, 0x16, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x44, 0x0a, 0x10, 0x52, 0x75, 0x6e, 0x6e, 0x69, + 0x6e, 0x67, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x16, 0x2e, 0x52, 0x75, + 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x45, 0x76, + 0x65, 0x6e, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x42, 0x0a, + 0x0f, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, + 0x12, 0x15, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x74, 0x6f, 0x70, 0x70, + 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, + 0x00, 0x42, 0x43, 0x5a, 0x41, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x32, 0x62, 0x2d, 0x64, 0x65, 0x76, 0x2f, + 0x61, 0x6e, 0x61, 0x6c, 0x79, 0x74, 0x69, 0x63, 0x73, 0x2d, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, + 0x74, 0x6f, 0x72, 0x2f, 0x61, 0x6e, 0x61, 0x6c, 0x79, 0x74, 0x69, 0x63, 0x73, 0x63, 0x6f, 0x6c, + 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/packages/api/internal/analytics_collector/collector_grpc.pb.go b/packages/api/internal/analytics_collector/collector_grpc.pb.go index 22caa14..f4fd1d5 100644 --- a/packages/api/internal/analytics_collector/collector_grpc.pb.go +++ b/packages/api/internal/analytics_collector/collector_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v4.25.3 +// - protoc v5.29.3 // source: collector.proto package analyticscollector diff --git a/packages/api/internal/api/api.gen.go b/packages/api/internal/api/api.gen.go index c4a0143..247f592 100644 --- a/packages/api/internal/api/api.gen.go +++ b/packages/api/internal/api/api.gen.go @@ -14,6 +14,24 @@ import ( // ServerInterface represents all server handlers. type ServerInterface interface { + // (POST /access-tokens) + PostAccessTokens(c *gin.Context) + + // (DELETE /access-tokens/{accessTokenID}) + DeleteAccessTokensAccessTokenID(c *gin.Context, accessTokenID AccessTokenID) + + // (GET /api-keys) + GetApiKeys(c *gin.Context) + + // (POST /api-keys) + PostApiKeys(c *gin.Context) + + // (DELETE /api-keys/{apiKeyID}) + DeleteApiKeysApiKeyID(c *gin.Context, apiKeyID ApiKeyID) + + // (PATCH /api-keys/{apiKeyID}) + PatchApiKeysApiKeyID(c *gin.Context, apiKeyID ApiKeyID) + // (GET /health) GetHealth(c *gin.Context) @@ -82,6 +100,9 @@ type ServerInterface interface { // (GET /templates/{templateID}/builds/{buildID}/status) GetTemplatesTemplateIDBuildsBuildIDStatus(c *gin.Context, templateID TemplateID, buildID BuildID, params GetTemplatesTemplateIDBuildsBuildIDStatusParams) + + // (GET /v2/sandboxes) + GetV2Sandboxes(c *gin.Context, params GetV2SandboxesParams) } // ServerInterfaceWrapper converts contexts to parameters. @@ -93,6 +114,137 @@ type ServerInterfaceWrapper struct { type MiddlewareFunc func(c *gin.Context) +// PostAccessTokens operation middleware +func (siw *ServerInterfaceWrapper) PostAccessTokens(c *gin.Context) { + + c.Set(Supabase1TokenAuthScopes, []string{}) + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PostAccessTokens(c) +} + +// DeleteAccessTokensAccessTokenID operation middleware +func (siw *ServerInterfaceWrapper) DeleteAccessTokensAccessTokenID(c *gin.Context) { + + var err error + + // ------------- Path parameter "accessTokenID" ------------- + var accessTokenID AccessTokenID + + err = runtime.BindStyledParameterWithOptions("simple", "accessTokenID", c.Param("accessTokenID"), &accessTokenID, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter accessTokenID: %w", err), http.StatusBadRequest) + return + } + + c.Set(Supabase1TokenAuthScopes, []string{}) + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.DeleteAccessTokensAccessTokenID(c, accessTokenID) +} + +// GetApiKeys operation middleware +func (siw *ServerInterfaceWrapper) GetApiKeys(c *gin.Context) { + + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetApiKeys(c) +} + +// PostApiKeys operation middleware +func (siw *ServerInterfaceWrapper) PostApiKeys(c *gin.Context) { + + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PostApiKeys(c) +} + +// DeleteApiKeysApiKeyID operation middleware +func (siw *ServerInterfaceWrapper) DeleteApiKeysApiKeyID(c *gin.Context) { + + var err error + + // ------------- Path parameter "apiKeyID" ------------- + var apiKeyID ApiKeyID + + err = runtime.BindStyledParameterWithOptions("simple", "apiKeyID", c.Param("apiKeyID"), &apiKeyID, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter apiKeyID: %w", err), http.StatusBadRequest) + return + } + + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.DeleteApiKeysApiKeyID(c, apiKeyID) +} + +// PatchApiKeysApiKeyID operation middleware +func (siw *ServerInterfaceWrapper) PatchApiKeysApiKeyID(c *gin.Context) { + + var err error + + // ------------- Path parameter "apiKeyID" ------------- + var apiKeyID ApiKeyID + + err = runtime.BindStyledParameterWithOptions("simple", "apiKeyID", c.Param("apiKeyID"), &apiKeyID, runtime.BindStyledParameterOptions{Explode: false, Required: true}) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter apiKeyID: %w", err), http.StatusBadRequest) + return + } + + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.PatchApiKeysApiKeyID(c, apiKeyID) +} + // GetHealth operation middleware func (siw *ServerInterfaceWrapper) GetHealth(c *gin.Context) { @@ -180,14 +332,18 @@ func (siw *ServerInterfaceWrapper) GetSandboxes(c *gin.Context) { c.Set(ApiKeyAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + // Parameter object where we will unmarshal all parameters from the context var params GetSandboxesParams - // ------------- Optional query parameter "query" ------------- + // ------------- Optional query parameter "metadata" ------------- - err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) + err = runtime.BindQueryParameter("form", true, false, "metadata", c.Request.URL.Query(), ¶ms.Metadata) if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter metadata: %w", err), http.StatusBadRequest) return } @@ -206,6 +362,10 @@ func (siw *ServerInterfaceWrapper) PostSandboxes(c *gin.Context) { c.Set(ApiKeyAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -226,11 +386,11 @@ func (siw *ServerInterfaceWrapper) GetSandboxesMetrics(c *gin.Context) { // Parameter object where we will unmarshal all parameters from the context var params GetSandboxesMetricsParams - // ------------- Optional query parameter "query" ------------- + // ------------- Optional query parameter "metadata" ------------- - err = runtime.BindQueryParameter("form", true, false, "query", c.Request.URL.Query(), ¶ms.Query) + err = runtime.BindQueryParameter("form", true, false, "metadata", c.Request.URL.Query(), ¶ms.Metadata) if err != nil { - siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter query: %w", err), http.StatusBadRequest) + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter metadata: %w", err), http.StatusBadRequest) return } @@ -260,6 +420,10 @@ func (siw *ServerInterfaceWrapper) DeleteSandboxesSandboxID(c *gin.Context) { c.Set(ApiKeyAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -286,6 +450,10 @@ func (siw *ServerInterfaceWrapper) GetSandboxesSandboxID(c *gin.Context) { c.Set(ApiKeyAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -312,6 +480,10 @@ func (siw *ServerInterfaceWrapper) GetSandboxesSandboxIDLogs(c *gin.Context) { c.Set(ApiKeyAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + // Parameter object where we will unmarshal all parameters from the context var params GetSandboxesSandboxIDLogsParams @@ -357,6 +529,10 @@ func (siw *ServerInterfaceWrapper) GetSandboxesSandboxIDMetrics(c *gin.Context) c.Set(ApiKeyAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -383,6 +559,10 @@ func (siw *ServerInterfaceWrapper) PostSandboxesSandboxIDPause(c *gin.Context) { c.Set(ApiKeyAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -409,6 +589,10 @@ func (siw *ServerInterfaceWrapper) PostSandboxesSandboxIDRefreshes(c *gin.Contex c.Set(ApiKeyAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -435,6 +619,10 @@ func (siw *ServerInterfaceWrapper) PostSandboxesSandboxIDResume(c *gin.Context) c.Set(ApiKeyAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -461,6 +649,10 @@ func (siw *ServerInterfaceWrapper) PostSandboxesSandboxIDTimeout(c *gin.Context) c.Set(ApiKeyAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -476,6 +668,8 @@ func (siw *ServerInterfaceWrapper) GetTeams(c *gin.Context) { c.Set(AccessTokenAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -493,6 +687,8 @@ func (siw *ServerInterfaceWrapper) GetTemplates(c *gin.Context) { c.Set(AccessTokenAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + // Parameter object where we will unmarshal all parameters from the context var params GetTemplatesParams @@ -519,6 +715,8 @@ func (siw *ServerInterfaceWrapper) PostTemplates(c *gin.Context) { c.Set(AccessTokenAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -545,6 +743,8 @@ func (siw *ServerInterfaceWrapper) DeleteTemplatesTemplateID(c *gin.Context) { c.Set(AccessTokenAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -571,6 +771,8 @@ func (siw *ServerInterfaceWrapper) PatchTemplatesTemplateID(c *gin.Context) { c.Set(AccessTokenAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -597,6 +799,8 @@ func (siw *ServerInterfaceWrapper) PostTemplatesTemplateID(c *gin.Context) { c.Set(AccessTokenAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -632,6 +836,8 @@ func (siw *ServerInterfaceWrapper) PostTemplatesTemplateIDBuildsBuildID(c *gin.C c.Set(AccessTokenAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + for _, middleware := range siw.HandlerMiddlewares { middleware(c) if c.IsAborted() { @@ -667,6 +873,8 @@ func (siw *ServerInterfaceWrapper) GetTemplatesTemplateIDBuildsBuildIDStatus(c * c.Set(AccessTokenAuthScopes, []string{}) + c.Set(Supabase1TokenAuthScopes, []string{}) + // Parameter object where we will unmarshal all parameters from the context var params GetTemplatesTemplateIDBuildsBuildIDStatusParams @@ -688,6 +896,62 @@ func (siw *ServerInterfaceWrapper) GetTemplatesTemplateIDBuildsBuildIDStatus(c * siw.Handler.GetTemplatesTemplateIDBuildsBuildIDStatus(c, templateID, buildID, params) } +// GetV2Sandboxes operation middleware +func (siw *ServerInterfaceWrapper) GetV2Sandboxes(c *gin.Context) { + + var err error + + c.Set(ApiKeyAuthScopes, []string{}) + + c.Set(Supabase1TokenAuthScopes, []string{}) + + c.Set(Supabase2TeamAuthScopes, []string{}) + + // Parameter object where we will unmarshal all parameters from the context + var params GetV2SandboxesParams + + // ------------- Optional query parameter "metadata" ------------- + + err = runtime.BindQueryParameter("form", true, false, "metadata", c.Request.URL.Query(), ¶ms.Metadata) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter metadata: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "state" ------------- + + err = runtime.BindQueryParameter("form", false, false, "state", c.Request.URL.Query(), ¶ms.State) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter state: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "nextToken" ------------- + + err = runtime.BindQueryParameter("form", true, false, "nextToken", c.Request.URL.Query(), ¶ms.NextToken) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter nextToken: %w", err), http.StatusBadRequest) + return + } + + // ------------- Optional query parameter "limit" ------------- + + err = runtime.BindQueryParameter("form", true, false, "limit", c.Request.URL.Query(), ¶ms.Limit) + if err != nil { + siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter limit: %w", err), http.StatusBadRequest) + return + } + + for _, middleware := range siw.HandlerMiddlewares { + middleware(c) + if c.IsAborted() { + return + } + } + + siw.Handler.GetV2Sandboxes(c, params) +} + // GinServerOptions provides options for the Gin server. type GinServerOptions struct { BaseURL string @@ -715,6 +979,12 @@ func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options ErrorHandler: errorHandler, } + router.POST(options.BaseURL+"/access-tokens", wrapper.PostAccessTokens) + router.DELETE(options.BaseURL+"/access-tokens/:accessTokenID", wrapper.DeleteAccessTokensAccessTokenID) + router.GET(options.BaseURL+"/api-keys", wrapper.GetApiKeys) + router.POST(options.BaseURL+"/api-keys", wrapper.PostApiKeys) + router.DELETE(options.BaseURL+"/api-keys/:apiKeyID", wrapper.DeleteApiKeysApiKeyID) + router.PATCH(options.BaseURL+"/api-keys/:apiKeyID", wrapper.PatchApiKeysApiKeyID) router.GET(options.BaseURL+"/health", wrapper.GetHealth) router.GET(options.BaseURL+"/nodes", wrapper.GetNodes) router.GET(options.BaseURL+"/nodes/:nodeID", wrapper.GetNodesNodeID) @@ -738,4 +1008,5 @@ func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options router.POST(options.BaseURL+"/templates/:templateID", wrapper.PostTemplatesTemplateID) router.POST(options.BaseURL+"/templates/:templateID/builds/:buildID", wrapper.PostTemplatesTemplateIDBuildsBuildID) router.GET(options.BaseURL+"/templates/:templateID/builds/:buildID/status", wrapper.GetTemplatesTemplateIDBuildsBuildIDStatus) + router.GET(options.BaseURL+"/v2/sandboxes", wrapper.GetV2Sandboxes) } diff --git a/packages/api/internal/api/spec.gen.go b/packages/api/internal/api/spec.gen.go index c9b4cb6..98ad870 100644 --- a/packages/api/internal/api/spec.gen.go +++ b/packages/api/internal/api/spec.gen.go @@ -18,63 +18,77 @@ import ( // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "H4sIAAAAAAAC/+xcb3PbNtL/Khg8z4u7GUVS3LTTeqYv7CTtZZqkvthpbyb13EDkSkJDAiwA2tFk9N1v", - "8I8ESVCiZFmxO3kVhwQXi93fLha7C33GCc8LzoApiU8/44IIkoMCYf43K2mWvnqh/6QMn+KCqCUeYUZy", - "wKfV2xEW8FdJBaT4VIkSRlgmS8iJ/kytCj1UKkHZAq/XI8x4Cr0k3cvdKErC0hn/1Eu0fr8bXQV5kRHV", - "z20wYBfKaz1YFpxJMFJ+Np3qfxLOFDCl/yRFkdGEKMrZ5E/JmX5W0/t/AXN8iv9vUqtuYt/KyUshuLBz", - "pCATQQtNBJ/ic5IizSJIhdcj/Gz69P7nPCvVEphyVBHYcXryZ/c/+Vuu0JyXLLUz/nD/Mz7nbJ7RxMj3", - "22Po9BLEDQgv17XHnAHV84v3z3lpp26xefEeJVyARHMukFoCcgaCR3jORU4UPsWUqW9O8Ajn5BPNyxyf", - "fj/COWX276cjj2nKFCzAKPUlu/mNWLdB0pTqyUh2IXgBQlEL9CYfL9kNFZzlwBS6IYKSWRblqWuYViDa", - "WzXIJzyFyDR6MDLvIuvrriMHKcmij1CUn9r0P2A3kadyvR7hN5BzsXpz3iVp37TXjChDb843a+PpDyeh", - "Qk6+jy3lLdxeOjF2hEVKxS9IKd1C56TMFD6dk0xCxIx5TrQZZ9kKFfoj2eCXzBXYFSiaAy9VLaUZ5xkQ", - "prmBGiAb0e6GGVUokhK11UDcIt/44R3f3VzPq1Q7pTkFgfjcsO0ViPxnXTWPsF9bKK+n37aFdUVzQIqj", - "jN5ATLESEs5SOY6q1+tz2tVmC2bB+jTE3jrot3ScZTwhCtLnF++7Ynhb5jMrgmocqnzDMFupPnQQpxGM", - "n+XaDTWnyS3uNc7p+bCpEgFEwU+EZnLTUryk7XA0N+ODCUrK1HfPojPUgck2uDBr4x2EuMl7/G6HSZBI", - "lIxRtkCchYQHiMORuFREKMoW26d0A9Gln7s1T3wWRVS51WI1+C7tyDZMq3jOUWrJaNSEaBRQTdX3rNzb", - "wAtQhGaRrYEkS0jPdcAagc9rKg1A7Shk4lqJaNpSC1WQy0hAV0mOCEFWjwyssEEe23BaCWQTOt7ZT/1G", - "FJHW/aHMoLyh+6ZuPGwuKw5aAZZ53pIkMO2iP2ABJF3hEU4FoXqFmjZnDBINS3wdEXk91fMlYYuIx76z", - "KBwBvbB3IMsc0gcUAXzhHVTLpAnGyI5JSQQHZ/qxh8GmGCHJKDA1zDDt2CiVoqwc+iYcVDG+ia7Ss8gO", - "YIR5uwTWkOItzTIEnwoqGttNShQ80UqKMZUHUewmpqpo924BXONQv02UvYcF4xKEgl1kQyRyHw2WzW7R", - "ph+N5oLn6HZJkyWiTXuyTirdetpoZCDCPEcFxFACAbICfXrsXHfs43eqlm9ACZrIr6bycE0lr1U0aEeu", - "SQiaRDfkr7b3BWzvgW9KwG7S30BIalNXTULuhaeix1YxI2VbcXIgvD1oKITyC9T9mi8iAThfIGBKrNAt", - "VUsTU0lF8gIRlqKMMq3mJkbMwygd/Qb5PGRPWsMQjxupndeJLPN8DbTOtpiqqUaW4aYcIptM5p52liW7", - "cNjF92mpdxxfi1szd8Dhm8BDD8tw+i+2QrcxiXbKMVKCJjuCItwc+86gO2Z8kqJ8LyG9SHoSy6UkC0AF", - "iASYIovGnjnPOAkgyAwPbr+84opk0fyRebMxY9RzRM4h16xGibrEaykh3YnmLsaSByq7u70Eu0egg8Yq", - "m4LUyL0Ckkf2k4L+AqvIhnLxCn2EOh2t9NcRj0HlC396a5P4fQlqCfXn3qG6416LZHA0tBW1DkxJDrW7", - "jnOjnw91+DEKHVduyDmORl5Y4aq9ZN9LiFQhIHcZqFb1QD/2nJT6y5hk0yHrcF/XaaKSbt+izBDLm+Xf", - "xQvxaAP64g2IRRzDE2MmtbbVJxncN/doHRnqj9UwNxUUrrdJMyNSIVkmCUg5LzOb/TM2sKA3Oj7dFFnt", - "cfpwMcX2oLix9joSGRYVu/HnK1cH+HWOTz9sZrKC9Pp6hFmZZWSWga1mr0dYi+myILdsZ9aNgLWnvdfz", - "U1HOstjG2fRIji0qkR2PuECcZStEjP7pLAM0W0W8ReCqpJbCvhhuy2HDVrNXMBsTZ1mkeyDOqs1+uuf2", - "FUbFdbNI/Bzk9BfaR8h5iOg2GBsqafiY0NOZBHDX3e3gKczQmIDrKNVtix+uO+0XxquYgbv4SzkoMR0o", - "3yenDa82Ke3z1LZN4Ppg56Z99V8l6asAu6Gid65J5fDH4D2cdcqTjyDmNIsEJy+qd0HE1D/9Pk7NpA+e", - "52kUAEKhhOe5jv4VR/AJklK7tpYp15n5XvgeOIIKZBYq972x5V7tHst/mzKAhKQUVK0utczt/GeGwBX/", - "COysVEvjGoAIED95x2en+K/SQ7DrtTGkzbB6qqVShRbrWZpT1iBoWsiWQFIz3DWR/eeJGfjkytH1LsDG", - "nZqO+WsbjYtXT2yc2vpeL5eyOTfuhioNZPzy5BydXbzCI3zjEzp4On46nurpeAGMFBSf4m/G0/FUu2ai", - "lkZGkyWQzLKxgMhu8i/zGiVLSD5iQ0mYfqdXKT7FP4Oy73Gr/e3Etko1STmc2IxgFZwFnWsxE6rITvQg", - "q+oJ46mdJ8qyKXWSLEN2WITpt+5FjOfB7V2Vxx8Wipl2jvV1N0PRbQGrZJOtkABVCgZpsKCdBFa1rW0e", - "qweFVmSW00b7h2sdRiqid8YPmOi3+LpWyOSzLdquezXzMyizBmTQ26eYt770Gzau9ki3HjJxFWPN4p30", - "uk2Jrh9hsOKqMvOOenMdldvGPjuGjke44DKWHjI1bySr0IX4inpTtRdcHk63xouc83R1ULU2ivjrbkfv", - "iVVHK9Z2uvUSMMc6QyINXFy2esy61/bdaCzZ7HR9iSBs1+jYedix1EJCKxJEf5Xgs3qKoznNfOxTd7L8", - "A8aLMfoDlxLEj2SW/FFOpyffkaL4sRA8/QP/c4z+bajouApIsjQpMf2fG5KVIFFeSoVmgN6/e42AJTyF", - "dKxjes2Bmb/elv1/+1vBr4+7r7R7ce62w3S1Z9A4HYLG6RF3piB+aqK2ZnyD17K9WaSqCZlqUSvY7zqw", - "ELT34oXq1t51MwB3+ZoWrA7X7d+YtuvhwlKuO7JHvNvjxEjDu02CsvuOXs4WcPz3m1zem2rMV893QM8X", - "NrYc2gk2lfu3Qfvnqqy9tlDPQEWSIr/QLKudZQfbL8xnFbwvg1L5bkFeXWSPIKkn+Apd00eaZY8j7hq4", - "e/Weoeqda7ZCpgrU727uSR+HO1O1A5hdzlWy7kB+rGruNcmJT0H3wsCDwKWgB2DgtR25Nw5G0Zyl9pUq", - "0lcikVoSheSSl1mqd5lKd5ShnGYZdX2/PTuOSZU2dpxOjWXz9ZpOi4C9a4VYVdLZxGUPVxnNaZOruvF5", - "Op3u2sF8n6YV9uHsY1cWWX9L49oW6YX2NSSqq0ysN7w7nrc9RMfoPmhpBEh/N8AU/lpF/Expbl20OsI2", - "HCEruNjbGscOlcximqGSORUkhFkPaK6Z3Kci3e3tbWN/+LJKFzAXIJeunBVV/Ds7pGEI8EkBS02jrJJm", - "a/SXXwai4l01712RsV+aolnHS0vLcKRe6t6Yaqlttw3lUO+pH6HQB2d6A8F1n/D28zff6a1zy21Z94jP", - "/oREDU7SthyXleyR4sfDA1Jb5iY06vd7+CH74ReC28bjQfPK28PNjDmnebTz5+PwoMH9wDhiL0GFlwzb", - "twPH6Cp+cwd98m4kSN/SurfUYXGMnpMsMyeUJZU6RFnyFOVlpmiRgWvp4jcgbgVVrrvr6ur1yGbLDMFS", - "2s8BJaUQwFTYp+0uF/hjUMGpfs9RDkSWAhpL8350PNAmr6p7l19+D2jc82y3m+nF1W691kcoL9e10rtJ", - "dO9j7fMTCo7L64PsFdJB03PqqT/y+FYByQekuO2wyJnnyr04Zq7XdL3fMa1rF3S8jGy7+6hVXtXPvEJs", - "1WmQUvzQqGLqly2PEUtkVG3xYSZjr2ax62ODwVXp7gwIL6+HAoqaowHVSwa3mwuWIR7uIzSL9ngOCtBO", - "Ds5DX4RmW/91fEaSBAq1+6n2KMpuuIHJ57rNdmNlxpZeEOmHgR1RAeEqbN/dLagIOn+H5xwa3ed2FXcL", - "kI9leUQly+6SbL/rBqPTn92LsO/PeJs9vIOsdzpA2a7N/zH0CdzdJb8D62YIG+iQHwc0vvr1e/TrE/uT", - "VJPP7hbFesMR2VwMCPv9B0HL/jzSeXVJY3+cjbaO9ldBIlvDSdxbWAUug1+HeOT6m9QXe3orSpWLtKvv", - "a4PepsxLf93mKCrtlFFfsRQ+VRfgfepj5q9D9VZ97R331j3TWIWVL+Sv87mEnjLrg6qxNu+i7VQ3q8Tw", - "MBMKO1iJ+VbceByWInOXZuTpZEIKOoaT2TiFGxxQ+Nz+yWVpoNb8gefmQ3NmXl+v/xcAAP//KiqN+OJa", - "AAA=", + "H4sIAAAAAAAC/+xd3W/bOpb/VwjtPuwCbuzmdi52AsxDmvbOFrftBE3aWaA3WNDSccyJROqSVBIj8P8+", + "4JdESdSHHcdJ2jy1kSjy8Jwfzwd5Dn0XxSzLGQUqRXR0F+WY4wwkcP0XjmMQ4pxdAf3wTj0gNDqKciyX", + "0SSiOIPoqNFmEnH4syAckuhI8gImkYiXkGH1sVzl6gMhOaGX0Xo9iXBOfodVd9fu9Wa9zguSJp2dureb", + "9UlZAp1d2peb9SgwTebstrPT6v1m/UrI8hTLbmq9Bpv0vFaNRc6oAI2NN7OZ+idmVAKVGi15npIYS8Lo", + "9F+CUfWs6u8/OSyio+g/phXgpuatmL7nnHEzRgIi5iRXnURH0VucIEUiCBmtJ9Gb2euHH/O4kEug0vaK", + "wLRTg795+ME/M4kWrKCJGfGvDz/iCaOLlMSav3/Zh0zPgF8Dd3xdO8xpUJ2cfj1hhRm6QebpVxQzDgIt", + "GEdyCcgukGgSLRjPsIyOIkLlL4fRJMoIJVmRRUevJw7HhEq4BC3IEw5YQnJcKS6t+TjLgUti0B3bNgFK", + "zkkGQuIsR2yBjPZDUvWC9EeqkUdSgiW8kiSDaNJcUpOIJO3uPyQKfAsCXPWvJuqP4XddFCQJ9ZphcTUk", + "nWqUT1hcEXr5DiQmqVDfGz3RpOszzqCDohYF0jG1wbkloEWRpitk2TvQ0drXT98jPVtNnBvBznXiieui", + "EvA54Oz49MPvsNpevsenH9AVrDYXrR3grR4bp+k/FtHR936ZKHq/CoXRi0lEizTF8xSMYh6NFUvvGJhc", + "Gb7Ue/yCb9A1Tgtod9jqIMVCfhUQoOsjFhIpziC5JKJk4g0WqFAfdDCxPudHQXbndENYNA0tBC0w60h8", + "T6+/YetLJQlRA+L0tIbEOi3v6TXhjGZAJbrGnCh2hFRemzqjb9tAZ0lgyrox0u8C6rOtMjMQAl92dTTI", + "LTuQ60VxplNMrRko/kLyTYHylMOC3LapMM81thChyHyBroELZcGtaI2OZrwLzt44Z8UiOI55fs9x8v5J", + "yCWWiDjuiFaXSHcY6Fcv249AL+UysCL1834SS3k3pGcJro8wCcglxEMl649ESEjOLHhbAsYpwYGlcKwe", + "lxRbpzWoalMCVBp/d0g/mrbBXvKidD369EvpoqwnEdBOC4JulkD9RYtuSJoiuM0Jh9FWJIOM8dWnt0NE", + "fXLt9DcSJ1gOOmhWHp9c82ZMMsTKTmU0iYTEvMe6BniDBbIfjeaNkAoP4yZ5ptu2oqOhKbrWaMFZhm6W", + "JF4iImqUW30/qAJrUZcf25Xo9dnmwdEDgQOcm7taW588hNSnY940bYfSW7qrHqf58H9CNuAz3PS6zPd1", + "GxsM091dmHG7VUch2SkuhB14gYtURkcLnAoIhHUswyqsUw5orj6qSxIvJBhWKcSxwtMSc8ZSwNQs+dKi", + "90Y/ttk91yPEBQ8w9Uw/RzhNkVgJCRmKWZYV1MWsN0Qu2+vTm8Vmy8CJpVcLO6b5gnj9l0lo+UuGUnIN", + "IWgKiBlNxEEvQGeDJsubn4VQXzCwO7ewAq11u5qWLmWxUhcnp18DAxbZ3DC9bIfKsHecn1Z+aNUCCeiF", + "40zplfowRsVo3UDejhtKIY6EAnX93DGO8XgJQnIsQ26ic5d/c55fF0Pq2hYtdHs/xiFU/vomSGe1czcE", + "c2q81LahMYN3bEy0iASBeEEpoZeIUb/jEUwVpbniktDL4SFtQ3Tmxm6MEx5FYlkMqjAF4TPTUnmXxslt", + "E/Ot7v32C7y5XNzGqaWowetJfcEE4V2HUAcHK/JL3LpFasKOQNyE4yUkbwuSJgFkKo9Wzdi0QnpPWSCS", + "NCROJGQisJla8gVzjlc/5WqCHq4OLaSSrX3wrQcdAZY//VWgV3MNiE20d8L6rJxcw3PQzxsyAqqs6veI", + "A06UjUs4JortultKIZbmj4IuAadyuYouAoKthj1ZYnoZMH+bc7zBKduBmuQXEEXWF1Tu3TN8ZAdI8cSs", + "FsuTfxK5/ASSk1i8xNxPN+bOKhGN0mtVF5zEQb32nIL4HyIeV/roie9uAb1uHng16PEPsvQGp1JO6rN6", + "bNnV+beRllH36Mw6oYMg3BGYnzTOfP55WOpyTV90d6c6ea4wf9nnfdnn7d/ntRP8yC4DcRO7REAlX5mN", + "P1keYGOaoJRQxda6CtEPg/2oN8glgHRs8+nOBw7OFe9SR9dIWTdZWQ41MQTX+RDwalP7tDUt0QbzJs6W", + "4nrL02pQq8f2KPzkLc9xZ7/ui8GFVxtEeYGhrjiJNwSFr9G7tg423I+M8+KrgOQ07sjoKQS+BJQDj4FK", + "fFlT9IuUYQ+CVNNgleU5kzgN7m7qN737mR07GxlkitRgp/YoxZ37ju5zk8WSeSK7/3rx1Iong9os64z0", + "kHvmFG576wDa2Cw3D4yxU6jCOskjtEdwDjgLODQ6zzNgrG3eiAuTpfo6lEYl3rmAu9nFP5cgl1B97tS6", + "jdAbXXrR/PCZQBc16vlYsxPqoWVQdHdlgolllj/rC8vZl2SnzmSnnz5XyaInmC9XyqKFHMhsBNLI+lGP", + "HRmF+nLr5Eb79YAAQzMytBn6bbATDpWgK1iCULg0fs9e7/oPWkytletepsKW+liOM6JePvsQNxXMkSh0", + "kLMoUnMwofXnJblWvnhfWLhFQDegWaoAoDb3ypd+JPWi2HSW4xu6MemawX16YSehXV7M05BbV7dmliwi", + "kGmPGEeMpiubZ0HmKaD5KmBpPDMnFBe2xXCTDz2O0FbhWIidRZ5sgTgjNvPpls6VH9dVNSTh8M3Kz18f", + "PuU+optgrImkpmN8TaePg9rqbgNNoZsGLWUZQ1mX6vtFqypDaxXdcBN9KUadSXnCd66lptX4ljeY2MMo", + "d1hl6ggudrbnty0SysO7MhCsCeuLrWLZ/W7eFmo7YfEV8AVJAx7Gu/Kd53d3D7+NetOiO8kC/sEX9QbF", + "S4iv9H6cilUlQ3ALcaFUXWNpVwdznXDWey3BsXSKwI5G2bHP78nHB9JXrUE6kbQvq6GoNaRskVQFN0i9", + "KbG1YWaVS4ojcnWmkGXG8rZ8jwuT/jwHzIH/5hS9mdz/u9RDjUo9Kd2sGn0pZa4EepxkhNY61JV0S8CJ", + "bm5r6f7vlW746rye0mhjNNWP/t9QH6cfXv3u86D6/qzI8RwLeD2GFte4mxzX4lBLbmxvNRi4zpQoCF0w", + "rfqJVKoken/4VgnUS0w4imYHrw9mamyWA8U5iY6iXw5mBzO9USCXWn5TI55XWjwGy0yEtoxMwgpGFG6a", + "2aQKezpq/ZBER9EpE9JDhbCljiDkW5asdlbk1siJXddRa73NWtnk4Q5LGAOFbKF6xlaJGiRejJCuvMrK", + "0Ggl+VPVqKoS7G+rGvmrVXvsITR/v1AuusTK6/ge1YGg13sdHNO7WsHx2oAkhdCO1Tv9HGHajxXTzEfL", + "caOm2a+K7gg8qibTekW0ml0DAW8GzqXMfO4nJFutOtT2zaMINCevrmCluXEJsiMRDKep2bKzJkK0BPd3", + "kEa/muVd4/FmhayjDgM8a9c+DGiXuXrCQxxkwSkkgUk98uIL2oSGCJ24lC8yQjH78wsrZk9oD6KTfUk9", + "ikpuEtAIVD0GPUmNvBko/CU9vXOXNozSzP1YsYrZoOW4ugxiQ3XsPhyniWvCee6aeOPVjWUcqB403v6Q", + "uE7VxzuW1u7VQytyGaUhZgNAsZs7PwlQ1Io3qcCdJvx/9WsTyocMt3kfjWG0DXhN8kjJ3824q4U8pSyB", + "EV6HaRYg+rN9sRtfY9xOtq4kWl/cy+MwE9qbUWkGzw0cqbcWRJqw6Z3JgF93SubvIPUckA44uwTz2eXR", + "b6ZxbPp9wDrs7jIUr9JktODKBP0nqUbGybjTX9QVAkiUO7/Y1SK0vcWdyfYBXM1mycO6fU9S2MmwsnUc", + "0KdiuovnYELGr+9asU+/0nXJkn7tS2ud+2VuDSR05FL9WYDL3JEMLUjq9nKrIqP/goPLA/RHVAjgf8Pz", + "+I9iNjv8Fef533LOkj+i/z5A73G81HYe08TcjyJQVgiJ5oC+fvmIgMYsgeQgmpjdND1qtZlWpmr2XbB1", + "sV+70qiPup+BaQtPg3E2BoyzPRombzf2+8V6cg9vqJrpiKjYJZHq9NLGiUpb4fkgf6AAuRT7fqPj2rBt", + "jehnCXeHxT8JqGrqc+pVCW2oRk36p/u+T6d+Ktu8qNZ7qdbuOrxdq9m6cJ/D8hiF9rsycb53F+l3kqaV", + "du3YPirhfeYl42/mRVZp/CO3kBq67Iqk6fNw7B7KPnZGdZVtnK+QTuvr1k8PJMDZrs3bNoGeqOrUfxpY", + "dK75qctB6oSNA43NQRqBmY+m5da4mQTTR5QyloGyF2GucRNLVqSJsmSlsAlFGUlTYuu8O6yazlqpmbRW", + "kl3/bTgto41vVWtEy5y+Pio7qEpJRupUVYXus9ls04r1PSxFLfVtFqJB1stqVKtxyPf0F+QYP7Nck50O", + "5/7U+S5K7reBV81l++kRlruLOsJxtL7Ho1F21BM2l/gy93/s29sz5U81b0/HNjGmRsfqi0seUvL23vCh", + "tn99ZijhsOAgltCTIPbFNKktNbiVQBNdhy2FrfQx96+MhNGXctz7Qmm7vZx6XmVSGIIDh+r2jc6tNEXM", + "Ph8qM38FuURY30BT3Tiji4NujbX+5VdlzQfu27OP2PxfEMvRO98N1Wg4uycf+AkgWK39Pviq91toOvPh", + "I+Gzdyukfk3T091vtGp5b0H6D6qjvUuwwhA/A+nfpNW8AusAnYevAEG3TlF5u+ikKoa04D1AJzhNdVi2", + "JEK5WUuWoKxIJclTsIVM7Br4DSfS1jSdn3+cIMCxKZJHhTCfA4oLzoFKv3beXgrhYr+cEfWeoQywKDjU", + "puY09cHIRXxeXi72+FamdplZs8hKTa4yHJU8fH7ZqolOM9S+2GWba14tlRc7sUbCQtNR6nr/2Xx0CTgb", + "mZsbDPTO7Yt9brnrGoV77q6bCe1vY7xZtNInxtoBu3rmRGXOEUeJyzUNiqx62VA+oY2g8k4Cfydoq7qn", + "i33DxJ673hsqjl9PHy4VraPzt3sOp32kPITDGCyaHOU2Hu6chi6/0VTVK68RxzHk0kXzT+7obReQqamZ", + "6V1V/To2wbsDTKZFCadzv6p2M//HK8gdv2NTKw/fRZr346/s3tzt7kWtPnsQMTyccqgXwm6dwN26z6Az", + "ifuHXNmTzl0Io+AwHWkKngdonqNF+QGsxNRcjj+9s1clrHv2BnRFvl9oPwp05m70t+VNDNsjcDLY2t33", + "EDA0h2ENY0S79C6+/GElO61u+Og8KCwVruFLV0L/kJjP3G0bexF26zj9A03gtrwLz+0Gzd29KJ2n/+Yq", + "xsaFU6GTdnYp/rFYCOg4bn9SZ+31S2k2Og4t2fA091h2tX6uDzfJhO/NgP92+CPnwLcW2m+G2IrQ+Qox", + "CohxlDFu6ic0J+A2T/VvLtmfeOjIqtErbrvj/+pu4da9Rit9+4VakQFdcVJwwbjivCjtW6pkveAs62AW", + "hVt57t9VMo5b7SwfPUE1tll2KAeOcnPR6o4yfNyZoXnf98vLLxUOzzcZXY/Dr52iKXhqL8sRR9MpzskB", + "HM4PcJ5HXg93zV+cF3p11H/fvv5Qb236f9duj/BfuGLU9cX63wEAAP//EslEScSAAAA=", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/packages/api/internal/api/types.gen.go b/packages/api/internal/api/types.gen.go index e428e76..9fad66d 100644 --- a/packages/api/internal/api/types.gen.go +++ b/packages/api/internal/api/types.gen.go @@ -10,9 +10,11 @@ import ( ) const ( - AccessTokenAuthScopes = "AccessTokenAuth.Scopes" - AdminTokenAuthScopes = "AdminTokenAuth.Scopes" - ApiKeyAuthScopes = "ApiKeyAuth.Scopes" + AccessTokenAuthScopes = "AccessTokenAuth.Scopes" + AdminTokenAuthScopes = "AdminTokenAuth.Scopes" + ApiKeyAuthScopes = "ApiKeyAuth.Scopes" + Supabase1TokenAuthScopes = "Supabase1TokenAuth.Scopes" + Supabase2TeamAuthScopes = "Supabase2TeamAuth.Scopes" ) // Defines values for NodeStatus. @@ -20,6 +22,13 @@ const ( NodeStatusConnecting NodeStatus = "connecting" NodeStatusDraining NodeStatus = "draining" NodeStatusReady NodeStatus = "ready" + NodeStatusUnhealthy NodeStatus = "unhealthy" +) + +// Defines values for SandboxState. +const ( + Paused SandboxState = "paused" + Running SandboxState = "running" ) // Defines values for TemplateBuildStatus. @@ -27,11 +36,48 @@ const ( TemplateBuildStatusBuilding TemplateBuildStatus = "building" TemplateBuildStatusError TemplateBuildStatus = "error" TemplateBuildStatusReady TemplateBuildStatus = "ready" + TemplateBuildStatusWaiting TemplateBuildStatus = "waiting" ) // CPUCount CPU cores for the sandbox type CPUCount = int32 +// CreatedAccessToken defines model for CreatedAccessToken. +type CreatedAccessToken struct { + // CreatedAt Timestamp of access token creation + CreatedAt time.Time `json:"createdAt"` + + // Id Identifier of the access token + Id openapi_types.UUID `json:"id"` + Mask IdentifierMaskingDetails `json:"mask"` + + // Name Name of the access token + Name string `json:"name"` + + // Token The fully created access token + Token string `json:"token"` +} + +// CreatedTeamAPIKey defines model for CreatedTeamAPIKey. +type CreatedTeamAPIKey struct { + // CreatedAt Timestamp of API key creation + CreatedAt time.Time `json:"createdAt"` + CreatedBy *TeamUser `json:"createdBy"` + + // Id Identifier of the API key + Id openapi_types.UUID `json:"id"` + + // Key Raw value of the API key + Key string `json:"key"` + + // LastUsed Last time this API key was used + LastUsed *time.Time `json:"lastUsed"` + Mask IdentifierMaskingDetails `json:"mask"` + + // Name Name of the API key + Name string `json:"name"` +} + // EnvVars defines model for EnvVars. type EnvVars map[string]string @@ -44,9 +90,61 @@ type Error struct { Message string `json:"message"` } +// IdentifierMaskingDetails defines model for IdentifierMaskingDetails. +type IdentifierMaskingDetails struct { + // MaskedValuePrefix Prefix used in masked version of the token or key + MaskedValuePrefix string `json:"maskedValuePrefix"` + + // MaskedValueSuffix Suffix used in masked version of the token or key + MaskedValueSuffix string `json:"maskedValueSuffix"` + + // Prefix Prefix that identifies the token or key type + Prefix string `json:"prefix"` + + // ValueLength Length of the token or key + ValueLength int `json:"valueLength"` +} + +// ListedSandbox defines model for ListedSandbox. +type ListedSandbox struct { + // Alias Alias of the template + Alias *string `json:"alias,omitempty"` + + // ClientID Identifier of the client + ClientID string `json:"clientID"` + + // CpuCount CPU cores for the sandbox + CpuCount CPUCount `json:"cpuCount"` + + // EndAt Time when the sandbox will expire + EndAt time.Time `json:"endAt"` + + // MemoryMB Memory for the sandbox in MB + MemoryMB MemoryMB `json:"memoryMB"` + Metadata *SandboxMetadata `json:"metadata,omitempty"` + + // SandboxID Identifier of the sandbox + SandboxID string `json:"sandboxID"` + + // StartedAt Time when the sandbox was started + StartedAt time.Time `json:"startedAt"` + + // State State of the sandbox + State SandboxState `json:"state"` + + // TemplateID Identifier of the template from which is the sandbox created + TemplateID string `json:"templateID"` +} + // MemoryMB Memory for the sandbox in MB type MemoryMB = int32 +// NewAccessToken defines model for NewAccessToken. +type NewAccessToken struct { + // Name Name of the access token + Name string `json:"name"` +} + // NewSandbox defines model for NewSandbox. type NewSandbox struct { // AutoPause Automatically pauses the sandbox after the timeout @@ -54,6 +152,9 @@ type NewSandbox struct { EnvVars *EnvVars `json:"envVars,omitempty"` Metadata *SandboxMetadata `json:"metadata,omitempty"` + // Secure Secure all system communication with sandbox + Secure *bool `json:"secure,omitempty"` + // TemplateID Identifier of the required template TemplateID string `json:"templateID"` @@ -61,6 +162,12 @@ type NewSandbox struct { Timeout *int32 `json:"timeout,omitempty"` } +// NewTeamAPIKey defines model for NewTeamAPIKey. +type NewTeamAPIKey struct { + // Name Name of the API key + Name string `json:"name"` +} + // Node defines model for Node. type Node struct { // AllocatedCPU Number of allocated CPU cores @@ -69,6 +176,9 @@ type Node struct { // AllocatedMemoryMiB Amount of allocated memory in MiB AllocatedMemoryMiB int32 `json:"allocatedMemoryMiB"` + // Commit Commit of the orchestrator + Commit string `json:"commit"` + // CreateFails Number of sandbox create fails CreateFails uint64 `json:"createFails"` @@ -83,6 +193,9 @@ type Node struct { // Status Status of the node Status NodeStatus `json:"status"` + + // Version Version of the orchestrator + Version string `json:"version"` } // NodeDetail defines model for NodeDetail. @@ -90,6 +203,9 @@ type NodeDetail struct { // CachedBuilds List of cached builds id on the node CachedBuilds []string `json:"cachedBuilds"` + // Commit Commit of the orchestrator + Commit string `json:"commit"` + // CreateFails Number of sandbox create fails CreateFails uint64 `json:"createFails"` @@ -97,10 +213,13 @@ type NodeDetail struct { NodeID string `json:"nodeID"` // Sandboxes List of sandboxes running on the node - Sandboxes []RunningSandbox `json:"sandboxes"` + Sandboxes []ListedSandbox `json:"sandboxes"` // Status Status of the node Status NodeStatus `json:"status"` + + // Version Version of the orchestrator + Version string `json:"version"` } // NodeStatus Status of the node @@ -121,8 +240,8 @@ type ResumedSandbox struct { Timeout *int32 `json:"timeout,omitempty"` } -// RunningSandbox defines model for RunningSandbox. -type RunningSandbox struct { +// RunningSandboxWithMetrics defines model for RunningSandboxWithMetrics. +type RunningSandboxWithMetrics struct { // Alias Alias of the template Alias *string `json:"alias,omitempty"` @@ -138,6 +257,7 @@ type RunningSandbox struct { // MemoryMB Memory for the sandbox in MB MemoryMB MemoryMB `json:"memoryMB"` Metadata *SandboxMetadata `json:"metadata,omitempty"` + Metrics *[]SandboxMetric `json:"metrics,omitempty"` // SandboxID Identifier of the sandbox SandboxID string `json:"sandboxID"` @@ -149,49 +269,60 @@ type RunningSandbox struct { TemplateID string `json:"templateID"` } -// RunningSandboxWithMetrics defines model for RunningSandboxWithMetrics. -type RunningSandboxWithMetrics struct { +// Sandbox defines model for Sandbox. +type Sandbox struct { // Alias Alias of the template Alias *string `json:"alias,omitempty"` // ClientID Identifier of the client ClientID string `json:"clientID"` - // CpuCount CPU cores for the sandbox - CpuCount CPUCount `json:"cpuCount"` - - // EndAt Time when the sandbox will expire - EndAt time.Time `json:"endAt"` + // EnvdAccessToken Access token used for envd communication + EnvdAccessToken *string `json:"envdAccessToken,omitempty"` - // MemoryMB Memory for the sandbox in MB - MemoryMB MemoryMB `json:"memoryMB"` - Metadata *SandboxMetadata `json:"metadata,omitempty"` - Metrics *[]SandboxMetric `json:"metrics,omitempty"` + // EnvdVersion Version of the envd running in the sandbox + EnvdVersion string `json:"envdVersion"` // SandboxID Identifier of the sandbox SandboxID string `json:"sandboxID"` - // StartedAt Time when the sandbox was started - StartedAt time.Time `json:"startedAt"` - // TemplateID Identifier of the template from which is the sandbox created TemplateID string `json:"templateID"` } -// Sandbox defines model for Sandbox. -type Sandbox struct { +// SandboxDetail defines model for SandboxDetail. +type SandboxDetail struct { // Alias Alias of the template Alias *string `json:"alias,omitempty"` // ClientID Identifier of the client ClientID string `json:"clientID"` + // CpuCount CPU cores for the sandbox + CpuCount CPUCount `json:"cpuCount"` + + // EndAt Time when the sandbox will expire + EndAt time.Time `json:"endAt"` + + // EnvdAccessToken Access token used for envd communication + EnvdAccessToken *string `json:"envdAccessToken,omitempty"` + // EnvdVersion Version of the envd running in the sandbox - EnvdVersion string `json:"envdVersion"` + EnvdVersion *string `json:"envdVersion,omitempty"` + + // MemoryMB Memory for the sandbox in MB + MemoryMB MemoryMB `json:"memoryMB"` + Metadata *SandboxMetadata `json:"metadata,omitempty"` // SandboxID Identifier of the sandbox SandboxID string `json:"sandboxID"` + // StartedAt Time when the sandbox was started + StartedAt time.Time `json:"startedAt"` + + // State State of the sandbox + State SandboxState `json:"state"` + // TemplateID Identifier of the template from which is the sandbox created TemplateID string `json:"templateID"` } @@ -232,6 +363,9 @@ type SandboxMetric struct { Timestamp time.Time `json:"timestamp"` } +// SandboxState State of the sandbox +type SandboxState string + // Team defines model for Team. type Team struct { // ApiKey API key for the team @@ -247,6 +381,23 @@ type Team struct { TeamID string `json:"teamID"` } +// TeamAPIKey defines model for TeamAPIKey. +type TeamAPIKey struct { + // CreatedAt Timestamp of API key creation + CreatedAt time.Time `json:"createdAt"` + CreatedBy *TeamUser `json:"createdBy"` + + // Id Identifier of the API key + Id openapi_types.UUID `json:"id"` + + // LastUsed Last time this API key was used + LastUsed *time.Time `json:"lastUsed"` + Mask IdentifierMaskingDetails `json:"mask"` + + // Name Name of the API key + Name string `json:"name"` +} + // TeamUser defines model for TeamUser. type TeamUser struct { // Email Email of the user @@ -325,6 +476,9 @@ type TemplateBuildRequest struct { // MemoryMB Memory for the sandbox in MB MemoryMB *MemoryMB `json:"memoryMB,omitempty"` + // ReadyCmd Ready check command to execute in the template after the build + ReadyCmd *string `json:"readyCmd,omitempty"` + // StartCmd Start command to execute in the template after the build StartCmd *string `json:"startCmd,omitempty"` @@ -338,6 +492,18 @@ type TemplateUpdateRequest struct { Public *bool `json:"public,omitempty"` } +// UpdateTeamAPIKey defines model for UpdateTeamAPIKey. +type UpdateTeamAPIKey struct { + // Name New name for the API key + Name string `json:"name"` +} + +// AccessTokenID defines model for accessTokenID. +type AccessTokenID = string + +// ApiKeyID defines model for apiKeyID. +type ApiKeyID = string + // BuildID defines model for buildID. type BuildID = string @@ -367,14 +533,14 @@ type N500 = Error // GetSandboxesParams defines parameters for GetSandboxes. type GetSandboxesParams struct { - // Query A query used to filter the sandboxes (e.g. "user=abc&app=prod"). Query and each key and values must be URL encoded. - Query *string `form:"query,omitempty" json:"query,omitempty"` + // Metadata Metadata query used to filter the sandboxes (e.g. "user=abc&app=prod"). Each key and values must be URL encoded. + Metadata *string `form:"metadata,omitempty" json:"metadata,omitempty"` } // GetSandboxesMetricsParams defines parameters for GetSandboxesMetrics. type GetSandboxesMetricsParams struct { - // Query A query used to filter the sandboxes (e.g. "user=abc&app=prod"). Query and each key and values must be URL encoded. - Query *string `form:"query,omitempty" json:"query,omitempty"` + // Metadata Metadata query used to filter the sandboxes (e.g. "user=abc&app=prod"). Each key and values must be URL encoded. + Metadata *string `form:"metadata,omitempty" json:"metadata,omitempty"` } // GetSandboxesSandboxIDLogsParams defines parameters for GetSandboxesSandboxIDLogs. @@ -409,6 +575,30 @@ type GetTemplatesTemplateIDBuildsBuildIDStatusParams struct { LogsOffset *int32 `form:"logsOffset,omitempty" json:"logsOffset,omitempty"` } +// GetV2SandboxesParams defines parameters for GetV2Sandboxes. +type GetV2SandboxesParams struct { + // Metadata Metadata query used to filter the sandboxes (e.g. "user=abc&app=prod"). Each key and values must be URL encoded. + Metadata *string `form:"metadata,omitempty" json:"metadata,omitempty"` + + // State Filter sandboxes by one or more states + State *[]SandboxState `form:"state,omitempty" json:"state,omitempty"` + + // NextToken Cursor to start the list from + NextToken *string `form:"nextToken,omitempty" json:"nextToken,omitempty"` + + // Limit Maximum number of items to return per page + Limit *int32 `form:"limit,omitempty" json:"limit,omitempty"` +} + +// PostAccessTokensJSONRequestBody defines body for PostAccessTokens for application/json ContentType. +type PostAccessTokensJSONRequestBody = NewAccessToken + +// PostApiKeysJSONRequestBody defines body for PostApiKeys for application/json ContentType. +type PostApiKeysJSONRequestBody = NewTeamAPIKey + +// PatchApiKeysApiKeyIDJSONRequestBody defines body for PatchApiKeysApiKeyID for application/json ContentType. +type PatchApiKeysApiKeyIDJSONRequestBody = UpdateTeamAPIKey + // PostNodesNodeIDJSONRequestBody defines body for PostNodesNodeID for application/json ContentType. type PostNodesNodeIDJSONRequestBody = NodeStatusChange diff --git a/packages/api/internal/auth/constants.go b/packages/api/internal/auth/constants.go index 0ba6dc4..832b42b 100644 --- a/packages/api/internal/auth/constants.go +++ b/packages/api/internal/auth/constants.go @@ -1,4 +1,6 @@ package auth -const TeamContextKey string = "team" -const UserIDContextKey string = "user_id" +const ( + TeamContextKey string = "team" + UserIDContextKey string = "user_id" +) diff --git a/packages/api/internal/auth/middleware.go b/packages/api/internal/auth/middleware.go index 523bc07..22f2b75 100644 --- a/packages/api/internal/auth/middleware.go +++ b/packages/api/internal/auth/middleware.go @@ -4,7 +4,6 @@ import ( "context" "errors" "fmt" - "log" "net/http" "os" "strings" @@ -14,74 +13,95 @@ import ( "github.com/google/uuid" middleware "github.com/oapi-codegen/gin-middleware" "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" + "github.com/e2b-dev/infra/packages/shared/pkg/db" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) var adminToken = os.Getenv("ADMIN_TOKEN") +type AuthorizationHeaderMissingError struct{} + +func (e *AuthorizationHeaderMissingError) Error() string { + return "authorization header is missing" +} + var ( - ErrNoAuthHeader = errors.New("authorization header is missing") + ErrNoAuthHeader = &AuthorizationHeaderMissingError{} ErrInvalidAuthHeader = errors.New("authorization header is malformed") ) -type authenticator[T any] struct { +type headerKey struct { + name string + prefix string + removePrefix string +} + +type commonAuthenticator[T any] struct { securitySchemeName string - headerKey string - prefix string - removePrefix string + headerKey headerKey validationFunction func(context.Context, string) (T, *api.APIError) contextKey string errorMessage string } -// getApiKeyFromRequest extracts an API key from the header. -func (a *authenticator[T]) getAPIKeyFromRequest(req *http.Request) (string, error) { - apiKey := req.Header.Get(a.headerKey) +type authenticator interface { + Authenticate(ctx context.Context, input *openapi3filter.AuthenticationInput) error + SecuritySchemeName() string +} + +func (a *commonAuthenticator[T]) getHeaderKeysFromRequest(req *http.Request) (string, error) { + key := req.Header.Get(a.headerKey.name) // Check for the Authorization header. - if apiKey == "" { + if key == "" { return "", ErrNoAuthHeader } // Remove the prefix from the API key - if a.removePrefix != "" { - apiKey = strings.TrimSpace(strings.TrimPrefix(apiKey, a.removePrefix)) + if a.headerKey.removePrefix != "" { + key = strings.TrimSpace(strings.TrimPrefix(key, a.headerKey.removePrefix)) } // We expect a header value to be in a special form - if !strings.HasPrefix(apiKey, a.prefix) { + if !strings.HasPrefix(key, a.headerKey.prefix) { return "", ErrInvalidAuthHeader } - return apiKey, nil + return key, nil } // Authenticate uses the specified validator to ensure an API key is valid. -func (a *authenticator[T]) Authenticate(ctx context.Context, input *openapi3filter.AuthenticationInput) error { - // Our security scheme is named ApiKeyAuth, ensure this is the case - if input.SecuritySchemeName != a.securitySchemeName { - return fmt.Errorf("security scheme %s != '%s'", a.securitySchemeName, input.SecuritySchemeName) - } - +func (a *commonAuthenticator[T]) Authenticate(ctx context.Context, input *openapi3filter.AuthenticationInput) error { // Now, we need to get the API key from the request - apiKey, err := a.getAPIKeyFromRequest(input.RequestValidationInput.Request) + headerKey, err := a.getHeaderKeysFromRequest(input.RequestValidationInput.Request) if err != nil { - telemetry.ReportCriticalError(ctx, fmt.Errorf("%v %w", a.errorMessage, err)) + telemetry.ReportCriticalError(ctx, a.errorMessage, err) - return fmt.Errorf("%v %w", a.errorMessage, err) + return fmt.Errorf("%s %w", a.errorMessage, err) } telemetry.ReportEvent(ctx, "api key extracted") // If the API key is valid, we will get a result back - result, validationError := a.validationFunction(ctx, apiKey) + result, validationError := a.validationFunction(ctx, headerKey) if validationError != nil { - log.Printf("validation error %v", validationError.Err) - telemetry.ReportError(ctx, fmt.Errorf("%s %w", a.errorMessage, validationError.Err)) + zap.L().Info("validation error", zap.Error(validationError.Err)) + telemetry.ReportError(ctx, a.errorMessage, validationError.Err) + + var forbiddenError *db.TeamForbiddenError + if errors.As(validationError.Err, &forbiddenError) { + return fmt.Errorf("forbidden: %w", validationError.Err) + } - return fmt.Errorf(a.errorMessage) + var blockedError *db.TeamBlockedError + if errors.As(validationError.Err, &blockedError) { + return fmt.Errorf("blocked: %w", validationError.Err) + } + + return fmt.Errorf("%s\n%s (%w)", a.errorMessage, validationError.ClientMsg, validationError.Err) } telemetry.ReportEvent(ctx, "api key validated") @@ -94,6 +114,10 @@ func (a *authenticator[T]) Authenticate(ctx context.Context, input *openapi3filt return nil } +func (a *commonAuthenticator[T]) SecuritySchemeName() string { + return a.securitySchemeName +} + func adminValidationFunction(_ context.Context, token string) (struct{}, *api.APIError) { if token != adminToken { return struct{}{}, &api.APIError{ @@ -106,51 +130,82 @@ func adminValidationFunction(_ context.Context, token string) (struct{}, *api.AP return struct{}{}, nil } -func CreateAuthenticationFunc(tracer trace.Tracer, teamValidationFunction func(context.Context, string) (authcache.AuthTeamInfo, *api.APIError), userValidationFunction func(context.Context, string) (uuid.UUID, *api.APIError)) func(ctx context.Context, input *openapi3filter.AuthenticationInput) error { - apiKeyValidator := authenticator[authcache.AuthTeamInfo]{ - securitySchemeName: "ApiKeyAuth", - headerKey: "X-API-Key", - prefix: "e2b_", - removePrefix: "", - validationFunction: teamValidationFunction, - contextKey: TeamContextKey, - errorMessage: "Invalid API key, please visit https://e2b.dev/docs?reason=sdk-missing-api-key to get your API key.", - } - accessTokenValidator := authenticator[uuid.UUID]{ - securitySchemeName: "AccessTokenAuth", - headerKey: "Authorization", - prefix: "sk_e2b_", - removePrefix: "Bearer ", - validationFunction: userValidationFunction, - contextKey: UserIDContextKey, - errorMessage: "Invalid Access token, try to login again by running `e2b login`.", - } - adminTokenValidator := authenticator[struct{}]{ - securitySchemeName: "AdminTokenAuth", - headerKey: "X-Admin-Token", - prefix: "", - removePrefix: "", - validationFunction: adminValidationFunction, - contextKey: "", - errorMessage: "Invalid Access token.", +func CreateAuthenticationFunc( + tracer trace.Tracer, + teamValidationFunction func(context.Context, string) (authcache.AuthTeamInfo, *api.APIError), + userValidationFunction func(context.Context, string) (uuid.UUID, *api.APIError), + supabaseTokenValidationFunction func(context.Context, string) (uuid.UUID, *api.APIError), + supabaseTeamValidationFunction func(context.Context, string) (authcache.AuthTeamInfo, *api.APIError), +) openapi3filter.AuthenticationFunc { + authenticators := []authenticator{ + &commonAuthenticator[authcache.AuthTeamInfo]{ + securitySchemeName: "ApiKeyAuth", + headerKey: headerKey{ + name: "X-API-Key", + prefix: "e2b_", + removePrefix: "", + }, + validationFunction: teamValidationFunction, + contextKey: TeamContextKey, + errorMessage: "Invalid API key, please visit https://e2b.dev/docs/quickstart/api-key for more information.", + }, + &commonAuthenticator[uuid.UUID]{ + securitySchemeName: "AccessTokenAuth", + headerKey: headerKey{ + name: "Authorization", + prefix: "sk_e2b_", + removePrefix: "Bearer ", + }, + validationFunction: userValidationFunction, + contextKey: UserIDContextKey, + errorMessage: "Invalid Access token, try to login again by running `e2b auth login`.", + }, + &commonAuthenticator[uuid.UUID]{ + securitySchemeName: "Supabase1TokenAuth", + headerKey: headerKey{ + name: "X-Supabase-Token", + prefix: "", + removePrefix: "", + }, + validationFunction: supabaseTokenValidationFunction, + contextKey: UserIDContextKey, + errorMessage: "Invalid Supabase token.", + }, + &commonAuthenticator[authcache.AuthTeamInfo]{ + securitySchemeName: "Supabase2TeamAuth", + headerKey: headerKey{ + name: "X-Supabase-Team", + prefix: "", + removePrefix: "", + }, + validationFunction: supabaseTeamValidationFunction, + contextKey: TeamContextKey, + errorMessage: "Invalid Supabase token teamID.", + }, + &commonAuthenticator[struct{}]{ + securitySchemeName: "AdminTokenAuth", + headerKey: headerKey{ + name: "X-Admin-Token", + prefix: "", + removePrefix: "", + }, + validationFunction: adminValidationFunction, + contextKey: "", + errorMessage: "Invalid Access token.", + }, } return func(ctx context.Context, input *openapi3filter.AuthenticationInput) error { ginContext := ctx.Value(middleware.GinContextKey).(*gin.Context) requestContext := ginContext.Request.Context() + _, span := tracer.Start(requestContext, "authenticate") defer span.End() - if input.SecuritySchemeName == apiKeyValidator.securitySchemeName { - return apiKeyValidator.Authenticate(ctx, input) - } - - if input.SecuritySchemeName == accessTokenValidator.securitySchemeName { - return accessTokenValidator.Authenticate(ctx, input) - } - - if input.SecuritySchemeName == adminTokenValidator.securitySchemeName { - return adminTokenValidator.Authenticate(ctx, input) + for _, validator := range authenticators { + if input.SecuritySchemeName == validator.SecuritySchemeName() { + return validator.Authenticate(ctx, input) + } } return fmt.Errorf("invalid security scheme name '%s'", input.SecuritySchemeName) diff --git a/packages/api/internal/cache/auth/cache.go b/packages/api/internal/cache/auth/cache.go index cdf4aaa..7a6a2e5 100644 --- a/packages/api/internal/cache/auth/cache.go +++ b/packages/api/internal/cache/auth/cache.go @@ -9,12 +9,13 @@ import ( "github.com/jellydator/ttlcache/v3" "golang.org/x/sync/singleflight" - "github.com/e2b-dev/infra/packages/shared/pkg/db" "github.com/e2b-dev/infra/packages/shared/pkg/models" ) -const authInfoExpiration = 5 * time.Minute -const refreshInterval = 1 * time.Minute +const ( + authInfoExpiration = 5 * time.Minute + refreshInterval = 1 * time.Minute +) type AuthTeamInfo struct { Team *models.Team @@ -30,43 +31,43 @@ type TeamInfo struct { lock sync.Mutex } +type DataCallback = func(ctx context.Context, key string) (*models.Team, *models.Tier, error) + type TeamAuthCache struct { cache *ttlcache.Cache[string, *TeamInfo] - db *db.DB } -func NewTeamAuthCache(db *db.DB) *TeamAuthCache { +func NewTeamAuthCache() *TeamAuthCache { cache := ttlcache.New(ttlcache.WithTTL[string, *TeamInfo](authInfoExpiration)) go cache.Start() return &TeamAuthCache{ cache: cache, - db: db, } } -// TODO: save blocked teams to cache as well, handle the condition in the Get method -func (c *TeamAuthCache) Get(ctx context.Context, apiKey string) (team *models.Team, tier *models.Tier, err error) { +// TODO: save blocked teams to cache as well, handle the condition in the GetOrSet method +func (c *TeamAuthCache) GetOrSet(ctx context.Context, key string, dataCallback DataCallback) (team *models.Team, tier *models.Tier, err error) { var item *ttlcache.Item[string, *TeamInfo] var templateInfo *TeamInfo - item = c.cache.Get(apiKey) + item = c.cache.Get(key) if item == nil { - team, tier, err = c.db.GetTeamAuth(ctx, apiKey) + team, tier, err = dataCallback(ctx, key) if err != nil { - return nil, nil, fmt.Errorf("failed to get the team from db for an api key: %w", err) + return nil, nil, fmt.Errorf("error while getting the team: %w", err) } templateInfo = &TeamInfo{team: team, tier: tier, lastRefresh: time.Now()} - c.cache.Set(apiKey, templateInfo, authInfoExpiration) + c.cache.Set(key, templateInfo, authInfoExpiration) return team, tier, nil } templateInfo = item.Value() if time.Since(templateInfo.lastRefresh) > refreshInterval { - go templateInfo.once.Do(apiKey, func() (interface{}, error) { - c.Refresh(apiKey) + go templateInfo.once.Do(key, func() (interface{}, error) { + c.Refresh(key, dataCallback) return nil, err }) } @@ -75,16 +76,16 @@ func (c *TeamAuthCache) Get(ctx context.Context, apiKey string) (team *models.Te } // Refresh refreshes the cache for the given team ID. -func (c *TeamAuthCache) Refresh(apiKey string) { +func (c *TeamAuthCache) Refresh(key string, dataCallback DataCallback) { ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) defer cancel() - team, tier, err := c.db.GetTeamAuth(ctx, apiKey) + team, tier, err := dataCallback(ctx, key) if err != nil { - c.cache.Delete(apiKey) + c.cache.Delete(key) return } - c.cache.Set(apiKey, &TeamInfo{team: team, tier: tier, lastRefresh: time.Now()}, authInfoExpiration) + c.cache.Set(key, &TeamInfo{team: team, tier: tier, lastRefresh: time.Now()}, authInfoExpiration) } diff --git a/packages/api/internal/cache/builds/build_cache.go b/packages/api/internal/cache/builds/build_cache.go deleted file mode 100644 index 135108c..0000000 --- a/packages/api/internal/cache/builds/build_cache.go +++ /dev/null @@ -1,179 +0,0 @@ -package builds - -import ( - "context" - "fmt" - "sync" - "time" - - "github.com/google/uuid" - "github.com/jellydator/ttlcache/v3" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/metric" - - "github.com/e2b-dev/infra/packages/api/internal/api" - "github.com/e2b-dev/infra/packages/shared/pkg/meters" -) - -const ( - buildInfoExpiration = time.Minute * 5 // 5 minutes -) - -type BuildInfo struct { - buildID uuid.UUID - teamID uuid.UUID - status api.TemplateBuildStatus - logs []string - - mu sync.RWMutex -} - -func (b *BuildInfo) GetLogs() []string { - b.mu.RLock() - defer b.mu.RUnlock() - - return b.logs -} - -func (b *BuildInfo) GetStatus() api.TemplateBuildStatus { - b.mu.RLock() - defer b.mu.RUnlock() - - return b.status -} - -func (b *BuildInfo) GetBuildID() uuid.UUID { - b.mu.RLock() - defer b.mu.RUnlock() - - return b.buildID -} - -func (b *BuildInfo) GetTeamID() uuid.UUID { - b.mu.RLock() - defer b.mu.RUnlock() - - return b.teamID -} - -func (b *BuildInfo) addLog(log string) { - b.mu.Lock() - defer b.mu.Unlock() - - b.logs = append(b.logs, log) -} - -func (b *BuildInfo) setStatus(status api.TemplateBuildStatus) { - b.mu.Lock() - defer b.mu.Unlock() - - b.status = status -} - -type BuildCache struct { - cache *ttlcache.Cache[string, *BuildInfo] - counter metric.Int64UpDownCounter - - mu sync.Mutex -} - -func NewBuildCache() *BuildCache { - cache := ttlcache.New(ttlcache.WithTTL[string, *BuildInfo](buildInfoExpiration)) - counter, err := meters.GetUpDownCounter(meters.BuildCounterMeterName) - if err != nil { - fmt.Printf("error creating counter: %s", err) - } - - go cache.Start() - - return &BuildCache{ - cache: cache, - counter: counter, - } -} - -// Get returns the build info. -func (c *BuildCache) Get(envID string, buildID uuid.UUID) (*BuildInfo, error) { - item := c.cache.Get(envID) - - if item == nil { - return nil, fmt.Errorf("build for %s not found in cache", envID) - } - - value := item.Value() - - if value == nil { - return nil, fmt.Errorf("build for %s not found in cache", envID) - } - - if value.GetBuildID() != buildID { - return nil, fmt.Errorf("received logs for another build %s env %s", buildID, envID) - } - - return value, nil -} - -// Append appends logs to the build. -func (c *BuildCache) Append(envID string, buildID uuid.UUID, log string) error { - item, err := c.Get(envID, buildID) - if err != nil { - errMsg := fmt.Errorf("build for %s not found in cache: %w", envID, err) - - return errMsg - } - - item.addLog(log) - - return nil -} - -// Create creates a new build if it doesn't exist in the cache or the build was already finished. -func (c *BuildCache) Create(envID string, buildID uuid.UUID, teamID uuid.UUID) error { - c.mu.Lock() - defer c.mu.Unlock() - - item := c.cache.Get(envID, ttlcache.WithDisableTouchOnHit[string, *BuildInfo]()) - if item != nil && item.Value().GetStatus() == api.TemplateBuildStatusBuilding { - return fmt.Errorf("build for %s already exists in cache", envID) - } - - info := BuildInfo{ - buildID: buildID, - teamID: teamID, - status: api.TemplateBuildStatusBuilding, - // We need to explicitly set the logs to an empty slice for the json serialization to work in CLI - logs: []string{}, - } - - c.cache.Set(envID, &info, buildInfoExpiration) - - c.updateCounter(envID, buildID, teamID, 1) - - return nil -} - -// SetDone marks the build as finished. -func (c *BuildCache) SetDone(envID string, buildID uuid.UUID, status api.TemplateBuildStatus) error { - item, err := c.Get(envID, buildID) - if err != nil { - return fmt.Errorf("build %s not found in cache: %w", buildID, err) - } - - item.setStatus(status) - c.updateCounter(envID, buildID, item.teamID, -1) - - return nil -} - -func (c *BuildCache) updateCounter(envID string, buildID, teamID uuid.UUID, value int64) { - c.counter.Add(context.Background(), value, - metric.WithAttributes(attribute.String("env_id", envID)), - metric.WithAttributes(attribute.String("build_id", buildID.String())), - metric.WithAttributes(attribute.String("team_id", teamID.String())), - ) -} - -func (c *BuildCache) Delete(envID string, buildID, teamID uuid.UUID) { - c.cache.Delete(envID) - c.updateCounter(envID, buildID, teamID, -1) -} diff --git a/packages/api/internal/cache/instance/instance.go b/packages/api/internal/cache/instance/instance.go index 1d45f61..c1c5170 100644 --- a/packages/api/internal/cache/instance/instance.go +++ b/packages/api/internal/cache/instance/instance.go @@ -12,12 +12,11 @@ import ( "go.opentelemetry.io/otel/metric" "go.uber.org/zap" - analyticscollector "github.com/e2b-dev/infra/packages/api/internal/analytics_collector" "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/node" - "github.com/e2b-dev/infra/packages/shared/pkg/logs" - "github.com/e2b-dev/infra/packages/shared/pkg/meters" + sbxlogger "github.com/e2b-dev/infra/packages/shared/pkg/logger/sandbox" "github.com/e2b-dev/infra/packages/shared/pkg/smap" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" "github.com/e2b-dev/infra/packages/shared/pkg/utils" ) @@ -25,16 +24,13 @@ const ( InstanceExpiration = time.Second * 15 // Should we auto pause the instance by default instead of killing it, InstanceAutoPauseDefault = false - CacheSyncTime = time.Minute ) -var ( - ErrPausingInstanceNotFound = errors.New("pausing instance not found") -) +var ErrPausingInstanceNotFound = errors.New("pausing instance not found") func NewInstanceInfo( - Logger *logs.SandboxLogger, Instance *api.Sandbox, + ExecutionID string, TeamID *uuid.UUID, BuildID *uuid.UUID, Metadata map[string]string, @@ -49,10 +45,12 @@ func NewInstanceInfo( EnvdVersion string, Node *node.NodeInfo, AutoPause bool, + EnvdAccessToken *string, + BaseTemplateID string, ) *InstanceInfo { instance := &InstanceInfo{ - Logger: Logger, Instance: Instance, + ExecutionID: ExecutionID, TeamID: TeamID, BuildID: BuildID, Metadata: Metadata, @@ -65,9 +63,11 @@ func NewInstanceInfo( KernelVersion: KernelVersion, FirecrackerVersion: FirecrackerVersion, EnvdVersion: EnvdVersion, + EnvdAccessToken: EnvdAccessToken, Node: Node, AutoPause: atomic.Bool{}, Pausing: utils.NewSetOnce[*node.NodeInfo](), + BaseTemplateID: BaseTemplateID, mu: sync.RWMutex{}, } @@ -77,10 +77,11 @@ func NewInstanceInfo( } type InstanceInfo struct { - Logger *logs.SandboxLogger Instance *api.Sandbox + ExecutionID string TeamID *uuid.UUID BuildID *uuid.UUID + BaseTemplateID string Metadata map[string]string MaxInstanceLength time.Duration StartTime time.Time @@ -91,12 +92,21 @@ type InstanceInfo struct { KernelVersion string FirecrackerVersion string EnvdVersion string + EnvdAccessToken *string Node *node.NodeInfo AutoPause atomic.Bool Pausing *utils.SetOnce[*node.NodeInfo] mu sync.RWMutex } +func (i *InstanceInfo) LoggerMetadata() sbxlogger.SandboxMetadata { + return sbxlogger.SandboxMetadata{ + SandboxID: i.Instance.SandboxID, + TemplateID: i.Instance.TemplateID, + TeamID: i.TeamID.String(), + } +} + func (i *InstanceInfo) IsExpired() bool { i.mu.RLock() defer i.mu.RUnlock() @@ -127,43 +137,38 @@ type InstanceCache struct { pausing *smap.Map[*InstanceInfo] cache *lifecycleCache[*InstanceInfo] - insertInstance func(data *InstanceInfo) error - - logger *zap.SugaredLogger + insertInstance func(data *InstanceInfo, created bool) error sandboxCounter metric.Int64UpDownCounter createdCounter metric.Int64Counter - analytics analyticscollector.AnalyticsCollectorClient mu sync.Mutex } func NewCache( ctx context.Context, - analytics analyticscollector.AnalyticsCollectorClient, - logger *zap.SugaredLogger, - insertInstance func(data *InstanceInfo) error, + meterProvider metric.MeterProvider, + insertInstance func(data *InstanceInfo, created bool) error, deleteInstance func(data *InstanceInfo) error, ) *InstanceCache { // We will need to either use Redis or Consul's KV for storing active sandboxes to keep everything in sync, // right now we load them from Orchestrator cache := newLifecycleCache[*InstanceInfo]() - sandboxCounter, err := meters.GetUpDownCounter(meters.SandboxCountMeterName) + meter := meterProvider.Meter("api.cache.sandbox") + sandboxCounter, err := telemetry.GetUpDownCounter(meter, telemetry.SandboxCountMeterName) if err != nil { - logger.Errorw("error getting counter", "error", err) + zap.L().Error("error getting counter", zap.Error(err)) } - createdCounter, err := meters.GetCounter(meters.SandboxCreateMeterName) + createdCounter, err := telemetry.GetCounter(meter, telemetry.SandboxCreateMeterName) if err != nil { - logger.Errorw("error getting counter", "error", err) + zap.L().Error("error getting counter", zap.Error(err)) } instanceCache := &InstanceCache{ cache: cache, insertInstance: insertInstance, - logger: logger, - analytics: analytics, sandboxCounter: sandboxCounter, createdCounter: createdCounter, reservations: NewReservationCache(), @@ -173,10 +178,10 @@ func NewCache( cache.OnEviction(func(ctx context.Context, instanceInfo *InstanceInfo) { err := deleteInstance(instanceInfo) if err != nil { - logger.Errorf("Error deleting instance (%v)\n: %v", err) + zap.L().Error("Error deleting instance", zap.Error(err)) } - instanceCache.UpdateCounters(instanceInfo, -1, false) + instanceCache.UpdateCounters(ctx, instanceInfo, -1, false) }) go cache.Start(ctx) @@ -188,13 +193,13 @@ func (c *InstanceCache) Len() int { return c.cache.Len() } -func (c *InstanceCache) Set(key string, value *InstanceInfo) { +func (c *InstanceCache) Set(key string, value *InstanceInfo, created bool) { inserted := c.cache.SetIfAbsent(key, value) if inserted { go func() { - err := c.insertInstance(value) + err := c.insertInstance(value, created) if err != nil { - fmt.Printf("error inserting instance: %v", err) + zap.L().Error("error inserting instance", zap.Error(err)) } }() } @@ -212,8 +217,8 @@ func (c *InstanceCache) UnmarkAsPausing(instanceInfo *InstanceInfo) { return false } - // We depend of the startTime not changing to uniquely identify instance in the cache. - return v.Instance.SandboxID == instanceInfo.Instance.SandboxID && v.StartTime == instanceInfo.StartTime + // Make sure it's the same instance and not a sandbox which has been already resumed + return v.ExecutionID == instanceInfo.ExecutionID }) } @@ -231,18 +236,18 @@ func (c *InstanceCache) WaitForPause(ctx context.Context, sandboxID string) (*no return value, nil } -func (c *InstanceInfo) PauseDone(err error) { +func (i *InstanceInfo) PauseDone(err error) { if err == nil { - err := c.Pausing.SetValue(c.Node) + err := i.Pausing.SetValue(i.Node) if err != nil { - fmt.Printf("error setting PauseDone value: %v", err) + zap.L().Error("error setting PauseDone value", zap.Error(err)) return } } else { - err := c.Pausing.SetError(err) + err := i.Pausing.SetError(err) if err != nil { - fmt.Printf("error setting PauseDone error: %v", err) + zap.L().Error("error setting PauseDone error", zap.Error(err)) return } diff --git a/packages/api/internal/cache/instance/lifecycle_cache.go b/packages/api/internal/cache/instance/lifecycle_cache.go index 4655feb..a46a901 100644 --- a/packages/api/internal/cache/instance/lifecycle_cache.go +++ b/packages/api/internal/cache/instance/lifecycle_cache.go @@ -18,15 +18,19 @@ type lifecycleCacheMetrics struct { type lifecycleCache[T LifecycleCacheItem] struct { running cmap.ConcurrentMap[string, T] - onEvict func(ctx context.Context, instance T) + // evicting is used to track items in the process of evicting. + // This is to allow checking if an item is still in the process as that might take some time. + evicting cmap.ConcurrentMap[string, struct{}] + onEvict func(ctx context.Context, instance T) metrics lifecycleCacheMetrics } func newLifecycleCache[T LifecycleCacheItem]() *lifecycleCache[T] { return &lifecycleCache[T]{ - running: cmap.New[T](), - onEvict: func(ctx context.Context, instance T) {}, + running: cmap.New[T](), + evicting: cmap.New[struct{}](), + onEvict: func(ctx context.Context, instance T) {}, metrics: lifecycleCacheMetrics{ Evictions: 0, }, @@ -58,7 +62,11 @@ func (c *lifecycleCache[T]) Start(ctx context.Context) { return false } - go c.onEvict(ctx, value) + c.evicting.Set(key, struct{}{}) + go func() { + c.onEvict(ctx, value) + c.evicting.Remove(key) + }() return true }) @@ -74,6 +82,21 @@ func (c *lifecycleCache[T]) SetIfAbsent(key string, value T) bool { return c.running.SetIfAbsent(key, value) } +func (c *lifecycleCache[T]) Has(key string, includeExpired bool) bool { + if includeExpired { + ok := c.evicting.Has(key) + + if ok { + return true + } + + return c.running.Has(key) + } + + _, ok := c.Get(key) + return ok +} + func (c *lifecycleCache[T]) Get(key string) (T, bool) { var zero T value, ok := c.running.Get(key) @@ -112,6 +135,7 @@ func (c *lifecycleCache[T]) Items() (items []T) { if item.IsExpired() { continue } + items = append(items, item) } return items diff --git a/packages/api/internal/cache/instance/lifecycle_cache_test.go b/packages/api/internal/cache/instance/lifecycle_cache_test.go index 95dcfca..0ae0135 100644 --- a/packages/api/internal/cache/instance/lifecycle_cache_test.go +++ b/packages/api/internal/cache/instance/lifecycle_cache_test.go @@ -125,6 +125,75 @@ func TestLifecycleCacheLen(t *testing.T) { assert.Equal(t, 1, cache.Len()) } +func TestLifecycleCacheHasNonExpired(t *testing.T) { + cache, cancel := newCache(t) + defer cancel() + + expired := false + cache.SetIfAbsent("test", &testLifecycleCacheItem{ + expired: &expired, + }) + + assert.True(t, cache.Has("test", false)) + assert.True(t, cache.Has("test", true)) + + // Check for a non-existent key + assert.False(t, cache.Has("non-existent", false)) + assert.False(t, cache.Has("non-existent", true)) +} + +func TestLifecycleCacheHasExpired(t *testing.T) { + cache, cancel := newCache(t) + defer cancel() + + expired := false + cache.SetIfAbsent("test", &testLifecycleCacheItem{ + expired: &expired, + }) + + // Set the item as expired + expired = true + + assert.False(t, cache.Has("test", false)) + assert.True(t, cache.Has("test", true)) +} + +func TestLifecycleCacheHasEvicting(t *testing.T) { + cache, cancel := newCache(t) + defer cancel() + + evictCalled := make(chan struct{}) + cache.OnEviction(func(ctx context.Context, item *testLifecycleCacheItem) { + // Simulate a slow eviction process + time.Sleep(500 * time.Millisecond) + close(evictCalled) + }) + + expired := false + cache.SetIfAbsent("test", &testLifecycleCacheItem{ + expired: &expired, + }) + + // Set the item as expired + expired = true + + // Wait for the eviction process to start but not complete + time.Sleep(200 * time.Millisecond) + + assert.True(t, cache.Has("test", true)) + assert.False(t, cache.Has("test", false)) + + // Wait for eviction to complete + <-evictCalled + // Wait for the eviction process (remove from an evicting map) to complete, + // this delay is waiting just for code runtime. + // Not ideal, but should be enough for most of the time + time.Sleep(50 * time.Millisecond) + + assert.False(t, cache.Has("test", true)) + assert.False(t, cache.Has("test", false)) +} + func TestLifecycleCacheOnEvictionCalled(t *testing.T) { cache, cancel := newCache(t) defer cancel() diff --git a/packages/api/internal/cache/instance/monitoring.go b/packages/api/internal/cache/instance/monitoring.go index b135bdc..d2a1866 100644 --- a/packages/api/internal/cache/instance/monitoring.go +++ b/packages/api/internal/cache/instance/monitoring.go @@ -5,16 +5,18 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" + + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) -func (c *InstanceCache) UpdateCounters(instance *InstanceInfo, value int64, newlyCreated bool) { +func (c *InstanceCache) UpdateCounters(ctx context.Context, instance *InstanceInfo, value int64, newlyCreated bool) { attributes := []attribute.KeyValue{ - attribute.String("team_id", instance.TeamID.String()), + telemetry.WithTeamID(instance.TeamID.String()), } if value > 0 && newlyCreated { - c.createdCounter.Add(context.Background(), value, metric.WithAttributes(attributes...)) + c.createdCounter.Add(ctx, value, metric.WithAttributes(attributes...)) } - c.sandboxCounter.Add(context.Background(), value, metric.WithAttributes(attributes...)) + c.sandboxCounter.Add(ctx, value, metric.WithAttributes(attributes...)) } diff --git a/packages/api/internal/cache/instance/operations.go b/packages/api/internal/cache/instance/operations.go index 63f31fd..ad901c5 100644 --- a/packages/api/internal/cache/instance/operations.go +++ b/packages/api/internal/cache/instance/operations.go @@ -1,9 +1,13 @@ package instance import ( + "context" "fmt" "github.com/google/uuid" + "go.uber.org/zap" + + sbxlogger "github.com/e2b-dev/infra/packages/shared/pkg/logger/sandbox" ) func (c *InstanceCache) Count() int { @@ -26,11 +30,9 @@ func (c *InstanceCache) CountForTeam(teamID uuid.UUID) (count uint) { return count } -// Exists Check if the instance exists in the cache. +// Exists Check if the instance exists in the cache or is being evicted. func (c *InstanceCache) Exists(instanceID string) bool { - _, exists := c.cache.Get(instanceID) - - return exists + return c.cache.Has(instanceID, true) } // Get the item from the cache. @@ -58,7 +60,13 @@ func (c *InstanceCache) GetInstances(teamID *uuid.UUID) (instances []*InstanceIn // Add the instance to the cache and start expiration timer. // If the instance already exists we do nothing - it was loaded from Orchestrator. // TODO: Any error here should delete the sandbox -func (c *InstanceCache) Add(instance *InstanceInfo, newlyCreated bool) error { +func (c *InstanceCache) Add(ctx context.Context, instance *InstanceInfo, newlyCreated bool) error { + sbxlogger.I(instance).Debug("Adding sandbox to cache", + zap.Bool("newly_created", newlyCreated), + zap.Time("start_time", instance.StartTime), + zap.Time("end_time", instance.GetEndTime()), + ) + if instance.Instance == nil { return fmt.Errorf("instance doesn't contain info about inself") } @@ -89,8 +97,8 @@ func (c *InstanceCache) Add(instance *InstanceInfo, newlyCreated bool) error { instance.SetEndTime(instance.StartTime.Add(instance.MaxInstanceLength)) } - c.Set(instance.Instance.SandboxID, instance) - c.UpdateCounters(instance, 1, newlyCreated) + c.Set(instance.Instance.SandboxID, instance, newlyCreated) + c.UpdateCounters(ctx, instance, 1, newlyCreated) // Release the reservation if it exists c.reservations.release(instance.Instance.SandboxID) diff --git a/packages/api/internal/cache/instance/reservation.go b/packages/api/internal/cache/instance/reservation.go index 76d3c26..90253a5 100644 --- a/packages/api/internal/cache/instance/reservation.go +++ b/packages/api/internal/cache/instance/reservation.go @@ -3,9 +3,9 @@ package instance import ( "fmt" - "github.com/e2b-dev/infra/packages/shared/pkg/smap" - "github.com/google/uuid" + + "github.com/e2b-dev/infra/packages/shared/pkg/smap" ) type Reservation struct { @@ -23,16 +23,11 @@ func NewReservationCache() *ReservationCache { } } -func (r *ReservationCache) reserve(instanceID string, team uuid.UUID) error { - inserted := r.reservations.InsertIfAbsent(instanceID, &Reservation{ +func (r *ReservationCache) insertIfAbsent(instanceID string, team uuid.UUID) bool { + return r.reservations.InsertIfAbsent(instanceID, &Reservation{ team: team, instanceID: instanceID, }) - if !inserted { - return fmt.Errorf("reservation for instance %s already exists", instanceID) - } - - return nil } func (r *ReservationCache) release(instanceID string) { @@ -67,7 +62,23 @@ func (c *InstanceCache) list(teamID uuid.UUID) (instanceIDs []string) { return instanceIDs } -func (c *InstanceCache) Reserve(instanceID string, team uuid.UUID, limit int64) (error, func()) { +type ErrAlreadyBeingStarted struct { + sandboxID string +} + +func (e *ErrAlreadyBeingStarted) Error() string { + return fmt.Sprintf("sandbox %s is already being started", e.sandboxID) +} + +type ErrSandboxLimitExceeded struct { + teamID string +} + +func (e *ErrSandboxLimitExceeded) Error() string { + return fmt.Sprintf("sandbox %s has exceeded the limit", e.teamID) +} + +func (c *InstanceCache) Reserve(instanceID string, team uuid.UUID, limit int64) (release func(), err error) { c.mu.Lock() defer c.mu.Unlock() @@ -79,16 +90,18 @@ func (c *InstanceCache) Reserve(instanceID string, team uuid.UUID, limit int64) } if int64(len(ids)) >= limit { - return fmt.Errorf("team %s has reached the limit of reserved instances", team), nil + return nil, &ErrSandboxLimitExceeded{teamID: team.String()} } - err := c.reservations.reserve(instanceID, team) - if err != nil { - return fmt.Errorf("error when reserving instance: %w", err), nil + inserted := c.reservations.insertIfAbsent(instanceID, team) + if !inserted { + return nil, &ErrAlreadyBeingStarted{ + sandboxID: instanceID, + } } - return nil, func() { + return func() { // We will call this method with defer to ensure the reservation is released even if the function panics/returns an error. c.reservations.release(instanceID) - } + }, nil } diff --git a/packages/api/internal/cache/instance/reservation_test.go b/packages/api/internal/cache/instance/reservation_test.go new file mode 100644 index 0000000..3927c34 --- /dev/null +++ b/packages/api/internal/cache/instance/reservation_test.go @@ -0,0 +1,64 @@ +package instance + +import ( + "context" + "testing" + + "github.com/google/uuid" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/otel/metric/noop" +) + +const ( + sandboxID = "test-sandbox-id" +) + +var teamID = uuid.New() + +func newInstanceCache() (*InstanceCache, context.CancelFunc) { + ctx, cancel := context.WithCancel(context.Background()) + cache := NewCache(ctx, noop.MeterProvider{}, nil, nil) + return cache, cancel +} + +func TestReservation(t *testing.T) { + cache, cancel := newInstanceCache() + defer cancel() + + _, err := cache.Reserve(sandboxID, teamID, 1) + assert.NoError(t, err) +} + +func TestReservation_Exceeded(t *testing.T) { + cache, cancel := newInstanceCache() + defer cancel() + + _, err := cache.Reserve(sandboxID, teamID, 0) + assert.Error(t, err) + assert.IsType(t, &ErrSandboxLimitExceeded{}, err) +} + +func TestReservation_SameSandbox(t *testing.T) { + cache, cancel := newInstanceCache() + defer cancel() + + _, err := cache.Reserve(sandboxID, teamID, 10) + assert.NoError(t, err) + + _, err = cache.Reserve(sandboxID, teamID, 10) + require.Error(t, err) + assert.IsType(t, &ErrAlreadyBeingStarted{}, err) +} + +func TestReservation_Release(t *testing.T) { + cache, cancel := newInstanceCache() + defer cancel() + + release, err := cache.Reserve(sandboxID, teamID, 1) + assert.NoError(t, err) + release() + + _, err = cache.Reserve(sandboxID, teamID, 1) + assert.NoError(t, err) +} diff --git a/packages/api/internal/cache/instance/sync.go b/packages/api/internal/cache/instance/sync.go index f537489..ecba528 100644 --- a/packages/api/internal/cache/instance/sync.go +++ b/packages/api/internal/cache/instance/sync.go @@ -2,14 +2,21 @@ package instance import ( "context" + "errors" "fmt" + "net/http" "time" - "google.golang.org/protobuf/types/known/timestamppb" + "go.uber.org/zap" - analyticscollector "github.com/e2b-dev/infra/packages/api/internal/analytics_collector" + "github.com/e2b-dev/infra/packages/api/internal/api" ) +// TODO: this should be removed once we have a better way to handle node sync +// Don't remove instances that were started in the grace period on node sync +// This is to prevent remove instances that are still being started +const syncSandboxRemoveGracePeriod = 10 * time.Second + func getMaxAllowedTTL(now time.Time, startTime time.Time, duration, maxInstanceLength time.Duration) time.Duration { timeLeft := maxInstanceLength - now.Sub(startTime) if timeLeft <= 0 { @@ -20,10 +27,10 @@ func getMaxAllowedTTL(now time.Time, startTime time.Time, duration, maxInstanceL } // KeepAliveFor the instance's expiration timer. -func (c *InstanceCache) KeepAliveFor(instanceID string, duration time.Duration, allowShorter bool) (*InstanceInfo, error) { +func (c *InstanceCache) KeepAliveFor(instanceID string, duration time.Duration, allowShorter bool) (*InstanceInfo, *api.APIError) { instance, err := c.Get(instanceID) if err != nil { - return nil, err + return nil, &api.APIError{Code: http.StatusNotFound, ClientMsg: fmt.Sprintf("Sandbox '%s' not found", instanceID), Err: err} } now := time.Now() @@ -36,7 +43,8 @@ func (c *InstanceCache) KeepAliveFor(instanceID string, duration time.Duration, if (time.Since(instance.StartTime)) > instance.MaxInstanceLength { c.cache.Remove(instanceID) - return nil, fmt.Errorf("instance \"%s\" reached maximal allowed uptime", instanceID) + msg := fmt.Sprintf("Sandbox '%s' reached maximal allowed uptime", instanceID) + return nil, &api.APIError{Code: http.StatusForbidden, ClientMsg: msg, Err: errors.New(msg)} } else { maxAllowedTTL := getMaxAllowedTTL(now, instance.StartTime, duration, instance.MaxInstanceLength) @@ -47,10 +55,10 @@ func (c *InstanceCache) KeepAliveFor(instanceID string, duration time.Duration, return instance, nil } -func (c *InstanceCache) Sync(instances []*InstanceInfo, nodeID string) { +func (c *InstanceCache) Sync(ctx context.Context, instances []*InstanceInfo, nodeID string) { instanceMap := make(map[string]*InstanceInfo) - // Use map for faster lookup + // Use a map for faster lookup for _, instance := range instances { instanceMap[instance.Instance.SandboxID] = instance } @@ -60,6 +68,9 @@ func (c *InstanceCache) Sync(instances []*InstanceInfo, nodeID string) { if item.Instance.ClientID != nodeID { continue } + if time.Since(item.StartTime) <= syncSandboxRemoveGracePeriod { + continue + } _, found := instanceMap[item.Instance.SandboxID] if !found { c.cache.Remove(item.Instance.SandboxID) @@ -68,24 +79,12 @@ func (c *InstanceCache) Sync(instances []*InstanceInfo, nodeID string) { // Add instances that are not in the cache with the default TTL for _, instance := range instances { - if !c.Exists(instance.Instance.SandboxID) { - err := c.Add(instance, false) - if err != nil { - fmt.Println(fmt.Errorf("error adding instance to cache: %w", err)) - } + if c.Exists(instance.Instance.SandboxID) { + continue } - } - - // Send running instances event to analytics - instanceIds := make([]string, len(instances)) - for i, instance := range instances { - instanceIds[i] = instance.Instance.SandboxID - } - - go func() { - _, err := c.analytics.RunningInstances(context.Background(), &analyticscollector.RunningInstancesEvent{InstanceIds: instanceIds, Timestamp: timestamppb.Now()}) + err := c.Add(ctx, instance, false) if err != nil { - c.logger.Errorf("Error sending running instances event to analytics\n: %v", err) + zap.L().Error("error adding instance to cache", zap.Error(err)) } - }() + } } diff --git a/packages/api/internal/cache/templates/cache.go b/packages/api/internal/cache/templates/cache.go index 0d435be..bf0c69a 100644 --- a/packages/api/internal/cache/templates/cache.go +++ b/packages/api/internal/cache/templates/cache.go @@ -2,16 +2,23 @@ package templatecache import ( "context" + "database/sql" + "errors" "fmt" "net/http" + "sync" "time" "github.com/google/uuid" "github.com/jellydator/ttlcache/v3" + "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" + sqlcdb "github.com/e2b-dev/infra/packages/db/client" + "github.com/e2b-dev/infra/packages/db/queries" "github.com/e2b-dev/infra/packages/shared/pkg/db" - "github.com/e2b-dev/infra/packages/shared/pkg/models" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" + "github.com/e2b-dev/infra/packages/shared/pkg/models/envbuild" ) const templateInfoExpiration = 5 * time.Minute @@ -19,7 +26,7 @@ const templateInfoExpiration = 5 * time.Minute type TemplateInfo struct { template *api.Template teamID uuid.UUID - build *models.EnvBuild + build *queries.EnvBuild } type AliasCache struct { @@ -48,11 +55,11 @@ func (c *AliasCache) Get(alias string) (templateID string, found bool) { type TemplateCache struct { cache *ttlcache.Cache[string, *TemplateInfo] - db *db.DB + db *sqlcdb.Client aliasCache *AliasCache } -func NewTemplateCache(db *db.DB) *TemplateCache { +func NewTemplateCache(db *sqlcdb.Client) *TemplateCache { cache := ttlcache.New(ttlcache.WithTTL[string, *TemplateInfo](templateInfoExpiration)) aliasCache := NewAliasCache() go cache.Start() @@ -64,11 +71,11 @@ func NewTemplateCache(db *db.DB) *TemplateCache { } } -func (c *TemplateCache) Get(ctx context.Context, aliasOrEnvID string, teamID uuid.UUID, public bool) (env *api.Template, build *models.EnvBuild, apiErr *api.APIError) { - var envDB *db.Template +func (c *TemplateCache) Get(ctx context.Context, aliasOrEnvID string, teamID uuid.UUID, public bool) (*api.Template, *queries.EnvBuild, *api.APIError) { var item *ttlcache.Item[string, *TemplateInfo] var templateInfo *TemplateInfo - var err error + + var build *queries.EnvBuild templateID, found := c.aliasCache.Get(aliasOrEnvID) if found == true { @@ -76,46 +83,149 @@ func (c *TemplateCache) Get(ctx context.Context, aliasOrEnvID string, teamID uui } if item == nil { - envDB, build, err = c.db.GetEnv(ctx, aliasOrEnvID) + result, err := c.db.GetEnvWithBuild(ctx, aliasOrEnvID) if err != nil { - if models.IsNotFound(err) == true { + if errors.Is(err, sql.ErrNoRows) { return nil, nil, &api.APIError{Code: http.StatusNotFound, ClientMsg: fmt.Sprintf("template '%s' not found", aliasOrEnvID), Err: err} } + return nil, nil, &api.APIError{Code: http.StatusInternalServerError, ClientMsg: fmt.Sprintf("error while getting template: %v", err), Err: err} } - c.aliasCache.cache.Set(envDB.TemplateID, envDB.TemplateID, templateInfoExpiration) - if envDB.Aliases != nil { - for _, alias := range *envDB.Aliases { - c.aliasCache.cache.Set(alias, envDB.TemplateID, templateInfoExpiration) - } + build = &result.EnvBuild + template := result.Env + aliases := result.Aliases + + c.aliasCache.cache.Set(template.ID, template.ID, templateInfoExpiration) + for _, alias := range aliases { + c.aliasCache.cache.Set(alias, template.ID, templateInfoExpiration) } // Check if the team has access to the environment - if envDB.TeamID != teamID && (!public || !envDB.Public) { + if template.TeamID != teamID && (!public || !template.Public) { return nil, nil, &api.APIError{Code: http.StatusForbidden, ClientMsg: fmt.Sprintf("Team '%s' does not have access to the template '%s'", teamID, aliasOrEnvID), Err: fmt.Errorf("team '%s' does not have access to the template '%s'", teamID, aliasOrEnvID)} } - templateInfo = &TemplateInfo{template: &api.Template{ - TemplateID: envDB.TemplateID, - BuildID: build.ID.String(), - Public: envDB.Public, - Aliases: envDB.Aliases, - }, teamID: teamID, build: build} + templateInfo = &TemplateInfo{ + template: &api.Template{ + TemplateID: template.ID, + BuildID: build.ID.String(), + Public: template.Public, + Aliases: &aliases, + }, + teamID: teamID, + build: build, + } - c.cache.Set(envDB.TemplateID, templateInfo, templateInfoExpiration) + c.cache.Set(template.ID, templateInfo, templateInfoExpiration) } else { templateInfo = item.Value() + build = templateInfo.build if templateInfo.teamID != teamID && !templateInfo.template.Public { return nil, nil, &api.APIError{Code: http.StatusForbidden, ClientMsg: fmt.Sprintf("Team '%s' does not have access to the template '%s'", teamID, aliasOrEnvID), Err: fmt.Errorf("team '%s' does not have access to the template '%s'", teamID, aliasOrEnvID)} } } - return templateInfo.template, templateInfo.build, nil + return templateInfo.template, build, nil } // Invalidate invalidates the cache for the given templateID func (c *TemplateCache) Invalidate(templateID string) { c.cache.Delete(templateID) } + +type TemplateBuildInfo struct { + TeamID uuid.UUID + TemplateID string + BuildStatus envbuild.Status + + ClusterID *uuid.UUID + ClusterNodeID *string +} + +type TemplateBuildInfoNotFound struct{ error } + +func (TemplateBuildInfoNotFound) Error() string { + return "Template build info not found" +} + +type TemplatesBuildCache struct { + cache *ttlcache.Cache[uuid.UUID, *TemplateBuildInfo] + db *db.DB + mx sync.Mutex +} + +func NewTemplateBuildCache(db *db.DB) *TemplatesBuildCache { + cache := ttlcache.New(ttlcache.WithTTL[uuid.UUID, *TemplateBuildInfo](templateInfoExpiration)) + go cache.Start() + + return &TemplatesBuildCache{ + cache: cache, + db: db, + } +} + +func (c *TemplatesBuildCache) SetStatus(buildID uuid.UUID, status envbuild.Status, reason string) { + c.mx.Lock() + defer c.mx.Unlock() + + item := c.cache.Get(buildID) + if item == nil { + return + } + + zap.L().Info("Setting template build status", + logger.WithBuildID(buildID.String()), + zap.String("to_status", status.String()), + zap.String("from_status", item.Value().BuildStatus.String()), + zap.String("reason", reason), + ) + + item.Value().BuildStatus = status +} + +func (c *TemplatesBuildCache) Get(ctx context.Context, buildID uuid.UUID, templateID string) (*TemplateBuildInfo, error) { + item := c.cache.Get(buildID) + if item == nil { + zap.L().Debug("Template build info not found in cache, fetching from DB", logger.WithBuildID(buildID.String())) + + envDB, envDBErr := c.db.GetEnv(ctx, templateID) + if envDBErr != nil { + if errors.Is(envDBErr, db.TemplateNotFound{}) { + return nil, TemplateBuildInfoNotFound{} + } + + return nil, fmt.Errorf("failed to get template '%s': %w", buildID, envDBErr) + } + + // making sure associated template build really exists + envBuildDB, envBuildDBErr := c.db.GetEnvBuild(ctx, buildID) + if envBuildDBErr != nil { + if errors.Is(envBuildDBErr, db.TemplateBuildNotFound{}) { + return nil, TemplateBuildInfoNotFound{} + } + + return nil, fmt.Errorf("failed to get template build '%s': %w", buildID, envBuildDBErr) + } + + item = c.cache.Set( + buildID, + &TemplateBuildInfo{ + TeamID: envDB.TeamID, + TemplateID: envDB.ID, + BuildStatus: envBuildDB.Status, + + ClusterID: envDB.ClusterID, + ClusterNodeID: envBuildDB.ClusterNodeID, + }, + templateInfoExpiration, + ) + + return item.Value(), nil + } + + zap.L().Debug("Template build info found in cache", logger.WithBuildID(buildID.String())) + + return item.Value(), nil +} diff --git a/packages/api/internal/constants/templates.go b/packages/api/internal/constants/templates.go index be96882..5b16d6a 100644 --- a/packages/api/internal/constants/templates.go +++ b/packages/api/internal/constants/templates.go @@ -1,10 +1,8 @@ package constants const ( - MinTemplateCPU = int32(1) - MinTemplateMemory = int32(128) - MaxTemplateCPU = int32(8) - MaxTemplateMemory = int32(8192) - DefaultTemplateCPU = int32(2) - DefaultTemplateMemory = int32(1024) + MinTemplateCPU = int64(1) + MinTemplateMemory = int64(128) + DefaultTemplateCPU = int64(2) + DefaultTemplateMemory = int64(1024) ) diff --git a/packages/api/internal/dns/server.go b/packages/api/internal/dns/server.go index 0731b7a..49b60fd 100644 --- a/packages/api/internal/dns/server.go +++ b/packages/api/internal/dns/server.go @@ -5,20 +5,24 @@ import ( "errors" "fmt" "net" + "reflect" "strings" "sync" "time" - "github.com/go-redis/cache/v8" - "github.com/go-redis/redis/v8" + "github.com/go-redis/cache/v9" resolver "github.com/miekg/dns" + "github.com/redis/go-redis/v9" "go.uber.org/zap" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" "github.com/e2b-dev/infra/packages/shared/pkg/smap" ) -const ttl = 0 -const redisTTL = 24 * time.Hour +const ( + ttl = 0 + redisTTL = 24 * time.Hour +) // This allows us to return a different error message when the sandbox is not found instead of generic 502 Bad Gateway const defaultRoutingIP = "127.0.0.1" @@ -26,11 +30,11 @@ const defaultRoutingIP = "127.0.0.1" const cachedDnsPrefix = "sandbox.dns." type DNS struct { - srv *resolver.Server - logger *zap.Logger + srv *resolver.Server + + redisCache *cache.Cache - remote *cache.Cache - local *smap.Map[string] + local *smap.Map[string] closer struct { once sync.Once @@ -39,11 +43,11 @@ type DNS struct { } } -func New(ctx context.Context, rc *redis.Client, logger *zap.Logger) *DNS { - d := &DNS{logger: logger} +func New(ctx context.Context, redisClient redis.UniversalClient) *DNS { + d := &DNS{} - if rc != nil { - d.remote = cache.New(&cache.Options{Redis: rc, LocalCache: cache.NewTinyLFU(10_000, time.Hour)}) + if redisClient != nil && !reflect.ValueOf(redisClient).IsNil() { + d.redisCache = cache.New(&cache.Options{Redis: redisClient, LocalCache: cache.NewTinyLFU(10_000, time.Hour)}) } else { d.local = smap.New[string]() } @@ -53,13 +57,16 @@ func New(ctx context.Context, rc *redis.Client, logger *zap.Logger) *DNS { func (d *DNS) Add(ctx context.Context, sandboxID, ip string) { switch { - case d.remote != nil: - d.remote.Set(&cache.Item{ + case d.redisCache != nil: + err := d.redisCache.Set(&cache.Item{ Ctx: ctx, TTL: redisTTL, Key: d.cacheKey(sandboxID), Value: ip, }) + if err != nil { + zap.L().Error("error adding DNS item to redis cache", zap.Error(err), logger.WithSandboxID(sandboxID)) + } case d.local != nil: d.local.Insert(sandboxID, ip) } @@ -67,9 +74,9 @@ func (d *DNS) Add(ctx context.Context, sandboxID, ip string) { func (d *DNS) Remove(ctx context.Context, sandboxID, ip string) { switch { - case d.remote != nil: - if err := d.remote.Delete(ctx, d.cacheKey(sandboxID)); err != nil { - d.logger.Debug("removing item from DNS cache", zap.Error(err), zap.String("sandbox", sandboxID)) + case d.redisCache != nil: + if err := d.redisCache.Delete(ctx, d.cacheKey(sandboxID)); err != nil { + zap.L().Debug("removing item from DNS cache", zap.Error(err), logger.WithSandboxID(sandboxID)) } case d.local != nil: d.local.RemoveCb(d.cacheKey(sandboxID), func(k string, v string, ok bool) bool { return v == ip }) @@ -79,26 +86,26 @@ func (d *DNS) Remove(ctx context.Context, sandboxID, ip string) { func (d *DNS) Get(ctx context.Context, sandboxID string) net.IP { var res string switch { - case d.remote != nil: - if err := d.remote.Get(ctx, d.cacheKey(sandboxID), &res); err != nil { + case d.redisCache != nil: + if err := d.redisCache.Get(ctx, d.cacheKey(sandboxID), &res); err != nil { if errors.Is(err, cache.ErrCacheMiss) { - d.logger.Warn("item missing in remote DNS cache", zap.String("sandbox", sandboxID)) + zap.L().Debug("item missing in redisCache DNS cache", logger.WithSandboxID(sandboxID)) } else { - d.logger.Error("resolving item from remote DNS cache", zap.String("sandbox", sandboxID), zap.Error(err)) + zap.L().Error("resolving item from redisCache DNS cache", logger.WithSandboxID(sandboxID), zap.Error(err)) } } case d.local != nil: var ok bool res, ok = d.local.Get(d.cacheKey(sandboxID)) if !ok { - d.logger.Warn("item not found in local DNS cache", zap.String("sandbox", sandboxID)) + zap.L().Debug("item not found in local DNS cache", logger.WithSandboxID(sandboxID)) } } addr := net.ParseIP(res) if addr == nil { if res != "" { - d.logger.Error("malformed address in cache", zap.Bool("local", d.local != nil), zap.String("addr", res)) + zap.L().Error("malformed address in cache", zap.Bool("local", d.local != nil), zap.String("addr", res)) } addr = net.ParseIP(defaultRoutingIP) @@ -109,9 +116,9 @@ func (d *DNS) Get(ctx context.Context, sandboxID string) net.IP { func (d *DNS) cacheKey(id string) string { switch { - case d.remote != nil: - // add a prefix to the remote cache items to make is - // reasonable to introspect the remote cache data, to + case d.redisCache != nil: + // add a prefix to the redisCache cache items to make is + // reasonable to introspect the redisCache cache data, to // make it possible to safely use the redis cache for // more than one set of cached items without fear of // collision. Additionally the prefix allows us to @@ -151,7 +158,7 @@ func (d *DNS) handleDNSRequest(ctx context.Context, w resolver.ResponseWriter, r } if err := w.WriteMsg(m); err != nil { - d.logger.Error("write DNS message", zap.Error(err)) + zap.L().Error("write DNS message", zap.Error(err)) } } diff --git a/packages/api/internal/edge/client.go b/packages/api/internal/edge/client.go new file mode 100644 index 0000000..a15ace2 --- /dev/null +++ b/packages/api/internal/edge/client.go @@ -0,0 +1,72 @@ +package edge + +import ( + "context" + "crypto/tls" + "fmt" + "time" + + "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials" + "google.golang.org/grpc/credentials/insecure" + "google.golang.org/grpc/keepalive" + + grpclient "github.com/e2b-dev/infra/packages/api/internal/grpc" + "github.com/e2b-dev/infra/packages/shared/pkg/consts" + infogrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" + templatemanagergrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +type clientAuthorization struct { + secret string + tls bool +} + +func (a clientAuthorization) GetRequestMetadata(_ context.Context, _ ...string) (map[string]string, error) { + return map[string]string{consts.EdgeRpcAuthHeader: a.secret}, nil +} + +func (a clientAuthorization) RequireTransportSecurity() bool { + return a.tls +} + +func createClusterClient(tel *telemetry.Client, auth clientAuthorization, endpoint string, endpointTLS bool) (*grpclient.GRPCClient, error) { + grpcOptions := []grpc.DialOption{ + grpc.WithPerRPCCredentials(auth), + grpc.WithStatsHandler( + otelgrpc.NewClientHandler( + otelgrpc.WithTracerProvider(tel.TracerProvider), + otelgrpc.WithMeterProvider(tel.MeterProvider), + ), + ), + grpc.WithKeepaliveParams( + keepalive.ClientParameters{ + Time: 10 * time.Second, // Send ping every 10s + Timeout: 2 * time.Second, // Wait 2s for response + PermitWithoutStream: true, + }, + ), + } + + if endpointTLS { + // (2025-06) AWS ALB with TLS termination is using TLS 1.2 as default so this is why we are not using TLS 1.3+ here + cred := credentials.NewTLS(&tls.Config{MinVersion: tls.VersionTLS12}) + grpcOptions = append(grpcOptions, grpc.WithAuthority(endpoint), grpc.WithTransportCredentials(cred)) + } else { + grpcOptions = append(grpcOptions, grpc.WithTransportCredentials(insecure.NewCredentials())) + } + + conn, err := grpc.NewClient(endpoint, grpcOptions...) + if err != nil { + return nil, fmt.Errorf("failed to create grpc client: %w", err) + } + + return &grpclient.GRPCClient{ + Sandbox: nil, + Info: infogrpc.NewInfoServiceClient(conn), + Template: templatemanagergrpc.NewTemplateServiceClient(conn), + Connection: conn, + }, nil +} diff --git a/packages/api/internal/edge/cluster.go b/packages/api/internal/edge/cluster.go new file mode 100644 index 0000000..51aa727 --- /dev/null +++ b/packages/api/internal/edge/cluster.go @@ -0,0 +1,134 @@ +package edge + +import ( + "context" + "errors" + "fmt" + "net/http" + + "github.com/google/uuid" + "go.opentelemetry.io/otel/trace" + "google.golang.org/grpc/metadata" + + grpclient "github.com/e2b-dev/infra/packages/api/internal/grpc" + "github.com/e2b-dev/infra/packages/shared/pkg/consts" + infogrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" + api "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" + "github.com/e2b-dev/infra/packages/shared/pkg/smap" + "github.com/e2b-dev/infra/packages/shared/pkg/synchronization" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +type Cluster struct { + ID uuid.UUID + + httpClient *api.ClientWithResponses + grpcClient *grpclient.GRPCClient + + nodes *smap.Map[*ClusterNode] + synchronization *synchronization.Synchronize[api.ClusterOrchestratorNode, *ClusterNode] + tracer trace.Tracer +} + +var ( + ErrTemplateBuilderNotFound = errors.New("template builder not found") + ErrAvailableTemplateBuilderNotFound = errors.New("available template builder not found") +) + +func NewCluster(tracer trace.Tracer, tel *telemetry.Client, endpoint string, endpointTLS bool, secret string, clusterID uuid.UUID) (*Cluster, error) { + clientAuthMiddleware := func(c *api.Client) error { + c.RequestEditors = append( + c.RequestEditors, + func(ctx context.Context, req *http.Request) error { + req.Header.Set(consts.EdgeApiAuthHeader, secret) + return nil + }, + ) + return nil + } + + // generate the full endpoint URL + var endpointBaseUrl string + if endpointTLS { + endpointBaseUrl = fmt.Sprintf("https://%s", endpoint) + } else { + endpointBaseUrl = fmt.Sprintf("http://%s", endpoint) + } + + httpClient, err := api.NewClientWithResponses(endpointBaseUrl, clientAuthMiddleware) + if err != nil { + return nil, fmt.Errorf("failed to create http client: %w", err) + } + + grpcAuthorization := clientAuthorization{secret: secret, tls: endpointTLS} + grpcClient, err := createClusterClient(tel, grpcAuthorization, endpoint, endpointTLS) + if err != nil { + return nil, fmt.Errorf("failed to create grpc client: %w", err) + } + + c := &Cluster{ + ID: clusterID, + + nodes: smap.New[*ClusterNode](), + tracer: tracer, + httpClient: httpClient, + grpcClient: grpcClient, + } + + store := clusterSynchronizationStore{cluster: c} + c.synchronization = synchronization.NewSynchronize(tracer, "cluster-nodes", "Cluster nodes", store) + + // periodically sync cluster nodes + go c.startSync() + + return c, nil +} + +func (c *Cluster) Close() error { + c.synchronization.Close() + err := c.grpcClient.Close() + return err +} + +func (c *Cluster) GetTemplateBuilderByID(nodeID string) (*ClusterNode, error) { + node, found := c.nodes.Get(nodeID) + if !found { + return nil, ErrTemplateBuilderNotFound + } + + if node.GetStatus() == infogrpc.ServiceInfoStatus_OrchestratorUnhealthy || !node.IsBuilderNode() { + return nil, ErrTemplateBuilderNotFound + } + + return node, nil +} + +func (c *Cluster) GetAvailableTemplateBuilder(ctx context.Context) (*ClusterNode, error) { + _, span := c.tracer.Start(ctx, "template-builder-get-available-node") + span.SetAttributes(telemetry.WithClusterID(c.ID)) + defer span.End() + + for _, node := range c.nodes.Items() { + // we don't want to place new builds to not healthy nodes + if node.GetStatus() != infogrpc.ServiceInfoStatus_OrchestratorHealthy { + continue + } + + // we want to use only template builders + if !node.IsBuilderNode() { + continue + } + + return node, nil + } + + return nil, ErrAvailableTemplateBuilderNotFound +} + +func (c *Cluster) GetGrpcClient(serviceInstanceID string) (*grpclient.GRPCClient, metadata.MD) { + return c.grpcClient, metadata.New(map[string]string{consts.EdgeRpcServiceInstanceIDHeader: serviceInstanceID}) +} + +func (c *Cluster) GetHttpClient() *api.ClientWithResponses { + return c.httpClient +} diff --git a/packages/api/internal/edge/cluster_nodes.go b/packages/api/internal/edge/cluster_nodes.go new file mode 100644 index 0000000..fe3f8e7 --- /dev/null +++ b/packages/api/internal/edge/cluster_nodes.go @@ -0,0 +1,160 @@ +package edge + +import ( + "context" + "errors" + "fmt" + "net/http" + "slices" + "sync" + "time" + + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + "google.golang.org/grpc/metadata" + "google.golang.org/protobuf/types/known/emptypb" + + "github.com/e2b-dev/infra/packages/api/internal/utils" + infogrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" + api "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" + l "github.com/e2b-dev/infra/packages/shared/pkg/logger" +) + +type ClusterNode struct { + NodeID string + + ServiceInstanceID string + ServiceVersion string + ServiceVersionCommit string + + roles []infogrpc.ServiceInfoRole + status infogrpc.ServiceInfoStatus + mutex sync.RWMutex + tracer trace.Tracer +} + +const ( + clusterNodesSyncInterval = 15 * time.Second + clusterNodesSyncTimeout = 15 * time.Second +) + +func (c *Cluster) startSync() { + c.synchronization.Start(clusterNodesSyncInterval, clusterNodesSyncTimeout, true) +} + +func (c *Cluster) syncNode(ctx context.Context, node *ClusterNode) { + client, clientMetadata := c.GetGrpcClient(node.ServiceInstanceID) + + // we are taking service info directly from the node to avoid timing delays in service discovery + reqCtx := metadata.NewOutgoingContext(ctx, clientMetadata) + info, err := client.Info.ServiceInfo(reqCtx, &emptypb.Empty{}) + + err = utils.UnwrapGRPCError(err) + if err != nil { + zap.L().Error("Failed to get node service info", zap.Error(err), l.WithClusterID(c.ID), l.WithClusterNodeID(node.NodeID)) + return + } + + node.mutex.Lock() + defer node.mutex.Unlock() + + node.status = info.ServiceStatus + node.roles = info.ServiceRoles +} + +func (n *ClusterNode) GetStatus() infogrpc.ServiceInfoStatus { + n.mutex.RLock() + defer n.mutex.RUnlock() + return n.status +} + +func (n *ClusterNode) hasRole(r infogrpc.ServiceInfoRole) bool { + n.mutex.RLock() + defer n.mutex.RUnlock() + return slices.Contains(n.roles, r) +} + +func (n *ClusterNode) IsBuilderNode() bool { + return n.hasRole(infogrpc.ServiceInfoRole_TemplateBuilder) +} + +func (n *ClusterNode) IsOrchestratorNode() bool { + return n.hasRole(infogrpc.ServiceInfoRole_Orchestrator) +} + +// SynchronizationStore defines methods for synchronizing cluster nodes +type clusterSynchronizationStore struct { + cluster *Cluster +} + +func (d clusterSynchronizationStore) SourceList(ctx context.Context) ([]api.ClusterOrchestratorNode, error) { + // fetch cluster nodes with use of service discovery + res, err := d.cluster.httpClient.V1ServiceDiscoveryGetOrchestratorsWithResponse(ctx) + if err != nil { + return nil, fmt.Errorf("failed to get cluster nodes from service discovery: %w", err) + } + + if res.StatusCode() != http.StatusOK { + return nil, fmt.Errorf("failed to get builders from api: %s", res.Status()) + } + + if res.JSON200 == nil { + return nil, errors.New("request to get builders returned nil response") + } + + return *res.JSON200, nil +} + +func (d clusterSynchronizationStore) SourceExists(ctx context.Context, s []api.ClusterOrchestratorNode, p *ClusterNode) bool { + for _, item := range s { + if item.NodeID == p.NodeID { + return true + } + } + + return false +} + +func (d clusterSynchronizationStore) PoolList(ctx context.Context) []*ClusterNode { + mapped := make([]*ClusterNode, 0) + for _, item := range d.cluster.nodes.Items() { + mapped = append(mapped, item) + } + + return mapped +} + +func (d clusterSynchronizationStore) PoolExists(ctx context.Context, s api.ClusterOrchestratorNode) bool { + _, found := d.cluster.nodes.Get(s.NodeID) + return found +} + +func (d clusterSynchronizationStore) PoolInsert(ctx context.Context, item api.ClusterOrchestratorNode) { + zap.L().Info("Adding new node into cluster nodes pool", l.WithClusterID(d.cluster.ID), l.WithClusterNodeID(item.NodeID)) + + node := &ClusterNode{ + NodeID: item.NodeID, + + ServiceInstanceID: item.ServiceInstanceID, + ServiceVersion: item.ServiceVersion, + ServiceVersionCommit: item.ServiceVersionCommit, + + // initial values before first sync + status: infogrpc.ServiceInfoStatus_OrchestratorUnhealthy, + roles: make([]infogrpc.ServiceInfoRole, 0), + + tracer: d.cluster.tracer, + mutex: sync.RWMutex{}, + } + + d.cluster.nodes.Insert(item.NodeID, node) +} + +func (d clusterSynchronizationStore) PoolUpdate(ctx context.Context, node *ClusterNode) { + d.cluster.syncNode(ctx, node) +} + +func (d clusterSynchronizationStore) PoolRemove(ctx context.Context, cluster *ClusterNode) { + zap.L().Info("Removing node from cluster nodes pool", l.WithClusterID(d.cluster.ID), l.WithClusterNodeID(cluster.NodeID)) + d.cluster.nodes.Remove(cluster.NodeID) +} diff --git a/packages/api/internal/edge/pool.go b/packages/api/internal/edge/pool.go new file mode 100644 index 0000000..9b23671 --- /dev/null +++ b/packages/api/internal/edge/pool.go @@ -0,0 +1,150 @@ +package edge + +import ( + "context" + "sync" + "time" + + "github.com/google/uuid" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/db/client" + "github.com/e2b-dev/infra/packages/db/queries" + l "github.com/e2b-dev/infra/packages/shared/pkg/logger" + "github.com/e2b-dev/infra/packages/shared/pkg/smap" + "github.com/e2b-dev/infra/packages/shared/pkg/synchronization" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +const ( + poolSyncInterval = 60 * time.Second + poolSyncTimeout = 15 * time.Second +) + +type Pool struct { + db *client.Client + tel *telemetry.Client + + clusters *smap.Map[*Cluster] + synchronization *synchronization.Synchronize[queries.GetActiveClustersRow, *Cluster] + + tracer trace.Tracer +} + +func NewPool(ctx context.Context, tel *telemetry.Client, db *client.Client, tracer trace.Tracer) (*Pool, error) { + p := &Pool{ + db: db, + tel: tel, + tracer: tracer, + clusters: smap.New[*Cluster](), + } + + // Periodically sync clusters with the database + go p.startSync() + + // Shutdown function to gracefully close the pool + go func() { + <-ctx.Done() + p.Close() + }() + + store := poolSynchronizationStore{pool: p} + p.synchronization = synchronization.NewSynchronize(p.tracer, "clusters-pool", "Clusters pool", store) + + return p, nil +} + +func (p *Pool) startSync() { + p.synchronization.Start(poolSyncInterval, poolSyncTimeout, true) +} + +func (p *Pool) GetClusterById(id uuid.UUID) (*Cluster, bool) { + cluster, ok := p.clusters.Get(id.String()) + if !ok { + return nil, false + } + + return cluster, true +} + +func (p *Pool) Close() { + p.synchronization.Close() + + wg := &sync.WaitGroup{} + for _, cluster := range p.clusters.Items() { + wg.Add(1) + go func(c *Cluster) { + defer wg.Done() + zap.L().Info("Closing cluster", l.WithClusterID(c.ID)) + err := c.Close() + if err != nil { + zap.L().Error("Error closing cluster", zap.Error(err), l.WithClusterID(c.ID)) + } + }(cluster) + } + wg.Wait() +} + +// SynchronizationStore is an interface that defines methods for synchronizing the clusters pool with the database +type poolSynchronizationStore struct { + pool *Pool +} + +func (d poolSynchronizationStore) SourceList(ctx context.Context) ([]queries.GetActiveClustersRow, error) { + return d.pool.db.GetActiveClusters(ctx) +} + +func (d poolSynchronizationStore) SourceExists(ctx context.Context, s []queries.GetActiveClustersRow, p *Cluster) bool { + for _, item := range s { + if item.Cluster.ID == p.ID { + return true + } + } + + return false +} + +func (d poolSynchronizationStore) PoolList(ctx context.Context) []*Cluster { + items := make([]*Cluster, 0) + for _, item := range d.pool.clusters.Items() { + items = append(items, item) + } + return items +} + +func (d poolSynchronizationStore) PoolExists(ctx context.Context, source queries.GetActiveClustersRow) bool { + _, found := d.pool.clusters.Get(source.Cluster.ID.String()) + return found +} + +func (d poolSynchronizationStore) PoolInsert(ctx context.Context, source queries.GetActiveClustersRow) { + cluster := source.Cluster + clusterID := cluster.ID.String() + + zap.L().Info("Initializing newly discovered cluster", l.WithClusterID(cluster.ID)) + + c, err := NewCluster(d.pool.tracer, d.pool.tel, cluster.Endpoint, cluster.EndpointTls, cluster.Token, cluster.ID) + if err != nil { + zap.L().Error("Initializing cluster failed", zap.Error(err), l.WithClusterID(c.ID)) + return + } + + zap.L().Info("Cluster initialized successfully", l.WithClusterID(c.ID)) + d.pool.clusters.Insert(clusterID, c) +} + +func (d poolSynchronizationStore) PoolUpdate(ctx context.Context, cluster *Cluster) { + // Clusters pool currently does not do something special during synchronization +} + +func (d poolSynchronizationStore) PoolRemove(ctx context.Context, cluster *Cluster) { + zap.L().Info("Removing cluster from pool", l.WithClusterID(cluster.ID)) + + err := cluster.Close() + if err != nil { + zap.L().Error("Error during removing cluster from pool", zap.Error(err), l.WithClusterID(cluster.ID)) + } + + d.pool.clusters.Remove(cluster.ID.String()) +} diff --git a/packages/api/internal/grpc/client.go b/packages/api/internal/grpc/client.go new file mode 100644 index 0000000..4597375 --- /dev/null +++ b/packages/api/internal/grpc/client.go @@ -0,0 +1,28 @@ +package grpc + +import ( + "fmt" + + "google.golang.org/grpc" + + orchestratorgrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator" + infogrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" + templatemanagergrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" +) + +type GRPCClient struct { + Info infogrpc.InfoServiceClient + Sandbox orchestratorgrpc.SandboxServiceClient + Template templatemanagergrpc.TemplateServiceClient + + Connection *grpc.ClientConn +} + +func (a *GRPCClient) Close() error { + err := a.Connection.Close() + if err != nil { + return fmt.Errorf("failed to close connection: %w", err) + } + + return nil +} diff --git a/packages/api/internal/handlers/accesstoken.go b/packages/api/internal/handlers/accesstoken.go new file mode 100644 index 0000000..f8c5496 --- /dev/null +++ b/packages/api/internal/handlers/accesstoken.go @@ -0,0 +1,103 @@ +package handlers + +import ( + "fmt" + "net/http" + + "github.com/gin-gonic/gin" + "github.com/google/uuid" + + "github.com/e2b-dev/infra/packages/api/internal/api" + "github.com/e2b-dev/infra/packages/api/internal/utils" + "github.com/e2b-dev/infra/packages/shared/pkg/keys" + "github.com/e2b-dev/infra/packages/shared/pkg/models/accesstoken" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +func (a *APIStore) PostAccessTokens(c *gin.Context) { + ctx := c.Request.Context() + + userID := a.GetUserID(c) + + body, err := utils.ParseBody[api.NewAccessToken](ctx, c) + if err != nil { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing request: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when parsing request", err) + + return + } + + accessToken, err := keys.GenerateKey(keys.AccessTokenPrefix) + if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when generating access token: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when generating access token", err) + + return + } + + accessTokenDB, err := a.db.Client.AccessToken. + Create(). + SetID(uuid.New()). + SetUserID(userID). + SetAccessToken(accessToken.PrefixedRawValue). + SetAccessTokenHash(accessToken.HashedValue). + SetAccessTokenPrefix(accessToken.Masked.Prefix). + SetAccessTokenLength(accessToken.Masked.ValueLength). + SetAccessTokenMaskPrefix(accessToken.Masked.MaskedValuePrefix). + SetAccessTokenMaskSuffix(accessToken.Masked.MaskedValueSuffix). + SetName(body.Name). + Save(ctx) + if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when creating access token: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when creating access token", err) + + return + } + + c.JSON(http.StatusCreated, api.CreatedAccessToken{ + Id: accessTokenDB.ID, + Token: accessToken.PrefixedRawValue, + Mask: api.IdentifierMaskingDetails{ + Prefix: accessTokenDB.AccessTokenPrefix, + ValueLength: accessTokenDB.AccessTokenLength, + MaskedValuePrefix: accessTokenDB.AccessTokenMaskPrefix, + MaskedValueSuffix: accessTokenDB.AccessTokenMaskSuffix, + }, + Name: accessTokenDB.Name, + CreatedAt: accessTokenDB.CreatedAt, + }) +} + +func (a *APIStore) DeleteAccessTokensAccessTokenID(c *gin.Context, accessTokenID string) { + ctx := c.Request.Context() + + userID := a.GetUserID(c) + + accessTokenIDParsed, err := uuid.Parse(accessTokenID) + if err != nil { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing access token ID: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when parsing access token ID", err) + + return + } + + n, err := a.db.Client.AccessToken.Delete(). + Where(accesstoken.IDEQ(accessTokenIDParsed), accesstoken.UserIDEQ(userID)). + Exec(ctx) + if n < 1 { + c.String(http.StatusNotFound, "id not found") + return + } else if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when deleting access token: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when deleting access token", err) + + return + } + + c.Status(http.StatusNoContent) +} diff --git a/packages/api/internal/handlers/admin.go b/packages/api/internal/handlers/admin.go index 32ea29f..c0a029f 100644 --- a/packages/api/internal/handlers/admin.go +++ b/packages/api/internal/handlers/admin.go @@ -41,8 +41,7 @@ func (a *APIStore) PostNodesNodeID(c *gin.Context, nodeId api.NodeID) { if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing request: %s", err)) - errMsg := fmt.Errorf("error when parsing request: %w", err) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "error when parsing request", err) return } @@ -53,7 +52,13 @@ func (a *APIStore) PostNodesNodeID(c *gin.Context, nodeId api.NodeID) { return } - node.SetStatus(body.Status) + err = node.SendStatusChange(ctx, body.Status) + if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when sending status change: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when sending status change", err) + return + } c.Status(http.StatusNoContent) } diff --git a/packages/api/internal/handlers/apikey.go b/packages/api/internal/handlers/apikey.go new file mode 100644 index 0000000..a11a043 --- /dev/null +++ b/packages/api/internal/handlers/apikey.go @@ -0,0 +1,183 @@ +package handlers + +import ( + "fmt" + "net/http" + "strings" + "time" + + "github.com/gin-gonic/gin" + "github.com/google/uuid" + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/api/internal/api" + "github.com/e2b-dev/infra/packages/api/internal/team" + "github.com/e2b-dev/infra/packages/api/internal/utils" + "github.com/e2b-dev/infra/packages/shared/pkg/keys" + "github.com/e2b-dev/infra/packages/shared/pkg/models" + "github.com/e2b-dev/infra/packages/shared/pkg/models/teamapikey" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +func (a *APIStore) PatchApiKeysApiKeyID(c *gin.Context, apiKeyID string) { + ctx := c.Request.Context() + + body, err := utils.ParseBody[api.UpdateTeamAPIKey](ctx, c) + if err != nil { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing request: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when parsing request", err) + return + } + + apiKeyIDParsed, err := uuid.Parse(apiKeyID) + if err != nil { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing API key ID: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when parsing API key ID", err) + return + } + + err = a.db.Client.TeamAPIKey.UpdateOneID(apiKeyIDParsed).SetName(body.Name).SetUpdatedAt(time.Now()).Exec(ctx) + if models.IsNotFound(err) { + c.String(http.StatusNotFound, "id not found") + return + } else if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when updating team API key name: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when updating team API key name", err) + return + } + + c.Status(http.StatusAccepted) +} + +func (a *APIStore) GetApiKeys(c *gin.Context) { + ctx := c.Request.Context() + + teamID := a.GetTeamInfo(c).Team.ID + + apiKeysDB, err := a.db.Client.TeamAPIKey. + Query(). + Where(teamapikey.TeamID(teamID)). + WithCreator(). + All(ctx) + if err != nil { + zap.L().Warn("error when getting team API keys", zap.Error(err)) + c.String(http.StatusInternalServerError, "Error when getting team API keys") + + return + } + + teamAPIKeys := make([]api.TeamAPIKey, len(apiKeysDB)) + for i, apiKey := range apiKeysDB { + var createdBy *api.TeamUser + if apiKey.Edges.Creator != nil { + createdBy = &api.TeamUser{ + Email: apiKey.Edges.Creator.Email, + Id: apiKey.Edges.Creator.ID, + } + } + + keyValue := strings.Split(apiKey.APIKey, keys.ApiKeyPrefix)[1] + + // TODO: remove this once we migrate to hashed API keys + maskedKeyProperties, err := keys.MaskKey(keys.ApiKeyPrefix, keyValue) + if err != nil { + fmt.Printf("masking API key failed %d: %v", apiKey.ID, err) + continue + } + + teamAPIKeys[i] = api.TeamAPIKey{ + Id: apiKey.ID, + Name: apiKey.Name, + Mask: api.IdentifierMaskingDetails{ + Prefix: maskedKeyProperties.Prefix, + ValueLength: maskedKeyProperties.ValueLength, + MaskedValuePrefix: maskedKeyProperties.MaskedValuePrefix, + MaskedValueSuffix: maskedKeyProperties.MaskedValueSuffix, + }, + CreatedAt: apiKey.CreatedAt, + CreatedBy: createdBy, + LastUsed: apiKey.LastUsed, + } + } + c.JSON(http.StatusOK, teamAPIKeys) +} + +func (a *APIStore) DeleteApiKeysApiKeyID(c *gin.Context, apiKeyID string) { + ctx := c.Request.Context() + + apiKeyIDParsed, err := uuid.Parse(apiKeyID) + if err != nil { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing API key ID: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when parsing API key ID", err) + return + } + + err = a.db.Client.TeamAPIKey.DeleteOneID(apiKeyIDParsed).Exec(ctx) + if models.IsNotFound(err) { + c.String(http.StatusNotFound, "id not found") + return + } else if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when deleting API key: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when deleting API key", err) + return + } + + c.Status(http.StatusNoContent) +} + +func (a *APIStore) PostApiKeys(c *gin.Context) { + ctx := c.Request.Context() + + userID := a.GetUserID(c) + teamID := a.GetTeamInfo(c).Team.ID + + body, err := utils.ParseBody[api.NewTeamAPIKey](ctx, c) + if err != nil { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing request: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when parsing request", err) + + return + } + + apiKey, err := team.CreateAPIKey(ctx, a.db, teamID, userID, body.Name) + if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when creating team API key: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when creating team API key", err) + + return + } + + user, err := a.db.Client.User.Get(ctx, userID) + if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when getting user: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when getting user", err) + + return + } + + c.JSON(http.StatusCreated, api.CreatedTeamAPIKey{ + Id: apiKey.ID, + Name: apiKey.Name, + Key: apiKey.APIKey, + Mask: api.IdentifierMaskingDetails{ + Prefix: apiKey.APIKeyPrefix, + ValueLength: apiKey.APIKeyLength, + MaskedValuePrefix: apiKey.APIKeyMaskPrefix, + MaskedValueSuffix: apiKey.APIKeyMaskSuffix, + }, + CreatedBy: &api.TeamUser{ + Id: user.ID, + Email: user.Email, + }, + CreatedAt: apiKey.CreatedAt, + LastUsed: apiKey.LastUsed, + }) +} diff --git a/packages/api/internal/handlers/auth.go b/packages/api/internal/handlers/auth.go index 4cae2e7..896fdbd 100644 --- a/packages/api/internal/handlers/auth.go +++ b/packages/api/internal/handlers/auth.go @@ -7,21 +7,26 @@ import ( "github.com/google/uuid" "github.com/e2b-dev/infra/packages/api/internal/auth" - "github.com/e2b-dev/infra/packages/shared/pkg/models" + authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" + "github.com/e2b-dev/infra/packages/db/queries" ) func (a *APIStore) GetUserID(c *gin.Context) uuid.UUID { return c.Value(auth.UserIDContextKey).(uuid.UUID) } -func (a *APIStore) GetUserAndTeams(c *gin.Context) (*uuid.UUID, []*models.Team, error) { +func (a *APIStore) GetUserAndTeams(c *gin.Context) (*uuid.UUID, []queries.GetTeamsWithUsersTeamsWithTierRow, error) { userID := a.GetUserID(c) ctx := c.Request.Context() - teams, err := a.db.GetTeams(ctx, userID) + teams, err := a.sqlcDB.GetTeamsWithUsersTeamsWithTier(ctx, userID) if err != nil { return nil, nil, fmt.Errorf("error when getting default team: %w", err) } return &userID, teams, err } + +func (a *APIStore) GetTeamInfo(c *gin.Context) authcache.AuthTeamInfo { + return c.Value(auth.TeamContextKey).(authcache.AuthTeamInfo) +} diff --git a/packages/api/internal/handlers/sandbox.go b/packages/api/internal/handlers/sandbox.go index fd6d648..344a8bd 100644 --- a/packages/api/internal/handlers/sandbox.go +++ b/packages/api/internal/handlers/sandbox.go @@ -2,16 +2,17 @@ package handlers import ( "context" - "fmt" "net/http" "time" + "github.com/google/uuid" "go.opentelemetry.io/otel/attribute" + "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" - "github.com/e2b-dev/infra/packages/shared/pkg/logs" - "github.com/e2b-dev/infra/packages/shared/pkg/models" + "github.com/e2b-dev/infra/packages/db/queries" + sbxlogger "github.com/e2b-dev/infra/packages/shared/pkg/logger/sandbox" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) @@ -19,24 +20,27 @@ func (a *APIStore) startSandbox( ctx context.Context, sandboxID string, timeout time.Duration, - envVars, + envVars map[string]string, metadata map[string]string, alias string, team authcache.AuthTeamInfo, - build *models.EnvBuild, - logger *logs.SandboxLogger, + build queries.EnvBuild, requestHeader *http.Header, isResume bool, clientID *string, baseTemplateID string, autoPause bool, -) (*api.Sandbox, error) { + envdAccessToken *string, +) (*api.Sandbox, *api.APIError) { startTime := time.Now() endTime := startTime.Add(timeout) + // Unique ID for the execution (from start/resume to stop/pause) + executionID := uuid.New().String() sandbox, instanceErr := a.orchestrator.CreateSandbox( ctx, sandboxID, + executionID, alias, team, build, @@ -45,17 +49,15 @@ func (a *APIStore) startSandbox( startTime, endTime, timeout, - logger, isResume, clientID, baseTemplateID, autoPause, + envdAccessToken, ) if instanceErr != nil { - errMsg := fmt.Errorf("error when creating instance: %w", instanceErr) - telemetry.ReportCriticalError(ctx, errMsg) - - return nil, errMsg + telemetry.ReportCriticalError(ctx, "error when creating instance", instanceErr.Err) + return nil, instanceErr } telemetry.ReportEvent(ctx, "Created sandbox") @@ -81,13 +83,18 @@ func (a *APIStore) startSandbox( attribute.String("instance.id", sandbox.SandboxID), ) - logger.Infof("Sandbox created with - end time: %s", endTime.Format("2006-01-02 15:04:05 -07:00")) + sbxlogger.E(&sbxlogger.SandboxMetadata{ + SandboxID: sandbox.SandboxID, + TemplateID: *build.EnvID, + TeamID: team.Team.ID.String(), + }).Info("Sandbox created", zap.String("end_time", endTime.Format("2006-01-02 15:04:05 -07:00"))) return &api.Sandbox{ - ClientID: sandbox.ClientID, - SandboxID: sandbox.SandboxID, - TemplateID: *build.EnvID, - Alias: &alias, - EnvdVersion: *build.EnvdVersion, + ClientID: sandbox.ClientID, + SandboxID: sandbox.SandboxID, + TemplateID: *build.EnvID, + Alias: &alias, + EnvdVersion: *build.EnvdVersion, + EnvdAccessToken: envdAccessToken, }, nil } diff --git a/packages/api/internal/handlers/sandbox_create.go b/packages/api/internal/handlers/sandbox_create.go index ed95c7d..d9b6976 100644 --- a/packages/api/internal/handlers/sandbox_create.go +++ b/packages/api/internal/handlers/sandbox_create.go @@ -1,6 +1,7 @@ package handlers import ( + "errors" "fmt" "net/http" "time" @@ -8,18 +9,35 @@ import ( "github.com/gin-gonic/gin" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/auth" authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" "github.com/e2b-dev/infra/packages/api/internal/cache/instance" + "github.com/e2b-dev/infra/packages/api/internal/middleware/otel/metrics" "github.com/e2b-dev/infra/packages/api/internal/utils" "github.com/e2b-dev/infra/packages/shared/pkg/id" - "github.com/e2b-dev/infra/packages/shared/pkg/logs" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" + sbxlogger "github.com/e2b-dev/infra/packages/shared/pkg/logger/sandbox" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" + sharedUtils "github.com/e2b-dev/infra/packages/shared/pkg/utils" ) -const InstanceIDPrefix = "i" +const ( + InstanceIDPrefix = "i" + metricTemplateAlias = metrics.MetricPrefix + "template.alias" + minEnvdVersionForSecureFlag = "0.2.0" // Minimum version of envd that supports secure flag +) + +// mostUsedTemplates is a map of the most used template aliases. +// It is used for monitoring and to reduce metric cardinality. +var mostUsedTemplates = map[string]struct{}{ + "base": {}, + "code-interpreter-v1": {}, + "code-interpreter-beta": {}, + "desktop": {}, +} func (a *APIStore) PostSandboxes(c *gin.Context) { ctx := c.Request.Context() @@ -37,8 +55,7 @@ func (a *APIStore) PostSandboxes(c *gin.Context) { if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing request: %s", err)) - errMsg := fmt.Errorf("error when parsing request: %w", err) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "error when parsing request", err) return } @@ -49,8 +66,7 @@ func (a *APIStore) PostSandboxes(c *gin.Context) { if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Invalid environment ID: %s", err)) - errMsg := fmt.Errorf("error when cleaning env ID: %w", err) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "error when cleaning env ID", err) return } @@ -59,12 +75,11 @@ func (a *APIStore) PostSandboxes(c *gin.Context) { _, templateSpan := a.Tracer.Start(ctx, "get-template") defer templateSpan.End() - + // Check if team has access to the environment env, build, checkErr := a.templateCache.Get(ctx, cleanedAliasOrEnvID, teamInfo.Team.ID, true) if checkErr != nil { - telemetry.ReportCriticalError(ctx, checkErr.Err) - + telemetry.ReportCriticalError(ctx, "error when getting template", checkErr.Err) a.sendAPIStoreError(c, checkErr.Code, checkErr.ClientMsg) return } @@ -73,29 +88,24 @@ func (a *APIStore) PostSandboxes(c *gin.Context) { telemetry.ReportEvent(ctx, "Checked team access") c.Set("envID", env.TemplateID) + if aliases := env.Aliases; aliases != nil { + setTemplateNameMetric(c, *aliases) + } sandboxID := InstanceIDPrefix + id.Generate() c.Set("instanceID", sandboxID) - sandboxLogger := logs.NewSandboxLogger( - sandboxID, - env.TemplateID, - teamInfo.Team.ID.String(), - build.Vcpu, - build.RAMMB, - false, - ) - sandboxLogger.Debugf("Started creating sandbox") - - var alias string - if env.Aliases != nil && len(*env.Aliases) > 0 { - alias = (*env.Aliases)[0] - } + sbxlogger.E(&sbxlogger.SandboxMetadata{ + SandboxID: sandboxID, + TemplateID: env.TemplateID, + TeamID: teamInfo.Team.ID.String(), + }).Debug("Started creating sandbox") + alias := firstAlias(env.Aliases) telemetry.SetAttributes(ctx, attribute.String("env.team.id", teamInfo.Team.ID.String()), - attribute.String("env.id", env.TemplateID), + telemetry.WithTemplateID(env.TemplateID), attribute.String("env.alias", alias), attribute.String("env.kernel.version", build.KernelVersion), attribute.String("env.firecracker.version", build.FirecrackerVersion), @@ -117,7 +127,6 @@ func (a *APIStore) PostSandboxes(c *gin.Context) { if timeout > time.Duration(teamInfo.Tier.MaxLengthHours)*time.Hour { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Timeout cannot be greater than %d hours", teamInfo.Tier.MaxLengthHours)) - return } } @@ -127,7 +136,19 @@ func (a *APIStore) PostSandboxes(c *gin.Context) { autoPause = *body.AutoPause } - sandbox, err := a.startSandbox( + var envdAccessToken *string = nil + if body.Secure != nil && *body.Secure == true { + accessToken, tokenErr := a.getEnvdAccessToken(build.EnvdVersion, sandboxID) + if tokenErr != nil { + zap.L().Error("Secure envd access token error", zap.Error(tokenErr.Err), logger.WithSandboxID(sandboxID), logger.WithBuildID(build.ID.String())) + a.sendAPIStoreError(c, tokenErr.Code, tokenErr.ClientMsg) + return + } + + envdAccessToken = &accessToken + } + + sbx, createErr := a.startSandbox( ctx, sandboxID, timeout, @@ -135,21 +156,73 @@ func (a *APIStore) PostSandboxes(c *gin.Context) { metadata, alias, teamInfo, - build, - sandboxLogger, + *build, &c.Request.Header, false, nil, env.TemplateID, autoPause, + envdAccessToken, ) + if createErr != nil { + zap.L().Error("Failed to create sandbox", zap.Error(createErr.Err)) + a.sendAPIStoreError(c, createErr.Code, createErr.ClientMsg) + return + } + + c.Set("nodeID", sbx.ClientID) + + c.JSON(http.StatusCreated, &sbx) +} + +func (a *APIStore) getEnvdAccessToken(envdVersion *string, sandboxID string) (string, *api.APIError) { + if envdVersion == nil { + return "", &api.APIError{ + Code: http.StatusBadRequest, + ClientMsg: "you need to re-build template to allow secure flag", + Err: errors.New("envd version is required during envd access token creation"), + } + } + + // check if the envd version is newer than 0.2.0 + if !sharedUtils.IsGTEVersion(*envdVersion, minEnvdVersionForSecureFlag) { + return "", &api.APIError{ + Code: http.StatusBadRequest, + ClientMsg: "current template build does not support access flag, you need to re-build template to allow it", + Err: errors.New("envd version is not supported for secure flag"), + } + } + + key, err := a.envdAccessTokenGenerator.GenerateAccessToken(sandboxID) if err != nil { - a.sendAPIStoreError(c, http.StatusInternalServerError, err.Error()) + return "", &api.APIError{ + Code: http.StatusInternalServerError, + ClientMsg: "error during sandbox access token generation", + Err: err, + } + } - return + return key, nil +} + +func setTemplateNameMetric(c *gin.Context, aliases []string) { + for _, alias := range aliases { + if _, exists := mostUsedTemplates[alias]; exists { + c.Set(metricTemplateAlias, alias) + return + } } - c.Set("nodeID", sandbox.ClientID) + // Fallback to 'other' if no match of mostUsedTemplates found + c.Set(metricTemplateAlias, "other") +} - c.JSON(http.StatusCreated, &sandbox) +func firstAlias(aliases *[]string) string { + if aliases == nil { + return "" + } + if len(*aliases) == 0 { + return "" + } + return (*aliases)[0] } diff --git a/packages/api/internal/handlers/sandbox_get.go b/packages/api/internal/handlers/sandbox_get.go index c3bed3e..9c16a9f 100644 --- a/packages/api/internal/handlers/sandbox_get.go +++ b/packages/api/internal/handlers/sandbox_get.go @@ -6,11 +6,13 @@ import ( "strings" "github.com/gin-gonic/gin" + "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/auth" authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" - "github.com/e2b-dev/infra/packages/shared/pkg/models/envbuild" + "github.com/e2b-dev/infra/packages/db/queries" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) @@ -20,56 +22,84 @@ func (a *APIStore) GetSandboxesSandboxID(c *gin.Context, id string) { teamInfo := c.Value(auth.TeamContextKey).(authcache.AuthTeamInfo) team := teamInfo.Team - telemetry.ReportEvent(ctx, "get running instance") + telemetry.ReportEvent(ctx, "get sandbox") sandboxId := strings.Split(id, "-")[0] + // Try to get the running sandbox first info, err := a.orchestrator.GetInstance(ctx, sandboxId) - if err != nil { - c.JSON(http.StatusNotFound, fmt.Sprintf("instance \"%s\" doesn't exist or you don't have access to it", id)) - return - } - - if *info.TeamID != team.ID { - c.JSON(http.StatusNotFound, fmt.Sprintf("instance \"%s\" doesn't exist or you don't have access to it", id)) + if err == nil { + // Check if sandbox belongs to the team + if *info.TeamID != team.ID { + zap.L().Error("sandbox %s doesn't exist or you don't have access to it", logger.WithSandboxID(id)) + c.JSON(http.StatusNotFound, fmt.Sprintf("sandbox \"%s\" doesn't exist or you don't have access to it", id)) + return + } + + // Sandbox exists and belongs to the team - return running sandbox info + sandbox := api.SandboxDetail{ + ClientID: info.Instance.ClientID, + TemplateID: info.Instance.TemplateID, + Alias: info.Instance.Alias, + SandboxID: info.Instance.SandboxID, + StartedAt: info.StartTime, + CpuCount: api.CPUCount(info.VCpu), + MemoryMB: api.MemoryMB(info.RamMB), + EndAt: info.GetEndTime(), + State: api.Running, + EnvdVersion: &info.EnvdVersion, + EnvdAccessToken: info.EnvdAccessToken, + } + + if info.Metadata != nil { + meta := api.SandboxMetadata(info.Metadata) + sandbox.Metadata = &meta + } + + c.JSON(http.StatusOK, sandbox) return } - a.posthog.IdentifyAnalyticsTeam(team.ID.String(), team.Name) - properties := a.posthog.GetPackageToPosthogProperties(&c.Request.Header) - a.posthog.CreateAnalyticsTeamEvent(team.ID.String(), "get running instance", properties) - - build, err := a.db.Client.EnvBuild.Query().Where(envbuild.ID(*info.BuildID)).First(ctx) + // If sandbox not found try to get the latest snapshot + lastSnapshot, err := a.sqlcDB.GetLastSnapshot(ctx, queries.GetLastSnapshotParams{SandboxID: sandboxId, TeamID: team.ID}) if err != nil { - telemetry.ReportCriticalError(ctx, err) - c.JSON(http.StatusInternalServerError, fmt.Sprintf("Error getting build for instance %s", id)) - + zap.L().Error("error getting last snapshot for sandbox", logger.WithSandboxID(id), zap.Error(err)) + c.JSON(http.StatusNotFound, fmt.Sprintf("sandbox \"%s\" doesn't exist or you don't have access to it", id)) return } - memoryMB := int32(-1) - cpuCount := int32(-1) + memoryMB := int32(lastSnapshot.EnvBuild.RamMb) + cpuCount := int32(lastSnapshot.EnvBuild.Vcpu) + + var sbxAccessToken *string = nil + if lastSnapshot.Snapshot.EnvSecure { + key, err := a.envdAccessTokenGenerator.GenerateAccessToken(lastSnapshot.Snapshot.SandboxID) + if err != nil { + zap.L().Error("error generating sandbox access token", logger.WithSandboxID(id), zap.Error(err)) + c.JSON(http.StatusInternalServerError, fmt.Sprintf("error generating sandbox access token: %s", err)) + return + } - if build != nil { - memoryMB = int32(build.RAMMB) - cpuCount = int32(build.Vcpu) + sbxAccessToken = &key } - instance := api.RunningSandbox{ - ClientID: info.Instance.ClientID, - TemplateID: info.Instance.TemplateID, - Alias: info.Instance.Alias, - SandboxID: info.Instance.SandboxID, - StartedAt: info.StartTime, - CpuCount: cpuCount, - MemoryMB: memoryMB, - EndAt: info.GetEndTime(), + sandbox := api.SandboxDetail{ + ClientID: "00000000", // for backwards compatibility we need to return a client id + TemplateID: lastSnapshot.Snapshot.EnvID, + SandboxID: lastSnapshot.Snapshot.SandboxID, + StartedAt: lastSnapshot.Snapshot.SandboxStartedAt.Time, + CpuCount: cpuCount, + MemoryMB: memoryMB, + EndAt: info.GetEndTime(), + State: api.Paused, + EnvdVersion: lastSnapshot.EnvBuild.EnvdVersion, + EnvdAccessToken: sbxAccessToken, } - if info.Metadata != nil { - meta := api.SandboxMetadata(info.Metadata) - instance.Metadata = &meta + if lastSnapshot.Snapshot.Metadata != nil { + metadata := api.SandboxMetadata(lastSnapshot.Snapshot.Metadata) + sandbox.Metadata = &metadata } - c.JSON(http.StatusOK, instance) + c.JSON(http.StatusOK, sandbox) } diff --git a/packages/api/internal/handlers/sandbox_kill.go b/packages/api/internal/handlers/sandbox_kill.go index 86f55a8..7b13757 100644 --- a/packages/api/internal/handlers/sandbox_kill.go +++ b/packages/api/internal/handlers/sandbox_kill.go @@ -1,6 +1,8 @@ package handlers import ( + "context" + "errors" "fmt" "net/http" @@ -10,10 +12,59 @@ import ( "github.com/e2b-dev/infra/packages/api/internal/auth" authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" + template_manager "github.com/e2b-dev/infra/packages/api/internal/template-manager" "github.com/e2b-dev/infra/packages/api/internal/utils" + "github.com/e2b-dev/infra/packages/shared/pkg/db" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) +func (a *APIStore) deleteSnapshot(ctx context.Context, sandboxID string, teamID uuid.UUID, teamClusterID *uuid.UUID) error { + env, builds, err := a.db.GetSnapshotBuilds(ctx, sandboxID, teamID) + if err != nil { + return err + } + + dbErr := a.db.DeleteEnv(ctx, env.ID) + if dbErr != nil { + return fmt.Errorf("error deleting env from db: %w", dbErr) + } + + go func() { + // remove any snapshots when the sandbox is not running + deleteCtx, span := a.Tracer.Start(context.Background(), "delete-snapshot") + defer span.End() + span.SetAttributes(telemetry.WithSandboxID(sandboxID)) + span.SetAttributes(telemetry.WithTemplateID(env.ID)) + + envBuildIDs := make([]template_manager.DeleteBuild, 0) + for _, build := range builds { + envBuildIDs = append( + envBuildIDs, + template_manager.DeleteBuild{ + BuildID: build.ID, + TemplateID: *build.EnvID, + + ClusterID: teamClusterID, + ClusterNodeID: build.ClusterNodeID, + }, + ) + } + + if len(envBuildIDs) == 0 { + return + } + + deleteJobErr := a.templateManager.DeleteBuilds(deleteCtx, envBuildIDs) + if deleteJobErr != nil { + telemetry.ReportError(deleteCtx, "error deleting snapshot builds", deleteJobErr, telemetry.WithSandboxID(sandboxID)) + } + }() + + a.templateCache.Invalidate(env.ID) + + return nil +} + func (a *APIStore) DeleteSandboxesSandboxID( c *gin.Context, sandboxID string, @@ -21,11 +72,12 @@ func (a *APIStore) DeleteSandboxesSandboxID( ctx := c.Request.Context() sandboxID = utils.ShortID(sandboxID) - teamID := c.Value(auth.TeamContextKey).(authcache.AuthTeamInfo).Team.ID + team := c.Value(auth.TeamContextKey).(authcache.AuthTeamInfo).Team + teamID := team.ID telemetry.SetAttributes(ctx, attribute.String("instance.id", sandboxID), - attribute.String("team.id", teamID.String()), + telemetry.WithTeamID(teamID.String()), ) telemetry.ReportEvent(ctx, "killing sandbox") @@ -33,64 +85,53 @@ func (a *APIStore) DeleteSandboxesSandboxID( sbx, err := a.orchestrator.GetSandbox(sandboxID) if err == nil { if *sbx.TeamID != teamID { - errMsg := fmt.Errorf("sandbox '%s' does not belong to team '%s'", sandboxID, teamID.String()) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "sandbox does not belong to team", fmt.Errorf("sandbox '%s' does not belong to team '%s'", sandboxID, teamID.String())) - a.sendAPIStoreError(c, http.StatusUnauthorized, fmt.Sprintf("Error killing sandbox - sandbox '%s' does not belong to your team '%s'", sandboxID, teamID.String())) + a.sendAPIStoreError(c, http.StatusUnauthorized, fmt.Sprintf("Error deleting sandbox - sandbox '%s' does not belong to your team '%s'", sandboxID, teamID.String())) return } - found := a.orchestrator.DeleteInstance(ctx, sandboxID, false) - if !found { - a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Error killing sandbox - sandbox '%s' was not found", sandboxID)) + // remove running sandbox from the orchestrator + sandboxExists := a.orchestrator.DeleteInstance(ctx, sandboxID, false) + if !sandboxExists { + telemetry.ReportError(ctx, "sandbox not found", fmt.Errorf("sandbox '%s' not found", sandboxID), telemetry.WithSandboxID(sandboxID)) + a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Error deleting sandbox - sandbox '%s' was not found", sandboxID)) return } - telemetry.ReportEvent(ctx, "deleted sandbox from orchestrator") + // remove any snapshots of the sandbox + err := a.deleteSnapshot(ctx, sandboxID, teamID, team.ClusterID) + if err != nil && !errors.Is(err, db.EnvNotFound{}) { + telemetry.ReportError(ctx, "error deleting sandbox", err) + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error deleting sandbox: %s", err)) - c.Status(http.StatusNoContent) - return - } + return + } - telemetry.ReportEvent(ctx, "getting paused sandbox from db") + telemetry.ReportEvent(ctx, "deleted sandbox from orchestrator") - env, builds, err := a.db.GetSnapshotBuilds(ctx, sandboxID, teamID) - if err != nil { - telemetry.ReportError(ctx, fmt.Errorf("error when getting paused sandbox from db: %w", err)) - a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Error killing sandbox - sandbox '%s' was not found", sandboxID)) + c.Status(http.StatusNoContent) return } - dbErr := a.db.DeleteEnv(ctx, env.ID) - if dbErr != nil { - errMsg := fmt.Errorf("error when deleting env from db: %w", dbErr) - telemetry.ReportCriticalError(ctx, errMsg) + // remove any snapshots when the sandbox is not running + deleteSnapshotErr := a.deleteSnapshot(ctx, sandboxID, teamID, team.ClusterID) + if errors.Is(deleteSnapshotErr, db.EnvNotFound{}) { + telemetry.ReportError(ctx, "snapshot for sandbox not found", fmt.Errorf("snapshot for sandbox '%s' not found", sandboxID), telemetry.WithSandboxID(sandboxID)) + a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Error deleting sandbox - sandbox '%s' not found", sandboxID)) - a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when deleting paused sandbox") return } - buildIds := make([]uuid.UUID, len(builds)) - for i, build := range builds { - buildIds[i] = build.ID - } + if deleteSnapshotErr != nil { + telemetry.ReportError(ctx, "error deleting sandbox", deleteSnapshotErr) + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error deleting sandbox: %s", deleteSnapshotErr)) - // delete all builds - // TODO: check if env.ID is the same as the templateID - deleteJobErr := a.templateManager.DeleteBuilds(ctx, env.ID, buildIds) - if deleteJobErr != nil { - errMsg := fmt.Errorf("error when deleting env files from storage: %w", deleteJobErr) - telemetry.ReportCriticalError(ctx, errMsg) - } else { - telemetry.ReportEvent(ctx, "deleted env from storage") + return } - a.templateCache.Invalidate(env.ID) - - telemetry.ReportEvent(ctx, "deleted paused sandbox from db") - c.Status(http.StatusNoContent) } diff --git a/packages/api/internal/handlers/sandbox_logs.go b/packages/api/internal/handlers/sandbox_logs.go index c22a215..15d4429 100644 --- a/packages/api/internal/handlers/sandbox_logs.go +++ b/packages/api/internal/handlers/sandbox_logs.go @@ -35,7 +35,7 @@ func (a *APIStore) GetSandboxesSandboxIDLogs( telemetry.SetAttributes(ctx, attribute.String("instance.id", sandboxID), - attribute.String("team.id", teamID.String()), + telemetry.WithTeamID(teamID.String()), ) var start time.Time @@ -51,12 +51,11 @@ func (a *APIStore) GetSandboxesSandboxIDLogs( // Sanitize ID // https://grafana.com/blog/2021/01/05/how-to-escape-special-characters-with-lokis-logql/ id := strings.ReplaceAll(sandboxID, "`", "") - query := fmt.Sprintf("{source=\"logs-collector\", service=\"envd\", teamID=`%s`, sandboxID=`%s`, category!=\"metrics\"}", teamID.String(), id) + query := fmt.Sprintf("{teamID=`%s`, sandboxID=`%s`, category!=\"metrics\"}", teamID.String(), id) res, err := a.lokiClient.QueryRange(query, int(*params.Limit), start, end, logproto.FORWARD, time.Duration(0), time.Duration(0), true) if err != nil { - errMsg := fmt.Errorf("error when returning logs for sandbox: %w", err) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "error when returning logs for sandbox", err) a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Error returning logs for sandbox '%s'", sandboxID)) return @@ -87,8 +86,7 @@ func (a *APIStore) GetSandboxesSandboxIDLogs( }) default: - errMsg := fmt.Errorf("unexpected value type %T", res.Data.Result.Type()) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "unexpected value type", fmt.Errorf("unexpected value type %T", res.Data.Result.Type())) a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error returning logs for sandbox '%s", sandboxID)) return diff --git a/packages/api/internal/handlers/sandbox_metrics.go b/packages/api/internal/handlers/sandbox_metrics.go index 8829c19..a9775d7 100644 --- a/packages/api/internal/handlers/sandbox_metrics.go +++ b/packages/api/internal/handlers/sandbox_metrics.go @@ -13,7 +13,6 @@ import ( "github.com/grafana/loki/pkg/loghttp" "github.com/grafana/loki/pkg/logproto" "go.opentelemetry.io/otel/attribute" - "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/auth" @@ -24,7 +23,7 @@ import ( const defaultLimit = 100 -func (a *APIStore) getSandboxesSandboxIDMetrics( +func (a *APIStore) LegacyGetSandboxIDMetrics( ctx context.Context, sandboxID string, teamID string, @@ -43,7 +42,7 @@ func (a *APIStore) getSandboxesSandboxIDMetrics( // equivalent CLI query: // logcli query '{source="logs-collector", service="envd", teamID="65d165ab-69f6-4b5c-9165-6b93cd341503", sandboxID="izuhqjlfabd8ataeixrtl", category="metrics"}' --from="2025-01-19T10:00:00Z" query := fmt.Sprintf( - "{source=\"logs-collector\", service=\"envd\", teamID=`%s`, sandboxID=`%s`, category=\"metrics\"}", teamID, id) + "{teamID=`%s`, sandboxID=`%s`, category=\"metrics\"}", teamID, id) res, err := a.lokiClient.QueryRange(query, limit, start, end, logproto.BACKWARD, time.Duration(0), time.Duration(0), true) if err != nil { @@ -61,16 +60,16 @@ func (a *APIStore) getSandboxesSandboxIDMetrics( for _, entry := range stream.Entries { var metric struct { - CPUUsedPct float32 `json:"cpuUsedPct"` - CPUCount int32 `json:"cpuCount"` - MemTotalMiB int64 `json:"memTotalMiB"` - MemUsedMiB int64 `json:"memUsedMiB"` + Timestamp time.Time `json:"timestamp"` + CPUUsedPct float32 `json:"cpuUsedPct"` + CPUCount int32 `json:"cpuCount"` + MemTotalMiB int64 `json:"memTotalMiB"` + MemUsedMiB int64 `json:"memUsedMiB"` } err := json.Unmarshal([]byte(entry.Line), &metric) if err != nil { - a.logger.Error("Failed to unmarshal metric", zap.String("sandbox", sandboxID), zap.Error(err)) - telemetry.ReportCriticalError(ctx, fmt.Errorf("failed to unmarshal metric: %w", err)) + telemetry.ReportCriticalError(ctx, "failed to unmarshal metric", err, telemetry.WithSandboxID(sandboxID)) continue } @@ -93,6 +92,69 @@ func (a *APIStore) getSandboxesSandboxIDMetrics( return metrics, nil } +func (a *APIStore) GetSandboxesSandboxIDMetricsFromClickhouse( + ctx context.Context, + sandboxID string, + teamID string, + limit int, + duration time.Duration, +) ([]api.SandboxMetric, error) { + end := time.Now().UTC() + start := end.Add(-duration) + + metrics, err := a.clickhouseStore.QueryMetrics(ctx, sandboxID, teamID, start.Unix(), limit) + if err != nil { + return nil, fmt.Errorf("error when returning metrics for sandbox: %w", err) + } + + // XXX avoid this conversion to be more efficient + apiMetrics := make([]api.SandboxMetric, len(metrics)) + for i, m := range metrics { + apiMetrics[i] = api.SandboxMetric{ + Timestamp: m.Timestamp, + CpuUsedPct: m.CPUUsedPercent, + CpuCount: int32(m.CPUCount), + MemTotalMiB: int64(m.MemTotalMiB), + MemUsedMiB: int64(m.MemUsedMiB), + } + } + + return apiMetrics, nil +} + +type metricReader interface { + LegacyGetSandboxIDMetrics( + ctx context.Context, + sandboxID string, + teamID string, + limit int, + duration time.Duration, + ) ([]api.SandboxMetric, error) + GetSandboxesSandboxIDMetricsFromClickhouse( + ctx context.Context, + sandboxID string, + teamID string, + limit int, + duration time.Duration, + ) ([]api.SandboxMetric, error) +} + +func (a *APIStore) readMetricsBasedOnConfig( + ctx context.Context, + sandboxID string, + teamID string, + reader metricReader, +) ([]api.SandboxMetric, error) { + // Get metrics and health status on sandbox startup + readMetricsFromClickhouse := a.readMetricsFromClickHouse == "true" + + if readMetricsFromClickhouse { + return reader.GetSandboxesSandboxIDMetricsFromClickhouse(ctx, sandboxID, teamID, defaultLimit, oldestLogsLimit) + } + + return reader.LegacyGetSandboxIDMetrics(ctx, sandboxID, teamID, defaultLimit, oldestLogsLimit) +} + func (a *APIStore) GetSandboxesSandboxIDMetrics( c *gin.Context, sandboxID string, @@ -104,16 +166,12 @@ func (a *APIStore) GetSandboxesSandboxIDMetrics( telemetry.SetAttributes(ctx, attribute.String("instance.id", sandboxID), - attribute.String("team.id", teamID), + telemetry.WithTeamID(teamID), ) - metrics, err := a.getSandboxesSandboxIDMetrics(ctx, sandboxID, teamID, defaultLimit, oldestLogsLimit) + metrics, err := a.readMetricsBasedOnConfig(ctx, sandboxID, teamID, a) if err != nil { - a.logger.Error("Error returning metrics for sandbox", - zap.Error(err), - zap.String("sandboxID", sandboxID), - ) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error returning metrics for sandbox", err, telemetry.WithSandboxID(sandboxID)) a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error returning metrics for sandbox '%s'", sandboxID)) return diff --git a/packages/api/internal/handlers/sandbox_metrics_test.go b/packages/api/internal/handlers/sandbox_metrics_test.go new file mode 100644 index 0000000..1db9e7e --- /dev/null +++ b/packages/api/internal/handlers/sandbox_metrics_test.go @@ -0,0 +1,234 @@ +package handlers + +import ( + "context" + "errors" + "reflect" + "testing" + "time" + + "github.com/google/go-cmp/cmp" + + "github.com/e2b-dev/infra/packages/api/internal/api" + "github.com/e2b-dev/infra/packages/shared/pkg/chdb" + "github.com/e2b-dev/infra/packages/shared/pkg/models/chmodels" +) + +// fake clickhouse store +type fakeClickhouseStore struct { + *chdb.MockStore + metrics []chmodels.Metrics + err error +} + +func (f *fakeClickhouseStore) QueryMetrics(ctx context.Context, sandboxID, teamID string, start int64, limit int) ([]chmodels.Metrics, error) { + return f.metrics, f.err +} + +var aTimestamp = time.Now().Add(-time.Hour * 24) + +func TestAPIStore_getSandboxesSandboxIDMetricsClickhouse(t *testing.T) { + type fields struct { + clickhouseStore chdb.Store + } + type args struct { + ctx context.Context + sandboxID string + teamID string + limit int + duration time.Duration + } + tests := []struct { + name string + fields fields + args args + want []api.SandboxMetric + wantErr bool + }{ + // TODO: Add test cases. + { + name: "test", + fields: fields{ + clickhouseStore: &fakeClickhouseStore{ + chdb.NewMockStore(), + []chmodels.Metrics{ + { + SandboxID: "sandbox1", + TeamID: "team1", + CPUUsedPercent: 10, + MemUsedMiB: 100, + MemTotalMiB: 100, + CPUCount: 1, + Timestamp: aTimestamp, + }, + }, + nil, + }, + }, + args: args{ + ctx: context.Background(), + sandboxID: "sandbox1", + teamID: "team1", + limit: 10, + duration: time.Hour * 24, + }, + want: []api.SandboxMetric{ + { + CpuCount: 1, + CpuUsedPct: 10, + MemTotalMiB: 100, + MemUsedMiB: 100, + Timestamp: aTimestamp, + }, + }, + }, + { + name: "test error", + fields: fields{ + clickhouseStore: &fakeClickhouseStore{ + chdb.NewMockStore(), + []chmodels.Metrics{}, + errors.New("test error"), + }, + }, + args: args{ + ctx: context.Background(), + sandboxID: "sandbox1", + teamID: "team1", + limit: 10, + duration: time.Hour * 24, + }, + wantErr: true, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + a := &APIStore{ + clickhouseStore: tt.fields.clickhouseStore, + } + got, err := a.GetSandboxesSandboxIDMetricsFromClickhouse(tt.args.ctx, tt.args.sandboxID, tt.args.teamID, tt.args.limit, tt.args.duration) + if (err != nil) != tt.wantErr { + t.Errorf("APIStore.getSandboxesSandboxIDMetrics() error = %v, wantErr %v", err, tt.wantErr) + return + } + + if out := cmp.Diff(got, tt.want); out != "" { + t.Errorf("APIStore.getSandboxesSandboxIDMetrics() = %v, want %v", got, tt.want) + } + }) + } +} + +// fake metric reader +type fakeMetricReader struct { + legacyMetrics []api.SandboxMetric + legacyErr error + clickhouseMetrics []api.SandboxMetric + clickhouseErr error +} + +func (f *fakeMetricReader) LegacyGetSandboxIDMetrics(ctx context.Context, sandboxID, teamID string, limit int, duration time.Duration) ([]api.SandboxMetric, error) { + return f.legacyMetrics, f.legacyErr +} + +func (f *fakeMetricReader) GetSandboxesSandboxIDMetricsFromClickhouse(ctx context.Context, sandboxID, teamID string, limit int, duration time.Duration) ([]api.SandboxMetric, error) { + return f.clickhouseMetrics, f.clickhouseErr +} + +func TestAPIStore_readMetricsBasedOnConfig(t *testing.T) { + type fields struct { + readMetricsFromClickHouse string + } + type args struct { + ctx context.Context + sandboxID string + teamID string + reader metricReader + } + tests := []struct { + name string + fields fields + args args + want []api.SandboxMetric + wantErr bool + }{ + // todo test all combinations of legacy and clickhouse metrics + { + name: "test legacy metrics", + fields: fields{ + readMetricsFromClickHouse: "", + }, + args: args{ + reader: &fakeMetricReader{ + legacyMetrics: []api.SandboxMetric{ + { + Timestamp: aTimestamp, + }, + }, + }, + }, + want: []api.SandboxMetric{ + { + Timestamp: aTimestamp, + }, + }, + wantErr: false, + }, + { + name: "test clickhouse metrics", + fields: fields{ + readMetricsFromClickHouse: "true", + }, + args: args{ + reader: &fakeMetricReader{ + clickhouseMetrics: []api.SandboxMetric{ + { + Timestamp: aTimestamp, + }, + }, + }, + }, + want: []api.SandboxMetric{ + { + Timestamp: aTimestamp, + }, + }, + wantErr: false, + }, + { + name: "test random string", + fields: fields{ + readMetricsFromClickHouse: "random string", + }, + args: args{ + reader: &fakeMetricReader{ + legacyMetrics: []api.SandboxMetric{ + { + Timestamp: aTimestamp, + }, + }, + }, + }, + want: []api.SandboxMetric{ + { + Timestamp: aTimestamp, + }, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + a := &APIStore{ + readMetricsFromClickHouse: tt.fields.readMetricsFromClickHouse, + } + got, err := a.readMetricsBasedOnConfig(tt.args.ctx, tt.args.sandboxID, tt.args.teamID, tt.args.reader) + if (err != nil) != tt.wantErr { + t.Errorf("APIStore.readMetricsBasedOnConfig() error = %v, wantErr %v", err, tt.wantErr) + return + } + if !reflect.DeepEqual(got, tt.want) { + t.Errorf("APIStore.readMetricsBasedOnConfig() = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/packages/api/internal/handlers/sandbox_pause.go b/packages/api/internal/handlers/sandbox_pause.go index beafc71..ca7ecb3 100644 --- a/packages/api/internal/handlers/sandbox_pause.go +++ b/packages/api/internal/handlers/sandbox_pause.go @@ -1,16 +1,19 @@ package handlers import ( + "database/sql" + "errors" "fmt" "net/http" "github.com/gin-gonic/gin" "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" - "github.com/e2b-dev/infra/packages/api/internal/auth" - authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" "github.com/e2b-dev/infra/packages/api/internal/utils" + "github.com/e2b-dev/infra/packages/db/queries" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) @@ -18,7 +21,7 @@ func (a *APIStore) PostSandboxesSandboxIDPause(c *gin.Context, sandboxID api.San ctx := c.Request.Context() // Get team from context, use TeamContextKey - teamID := c.Value(auth.TeamContextKey).(authcache.AuthTeamInfo).Team.ID + teamID := a.GetTeamInfo(c).Team.ID sandboxID = utils.ShortID(sandboxID) @@ -28,19 +31,26 @@ func (a *APIStore) PostSandboxesSandboxIDPause(c *gin.Context, sandboxID api.San sbx, err := a.orchestrator.GetSandbox(sandboxID) if err != nil { - _, _, fErr := a.db.GetLastSnapshot(ctx, sandboxID, teamID) + _, fErr := a.sqlcDB.GetLastSnapshot(ctx, queries.GetLastSnapshotParams{SandboxID: sandboxID, TeamID: teamID}) if fErr == nil { + zap.L().Warn("Sandbox is already paused", logger.WithSandboxID(sandboxID)) a.sendAPIStoreError(c, http.StatusConflict, fmt.Sprintf("Error pausing sandbox - sandbox '%s' is already paused", sandboxID)) return } - a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Error pausing sandbox - sandbox '%s' was not found", sandboxID)) + if errors.Is(fErr, sql.ErrNoRows) { + zap.L().Debug("Snapshot not found", logger.WithSandboxID(sandboxID)) + a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Error pausing sandbox - snapshot for sandbox '%s' was not found", sandboxID)) + return + } + + zap.L().Error("Error getting snapshot", zap.Error(fErr), logger.WithSandboxID(sandboxID)) + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error pausing sandbox") return } if *sbx.TeamID != teamID { - errMsg := fmt.Errorf("sandbox '%s' does not belong to team '%s'", sandboxID, teamID.String()) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "sandbox does not belong to team", fmt.Errorf("sandbox '%s' does not belong to team '%s'", sandboxID, teamID.String())) a.sendAPIStoreError(c, http.StatusUnauthorized, fmt.Sprintf("Error pausing sandbox - sandbox '%s' does not belong to your team '%s'", sandboxID, teamID.String())) diff --git a/packages/api/internal/handlers/sandbox_refresh.go b/packages/api/internal/handlers/sandbox_refresh.go index 3f468a5..9e5e9b8 100644 --- a/packages/api/internal/handlers/sandbox_refresh.go +++ b/packages/api/internal/handlers/sandbox_refresh.go @@ -5,11 +5,12 @@ import ( "net/http" "time" + "github.com/gin-gonic/gin" + "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/cache/instance" "github.com/e2b-dev/infra/packages/api/internal/utils" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" - "github.com/gin-gonic/gin" ) func (a *APIStore) PostSandboxesSandboxIDRefreshes( @@ -25,8 +26,7 @@ func (a *APIStore) PostSandboxesSandboxIDRefreshes( if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing request: %s", err)) - errMsg := fmt.Errorf("error when parsing request: %w", err) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "error when parsing request", err) return } @@ -41,12 +41,10 @@ func (a *APIStore) PostSandboxesSandboxIDRefreshes( duration = instance.InstanceExpiration } - err = a.orchestrator.KeepAliveFor(ctx, sandboxID, duration, false) - if err != nil { - errMsg := fmt.Errorf("error when refreshing sandbox: %w", err) - telemetry.ReportCriticalError(ctx, errMsg) - - a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error refreshing sandbox '%s'", sandboxID)) + apiErr := a.orchestrator.KeepAliveFor(ctx, sandboxID, duration, false) + if apiErr != nil { + telemetry.ReportCriticalError(ctx, "error when refreshing sandbox", apiErr.Err) + a.sendAPIStoreError(c, apiErr.Code, apiErr.ClientMsg) return } diff --git a/packages/api/internal/handlers/sandbox_resume.go b/packages/api/internal/handlers/sandbox_resume.go index 1fc5295..b325411 100644 --- a/packages/api/internal/handlers/sandbox_resume.go +++ b/packages/api/internal/handlers/sandbox_resume.go @@ -1,21 +1,26 @@ package handlers import ( + "database/sql" "errors" "fmt" "net/http" "strings" "time" + "github.com/gin-gonic/gin" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/auth" authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" "github.com/e2b-dev/infra/packages/api/internal/cache/instance" "github.com/e2b-dev/infra/packages/api/internal/utils" - "github.com/e2b-dev/infra/packages/shared/pkg/logs" + "github.com/e2b-dev/infra/packages/db/queries" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" + sbxlogger "github.com/e2b-dev/infra/packages/shared/pkg/logger/sandbox" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" - "github.com/gin-gonic/gin" - "go.opentelemetry.io/otel/trace" ) func getSandboxIDClient(sandboxID string) (string, bool) { @@ -43,8 +48,7 @@ func (a *APIStore) PostSandboxesSandboxIDResume(c *gin.Context, sandboxID api.Sa if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing request: %s", err)) - errMsg := fmt.Errorf("error when parsing request: %w", err) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "error when parsing request", err) return } @@ -74,8 +78,15 @@ func (a *APIStore) PostSandboxesSandboxIDResume(c *gin.Context, sandboxID api.Sa sandboxID = utils.ShortID(sandboxID) - _, err = a.orchestrator.GetSandbox(sandboxID) + sbxCache, err := a.orchestrator.GetSandbox(sandboxID) if err == nil { + zap.L().Debug("Sandbox is already running", + logger.WithSandboxID(sandboxID), + zap.Time("end_time", sbxCache.GetEndTime()), + zap.Bool("auto_pause", sbxCache.AutoPause.Load()), + zap.Time("start_time", sbxCache.StartTime), + zap.String("node_id", sbxCache.Node.ID), + ) a.sendAPIStoreError(c, http.StatusConflict, fmt.Sprintf("Sandbox %s is already running", sandboxID)) return @@ -94,41 +105,65 @@ func (a *APIStore) PostSandboxesSandboxIDResume(c *gin.Context, sandboxID api.Sa clientID = pausedOnNode.ID } - snapshot, build, err := a.db.GetLastSnapshot(ctx, sandboxID, teamInfo.Team.ID) + lastSnapshot, err := a.sqlcDB.GetLastSnapshot(ctx, queries.GetLastSnapshotParams{SandboxID: sandboxID, TeamID: teamInfo.Team.ID}) if err != nil { - a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Error resuming sandbox: %s", err)) + if errors.Is(err, sql.ErrNoRows) { + zap.L().Debug("Snapshot not found", logger.WithSandboxID(sandboxID)) + a.sendAPIStoreError(c, http.StatusNotFound, "Sandbox snapshot not found") + return + } + zap.L().Error("Error getting last snapshot", logger.WithSandboxID(sandboxID), zap.Error(err)) + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when getting snapshot") return } - sandboxLogger := logs.NewSandboxLogger( - sandboxID, - *build.EnvID, - teamInfo.Team.ID.String(), - build.Vcpu, - build.RAMMB, - false, - ) - sandboxLogger.Debugf("Started resuming sandbox") + snap := lastSnapshot.Snapshot + build := lastSnapshot.EnvBuild - sbx, err := a.startSandbox( + alias := "" + if len(lastSnapshot.Aliases) > 0 { + alias = lastSnapshot.Aliases[0] + } + + sbxlogger.E(&sbxlogger.SandboxMetadata{ + SandboxID: sandboxID, + TemplateID: *build.EnvID, + TeamID: teamInfo.Team.ID.String(), + }).Debug("Started resuming sandbox") + + var envdAccessToken *string = nil + if snap.EnvSecure { + accessToken, tokenErr := a.getEnvdAccessToken(build.EnvdVersion, sandboxID) + if tokenErr != nil { + zap.L().Error("Secure envd access token error", zap.Error(tokenErr.Err), logger.WithTemplateID(*build.EnvID), logger.WithBuildID(build.ID.String())) + a.sendAPIStoreError(c, tokenErr.Code, tokenErr.ClientMsg) + return + } + + envdAccessToken = &accessToken + } + + sbx, createErr := a.startSandbox( ctx, - snapshot.SandboxID, + snap.SandboxID, timeout, nil, - snapshot.Metadata, - "", + snap.Metadata, + alias, teamInfo, build, - sandboxLogger, &c.Request.Header, true, &clientID, - snapshot.BaseEnvID, + snap.BaseEnvID, autoPause, + envdAccessToken, ) - if err != nil { - a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error resuming sandbox: %s", err)) + + if createErr != nil { + zap.L().Error("Failed to resume sandbox", zap.Error(createErr.Err)) + a.sendAPIStoreError(c, createErr.Code, createErr.ClientMsg) return } diff --git a/packages/api/internal/handlers/sandbox_timeout.go b/packages/api/internal/handlers/sandbox_timeout.go index 2599e22..a28f4ff 100644 --- a/packages/api/internal/handlers/sandbox_timeout.go +++ b/packages/api/internal/handlers/sandbox_timeout.go @@ -5,11 +5,11 @@ import ( "net/http" "time" + "github.com/gin-gonic/gin" + "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/utils" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" - - "github.com/gin-gonic/gin" ) func (a *APIStore) PostSandboxesSandboxIDTimeout( @@ -25,8 +25,7 @@ func (a *APIStore) PostSandboxesSandboxIDTimeout( if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing request: %s", err)) - errMsg := fmt.Errorf("error when parsing request: %w", err) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "error when parsing request", err) return } @@ -37,11 +36,10 @@ func (a *APIStore) PostSandboxesSandboxIDTimeout( duration = time.Duration(body.Timeout) * time.Second } - err = a.orchestrator.KeepAliveFor(ctx, sandboxID, duration, true) - if err != nil { - errMsg := fmt.Errorf("error setting sandbox timeout: %w", err) - telemetry.ReportCriticalError(ctx, errMsg) - a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Error setting sandbox timeout for sandbox '%s'", sandboxID)) + apiErr := a.orchestrator.KeepAliveFor(ctx, sandboxID, duration, true) + if apiErr != nil { + telemetry.ReportCriticalError(ctx, "error when setting timeout", apiErr.Err) + a.sendAPIStoreError(c, apiErr.Code, apiErr.ClientMsg) return } diff --git a/packages/api/internal/handlers/sandboxes_list.go b/packages/api/internal/handlers/sandboxes_list.go index 60b896f..13114c4 100644 --- a/packages/api/internal/handlers/sandboxes_list.go +++ b/packages/api/internal/handlers/sandboxes_list.go @@ -4,164 +4,268 @@ import ( "context" "fmt" "net/http" - "net/url" "slices" - "strings" + "sort" + "strconv" + "time" "github.com/gin-gonic/gin" "github.com/google/uuid" + "github.com/jackc/pgx/v5/pgtype" "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/auth" authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" - "github.com/e2b-dev/infra/packages/shared/pkg/models" - "github.com/e2b-dev/infra/packages/shared/pkg/models/envbuild" + "github.com/e2b-dev/infra/packages/api/internal/cache/instance" + "github.com/e2b-dev/infra/packages/api/internal/orchestrator" + "github.com/e2b-dev/infra/packages/api/internal/utils" + "github.com/e2b-dev/infra/packages/db/queries" + "github.com/e2b-dev/infra/packages/db/types" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) -func (a *APIStore) getSandboxes(ctx context.Context, teamID uuid.UUID, query *string) ([]api.RunningSandbox, error) { - instanceInfo := a.orchestrator.GetSandboxes(ctx, &teamID) +const defaultSandboxListLimit int32 = 1000 - if query != nil { - // Unescape query - query, err := url.QueryUnescape(*query) - if err != nil { - return nil, fmt.Errorf("error when unescaping query: %w", err) - } +func (a *APIStore) getPausedSandboxes(ctx context.Context, teamID uuid.UUID, runningSandboxesIDs []string, metadataFilter *map[string]string, limit int32, cursorTime time.Time, cursorID string) ([]utils.PaginatedSandbox, error) { + // Apply limit + 1 to check if there are more results + queryLimit := int32(limit) + 1 + queryMetadata := types.JSONBStringMap{} + if metadataFilter != nil { + queryMetadata = *metadataFilter + } - // Parse filters, both key and value are also unescaped - filters := make(map[string]string) + snapshots, err := a.sqlcDB.GetSnapshotsWithCursor( + ctx, queries.GetSnapshotsWithCursorParams{ + Limit: queryLimit, + TeamID: teamID, + Metadata: queryMetadata, + CursorTime: pgtype.Timestamptz{Time: cursorTime, Valid: true}, + CursorID: cursorID, + SnapshotExcludeSbxIds: runningSandboxesIDs, + }, + ) + if err != nil { + return nil, fmt.Errorf("error getting team snapshots: %s", err) + } - for _, filter := range strings.Split(query, "&") { - parts := strings.Split(filter, "=") - if len(parts) != 2 { - return nil, fmt.Errorf("invalid key value pair in query") - } + sandboxes := snapshotsToPaginatedSandboxes(snapshots) + return sandboxes, nil +} - key, err := url.QueryUnescape(parts[0]) - if err != nil { - return nil, fmt.Errorf("error when unescaping key: %w", err) - } +func getRunningSandboxes(ctx context.Context, orchestrator *orchestrator.Orchestrator, teamID uuid.UUID, metadataFilter *map[string]string) []utils.PaginatedSandbox { + // Get all sandbox instances + runningSandboxes := orchestrator.GetSandboxes(ctx, &teamID) - value, err := url.QueryUnescape(parts[1]) - if err != nil { - return nil, fmt.Errorf("error when unescaping value: %w", err) - } + // Running Sandbox IDs + runningSandboxList := instanceInfoToPaginatedSandboxes(runningSandboxes) - filters[key] = value - } + // Filter sandboxes based on metadata + runningSandboxList = utils.FilterSandboxesOnMetadata(runningSandboxList, metadataFilter) - // Filter instances to match all filters - n := 0 - for _, instance := range instanceInfo { - if instance.Metadata == nil { - continue - } - - matchesAll := true - for key, value := range filters { - if metadataValue, ok := instance.Metadata[key]; !ok || metadataValue != value { - matchesAll = false - break - } - } - - if matchesAll { - instanceInfo[n] = instance - n++ - } - } + return runningSandboxList +} + +func (a *APIStore) GetSandboxes(c *gin.Context, params api.GetSandboxesParams) { + ctx := c.Request.Context() + telemetry.ReportEvent(ctx, "list sandboxes") + + teamInfo := c.Value(auth.TeamContextKey).(authcache.AuthTeamInfo) + team := teamInfo.Team - // Trim slice - instanceInfo = instanceInfo[:n] + a.posthog.IdentifyAnalyticsTeam(team.ID.String(), team.Name) + properties := a.posthog.GetPackageToPosthogProperties(&c.Request.Header) + a.posthog.CreateAnalyticsTeamEvent(team.ID.String(), "listed sandboxes", properties) + + metadataFilter, err := utils.ParseMetadata(params.Metadata) + if err != nil { + zap.L().Error("Error parsing metadata", zap.Error(err)) + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error parsing metadata: %s", err)) + + return } - buildIDs := make([]uuid.UUID, 0) - for _, info := range instanceInfo { - if info.TeamID == nil { - continue - } + sandboxes := getRunningSandboxes(ctx, a.orchestrator, team.ID, metadataFilter) - if *info.TeamID != teamID { - continue - } + // Sort sandboxes by start time descending + slices.SortFunc(sandboxes, func(a, b utils.PaginatedSandbox) int { + // SortFunc sorts the list ascending by default, because we want the opposite behavior we switch `a` and `b` + return b.StartedAt.Compare(a.StartedAt) + }) - buildIDs = append(buildIDs, *info.BuildID) + c.JSON(http.StatusOK, sandboxes) +} + +func (a *APIStore) GetV2Sandboxes(c *gin.Context, params api.GetV2SandboxesParams) { + ctx := c.Request.Context() + telemetry.ReportEvent(ctx, "list sandboxes") + + teamInfo := c.Value(auth.TeamContextKey).(authcache.AuthTeamInfo) + team := teamInfo.Team + + a.posthog.IdentifyAnalyticsTeam(team.ID.String(), team.Name) + properties := a.posthog.GetPackageToPosthogProperties(&c.Request.Header) + a.posthog.CreateAnalyticsTeamEvent(team.ID.String(), "listed sandboxes", properties) + + // If no state is provided we want to return both running and paused sandboxes + states := make([]api.SandboxState, 0) + if params.State == nil { + states = append(states, api.Running, api.Paused) + } else { + states = append(states, *params.State...) + } + + limit := defaultSandboxListLimit + if params.Limit != nil { + limit = *params.Limit } - builds, err := a.db.Client.EnvBuild.Query().Where(envbuild.IDIn(buildIDs...)).All(ctx) + metadataFilter, err := utils.ParseMetadata(params.Metadata) if err != nil { - telemetry.ReportCriticalError(ctx, err) + zap.L().Error("Error parsing metadata", zap.Error(err)) + a.sendAPIStoreError(c, http.StatusBadRequest, "Error parsing metadata") - return nil, fmt.Errorf("error when getting builds: %w", err) + return } - buildsMap := make(map[uuid.UUID]*models.EnvBuild, len(builds)) - for _, build := range builds { - buildsMap[build.ID] = build + // Get sandboxes with pagination + sandboxes := make([]utils.PaginatedSandbox, 0) + + // Parse the next token to offset sandboxes for pagination + cursorTime, cursorID, err := utils.ParseNextToken(params.NextToken) + if err != nil { + zap.L().Error("Error parsing cursor", zap.Error(err)) + a.sendAPIStoreError(c, http.StatusBadRequest, "Invalid next token") + + return } - sandboxes := make([]api.RunningSandbox, 0) + // Get all sandbox instances + runningSandboxes := a.orchestrator.GetSandboxes(ctx, &team.ID) - for _, info := range instanceInfo { - if info.TeamID == nil { - continue - } + // Running Sandbox IDs + runningSandboxesIDs := make([]string, 0) + for _, info := range runningSandboxes { + runningSandboxesIDs = append(runningSandboxesIDs, utils.ShortID(info.Instance.SandboxID)) + } - if *info.TeamID != teamID { - continue - } + if slices.Contains(states, api.Running) { + runningSandboxList := instanceInfoToPaginatedSandboxes(runningSandboxes) - if info.BuildID == nil { - continue - } + // Filter based on metadata + runningSandboxList = utils.FilterSandboxesOnMetadata(runningSandboxList, metadataFilter) + + // Filter based on cursor and limit + runningSandboxList = utils.FilterBasedOnCursor(runningSandboxList, cursorTime, cursorID, limit) - instance := api.RunningSandbox{ - ClientID: info.Instance.ClientID, - TemplateID: info.Instance.TemplateID, - Alias: info.Instance.Alias, - SandboxID: info.Instance.SandboxID, - StartedAt: info.StartTime, - CpuCount: int32(buildsMap[*info.BuildID].Vcpu), - MemoryMB: int32(buildsMap[*info.BuildID].RAMMB), - EndAt: info.GetEndTime(), + sandboxes = append(sandboxes, runningSandboxList...) + } + + if slices.Contains(states, api.Paused) { + pausedSandboxList, err := a.getPausedSandboxes(ctx, team.ID, runningSandboxesIDs, metadataFilter, limit, cursorTime, cursorID) + if err != nil { + zap.L().Error("Error getting paused sandboxes", zap.Error(err)) + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error getting paused sandboxes") + + return } + sandboxes = append(sandboxes, pausedSandboxList...) + } - if info.Metadata != nil { - meta := api.SandboxMetadata(info.Metadata) - instance.Metadata = &meta + // Sort by StartedAt (descending), then by SandboxID (ascending) for stability + sort.Slice(sandboxes, func(a, b int) bool { + if !sandboxes[a].StartedAt.Equal(sandboxes[b].StartedAt) { + return sandboxes[a].StartedAt.After(sandboxes[b].StartedAt) } + return sandboxes[a].SandboxID < sandboxes[b].SandboxID + }) + + var nextToken *string + if len(sandboxes) > int(limit) { + // We have more results than the limit, so we need to set the nextToken + lastSandbox := sandboxes[limit-1] + cursor := lastSandbox.GenerateCursor() + nextToken = &cursor - sandboxes = append(sandboxes, instance) + // Trim to the requested limit + sandboxes = sandboxes[:limit] } - // Sort sandboxes by start time descending - slices.SortFunc(sandboxes, func(a, b api.RunningSandbox) int { - return a.StartedAt.Compare(b.StartedAt) - }) + // Add pagination info to headers + if nextToken != nil { + c.Header("X-Next-Token", *nextToken) + } - return sandboxes, nil + c.Header("X-Total-Items", strconv.Itoa(len(sandboxes))) + c.JSON(http.StatusOK, sandboxes) } -func (a *APIStore) GetSandboxes(c *gin.Context, params api.GetSandboxesParams) { - ctx := c.Request.Context() - telemetry.ReportEvent(ctx, "list running instances") +func snapshotsToPaginatedSandboxes(snapshots []queries.GetSnapshotsWithCursorRow) []utils.PaginatedSandbox { + sandboxes := make([]utils.PaginatedSandbox, 0) - teamInfo := c.Value(auth.TeamContextKey).(authcache.AuthTeamInfo) - team := teamInfo.Team + // Add snapshots to results + for _, record := range snapshots { + snapshot := record.Snapshot + build := record.EnvBuild - a.posthog.IdentifyAnalyticsTeam(team.ID.String(), team.Name) - properties := a.posthog.GetPackageToPosthogProperties(&c.Request.Header) - a.posthog.CreateAnalyticsTeamEvent(team.ID.String(), "listed running instances", properties) + var alias *string + if len(record.Aliases) > 0 { + alias = &record.Aliases[0] + } - sandboxes, err := a.getSandboxes(ctx, team.ID, params.Query) - if err != nil { - a.logger.Error("Error fetching sandboxes", zap.Error(err)) - a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error returning sandboxes for team '%s'", team.ID)) + sandbox := utils.PaginatedSandbox{ + ListedSandbox: api.ListedSandbox{ + ClientID: "00000000", // for backwards compatibility we need to return a client id + Alias: alias, + TemplateID: snapshot.BaseEnvID, + SandboxID: snapshot.SandboxID, + StartedAt: snapshot.SandboxStartedAt.Time, + CpuCount: int32(build.Vcpu), + MemoryMB: int32(build.RamMb), + EndAt: snapshot.CreatedAt.Time, + State: api.Paused, + }, + PaginationTimestamp: snapshot.CreatedAt.Time, + } - return + if snapshot.Metadata != nil { + meta := api.SandboxMetadata(snapshot.Metadata) + sandbox.Metadata = &meta + } + + sandboxes = append(sandboxes, sandbox) } - c.JSON(http.StatusOK, sandboxes) + return sandboxes +} + +func instanceInfoToPaginatedSandboxes(runningSandboxes []*instance.InstanceInfo) []utils.PaginatedSandbox { + sandboxes := make([]utils.PaginatedSandbox, 0) + + // Add running sandboxes to results + for _, info := range runningSandboxes { + sandbox := utils.PaginatedSandbox{ + ListedSandbox: api.ListedSandbox{ + ClientID: info.Instance.ClientID, + TemplateID: info.BaseTemplateID, + Alias: info.Instance.Alias, + SandboxID: info.Instance.SandboxID, + StartedAt: info.StartTime, + CpuCount: api.CPUCount(info.VCpu), + MemoryMB: api.MemoryMB(info.RamMB), + EndAt: info.GetEndTime(), + State: api.Running, + }, + PaginationTimestamp: info.StartTime, + } + + if info.Metadata != nil { + meta := api.SandboxMetadata(info.Metadata) + sandbox.Metadata = &meta + } + + sandboxes = append(sandboxes, sandbox) + } + + return sandboxes } diff --git a/packages/api/internal/handlers/sandboxes_list_metrics.go b/packages/api/internal/handlers/sandboxes_list_metrics.go index d0c74b7..a011e7d 100644 --- a/packages/api/internal/handlers/sandboxes_list_metrics.go +++ b/packages/api/internal/handlers/sandboxes_list_metrics.go @@ -18,6 +18,8 @@ import ( "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/auth" authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" + "github.com/e2b-dev/infra/packages/api/internal/utils" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) @@ -29,12 +31,12 @@ const ( func (a *APIStore) getSandboxesMetrics( ctx context.Context, teamID uuid.UUID, - sandboxes []api.RunningSandbox, + sandboxes []utils.PaginatedSandbox, ) ([]api.RunningSandboxWithMetrics, error) { // Add operation telemetry telemetry.ReportEvent(ctx, "fetch metrics for sandboxes") telemetry.SetAttributes(ctx, - attribute.String("team.id", teamID.String()), + telemetry.WithTeamID(teamID.String()), attribute.Int("sandboxes.count", len(sandboxes)), ) @@ -48,7 +50,7 @@ func (a *APIStore) getSandboxesMetrics( }() type metricsResult struct { - sandbox api.RunningSandbox + sandbox utils.PaginatedSandbox metrics []api.SandboxMetric err error } @@ -66,14 +68,14 @@ func (a *APIStore) getSandboxesMetrics( // Fetch metrics for each sandbox concurrently with rate limiting for _, sandbox := range sandboxes { wg.Add(1) - go func(s api.RunningSandbox) { + go func(s utils.PaginatedSandbox) { defer wg.Done() err := sem.Acquire(ctx, 1) if err != nil { timeoutCount.Add(1) err := fmt.Errorf("context cancelled while waiting for rate limiter: %w", ctx.Err()) - telemetry.ReportError(ctx, err) + telemetry.ReportError(ctx, "context cancelled while waiting for rate limiter", err) results <- metricsResult{ sandbox: s, err: err, @@ -84,7 +86,7 @@ func (a *APIStore) getSandboxesMetrics( defer sem.Release(1) // Get metrics for this sandbox - metrics, err := a.getSandboxesSandboxIDMetrics( + metrics, err := a.LegacyGetSandboxIDMetrics( ctx, s.SandboxID, teamID.String(), @@ -94,7 +96,7 @@ func (a *APIStore) getSandboxesMetrics( if err != nil { errorCount.Add(1) - telemetry.ReportError(ctx, fmt.Errorf("failed to fetch metrics for sandbox %s: %w", s.SandboxID, err)) + telemetry.ReportError(ctx, "failed to fetch metrics for sandbox", err, telemetry.WithSandboxID(s.SandboxID)) } else { successCount.Add(1) } @@ -148,8 +150,8 @@ func (a *APIStore) getSandboxesMetrics( // Log operation summary if len(metricsErrors) == 0 { - a.logger.Info("Completed fetching sandbox metrics without errors", - zap.String("team_id", teamID.String()), + zap.L().Info("Completed fetching sandbox metrics without errors", + logger.WithTeamID(teamID.String()), zap.Int32("total_sandboxes", int32(len(sandboxes))), zap.Int32("successful_fetches", successCount.Load()), zap.Int32("timeouts", timeoutCount.Load()), @@ -163,8 +165,8 @@ func (a *APIStore) getSandboxesMetrics( err := errors.Join(metricsErrors...) - a.logger.Error("Received errors while fetching metrics for some sandboxes", - zap.String("team_id", teamID.String()), + zap.L().Error("Received errors while fetching metrics for some sandboxes", + logger.WithTeamID(teamID.String()), zap.Int32("total_sandboxes", int32(len(sandboxes))), zap.Int32("successful_fetches", successCount.Load()), zap.Int32("failed_fetches", errorCount.Load()), @@ -191,19 +193,20 @@ func (a *APIStore) GetSandboxesMetrics(c *gin.Context, params api.GetSandboxesMe properties := a.posthog.GetPackageToPosthogProperties(&c.Request.Header) a.posthog.CreateAnalyticsTeamEvent(team.ID.String(), "listed running instances with metrics", properties) - sandboxes, err := a.getSandboxes(ctx, team.ID, params.Query) + metadataFilter, err := utils.ParseMetadata(params.Metadata) if err != nil { - a.logger.Error("Error fetching sandboxes", zap.Error(err)) - telemetry.ReportCriticalError(ctx, err) - a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error returning sandboxes for team '%s'", team.ID)) + zap.L().Error("Error parsing metadata", zap.Error(err)) + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error parsing metadata: %s", err)) return } + // Get relevant running sandboxes + sandboxes := getRunningSandboxes(ctx, a.orchestrator, team.ID, metadataFilter) + sandboxesWithMetrics, err := a.getSandboxesMetrics(ctx, team.ID, sandboxes) if err != nil { - a.logger.Error("Error fetching metrics for sandboxes", zap.Error(err)) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error fetching metrics for sandboxes", err) a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error returning metrics for sandboxes for team '%s'", team.ID)) return diff --git a/packages/api/internal/handlers/store.go b/packages/api/internal/handlers/store.go index d33d600..1c3a1d1 100644 --- a/packages/api/internal/handlers/store.go +++ b/packages/api/internal/handlers/store.go @@ -2,69 +2,110 @@ package handlers import ( "context" + "crypto/tls" "errors" "fmt" "net/http" "os" + "strings" "time" "github.com/gin-gonic/gin" - "github.com/go-redis/redis/v8" + "github.com/golang-jwt/jwt/v5" "github.com/google/uuid" loki "github.com/grafana/loki/pkg/logcli/client" nomadapi "github.com/hashicorp/nomad/api" - "go.opentelemetry.io/otel" + middleware "github.com/oapi-codegen/gin-middleware" + "github.com/redis/go-redis/v9" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" analyticscollector "github.com/e2b-dev/infra/packages/api/internal/analytics_collector" "github.com/e2b-dev/infra/packages/api/internal/api" authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" - "github.com/e2b-dev/infra/packages/api/internal/cache/builds" templatecache "github.com/e2b-dev/infra/packages/api/internal/cache/templates" + "github.com/e2b-dev/infra/packages/api/internal/edge" "github.com/e2b-dev/infra/packages/api/internal/orchestrator" + "github.com/e2b-dev/infra/packages/api/internal/sandbox" template_manager "github.com/e2b-dev/infra/packages/api/internal/template-manager" "github.com/e2b-dev/infra/packages/api/internal/utils" + sqlcdb "github.com/e2b-dev/infra/packages/db/client" + "github.com/e2b-dev/infra/packages/shared/pkg/chdb" "github.com/e2b-dev/infra/packages/shared/pkg/db" "github.com/e2b-dev/infra/packages/shared/pkg/env" - "github.com/e2b-dev/infra/packages/shared/pkg/logging" + "github.com/e2b-dev/infra/packages/shared/pkg/models" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) +var supabaseJWTSecretsString = strings.TrimSpace(os.Getenv("SUPABASE_JWT_SECRETS")) + +// minSupabaseJWTSecretLength is the minimum length of a secret used to verify the Supabase JWT. +// This is a security measure to prevent the use of weak secrets (like empty). +const minSupabaseJWTSecretLength = 16 + +// supabaseJWTSecrets is a list of secrets used to verify the Supabase JWT. +// More secrets are possible in the case of JWT secret rotation where we need to accept +// tokens signed with the old secret for some time. +var supabaseJWTSecrets = strings.Split(supabaseJWTSecretsString, ",") + type APIStore struct { - Healthy bool - posthog *analyticscollector.PosthogClient - Tracer trace.Tracer - orchestrator *orchestrator.Orchestrator - templateManager *template_manager.TemplateManager - buildCache *builds.BuildCache - db *db.DB - lokiClient *loki.DefaultClient - logger *zap.SugaredLogger - templateCache *templatecache.TemplateCache - authCache *authcache.TeamAuthCache - templateSpawnCounter *utils.TemplateSpawnCounter + Healthy bool + posthog *analyticscollector.PosthogClient + Tracer trace.Tracer + Telemetry *telemetry.Client + orchestrator *orchestrator.Orchestrator + templateManager *template_manager.TemplateManager + db *db.DB + sqlcDB *sqlcdb.Client + lokiClient *loki.DefaultClient + templateCache *templatecache.TemplateCache + templateBuildsCache *templatecache.TemplatesBuildCache + authCache *authcache.TeamAuthCache + templateSpawnCounter *utils.TemplateSpawnCounter + clickhouseStore chdb.Store + envdAccessTokenGenerator *sandbox.EnvdAccessTokenGenerator + // should use something like this: https://github.com/spf13/viper + // but for now this is good + readMetricsFromClickHouse string + clustersPool *edge.Pool } -func NewAPIStore(ctx context.Context) *APIStore { - tracer := otel.Tracer("api") +func NewAPIStore(ctx context.Context, tel *telemetry.Client) *APIStore { + tracer := tel.TracerProvider.Tracer("api") - logger, err := logging.New(env.IsLocal()) + zap.L().Info("Initializing API store and services") + + dbClient, err := db.NewClient(40, 20) if err != nil { - panic(fmt.Errorf("initializing logger: %w", err)) + zap.L().Fatal("Initializing Supabase client", zap.Error(err)) } - logger.Info("initializing API store and services") - - dbClient, err := db.NewClient() + sqlcDB, err := sqlcdb.NewClient(ctx, sqlcdb.WithMaxConnections(40), sqlcdb.WithMinIdle(5)) if err != nil { - logger.Panic("initializing Supabase client", zap.Error(err)) + zap.L().Fatal("Initializing SQLC client", zap.Error(err)) } - logger.Info("created Supabase client") + zap.L().Info("Created database client") + + readMetricsFromClickHouse := os.Getenv("READ_METRICS_FROM_CLICKHOUSE") + var clickhouseStore chdb.Store = nil - posthogClient, posthogErr := analyticscollector.NewPosthogClient(logger) + if readMetricsFromClickHouse == "true" { + clickhouseStore, err = chdb.NewStore(chdb.ClickHouseConfig{ + ConnectionString: os.Getenv("CLICKHOUSE_CONNECTION_STRING"), + Username: os.Getenv("CLICKHOUSE_USERNAME"), + Password: os.Getenv("CLICKHOUSE_PASSWORD"), + Database: os.Getenv("CLICKHOUSE_DATABASE"), + Debug: os.Getenv("CLICKHOUSE_DEBUG") == "true", + }) + if err != nil { + zap.L().Fatal("initializing ClickHouse store", zap.Error(err)) + } + } + + posthogClient, posthogErr := analyticscollector.NewPosthogClient() if posthogErr != nil { - logger.Panic("initializing Posthog client", zap.Error(posthogErr)) + zap.L().Fatal("Initializing Posthog client", zap.Error(posthogErr)) } nomadConfig := &nomadapi.Config{ @@ -74,29 +115,42 @@ func NewAPIStore(ctx context.Context) *APIStore { nomadClient, err := nomadapi.NewClient(nomadConfig) if err != nil { - logger.Panic("initializing Nomad client", zap.Error(err)) + zap.L().Fatal("Initializing Nomad client", zap.Error(err)) } - var redisClient *redis.Client - if rurl := os.Getenv("REDIS_URL"); rurl != "" { - opts, err := redis.ParseURL(rurl) - if err != nil { - logger.Panic("invalid redis URL", zap.String("url", rurl), zap.Error(err)) - } - - redisClient = redis.NewClient(opts) + var redisClient redis.UniversalClient + if redisClusterUrl := os.Getenv("REDIS_CLUSTER_URL"); redisClusterUrl != "" { + // For managed Redis Cluster in GCP we should use Cluster Client, because + // > Redis node endpoints can change and can be recycled as nodes are added and removed over time. + // https://cloud.google.com/memorystore/docs/cluster/cluster-node-specification#cluster_endpoints + // https://cloud.google.com/memorystore/docs/cluster/client-library-code-samples#go-redis + redisClient = redis.NewClusterClient(&redis.ClusterOptions{ + Addrs: []string{redisClusterUrl}, + MinIdleConns: 1, + TLSConfig: &tls.Config{}, // 添加 TLS 支持 + }) + } else if rurl := os.Getenv("REDIS_URL"); rurl != "" { + redisClient = redis.NewClient(&redis.Options{ + Addr: rurl, + MinIdleConns: 1, + TLSConfig: &tls.Config{}, // 添加 TLS 支持 + }) } else { - logger.Warn("REDIS_URL not set, using local caches") + zap.L().Warn("REDIS_URL not set, using local caches") } - orch, err := orchestrator.New(ctx, tracer, nomadClient, logger.Desugar(), posthogClient, redisClient, dbClient) - if err != nil { - logger.Panic("initializing Orchestrator client", zap.Error(err)) + if redisClient != nil { + _, err := redisClient.Ping(ctx).Result() + if err != nil { + zap.L().Fatal("Could not connect to Redis", zap.Error(err)) + } + + zap.L().Info("Connected to Redis cluster") } - templateManager, err := template_manager.New() + orch, err := orchestrator.New(ctx, tel, tracer, nomadClient, posthogClient, redisClient, dbClient) if err != nil { - logger.Panic("initializing Template manager client", zap.Error(err)) + zap.L().Fatal("Initializing Orchestrator client", zap.Error(err)) } var lokiClient *loki.DefaultClient @@ -105,29 +159,70 @@ func NewAPIStore(ctx context.Context) *APIStore { Address: laddr, } } else { - logger.Warn("LOKI_ADDRESS not set, disabling Loki client") + zap.L().Warn("LOKI_ADDRESS not set, disabling Loki client") } - buildCache := builds.NewBuildCache() - - templateCache := templatecache.NewTemplateCache(dbClient) - authCache := authcache.NewTeamAuthCache(dbClient) + authCache := authcache.NewTeamAuthCache() + templateCache := templatecache.NewTemplateCache(sqlcDB) templateSpawnCounter := utils.NewTemplateSpawnCounter(time.Minute, dbClient) - return &APIStore{ - Healthy: true, - orchestrator: orch, - templateManager: templateManager, - db: dbClient, - Tracer: tracer, - posthog: posthogClient, - buildCache: buildCache, - logger: logger, - lokiClient: lokiClient, - templateCache: templateCache, - authCache: authCache, - templateSpawnCounter: templateSpawnCounter, + accessTokenGenerator, err := sandbox.NewEnvdAccessTokenGenerator() + if err != nil { + zap.L().Fatal("Initializing access token generator failed", zap.Error(err)) + } + + clustersPool, err := edge.NewPool(ctx, tel, sqlcDB, tracer) + if err != nil { + zap.L().Fatal("initializing edge clusters pool failed", zap.Error(err)) + } + + templateBuildsCache := templatecache.NewTemplateBuildCache(dbClient) + templateManager, err := template_manager.New(ctx, tracer, tel.TracerProvider, tel.MeterProvider, dbClient, sqlcDB, clustersPool, lokiClient, templateBuildsCache) + if err != nil { + zap.L().Fatal("Initializing Template manager client", zap.Error(err)) + } + + // Start the periodic sync of template builds statuses + go templateManager.BuildsStatusPeriodicalSync(ctx) + + a := &APIStore{ + Healthy: false, + orchestrator: orch, + templateManager: templateManager, + db: dbClient, + sqlcDB: sqlcDB, + Telemetry: tel, + Tracer: tracer, + posthog: posthogClient, + lokiClient: lokiClient, + templateCache: templateCache, + templateBuildsCache: templateBuildsCache, + authCache: authCache, + templateSpawnCounter: templateSpawnCounter, + clickhouseStore: clickhouseStore, + envdAccessTokenGenerator: accessTokenGenerator, + readMetricsFromClickHouse: readMetricsFromClickHouse, + clustersPool: clustersPool, } + + // Wait till there's at least one, otherwise we can't create sandboxes yet + go func() { + ticker := time.NewTicker(5 * time.Millisecond) + for { + select { + case <-ctx.Done(): + return + case <-ticker.C: + if orch.NodeCount() != 0 { + zap.L().Info("Nodes are ready, setting API as healthy") + a.Healthy = true + return + } + } + } + }() + + return a } func (a *APIStore) Close(ctx context.Context) error { @@ -140,12 +235,16 @@ func (a *APIStore) Close(ctx context.Context) error { if err := a.orchestrator.Close(ctx); err != nil { errs = append(errs, fmt.Errorf("closing Orchestrator client: %w", err)) - } + if err := a.templateManager.Close(); err != nil { errs = append(errs, fmt.Errorf("closing Template manager client: %w", err)) } + if err := a.sqlcDB.Close(); err != nil { + errs = append(errs, fmt.Errorf("closing sqlc database client: %w", err)) + } + if err := a.db.Close(); err != nil { errs = append(errs, fmt.Errorf("closing database client: %w", err)) } @@ -161,7 +260,7 @@ func (a *APIStore) sendAPIStoreError(c *gin.Context, code int, message string) { Message: message, } - c.Error(fmt.Errorf(message)) + c.Error(errors.New(message)) c.JSON(code, apiErr) } @@ -176,8 +275,28 @@ func (a *APIStore) GetHealth(c *gin.Context) { } func (a *APIStore) GetTeamFromAPIKey(ctx context.Context, apiKey string) (authcache.AuthTeamInfo, *api.APIError) { - team, tier, err := a.authCache.Get(ctx, apiKey) + team, tier, err := a.authCache.GetOrSet(ctx, apiKey, func(ctx context.Context, key string) (*models.Team, *models.Tier, error) { + return a.db.GetTeamAuth(ctx, key) + }) if err != nil { + var usageErr *db.TeamForbiddenError + if errors.As(err, &usageErr) { + return authcache.AuthTeamInfo{}, &api.APIError{ + Err: err, + ClientMsg: err.Error(), + Code: http.StatusForbidden, + } + } + + var blockedErr *db.TeamBlockedError + if errors.As(err, &blockedErr) { + return authcache.AuthTeamInfo{}, &api.APIError{ + Err: err, + ClientMsg: err.Error(), + Code: http.StatusForbidden, + } + } + return authcache.AuthTeamInfo{}, &api.APIError{ Err: fmt.Errorf("failed to get the team from db for an api key: %w", err), ClientMsg: "Cannot get the team for the given API key", @@ -203,3 +322,115 @@ func (a *APIStore) GetUserFromAccessToken(ctx context.Context, accessToken strin return *userID, nil } + +// supabaseClaims defines the claims we expect from the Supabase JWT. +type supabaseClaims struct { + jwt.RegisteredClaims +} + +func getJWTClaims(secrets []string, token string) (*supabaseClaims, error) { + errs := make([]error, 0) + + for _, secret := range secrets { + if len(secret) < minSupabaseJWTSecretLength { + zap.L().Warn("jwt secret is too short and will be ignored", zap.Int("min_length", minSupabaseJWTSecretLength), zap.String("secret_start", secret[:min(3, len(secret))])) + + continue + } + + // Parse the token with the custom claims. + token, err := jwt.ParseWithClaims(token, &supabaseClaims{}, func(token *jwt.Token) (interface{}, error) { + // Verify that the signing method is HMAC (HS256) + if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok { + return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"]) + } + // Return the secret key used for signing the token. + return []byte(secret), nil + }) + if err != nil { + // This error is ignored because we will try to parse the token with the next secret. + errs = append(errs, fmt.Errorf("failed to parse supabase token: %w", err)) + continue + } + + // Extract and return the custom claims if the token is valid. + if claims, ok := token.Claims.(*supabaseClaims); ok && token.Valid { + return claims, nil + } + } + + if len(errs) == 0 { + return nil, errors.New("failed to parse supabase token, no secrets found") + } + + return nil, errors.Join(errs...) +} + +func (a *APIStore) GetUserIDFromSupabaseToken(ctx context.Context, supabaseToken string) (uuid.UUID, *api.APIError) { + claims, err := getJWTClaims(supabaseJWTSecrets, supabaseToken) + if err != nil { + return uuid.UUID{}, &api.APIError{ + Err: err, + ClientMsg: "Backend authentication failed", + Code: http.StatusUnauthorized, + } + } + + userId, err := claims.GetSubject() + if err != nil { + return uuid.UUID{}, &api.APIError{ + Err: fmt.Errorf("failed getting jwt subject: %w", err), + ClientMsg: "Backend authentication failed", + Code: http.StatusUnauthorized, + } + } + + userIDParsed, err := uuid.Parse(userId) + if err != nil { + return uuid.UUID{}, &api.APIError{ + Err: fmt.Errorf("failed parsing user uuid: %w", err), + ClientMsg: "Backend authentication failed", + Code: http.StatusUnauthorized, + } + } + + return userIDParsed, nil +} + +func (a *APIStore) GetTeamFromSupabaseToken(ctx context.Context, teamID string) (authcache.AuthTeamInfo, *api.APIError) { + userID := a.GetUserID(middleware.GetGinContext(ctx)) + + team, tier, err := a.authCache.GetOrSet(ctx, teamID, func(ctx context.Context, key string) (*models.Team, *models.Tier, error) { + return a.db.GetTeamByIDAndUserIDAuth(ctx, teamID, userID) + }) + if err != nil { + var usageErr *db.TeamForbiddenError + if errors.As(err, &usageErr) { + return authcache.AuthTeamInfo{}, &api.APIError{ + Err: fmt.Errorf("failed getting team: %w", err), + ClientMsg: fmt.Sprintf("Forbidden: %s", err.Error()), + Code: http.StatusForbidden, + } + } + + var blockedErr *db.TeamBlockedError + if errors.As(err, &blockedErr) { + return authcache.AuthTeamInfo{}, &api.APIError{ + Err: fmt.Errorf("failed getting team: %w", err), + ClientMsg: fmt.Sprintf("Blocked: %s", err.Error()), + Code: http.StatusForbidden, + } + } + + return authcache.AuthTeamInfo{}, &api.APIError{ + Err: fmt.Errorf("failed getting team: %w", err), + ClientMsg: "Backend authentication failed", + Code: http.StatusUnauthorized, + } + } + + return authcache.AuthTeamInfo{ + Team: team, + Tier: tier, + }, nil +} diff --git a/packages/api/internal/handlers/store_test.go b/packages/api/internal/handlers/store_test.go new file mode 100644 index 0000000..41475ab --- /dev/null +++ b/packages/api/internal/handlers/store_test.go @@ -0,0 +1,72 @@ +package handlers + +import ( + "testing" + "time" + + "github.com/golang-jwt/jwt/v5" + "github.com/stretchr/testify/assert" +) + +func signToken(t *testing.T, secret string, subject string) string { + claims := supabaseClaims{ + RegisteredClaims: jwt.RegisteredClaims{ + Subject: subject, + ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)), // 1 hour expiry + IssuedAt: jwt.NewNumericDate(time.Now()), + Issuer: "test", + }, + } + + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + + signedToken, err := token.SignedString([]byte(secret)) + assert.NoError(t, err) + + return signedToken +} + +func TestGetJWTClaims(t *testing.T) { + secret1 := "testsecret1testsecret1" + secret2 := "testsecret2testsecret2" + + token1 := signToken(t, secret1, "1") + token2 := signToken(t, secret2, "2") + tokenEmpty := signToken(t, "", "3") + + t.Run("valid token for first secret", func(t *testing.T) { + claims, err := getJWTClaims([]string{secret1, secret2}, token1) + assert.NoError(t, err) + assert.Equal(t, "1", claims.Subject) + }) + + t.Run("valid token for second secret", func(t *testing.T) { + claims, err := getJWTClaims([]string{secret1, secret2}, token2) + assert.NoError(t, err) + assert.Equal(t, "2", claims.Subject) + }) + + t.Run("invalid token secret combination", func(t *testing.T) { + claims, err := getJWTClaims([]string{secret1}, token2) + assert.Error(t, err) + assert.Nil(t, claims) + }) + + t.Run("no secrets", func(t *testing.T) { + claims, err := getJWTClaims([]string{}, token1) + assert.Error(t, err) + assert.Nil(t, claims) + }) + + t.Run("empty secret", func(t *testing.T) { + claims, err := getJWTClaims([]string{""}, tokenEmpty) + assert.Error(t, err) + assert.Nil(t, claims) + }) + + t.Run("invalid token for all secrets", func(t *testing.T) { + claims, err := getJWTClaims([]string{secret1, secret2}, "invalid") + assert.Error(t, err) + assert.Nil(t, claims) + }) +} diff --git a/packages/api/internal/handlers/teams.go b/packages/api/internal/handlers/teams.go index e407d99..a76e096 100644 --- a/packages/api/internal/handlers/teams.go +++ b/packages/api/internal/handlers/teams.go @@ -1,16 +1,13 @@ package handlers import ( - "log" "net/http" "github.com/gin-gonic/gin" + "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" - "github.com/e2b-dev/infra/packages/shared/pkg/models" - "github.com/e2b-dev/infra/packages/shared/pkg/models/team" - "github.com/e2b-dev/infra/packages/shared/pkg/models/user" - "github.com/e2b-dev/infra/packages/shared/pkg/models/usersteams" + "github.com/e2b-dev/infra/packages/api/internal/team" ) func (a *APIStore) GetTeams(c *gin.Context) { @@ -18,28 +15,32 @@ func (a *APIStore) GetTeams(c *gin.Context) { userID := a.GetUserID(c) - teamsDB, err := a.db.Client.Team.Query(). - Where(team.HasUsersWith(user.ID(userID))). - WithTeamAPIKeys(). - WithUsersTeams(func(query *models.UsersTeamsQuery) { - query.Where(usersteams.UserID(userID)) - }). - All(ctx) + results, err := a.sqlcDB.GetTeamsWithUsersTeams(ctx, userID) if err != nil { - log.Println("Error when starting transaction: ", err) + zap.L().Error("error when starting transaction", zap.Error(err)) c.JSON(http.StatusInternalServerError, "Error when starting transaction") return } - teams := make([]api.Team, len(teamsDB)) - for i, teamDB := range teamsDB { + teams := make([]api.Team, len(results)) + for i, row := range results { + // We create a new API key for the CLI and backwards compatibility with API Keys hashing + apiKey, err := team.CreateAPIKey(ctx, a.db, row.Team.ID, userID, "CLI login/configure") + if err != nil { + zap.L().Error("error when creating API key", zap.Error(err)) + c.JSON(http.StatusInternalServerError, "Error when creating API key") + + return + } + teams[i] = api.Team{ - TeamID: teamDB.ID.String(), - Name: teamDB.Name, - ApiKey: teamDB.Edges.TeamAPIKeys[0].APIKey, - IsDefault: teamDB.Edges.UsersTeams[0].IsDefault, + TeamID: row.Team.ID.String(), + Name: row.Team.Name, + ApiKey: apiKey.APIKey, + IsDefault: row.UsersTeam.IsDefault, } } + c.JSON(http.StatusOK, teams) } diff --git a/packages/api/internal/handlers/template_build_logs.go b/packages/api/internal/handlers/template_build_logs.go deleted file mode 100644 index 4488934..0000000 --- a/packages/api/internal/handlers/template_build_logs.go +++ /dev/null @@ -1,81 +0,0 @@ -package handlers - -import ( - "fmt" - "net/http" - - "github.com/e2b-dev/infra/packages/api/internal/api" - "github.com/e2b-dev/infra/packages/api/internal/auth" - "github.com/e2b-dev/infra/packages/shared/pkg/models" - "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" - "github.com/gin-gonic/gin" - "github.com/google/uuid" -) - -// GetTemplatesTemplateIDBuildsBuildIDStatus serves to get a template build status (e.g. to CLI) -func (a *APIStore) GetTemplatesTemplateIDBuildsBuildIDStatus(c *gin.Context, templateID api.TemplateID, buildID api.BuildID, params api.GetTemplatesTemplateIDBuildsBuildIDStatusParams) { - ctx := c.Request.Context() - - userID := c.Value(auth.UserIDContextKey).(uuid.UUID) - teams, err := a.db.GetTeams(ctx, userID) - if err != nil { - errMsg := fmt.Errorf("error when getting teams: %w", err) - - a.sendAPIStoreError(c, http.StatusInternalServerError, "Failed to get the default team") - - telemetry.ReportCriticalError(ctx, errMsg) - - return - } - - buildUUID, err := uuid.Parse(buildID) - if err != nil { - errMsg := fmt.Errorf("error when parsing build id: %w", err) - telemetry.ReportError(ctx, errMsg) - - a.sendAPIStoreError(c, http.StatusBadRequest, "Invalid build id") - - return - } - - dockerBuild, err := a.buildCache.Get(templateID, buildUUID) - if err != nil { - msg := fmt.Errorf("error finding cache for env %s and build %s", templateID, buildID) - telemetry.ReportError(ctx, msg) - - a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Build (%s) not found", buildID)) - - return - } - - templateTeamID := dockerBuild.GetTeamID() - - var team *models.Team - for _, t := range teams { - if t.ID == templateTeamID { - team = t - break - } - } - - if team == nil { - msg := fmt.Errorf("user doesn't have access to env '%s'", templateID) - telemetry.ReportError(ctx, msg) - - a.sendAPIStoreError(c, http.StatusForbidden, fmt.Sprintf("You don't have access to this sandbox template (%s)", templateID)) - - return - } - - status := dockerBuild.GetStatus() - logs := dockerBuild.GetLogs() - - result := api.TemplateBuild{ - Logs: logs[*params.LogsOffset:], - TemplateID: templateID, - BuildID: buildID, - Status: status, - } - - c.JSON(http.StatusOK, result) -} diff --git a/packages/api/internal/handlers/template_build_status.go b/packages/api/internal/handlers/template_build_status.go new file mode 100644 index 0000000..c3f8608 --- /dev/null +++ b/packages/api/internal/handlers/template_build_status.go @@ -0,0 +1,115 @@ +package handlers + +import ( + "errors" + "fmt" + "net/http" + + "github.com/gin-gonic/gin" + "github.com/google/uuid" + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/api/internal/api" + "github.com/e2b-dev/infra/packages/api/internal/auth" + "github.com/e2b-dev/infra/packages/db/queries" + "github.com/e2b-dev/infra/packages/shared/pkg/db" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" + "github.com/e2b-dev/infra/packages/shared/pkg/models/envbuild" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +// GetTemplatesTemplateIDBuildsBuildIDStatus serves to get a template build status (e.g. to CLI) +func (a *APIStore) GetTemplatesTemplateIDBuildsBuildIDStatus(c *gin.Context, templateID api.TemplateID, buildID api.BuildID, params api.GetTemplatesTemplateIDBuildsBuildIDStatusParams) { + ctx := c.Request.Context() + + userID := c.Value(auth.UserIDContextKey).(uuid.UUID) + teams, err := a.sqlcDB.GetTeamsWithUsersTeams(ctx, userID) + if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, "Failed to get the default team") + + telemetry.ReportCriticalError(ctx, "error when getting teams", err) + + return + } + + buildUUID, err := uuid.Parse(buildID) + if err != nil { + telemetry.ReportError(ctx, "error when parsing build id", err) + a.sendAPIStoreError(c, http.StatusBadRequest, "Invalid build id") + return + } + + buildInfo, err := a.templateBuildsCache.Get(ctx, buildUUID, templateID) + if err != nil { + if errors.Is(err, db.TemplateBuildNotFound{}) { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Build '%s' not found", buildUUID)) + return + } + + if errors.Is(err, db.TemplateNotFound{}) { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Template '%s' not found", templateID)) + return + } + + telemetry.ReportError(ctx, "error when getting template", err) + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when getting template") + return + } + + var team *queries.Team + for _, t := range teams { + if t.Team.ID == buildInfo.TeamID { + team = &t.Team + break + } + } + + if team == nil { + telemetry.ReportError(ctx, "user doesn't have access to env", fmt.Errorf("user doesn't have access to env '%s'", templateID), telemetry.WithTemplateID(templateID)) + a.sendAPIStoreError(c, http.StatusForbidden, fmt.Sprintf("You don't have access to this sandbox template (%s)", templateID)) + return + } + + // early return if still waiting for build start + if buildInfo.BuildStatus == envbuild.StatusWaiting { + result := api.TemplateBuild{ + Logs: make([]string, 0), + TemplateID: templateID, + BuildID: buildID, + Status: api.TemplateBuildStatusWaiting, + } + + c.JSON(http.StatusOK, result) + return + } + + logs := make([]string, 0) + l, err := a.templateManager.GetLogs(ctx, buildUUID, templateID, team.ClusterID, buildInfo.ClusterNodeID, params.LogsOffset) + if err != nil { + zap.L().Error("Failed to get build logs", zap.Error(err), logger.WithBuildID(buildID), logger.WithTemplateID(templateID)) + } else { + logs = l + } + + result := api.TemplateBuild{ + Logs: logs, + TemplateID: templateID, + BuildID: buildID, + Status: getCorrespondingTemplateBuildStatus(buildInfo.BuildStatus), + } + + c.JSON(http.StatusOK, result) +} + +func getCorrespondingTemplateBuildStatus(s envbuild.Status) api.TemplateBuildStatus { + switch s { + case envbuild.StatusWaiting: + return api.TemplateBuildStatusWaiting + case envbuild.StatusFailed: + return api.TemplateBuildStatusError + case envbuild.StatusUploaded: + return api.TemplateBuildStatusReady + default: + return api.TemplateBuildStatusBuilding + } +} diff --git a/packages/api/internal/handlers/template_delete.go b/packages/api/internal/handlers/template_delete.go index 176fc8e..4cd7d21 100644 --- a/packages/api/internal/handlers/template_delete.go +++ b/packages/api/internal/handlers/template_delete.go @@ -5,11 +5,14 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/google/uuid" "go.opentelemetry.io/otel/attribute" + "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" + template_manager "github.com/e2b-dev/infra/packages/api/internal/template-manager" + "github.com/e2b-dev/infra/packages/db/queries" "github.com/e2b-dev/infra/packages/shared/pkg/id" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" "github.com/e2b-dev/infra/packages/shared/pkg/models" "github.com/e2b-dev/infra/packages/shared/pkg/models/env" "github.com/e2b-dev/infra/packages/shared/pkg/models/envalias" @@ -24,8 +27,7 @@ func (a *APIStore) DeleteTemplatesTemplateID(c *gin.Context, aliasOrTemplateID a if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Invalid env ID: %s", aliasOrTemplateID)) - err = fmt.Errorf("invalid env ID: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "invalid env ID", err) return } @@ -35,8 +37,7 @@ func (a *APIStore) DeleteTemplatesTemplateID(c *gin.Context, aliasOrTemplateID a if err != nil { a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when getting default team: %s", err)) - err = fmt.Errorf("error when getting default team: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when getting default team", err) return } @@ -56,28 +57,27 @@ func (a *APIStore) DeleteTemplatesTemplateID(c *gin.Context, aliasOrTemplateID a notFound := models.IsNotFound(err) if notFound { - telemetry.ReportError(ctx, fmt.Errorf("template '%s' not found", aliasOrTemplateID)) + telemetry.ReportError(ctx, "template not found", nil, telemetry.WithTemplateID(aliasOrTemplateID)) a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("the sandbox template '%s' wasn't found", cleanedAliasOrEnvID)) return } else if err != nil { - telemetry.ReportError(ctx, fmt.Errorf("failed to get env '%s': %w", aliasOrTemplateID, err)) - a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when getting env") + telemetry.ReportError(ctx, "failed to get template", fmt.Errorf("failed to get template: %w", err), telemetry.WithTemplateID(aliasOrTemplateID)) + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when getting template") return } - var team *models.Team + var team *queries.Team for _, t := range teams { - if t.ID == template.TeamID { - team = t + if t.Team.ID == template.TeamID { + team = &t.Team break } } if team == nil { - errMsg := fmt.Errorf("user '%s' doesn't have access to the sandbox template '%s'", userID, cleanedAliasOrEnvID) - telemetry.ReportError(ctx, errMsg) + telemetry.ReportError(ctx, "user doesn't have access to the sandbox template", nil, telemetry.WithTemplateID(cleanedAliasOrEnvID), attribute.String("userID", userID.String())) a.sendAPIStoreError(c, http.StatusForbidden, fmt.Sprintf("You (%s) don't have access to sandbox template '%s'", userID, cleanedAliasOrEnvID)) @@ -88,20 +88,20 @@ func (a *APIStore) DeleteTemplatesTemplateID(c *gin.Context, aliasOrTemplateID a attribute.String("user.id", userID.String()), attribute.String("env.team.id", team.ID.String()), attribute.String("env.team.name", team.Name), - attribute.String("env.id", template.ID), + telemetry.WithTemplateID(template.ID), ) // check if base env has snapshots hasSnapshots, err := a.db.CheckBaseEnvHasSnapshots(ctx, template.ID) if err != nil { - telemetry.ReportError(ctx, fmt.Errorf("error when checking if base env has snapshots: %w", err)) + telemetry.ReportError(ctx, "error when checking if base env has snapshots", err) a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when checking if base env has snapshots") return } if hasSnapshots { - telemetry.ReportError(ctx, fmt.Errorf("base template '%s' has paused sandboxes", template.ID)) + telemetry.ReportError(ctx, "base template has paused sandboxes", nil, telemetry.WithTemplateID(template.ID)) a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("cannot delete template '%s' because there are paused sandboxes using it", template.ID)) return @@ -109,8 +109,7 @@ func (a *APIStore) DeleteTemplatesTemplateID(c *gin.Context, aliasOrTemplateID a dbErr := a.db.DeleteEnv(ctx, template.ID) if dbErr != nil { - errMsg := fmt.Errorf("error when deleting env from db: %w", dbErr) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "error when deleting env from db", dbErr) a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when deleting env") @@ -118,16 +117,18 @@ func (a *APIStore) DeleteTemplatesTemplateID(c *gin.Context, aliasOrTemplateID a } // get all build ids - buildIds := make([]uuid.UUID, len(template.Edges.Builds)) + buildIds := make([]template_manager.DeleteBuild, len(template.Edges.Builds)) for i, build := range template.Edges.Builds { - buildIds[i] = build.ID + buildIds[i] = template_manager.DeleteBuild{ + BuildID: build.ID, + TemplateID: *build.EnvID, + } } // delete all builds - deleteJobErr := a.templateManager.DeleteBuilds(ctx, template.ID, buildIds) + deleteJobErr := a.templateManager.DeleteBuilds(ctx, buildIds) if deleteJobErr != nil { - errMsg := fmt.Errorf("error when deleting env files from storage: %w", deleteJobErr) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "error when deleting env files from storage", deleteJobErr) } else { telemetry.ReportEvent(ctx, "deleted env from storage") } @@ -140,7 +141,7 @@ func (a *APIStore) DeleteTemplatesTemplateID(c *gin.Context, aliasOrTemplateID a a.posthog.IdentifyAnalyticsTeam(team.ID.String(), team.Name) a.posthog.CreateAnalyticsUserEvent(userID.String(), team.ID.String(), "deleted environment", properties.Set("environment", template.ID)) - a.logger.Infof("Deleted env '%s' from team '%s'", template.ID, team.ID) + zap.L().Info("Deleted env", logger.WithTemplateID(template.ID), logger.WithTeamID(team.ID.String())) c.JSON(http.StatusOK, nil) } diff --git a/packages/api/internal/handlers/template_request_build.go b/packages/api/internal/handlers/template_request_build.go index dfabc71..affe218 100644 --- a/packages/api/internal/handlers/template_request_build.go +++ b/packages/api/internal/handlers/template_request_build.go @@ -8,11 +8,14 @@ import ( "github.com/gin-gonic/gin" "github.com/google/uuid" "go.opentelemetry.io/otel/attribute" + "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/constants" "github.com/e2b-dev/infra/packages/api/internal/utils" + "github.com/e2b-dev/infra/packages/db/queries" "github.com/e2b-dev/infra/packages/shared/pkg/id" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" "github.com/e2b-dev/infra/packages/shared/pkg/models" "github.com/e2b-dev/infra/packages/shared/pkg/models/env" "github.com/e2b-dev/infra/packages/shared/pkg/models/envalias" @@ -38,8 +41,7 @@ func (a *APIStore) PostTemplatesTemplateID(c *gin.Context, templateID api.Templa if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Invalid template ID: %s", cleanedTemplateID)) - err = fmt.Errorf("invalid template ID: %w", err) - telemetry.ReportCriticalError(c.Request.Context(), err) + telemetry.ReportCriticalError(c.Request.Context(), "invalid template ID", err) return } @@ -55,17 +57,23 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI ctx := c.Request.Context() body, err := utils.ParseBody[api.TemplateBuildRequest](ctx, c) + if err != nil { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Invalid request body: %s", err)) + telemetry.ReportCriticalError(ctx, "invalid request body", err) + + return nil + } telemetry.ReportEvent(ctx, "started request for environment build") - var team *models.Team + var team *queries.Team + var tier *queries.Tier // Prepare info for rebuilding env userID, teams, err := a.GetUserAndTeams(c) if err != nil { a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when getting user: %s", err)) - err = fmt.Errorf("error when getting default team: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when getting user", err) return nil } @@ -75,15 +83,15 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Invalid team ID: %s", *body.TeamID)) - err = fmt.Errorf("invalid team ID: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "invalid team ID", err) return nil } for _, t := range teams { - if t.ID == teamUUID { - team = t + if t.Team.ID == teamUUID { + team = &t.Team + tier = &t.Tier break } } @@ -91,15 +99,15 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if team == nil { a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Team '%s' not found", *body.TeamID)) - err = fmt.Errorf("team not found: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "team not found", err) return nil } } else { for _, t := range teams { - if t.Edges.UsersTeams[0].IsDefault { - team = t + if t.UsersTeam.IsDefault { + team = &t.Team + tier = &t.Tier break } } @@ -107,8 +115,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if team == nil { a.sendAPIStoreError(c, http.StatusInternalServerError, "Default team not found") - err = fmt.Errorf("default team not found: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "default team not found", err) return nil } @@ -118,11 +125,9 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI // Check if the user has access to the template _, err = a.db.Client.Env.Query().Where(env.ID(templateID), env.TeamID(team.ID)).Only(ctx) if err != nil { - errMsg := fmt.Sprintf("Error when getting template '%s' for team '%s'", templateID, team.ID.String()) - a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("%s: %s", errMsg, err)) + a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Error when getting template '%s' for team '%s'", templateID, team.ID.String())) - err = fmt.Errorf("%s: %w", errMsg, err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when getting template", err, telemetry.WithTemplateID(templateID), telemetry.WithTeamID(team.ID.String())) return nil } @@ -131,8 +136,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI // Generate a build id for the new build buildID, err := uuid.NewRandom() if err != nil { - err = fmt.Errorf("error when generating build id: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when generating build id", err) a.sendAPIStoreError(c, http.StatusInternalServerError, "Failed to generate build id") @@ -143,9 +147,9 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI attribute.String("user.id", userID.String()), attribute.String("env.team.id", team.ID.String()), attribute.String("env.team.name", team.Name), - attribute.String("env.id", templateID), + telemetry.WithTemplateID(templateID), attribute.String("env.team.tier", team.Tier), - attribute.String("build.id", buildID.String()), + telemetry.WithBuildID(buildID.String()), attribute.String("env.dockerfile", body.Dockerfile), ) @@ -156,6 +160,10 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI telemetry.SetAttributes(ctx, attribute.String("env.start_cmd", *body.StartCmd)) } + if body.ReadyCmd != nil { + telemetry.SetAttributes(ctx, attribute.String("env.ready_cmd", *body.ReadyCmd)) + } + if body.CpuCount != nil { telemetry.SetAttributes(ctx, attribute.Int("env.cpu", int(*body.CpuCount))) } @@ -164,9 +172,9 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI telemetry.SetAttributes(ctx, attribute.Int("env.memory_mb", int(*body.MemoryMB))) } - cpuCount, ramMB, apiError := getCPUAndRAM(team.Tier, body.CpuCount, body.MemoryMB) + cpuCount, ramMB, apiError := getCPUAndRAM(tier, body.CpuCount, body.MemoryMB) if apiError != nil { - telemetry.ReportCriticalError(ctx, apiError.Err) + telemetry.ReportCriticalError(ctx, "error when getting CPU and RAM", apiError.Err) a.sendAPIStoreError(c, apiError.Code, apiError.ClientMsg) return nil @@ -178,8 +186,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Invalid alias: %s", alias)) - err = fmt.Errorf("invalid alias: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "invalid alias", err) return nil } @@ -190,8 +197,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if err != nil { a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when starting transaction: %s", err)) - err = fmt.Errorf("error when starting transaction: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when starting transaction", err) return nil } @@ -205,6 +211,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI SetTeamID(team.ID). SetCreatedBy(*userID). SetPublic(false). + SetNillableClusterID(team.ClusterID). OnConflictColumns(env.FieldID). UpdateUpdatedAt(). Update(func(e *models.EnvUpsert) { @@ -214,8 +221,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if err != nil { a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when updating template: %s", err)) - err = fmt.Errorf("error when updating env: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when updating env", err) return nil } @@ -228,12 +234,30 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if err != nil { a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when updating template: %s", err)) - err = fmt.Errorf("error when updating env: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when updating env", err) return nil } + var builderNodeID *string + if team.ClusterID != nil { + cluster, found := a.clustersPool.GetClusterById(*team.ClusterID) + if !found { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Cluster with ID '%s' not found", *team.ClusterID)) + telemetry.ReportCriticalError(ctx, "cluster not found", fmt.Errorf("cluster with ID '%s' not found", *team.ClusterID), telemetry.WithTemplateID(templateID)) + return nil + } + + clusterNode, err := cluster.GetAvailableTemplateBuilder(ctx) + if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when getting available template builder: %s", err)) + telemetry.ReportCriticalError(ctx, "error when getting available template builder", err, telemetry.WithTemplateID(templateID)) + return nil + } + + builderNodeID = &clusterNode.NodeID + } + // Insert the new build err = tx.EnvBuild.Create(). SetID(buildID). @@ -243,10 +267,19 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI SetVcpu(cpuCount). SetKernelVersion(schema.DefaultKernelVersion). SetFirecrackerVersion(schema.DefaultFirecrackerVersion). - SetFreeDiskSizeMB(team.Edges.TeamTier.DiskMB). + SetFreeDiskSizeMB(tier.DiskMb). SetNillableStartCmd(body.StartCmd). + SetNillableReadyCmd(body.ReadyCmd). + SetNillableClusterNodeID(builderNodeID). SetDockerfile(body.Dockerfile). Exec(ctx) + if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when inserting build: %s", err)) + + telemetry.ReportCriticalError(ctx, "error when inserting build", err) + + return nil + } // Check if the alias is available and claim it if alias != "" { @@ -258,8 +291,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if err != nil { a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when querying alias '%s': %s", alias, err)) - err = fmt.Errorf("error when checking alias '%s': %w", alias, err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when checking alias", err, attribute.String("alias", alias)) return nil } @@ -267,8 +299,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if len(envs) > 0 { a.sendAPIStoreError(c, http.StatusConflict, fmt.Sprintf("Alias '%s' is already used", alias)) - err = fmt.Errorf("conflict of alias '%s' with template ID: %w", alias, err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "conflict of alias", err, attribute.String("alias", alias)) return nil } @@ -278,8 +309,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if !models.IsNotFound(err) { a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when querying for alias: %s", err)) - err = fmt.Errorf("error when checking alias: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when checking alias", err, attribute.String("alias", alias)) return nil @@ -289,8 +319,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if err != nil { a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when deleting template alias: %s", err)) - err = fmt.Errorf("error when deleting template alias: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when deleting template alias", err, attribute.String("alias", alias)) return nil } @@ -307,8 +336,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if err != nil { a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when inserting alias '%s': %s", alias, err)) - err = fmt.Errorf("error when inserting alias '%s': %w", alias, err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when inserting alias", err, attribute.String("alias", alias)) return nil @@ -316,8 +344,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI } else if aliasDB.EnvID != templateID { a.sendAPIStoreError(c, http.StatusForbidden, fmt.Sprintf("Alias '%s' already used", alias)) - err = fmt.Errorf("alias '%s' already used: %w", alias, err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "alias already used", err, attribute.String("alias", alias)) return nil } @@ -330,8 +357,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI if err != nil { a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when committing transaction: %s", err)) - err = fmt.Errorf("error when committing transaction: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when committing transaction", err) return nil } @@ -357,7 +383,7 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI aliases = append(aliases, alias) } - a.logger.Infof("Built template %s with build id %s", templateID, buildID.String()) + zap.L().Info("Built template", logger.WithTemplateID(templateID), logger.WithBuildID(buildID.String())) return &api.Template{ TemplateID: templateID, @@ -367,50 +393,57 @@ func (a *APIStore) TemplateRequestBuild(c *gin.Context, templateID api.TemplateI } } -func getCPUAndRAM(tierID string, cpuCount, memoryMB *int32) (int64, int64, *api.APIError) { +func getCPUAndRAM(tier *queries.Tier, cpuCount, memoryMB *int32) (int64, int64, *api.APIError) { cpu := constants.DefaultTemplateCPU ramMB := constants.DefaultTemplateMemory - // // Check if team can customize the resources - // if (cpuCount != nil || memoryMB != nil) && tierID == constants.BaseTierID { - // return 0, 0, &api.APIError{ - // Err: fmt.Errorf("team with tier %s can't customize resources", tierID), - // ClientMsg: "Team with this tier can't customize resources, don't specify cpu count or memory", - // Code: http.StatusBadRequest, - // } - // } - if cpuCount != nil { - if *cpuCount < constants.MinTemplateCPU || *cpuCount > constants.MaxTemplateCPU { + cpu = int64(*cpuCount) + if cpu < constants.MinTemplateCPU { return 0, 0, &api.APIError{ - Err: fmt.Errorf("customCPU must be between %d and %d", constants.MinTemplateCPU, constants.MaxTemplateCPU), - ClientMsg: fmt.Sprintf("CPU must be between %d and %d", constants.MinTemplateCPU, constants.MaxTemplateCPU), + Err: fmt.Errorf("CPU count must be at least %d", constants.MinTemplateCPU), + ClientMsg: fmt.Sprintf("CPU count must be at least %d", constants.MinTemplateCPU), + Code: http.StatusBadRequest, + } + } + + if cpu > tier.MaxVcpu { + return 0, 0, &api.APIError{ + Err: fmt.Errorf("CPU count exceeds team limits (%d)", tier.MaxVcpu), + ClientMsg: fmt.Sprintf("CPU count can't be higher than %d (if you need to increase this limit, please contact support)", tier.MaxVcpu), Code: http.StatusBadRequest, } } - cpu = *cpuCount } if memoryMB != nil { - if *memoryMB < constants.MinTemplateMemory || *memoryMB > constants.MaxTemplateMemory { + ramMB = int64(*memoryMB) + + if ramMB < constants.MinTemplateMemory { return 0, 0, &api.APIError{ - Err: fmt.Errorf("customMemory must be between %d and %d", constants.MinTemplateMemory, constants.MaxTemplateMemory), - ClientMsg: fmt.Sprintf("Memory must be between %d and %d", constants.MinTemplateMemory, constants.MaxTemplateMemory), + Err: fmt.Errorf("memory must be at least %d MiB", constants.MinTemplateMemory), + ClientMsg: fmt.Sprintf("Memory must be at least %d MiB", constants.MinTemplateMemory), Code: http.StatusBadRequest, } } - if *memoryMB%2 != 0 { + if ramMB%2 != 0 { return 0, 0, &api.APIError{ - Err: fmt.Errorf("customMemory must be divisible by 2"), - ClientMsg: "Memory must be a divisible by 2", + Err: fmt.Errorf("user provided memory size isn't divisible by 2"), + ClientMsg: "Memory must be divisible by 2", Code: http.StatusBadRequest, } } - ramMB = *memoryMB + if ramMB > tier.MaxRamMb { + return 0, 0, &api.APIError{ + Err: fmt.Errorf("memory exceeds team limits (%d MiB)", tier.MaxRamMb), + ClientMsg: fmt.Sprintf("Memory can't be higher than %d MiB (if you need to increase this limit, please contact support)", tier.MaxRamMb), + Code: http.StatusBadRequest, + } + } } - return int64(cpu), int64(ramMB), nil + return cpu, ramMB, nil } diff --git a/packages/api/internal/handlers/template_start_build.go b/packages/api/internal/handlers/template_start_build.go index 7ddbdaf..981fe87 100644 --- a/packages/api/internal/handlers/template_start_build.go +++ b/packages/api/internal/handlers/template_start_build.go @@ -14,40 +14,58 @@ import ( "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" + template_manager "github.com/e2b-dev/infra/packages/api/internal/template-manager" + "github.com/e2b-dev/infra/packages/db/queries" "github.com/e2b-dev/infra/packages/shared/pkg/models" "github.com/e2b-dev/infra/packages/shared/pkg/models/env" "github.com/e2b-dev/infra/packages/shared/pkg/models/envbuild" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" + "github.com/e2b-dev/infra/packages/shared/pkg/utils" ) // PostTemplatesTemplateIDBuildsBuildID triggers a new build after the user pushes the Docker image to the registry func (a *APIStore) PostTemplatesTemplateIDBuildsBuildID(c *gin.Context, templateID api.TemplateID, buildID api.BuildID) { ctx := c.Request.Context() span := trace.SpanFromContext(ctx) + + zap.L().Info("开始处理构建请求", + zap.String("templateID", templateID), + zap.String("buildID", string(buildID))) buildUUID, err := uuid.Parse(buildID) if err != nil { + zap.L().Error("解析buildID失败", + zap.String("buildID", string(buildID)), + zap.Error(err)) a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Invalid build ID: %s", buildID)) - err = fmt.Errorf("invalid build ID: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "invalid build ID", err) return } + + zap.L().Debug("成功解析buildID", + zap.String("buildID", string(buildID)), + zap.String("buildUUID", buildUUID.String())) userID, teams, err := a.GetUserAndTeams(c) if err != nil { + zap.L().Error("获取用户和团队信息失败", zap.Error(err)) a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when getting default team: %s", err)) - err = fmt.Errorf("error when getting default team: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when getting default team", err) return } + + zap.L().Info("成功获取用户和团队信息", + zap.String("userID", userID.String()), + zap.Int("teamsCount", len(teams))) telemetry.ReportEvent(ctx, "started environment build") // Check if the user has access to the template, load the template with build info + zap.L().Info("开始查询模板信息", zap.String("templateID", templateID)) envDB, err := a.db.Client.Env.Query().Where( env.ID(templateID), ).WithBuilds( @@ -56,125 +74,248 @@ func (a *APIStore) PostTemplatesTemplateIDBuildsBuildID(c *gin.Context, template }, ).Only(ctx) if err != nil { + zap.L().Error("获取模板信息失败", + zap.String("templateID", templateID), + zap.Error(err)) a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("Error when getting template: %s", err)) - err = fmt.Errorf("error when getting env: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when getting env", err, telemetry.WithTemplateID(templateID)) return } + + zap.L().Info("成功获取模板信息", + zap.String("templateID", templateID), + zap.String("teamID", envDB.TeamID.String()), + zap.Int("buildsCount", len(envDB.Edges.Builds))) - var team *models.Team + var team *queries.Team // Check if the user has access to the template + zap.L().Info("开始检查用户访问权限", + zap.String("userID", userID.String()), + zap.String("templateTeamID", envDB.TeamID.String())) for _, t := range teams { - if t.ID == envDB.TeamID { - team = t + if t.Team.ID == envDB.TeamID { + team = &t.Team break } } if team == nil { - a.sendAPIStoreError(c, http.StatusForbidden, fmt.Sprintf("User does not have access to the template")) + zap.L().Warn("用户无权访问模板", + zap.String("userID", userID.String()), + zap.String("templateID", templateID), + zap.String("templateTeamID", envDB.TeamID.String())) + a.sendAPIStoreError(c, http.StatusForbidden, "User does not have access to the template") - err = fmt.Errorf("user '%s' does not have access to the template '%s'", userID, templateID) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "user does not have access to the template", err, telemetry.WithTemplateID(templateID)) return } + + zap.L().Info("用户有权访问模板", + zap.String("userID", userID.String()), + zap.String("teamID", team.ID.String()), + zap.String("templateID", templateID)) telemetry.SetAttributes(ctx, attribute.String("user.id", userID.String()), - attribute.String("team.id", team.ID.String()), - attribute.String("template.id", templateID), + telemetry.WithTeamID(team.ID.String()), + telemetry.WithTemplateID(templateID), ) - // Create a new build cache for storing logs - err = a.buildCache.Create(templateID, buildUUID, team.ID) + zap.L().Info("开始检查并发运行的构建", zap.String("templateID", templateID)) + concurrentlyRunningBuilds, err := a.db. + Client. + EnvBuild. + Query(). + Where( + envbuild.EnvID(envDB.ID), + envbuild.StatusIn(envbuild.StatusWaiting, envbuild.StatusBuilding), + envbuild.IDNotIn(buildUUID), + ). + All(ctx) if err != nil { - a.sendAPIStoreError(c, http.StatusConflict, fmt.Sprintf("there's already running build for %s", templateID)) - - err = fmt.Errorf("build is already running build for %s", templateID) - telemetry.ReportCriticalError(ctx, err) - + zap.L().Error("获取并发运行构建失败", + zap.String("templateID", templateID), + zap.Error(err)) + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error during template build request") + telemetry.ReportCriticalError(ctx, "Error when getting running builds", err) return } + + zap.L().Info("检查到并发运行的构建", + zap.String("templateID", templateID), + zap.Int("concurrentBuildsCount", len(concurrentlyRunningBuilds))) + + // make sure there is no other build in progress for the same template + if len(concurrentlyRunningBuilds) > 0 { + buildIDs := utils.Map(concurrentlyRunningBuilds, func(b *models.EnvBuild) template_manager.DeleteBuild { + return template_manager.DeleteBuild{ + TemplateID: envDB.ID, + BuildID: b.ID, + } + }) + telemetry.ReportEvent(ctx, "canceling running builds", attribute.StringSlice("ids", utils.Map(buildIDs, func(b template_manager.DeleteBuild) string { + return fmt.Sprintf("%s/%s", b.TemplateID, b.BuildID) + }))) + deleteJobErr := a.templateManager.DeleteBuilds(ctx, buildIDs) + if deleteJobErr != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error during template build cancel request") + telemetry.ReportCriticalError(ctx, "error when canceling running build", deleteJobErr) + return + } + telemetry.ReportEvent(ctx, "canceled running builds") + } - // Set the build status to building - err = a.db.EnvBuildSetStatus(ctx, envDB.ID, buildUUID, envbuild.StatusBuilding) - if err != nil { - err = fmt.Errorf("error when setting build status: %w", err) - telemetry.ReportCriticalError(ctx, err) + startTime := time.Now() + build := envDB.Edges.Builds[0] + var startCmd string + if build.StartCmd != nil { + startCmd = *build.StartCmd + } - a.buildCache.Delete(templateID, buildUUID, team.ID) + var readyCmd string + if build.ReadyCmd != nil { + readyCmd = *build.ReadyCmd + } + // only waiting builds can be triggered + if build.Status != envbuild.StatusWaiting { + a.sendAPIStoreError(c, http.StatusBadRequest, "build is not in waiting state") + telemetry.ReportCriticalError(ctx, "build is not in waiting state", fmt.Errorf("build is not in waiting state: %s", build.Status), telemetry.WithTemplateID(templateID)) return } - // Trigger the build in the background - go func() { - buildContext, childSpan := a.Tracer.Start( - trace.ContextWithSpanContext(context.Background(), span.SpanContext()), - "background-build-env", - ) - defer childSpan.End() + // team is part of the cluster but template build is not assigned to a cluster node so its invalid stats + if team.ClusterID != nil && build.ClusterNodeID == nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, "build is not assigned to a cluster node") + telemetry.ReportCriticalError(ctx, "build is not assigned to a cluster node", nil, telemetry.WithTemplateID(templateID)) + return + } - startTime := time.Now() - build := envDB.Edges.Builds[0] - startCmd := "" - if build.StartCmd != nil { - startCmd = *build.StartCmd - } + // Call the Template Manager to build the environment + zap.L().Info("开始创建模板", + zap.String("templateID", templateID), + zap.String("buildID", buildUUID.String()), + zap.String("kernelVersion", build.KernelVersion), + zap.String("firecrackerVersion", build.FirecrackerVersion), + zap.Int64("vcpu", build.Vcpu), + zap.Int64("ramMB", build.RAMMB)) + buildErr := a.templateManager.CreateTemplate( + a.Tracer, + ctx, + templateID, + buildUUID, + build.KernelVersion, + build.FirecrackerVersion, + startCmd, + build.Vcpu, + build.FreeDiskSizeMB, + build.RAMMB, + readyCmd, + team.ClusterID, + build.ClusterNodeID, + ) - // Call the Template Manager to build the environment - buildErr := a.templateManager.CreateTemplate( - a.Tracer, - buildContext, - a.db, - a.buildCache, + if buildErr != nil { + zap.L().Error("创建模板失败", + zap.String("templateID", templateID), + zap.String("buildID", buildUUID.String()), + zap.Error(buildErr)) + telemetry.ReportCriticalError(ctx, "build failed", buildErr, telemetry.WithTemplateID(templateID)) + err = a.templateManager.SetStatus( + ctx, templateID, buildUUID, - build.KernelVersion, - build.FirecrackerVersion, - startCmd, - build.Vcpu, - build.FreeDiskSizeMB, - build.RAMMB, + envbuild.StatusFailed, + fmt.Sprintf("error when building env: %s", buildErr), ) - if buildErr != nil { - buildErr = fmt.Errorf("error when building env: %w", buildErr) - a.logger.Error("build failed", zap.Error(buildErr)) - telemetry.ReportCriticalError(buildContext, buildErr) - - dbErr := a.db.EnvBuildSetStatus(buildContext, templateID, buildUUID, envbuild.StatusFailed) - if dbErr != nil { - telemetry.ReportCriticalError(buildContext, fmt.Errorf("error when setting build status: %w", dbErr)) - } + if err != nil { + zap.L().Error("设置构建状态失败", + zap.String("templateID", templateID), + zap.String("buildID", buildUUID.String()), + zap.Error(err)) + telemetry.ReportCriticalError(ctx, "error when setting build status", err) + } - // Save the error in the logs - buildCacheErr := a.buildCache.Append(templateID, buildUUID, fmt.Sprintf("Build failed: %s\n", buildErr)) - if buildCacheErr != nil { - telemetry.ReportCriticalError(buildContext, fmt.Errorf("error when appending build logs: %w", buildCacheErr)) - } + return + } + + zap.L().Info("成功创建模板", + zap.String("templateID", templateID), + zap.String("buildID", buildUUID.String())) + + // status building must be set after build is triggered because then + // it's possible build status job will be triggered before build cache on template manager is created and build will fail + zap.L().Info("开始设置构建状态为building", + zap.String("templateID", templateID), + zap.String("buildID", buildUUID.String())) + err = a.templateManager.SetStatus( + ctx, + templateID, + buildUUID, + envbuild.StatusBuilding, + "starting build", + ) + if err != nil { + zap.L().Error("设置构建状态失败", + zap.String("templateID", templateID), + zap.String("buildID", buildUUID.String()), + zap.Error(err)) + telemetry.ReportCriticalError(ctx, "error when setting build status", err) + return + } + + zap.L().Info("成功设置构建状态为building", + zap.String("templateID", templateID), + zap.String("buildID", buildUUID.String())) - cacheErr := a.buildCache.SetDone(templateID, buildUUID, api.TemplateBuildStatusError) - if cacheErr != nil { - telemetry.ReportCriticalError(buildContext, fmt.Errorf("error when setting build done in logs: %w", cacheErr)) - } + telemetry.ReportEvent(ctx, "created new environment", telemetry.WithTemplateID(templateID)) - return + // Do not wait for global build sync trigger it immediately + zap.L().Info("开始触发后台构建同步", + zap.String("templateID", templateID), + zap.String("buildID", buildUUID.String())) + go func() { + buildContext, buildSpan := a.Tracer.Start( + trace.ContextWithSpanContext(context.Background(), span.SpanContext()), + "template-background-build-env", + ) + defer buildSpan.End() + + zap.L().Info("开始后台构建状态同步", + zap.String("templateID", templateID), + zap.String("buildID", buildUUID.String())) + err := a.templateManager.BuildStatusSync(buildContext, buildUUID, templateID, team.ClusterID, build.ClusterNodeID) + if err != nil { + zap.L().Error("后台构建状态同步失败", + zap.String("templateID", templateID), + zap.String("buildID", buildUUID.String()), + zap.Error(err)) + } else { + zap.L().Info("后台构建状态同步成功", + zap.String("templateID", templateID), + zap.String("buildID", buildUUID.String())) } // Invalidate the cache + zap.L().Info("开始使模板缓存失效", zap.String("templateID", templateID)) a.templateCache.Invalidate(templateID) - - a.posthog.CreateAnalyticsUserEvent(userID.String(), team.ID.String(), "built environment", posthog.NewProperties(). - Set("user_id", userID). - Set("environment", templateID). - Set("build_id", buildID). - Set("duration", time.Since(startTime).String()). - Set("success", err != nil), - ) + zap.L().Info("成功使模板缓存失效", zap.String("templateID", templateID)) }() + a.posthog.CreateAnalyticsUserEvent(userID.String(), team.ID.String(), "built environment", posthog.NewProperties(). + Set("user_id", userID). + Set("environment", templateID). + Set("build_id", buildID). + Set("duration", time.Since(startTime).String()). + Set("success", err != nil), + ) + + zap.L().Info("构建请求处理完成", + zap.String("templateID", templateID), + zap.String("buildID", string(buildID)), + zap.String("duration", time.Since(startTime).String())) c.Status(http.StatusAccepted) } diff --git a/packages/api/internal/handlers/template_update.go b/packages/api/internal/handlers/template_update.go index fa04c38..7b4e163 100644 --- a/packages/api/internal/handlers/template_update.go +++ b/packages/api/internal/handlers/template_update.go @@ -6,11 +6,14 @@ import ( "github.com/gin-gonic/gin" "go.opentelemetry.io/otel/attribute" + "go.uber.org/zap" "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/utils" + "github.com/e2b-dev/infra/packages/db/queries" "github.com/e2b-dev/infra/packages/shared/pkg/db" "github.com/e2b-dev/infra/packages/shared/pkg/id" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" "github.com/e2b-dev/infra/packages/shared/pkg/models" "github.com/e2b-dev/infra/packages/shared/pkg/models/env" "github.com/e2b-dev/infra/packages/shared/pkg/models/envalias" @@ -32,8 +35,7 @@ func (a *APIStore) PatchTemplatesTemplateID(c *gin.Context, aliasOrTemplateID ap if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Invalid env ID: %s", aliasOrTemplateID)) - err = fmt.Errorf("invalid env ID: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "invalid env ID", err) return } @@ -43,8 +45,7 @@ func (a *APIStore) PatchTemplatesTemplateID(c *gin.Context, aliasOrTemplateID ap if err != nil { a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when getting default team: %s", err)) - err = fmt.Errorf("error when getting default team: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when getting default team", err) return } @@ -62,28 +63,28 @@ func (a *APIStore) PatchTemplatesTemplateID(c *gin.Context, aliasOrTemplateID ap notFound := models.IsNotFound(err) if notFound { - telemetry.ReportError(ctx, fmt.Errorf("template '%s' not found", aliasOrTemplateID)) + telemetry.ReportError(ctx, "template not found", fmt.Errorf("template '%s' not found", aliasOrTemplateID)) a.sendAPIStoreError(c, http.StatusNotFound, fmt.Sprintf("the sandbox template '%s' wasn't found", cleanedAliasOrEnvID)) return } else if err != nil { - telemetry.ReportError(ctx, fmt.Errorf("failed to get env '%s': %w", aliasOrTemplateID, err)) + telemetry.ReportError(ctx, "failed to get env", err, telemetry.WithTemplateID(aliasOrTemplateID)) + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when getting env") return } - var team *models.Team + var team *queries.Team for _, t := range teams { - if t.ID == template.TeamID { - team = t + if t.Team.ID == template.TeamID { + team = &t.Team break } } if team == nil { - errMsg := fmt.Errorf("user '%s' doesn't have access to the sandbox template '%s'", userID, cleanedAliasOrEnvID) - telemetry.ReportError(ctx, errMsg) + telemetry.ReportError(ctx, "user doesn't have access to the sandbox template", fmt.Errorf("user '%s' doesn't have access to the sandbox template '%s'", userID, cleanedAliasOrEnvID)) a.sendAPIStoreError(c, http.StatusForbidden, fmt.Sprintf("You (%s) don't have access to sandbox template '%s'", userID, cleanedAliasOrEnvID)) @@ -97,8 +98,7 @@ func (a *APIStore) PatchTemplatesTemplateID(c *gin.Context, aliasOrTemplateID ap }) if dbErr != nil { - errMsg := fmt.Errorf("error when updating env: %w", dbErr) - telemetry.ReportError(ctx, errMsg) + telemetry.ReportError(ctx, "error when updating env", dbErr) a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when updating env") return @@ -109,7 +109,7 @@ func (a *APIStore) PatchTemplatesTemplateID(c *gin.Context, aliasOrTemplateID ap attribute.String("user.id", userID.String()), attribute.String("env.team.id", team.ID.String()), attribute.String("env.team.name", team.Name), - attribute.String("env.id", template.ID), + telemetry.WithTemplateID(template.ID), ) a.templateCache.Invalidate(template.ID) @@ -120,7 +120,7 @@ func (a *APIStore) PatchTemplatesTemplateID(c *gin.Context, aliasOrTemplateID ap a.posthog.IdentifyAnalyticsTeam(team.ID.String(), team.Name) a.posthog.CreateAnalyticsUserEvent(userID.String(), team.ID.String(), "updated environment", properties.Set("environment", template.ID)) - a.logger.Infof("Updated env '%s' from team '%s'", template.ID, team.ID) + zap.L().Info("Updated env", logger.WithTemplateID(template.ID), logger.WithTeamID(team.ID.String())) c.JSON(http.StatusOK, nil) } diff --git a/packages/api/internal/handlers/templates_list.go b/packages/api/internal/handlers/templates_list.go index 4c8552f..ef93fa8 100644 --- a/packages/api/internal/handlers/templates_list.go +++ b/packages/api/internal/handlers/templates_list.go @@ -1,7 +1,6 @@ package handlers import ( - "fmt" "net/http" "github.com/gin-gonic/gin" @@ -10,7 +9,7 @@ import ( "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/auth" - "github.com/e2b-dev/infra/packages/shared/pkg/models" + "github.com/e2b-dev/infra/packages/db/queries" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) @@ -20,13 +19,12 @@ func (a *APIStore) GetTemplates(c *gin.Context, params api.GetTemplatesParams) { userID := c.Value(auth.UserIDContextKey).(uuid.UUID) - var team *models.Team - teams, err := a.db.GetTeams(ctx, userID) + var team *queries.Team + teams, err := a.sqlcDB.GetTeamsWithUsersTeams(ctx, userID) if err != nil { - a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when getting teams")) + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when getting teams") - err = fmt.Errorf("error when getting teams: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when getting teams", err) return } @@ -36,14 +34,14 @@ func (a *APIStore) GetTemplates(c *gin.Context, params api.GetTemplatesParams) { if err != nil { a.sendAPIStoreError(c, http.StatusBadRequest, "Invalid team ID") - telemetry.ReportError(ctx, err) + telemetry.ReportError(ctx, "invalid team ID", err) return } for _, t := range teams { - if t.ID == teamUUID { - team = t + if t.Team.ID == teamUUID { + team = &t.Team break } } @@ -51,14 +49,14 @@ func (a *APIStore) GetTemplates(c *gin.Context, params api.GetTemplatesParams) { if team == nil { a.sendAPIStoreError(c, http.StatusNotFound, "Team not found") - telemetry.ReportError(ctx, fmt.Errorf("team not found")) + telemetry.ReportError(ctx, "team not found", err) return } } else { for _, t := range teams { - if t.Edges.UsersTeams[0].IsDefault { - team = t + if t.UsersTeam.IsDefault { + team = &t.Team break } } @@ -66,7 +64,7 @@ func (a *APIStore) GetTemplates(c *gin.Context, params api.GetTemplatesParams) { if team == nil { a.sendAPIStoreError(c, http.StatusInternalServerError, "Default team not found") - telemetry.ReportError(ctx, fmt.Errorf("default team not found")) + telemetry.ReportError(ctx, "default team not found", err) return } @@ -74,15 +72,14 @@ func (a *APIStore) GetTemplates(c *gin.Context, params api.GetTemplatesParams) { telemetry.SetAttributes(ctx, attribute.String("user.id", userID.String()), - attribute.String("team.id", team.ID.String()), + telemetry.WithTeamID(team.ID.String()), ) envs, err := a.db.GetEnvs(ctx, team.ID) if err != nil { a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when getting sandbox templates") - err = fmt.Errorf("error when getting envs: %w", err) - telemetry.ReportCriticalError(ctx, err) + telemetry.ReportCriticalError(ctx, "error when getting envs", err) return } diff --git a/packages/api/internal/middleware/exclude.go b/packages/api/internal/middleware/exclude.go new file mode 100644 index 0000000..3d5a32f --- /dev/null +++ b/packages/api/internal/middleware/exclude.go @@ -0,0 +1,67 @@ +package middleware + +import ( + "strings" + + "github.com/gin-gonic/gin" +) + +func ExcludeRoutes(middleware gin.HandlerFunc, notlogged ...string) gin.HandlerFunc { + return func(c *gin.Context) { + path := c.Request.URL.Path + + if !shouldSkip(path, notlogged) { + middleware(c) + } else { + c.Next() + } + } +} + +func IncludeRoutes(middleware gin.HandlerFunc, included ...string) gin.HandlerFunc { + return func(c *gin.Context) { + path := c.Request.URL.Path + + if shouldInclude(path, included) { + middleware(c) + } else { + c.Next() + } + } +} + +func shouldInclude(path string, patterns []string) bool { + for _, pattern := range patterns { + if matchPattern(path, pattern) { + return true + } + } + return false +} + +func shouldSkip(path string, patterns []string) bool { + for _, pattern := range patterns { + if matchPattern(path, pattern) { + return true + } + } + + return false +} + +func matchPattern(path, pattern string) bool { + pathSegments := strings.Split(path, "/") + patternSegments := strings.Split(pattern, "/") + + if len(pathSegments) != len(patternSegments) { + return false + } + + for i := range pathSegments { + if patternSegments[i] != pathSegments[i] && !strings.HasPrefix(patternSegments[i], ":") { + return false + } + } + + return true +} diff --git a/packages/api/internal/middleware/otel/metrics/config.go b/packages/api/internal/middleware/otel/metrics/config.go new file mode 100644 index 0000000..e1ab407 --- /dev/null +++ b/packages/api/internal/middleware/otel/metrics/config.go @@ -0,0 +1,43 @@ +package metrics + +import ( + "net/http" + + "go.opentelemetry.io/otel/attribute" + semconv "go.opentelemetry.io/otel/semconv/v1.7.0" +) + +type config struct { + recordInFlight bool + recordSize bool + recordDuration bool + groupedStatus bool + recorder Recorder + attributes func(serverName, route string, request *http.Request) []attribute.KeyValue + shouldRecord func(serverName, route string, request *http.Request) bool +} + +func defaultConfig() *config { + return &config{ + recordInFlight: true, + recordDuration: true, + recordSize: true, + groupedStatus: true, + attributes: DefaultAttributes, + shouldRecord: func(_, _ string, _ *http.Request) bool { + return true + }, + } +} + +var DefaultAttributes = func(serverName, route string, request *http.Request) []attribute.KeyValue { + attrs := []attribute.KeyValue{ + semconv.HTTPMethodKey.String(request.Method), + } + + if route != "" { + attrs = append(attrs, semconv.HTTPRouteKey.String(route)) + } + + return attrs +} diff --git a/packages/api/internal/middleware/otel/metrics/middleware.go b/packages/api/internal/middleware/otel/metrics/middleware.go new file mode 100644 index 0000000..b052670 --- /dev/null +++ b/packages/api/internal/middleware/otel/metrics/middleware.go @@ -0,0 +1,90 @@ +package metrics + +import ( + "fmt" + "strings" + "time" + + "github.com/gin-gonic/gin" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/metric" + semconv "go.opentelemetry.io/otel/semconv/v1.7.0" +) + +const MetricPrefix = "metric." + +// Middleware returns middleware that will trace incoming requests. +// The service parameter should describe the name of the (virtual) +// server handling the request. +func Middleware(meterProvider metric.MeterProvider, service string, options ...Option) gin.HandlerFunc { + cfg := defaultConfig() + for _, option := range options { + option.apply(cfg) + } + + recorder := cfg.recorder + if recorder == nil { + recorder = GetRecorder(meterProvider, service) + } + + return func(ginCtx *gin.Context) { + ctx := ginCtx.Request.Context() + + route := ginCtx.FullPath() + if len(route) <= 0 { + route = "nonconfigured" + } + + if !cfg.shouldRecord(service, route, ginCtx.Request) { + ginCtx.Next() + + return + } + + start := time.Now() + reqAttributes := cfg.attributes(service, route, ginCtx.Request) + + defer func() { + resAttributes := append( + reqAttributes[0:0], + reqAttributes..., + ) + + if cfg.groupedStatus { + code := int(ginCtx.Writer.Status()/100) * 100 + resAttributes = append(resAttributes, semconv.HTTPStatusCodeKey.Int(code)) + } else { + resAttributes = append(resAttributes, semconv.HTTPAttributesFromHTTPStatusCode(ginCtx.Writer.Status())...) + } + + // Append attributes from ginCtx + resAttributes = append(resAttributes, attributesFromGinContext(ginCtx, MetricPrefix)...) + + duration := time.Since(start) + recorder.ObserveHTTPRequestDuration(ctx, duration, resAttributes) + }() + + ginCtx.Next() + } +} + +func attributesFromGinContext(ginCtx *gin.Context, filterPrefix string) []attribute.KeyValue { + attrs := make([]attribute.KeyValue, 0, len(ginCtx.Keys)) + for keyRaw, v := range ginCtx.Keys { + if !strings.HasPrefix(keyRaw, filterPrefix) { + continue + } + k := strings.TrimPrefix(keyRaw, filterPrefix) + switch val := v.(type) { + case string: + attrs = append(attrs, attribute.String(k, val)) + case int: + attrs = append(attrs, attribute.Int(k, val)) + case bool: + attrs = append(attrs, attribute.Bool(k, val)) + default: + attrs = append(attrs, attribute.String(k, fmt.Sprintf("%v", val))) + } + } + return attrs +} diff --git a/packages/api/internal/middleware/otel/metrics/option.go b/packages/api/internal/middleware/otel/metrics/option.go new file mode 100644 index 0000000..f01478d --- /dev/null +++ b/packages/api/internal/middleware/otel/metrics/option.go @@ -0,0 +1,74 @@ +package metrics + +import ( + "net/http" + + "go.opentelemetry.io/otel/attribute" +) + +// Option applies a configuration to the given config +type Option interface { + apply(cfg *config) +} + +type optionFunc func(cfg *config) + +func (fn optionFunc) apply(cfg *config) { + fn(cfg) +} + +// WithAttributes sets a func using which what attributes to be recorded can be specified. +// By default the DefaultAttributes is used +func WithAttributes(attributes func(serverName, route string, request *http.Request) []attribute.KeyValue) Option { + return optionFunc(func(cfg *config) { + cfg.attributes = attributes + }) +} + +// WithRecordInFlight determines whether to record In Flight Requests or not +// By default the recordInFlight is true +func WithRecordInFlightDisabled() Option { + return optionFunc(func(cfg *config) { + cfg.recordInFlight = false + }) +} + +// WithRecordDuration determines whether to record Duration of Requests or not +// By default the recordDuration is true +func WithRecordDurationDisabled() Option { + return optionFunc(func(cfg *config) { + cfg.recordDuration = false + }) +} + +// WithRecordSize determines whether to record Size of Requests and Responses or not +// By default the recordSize is true +func WithRecordSizeDisabled() Option { + return optionFunc(func(cfg *config) { + cfg.recordSize = false + }) +} + +// WithGroupedStatus determines whether to group the response status codes or not. If true 2xx, 3xx will be stored +// By default the groupedStatus is true +func WithGroupedStatusDisabled() Option { + return optionFunc(func(cfg *config) { + cfg.groupedStatus = false + }) +} + +// WithRecorder sets a recorder for recording requests +// By default the open telemetry recorder is used +func WithRecorder(recorder Recorder) Option { + return optionFunc(func(cfg *config) { + cfg.recorder = recorder + }) +} + +// WithShouldRecordFunc sets a func using which whether a record should be recorded +// By default the all api calls are recorded +func WithShouldRecordFunc(shouldRecord func(serverName, route string, request *http.Request) bool) Option { + return optionFunc(func(cfg *config) { + cfg.shouldRecord = shouldRecord + }) +} diff --git a/packages/api/internal/middleware/otel/metrics/otelrecorder.go b/packages/api/internal/middleware/otel/metrics/otelrecorder.go new file mode 100644 index 0000000..41c05a8 --- /dev/null +++ b/packages/api/internal/middleware/otel/metrics/otelrecorder.go @@ -0,0 +1,42 @@ +package metrics + +import ( + "context" + "time" + + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/metric" +) + +// Recorder knows how to record and measure the metrics. This +// has the required methods to be used with the HTTP +// middlewares. +type otelRecorder struct { + totalDuration metric.Float64Histogram +} + +func GetRecorder(meterProvider metric.MeterProvider, metricsPrefix string) Recorder { + metricName := func(metricName string) string { + if len(metricsPrefix) > 0 { + return metricsPrefix + "." + metricName + } + + return metricName + } + + meter := meterProvider.Meter("api.server.middleware") + totalDuration, _ := meter.Float64Histogram( + metricName("http.server.duration"), + metric.WithDescription("Time Taken by request"), + metric.WithUnit("ms"), + ) + + return &otelRecorder{ + totalDuration: totalDuration, + } +} + +// ObserveHTTPRequestDuration measures the duration of an HTTP request. +func (r *otelRecorder) ObserveHTTPRequestDuration(ctx context.Context, duration time.Duration, attributes []attribute.KeyValue) { + r.totalDuration.Record(ctx, float64(duration/time.Millisecond), metric.WithAttributes(attributes...)) +} diff --git a/packages/api/internal/middleware/otel/metrics/recorder.go b/packages/api/internal/middleware/otel/metrics/recorder.go new file mode 100644 index 0000000..fe0d46b --- /dev/null +++ b/packages/api/internal/middleware/otel/metrics/recorder.go @@ -0,0 +1,13 @@ +package metrics + +import ( + "context" + "time" + + "go.opentelemetry.io/otel/attribute" +) + +type Recorder interface { + // ObserveHTTPRequestDuration measures the duration of an HTTP request. + ObserveHTTPRequestDuration(ctx context.Context, duration time.Duration, attributes []attribute.KeyValue) +} diff --git a/packages/api/internal/middleware/otel/tracing/middleware.go b/packages/api/internal/middleware/otel/tracing/middleware.go new file mode 100644 index 0000000..bde581e --- /dev/null +++ b/packages/api/internal/middleware/otel/tracing/middleware.go @@ -0,0 +1,98 @@ +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Based on https://github.com/DataDog/dd-trace-go/blob/8fb554ff7cf694267f9077ae35e27ce4689ed8b6/contrib/gin-gonic/gin/gintrace.go + +package tracing // import "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin" + +import ( + "fmt" + + "github.com/gin-gonic/gin" + "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin" + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/propagation" + semconv "go.opentelemetry.io/otel/semconv/v1.12.0" + oteltrace "go.opentelemetry.io/otel/trace" +) + +const ( + tracerKey = "otel-go-contrib-tracer" + tracerName = "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin" +) + +type config struct { + TracerProvider oteltrace.TracerProvider + Propagators propagation.TextMapPropagator +} + +// Middleware returns middleware that will trace incoming requests. +// The service parameter should describe the name of the (virtual) +// server handling the request. +func Middleware(tracerProvider oteltrace.TracerProvider, service string) gin.HandlerFunc { + cfg := config{} + if cfg.TracerProvider == nil { + cfg.TracerProvider = tracerProvider + } + tracer := cfg.TracerProvider.Tracer( + tracerName, + oteltrace.WithInstrumentationVersion(otelgin.Version()), + ) + if cfg.Propagators == nil { + cfg.Propagators = otel.GetTextMapPropagator() + } + return func(c *gin.Context) { + c.Set(tracerKey, tracer) + ctx := c.Request.Context() + defer func() { + c.Request = c.Request.WithContext(ctx) + }() + + // Remove traceparent (it's coming from our users and it can cause multiple calls share the same trace ID) + if c.Request.Header.Get("traceparent") != "" { + c.Request.Header.Del("traceparent") + } + // No need for calling Extract, as we are not expecting any incoming trace + // ctx := cfg.Propagators.Extract(savedCtx, propagation.HeaderCarrier(c.Request.Header)) + + opts := []oteltrace.SpanStartOption{ + oteltrace.WithAttributes(semconv.NetAttributesFromHTTPRequest("tcp", c.Request)...), + oteltrace.WithAttributes(semconv.EndUserAttributesFromHTTPRequest(c.Request)...), + oteltrace.WithAttributes(semconv.HTTPServerAttributesFromHTTPRequest(service, c.FullPath(), c.Request)...), + oteltrace.WithSpanKind(oteltrace.SpanKindServer), + } + spanName := c.FullPath() + if spanName == "" { + spanName = fmt.Sprintf("HTTP %s route not found", c.Request.Method) + } + ctx, span := tracer.Start(ctx, spanName, opts...) + defer span.End() + + // pass the span through the request context + c.Request = c.Request.WithContext(ctx) + + // serve the request to the next middleware + c.Next() + + status := c.Writer.Status() + attrs := semconv.HTTPAttributesFromHTTPStatusCode(status) + spanStatus, spanMessage := semconv.SpanStatusFromHTTPStatusCode(status) + span.SetAttributes(attrs...) + span.SetStatus(spanStatus, spanMessage) + if len(c.Errors) > 0 { + span.SetAttributes(attribute.String("gin.errors", c.Errors.String())) + } + } +} diff --git a/packages/api/internal/orchestrator/analytics.go b/packages/api/internal/orchestrator/analytics.go new file mode 100644 index 0000000..f418357 --- /dev/null +++ b/packages/api/internal/orchestrator/analytics.go @@ -0,0 +1,70 @@ +package orchestrator + +import ( + "context" + "time" + + "go.uber.org/zap" + "google.golang.org/protobuf/types/known/timestamppb" + + analyticscollector "github.com/e2b-dev/infra/packages/api/internal/analytics_collector" + "github.com/e2b-dev/infra/packages/api/internal/cache/instance" +) + +const ( + // syncAnalyticsTime if this value is updated, it should be correctly updated in analytics too. + syncAnalyticsTime = 10 * time.Minute + oldSandboxThreshold = 30 * time.Minute // Threshold to consider a sandbox as old +) + +func (o *Orchestrator) reportLongRunningSandboxes(ctx context.Context) { + ticker := time.NewTicker(syncAnalyticsTime) + defer ticker.Stop() + + for { + select { + case <-ctx.Done(): + zap.L().Info("Stopping node analytics reporting due to context cancellation") + return + case <-ticker.C: + sandboxes := o.instanceCache.Items() + longRunningSandboxes := make([]*instance.InstanceInfo, 0, len(sandboxes)) + for _, sandbox := range sandboxes { + if time.Since(sandbox.StartTime) > oldSandboxThreshold { + longRunningSandboxes = append(longRunningSandboxes, sandbox) + } + } + + sendAnalyticsForLongRunningSandboxes(ctx, o.analytics, longRunningSandboxes) + } + } +} + +// sendAnalyticsForLongRunningSandboxes sends long-running instances event to analytics +func sendAnalyticsForLongRunningSandboxes(ctx context.Context, analytics *analyticscollector.Analytics, instances []*instance.InstanceInfo) { + if len(instances) == 0 { + zap.L().Debug("No long-running instances to report to analytics") + return + } + + childCtx, cancel := context.WithTimeout(ctx, syncAnalyticsTime) + defer cancel() + + instanceIds := make([]string, len(instances)) + executionIds := make([]string, len(instances)) + for idx, i := range instances { + instanceIds[idx] = i.Instance.SandboxID + executionIds[idx] = i.ExecutionID + } + + _, err := analytics.RunningInstances(childCtx, + &analyticscollector.RunningInstancesEvent{ + InstanceIds: instanceIds, + ExecutionIds: executionIds, + Timestamp: timestamppb.Now(), + }, + ) + if err != nil { + zap.L().Error("error sending running instances event to analytics", zap.Error(err)) + } +} diff --git a/packages/api/internal/orchestrator/cache.go b/packages/api/internal/orchestrator/cache.go index 126961b..4a95eb1 100644 --- a/packages/api/internal/orchestrator/cache.go +++ b/packages/api/internal/orchestrator/cache.go @@ -3,22 +3,40 @@ package orchestrator import ( "context" "fmt" - "log" "sync" "time" "github.com/posthog/posthog-go" "go.opentelemetry.io/otel/attribute" "go.uber.org/zap" + "google.golang.org/protobuf/types/known/emptypb" "google.golang.org/protobuf/types/known/timestamppb" analyticscollector "github.com/e2b-dev/infra/packages/api/internal/analytics_collector" + "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/cache/instance" "github.com/e2b-dev/infra/packages/api/internal/node" "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator" + sbxlogger "github.com/e2b-dev/infra/packages/shared/pkg/logger/sandbox" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) +// cacheSyncTime is the time to sync the cache with the actual instances in Orchestrator. +const cacheSyncTime = 20 * time.Second + +// reportTimeout is the timeout for the analytics report +// This timeout is also set in the CloudRun for Analytics Collector, there it is 3 minutes. +const reportTimeout = 4 * time.Minute + +type closeType string + +const ( + syncMaxRetries = 4 + + ClosePause closeType = "pause" + CloseDelete closeType = "delete" +) + func (o *Orchestrator) GetSandbox(sandboxID string) (*instance.InstanceInfo, error) { item, err := o.instanceCache.Get(sandboxID) if err != nil { @@ -30,22 +48,28 @@ func (o *Orchestrator) GetSandbox(sandboxID string) (*instance.InstanceInfo, err // keepInSync the cache with the actual instances in Orchestrator to handle instances that died. func (o *Orchestrator) keepInSync(ctx context.Context, instanceCache *instance.InstanceCache) { + // Run the first sync immediately + zap.L().Info("Running the initial node sync") + o.syncNodes(ctx, instanceCache) + + // Sync the nodes every cacheSyncTime + ticker := time.NewTicker(cacheSyncTime) + defer ticker.Stop() + for { select { case <-ctx.Done(): - o.logger.Info("Stopping keepInSync") + zap.L().Info("Stopping keepInSync") return - case <-time.After(instance.CacheSyncTime): - // Sleep for a while before syncing again - + case <-ticker.C: o.syncNodes(ctx, instanceCache) } } } func (o *Orchestrator) syncNodes(ctx context.Context, instanceCache *instance.InstanceCache) { - ctxTimeout, cancel := context.WithTimeout(ctx, 1*time.Minute) + ctxTimeout, cancel := context.WithTimeout(ctx, cacheSyncTime) defer cancel() spanCtx, span := o.tracer.Start(ctxTimeout, "keep-in-sync") @@ -53,7 +77,7 @@ func (o *Orchestrator) syncNodes(ctx context.Context, instanceCache *instance.In nodes, err := o.listNomadNodes(spanCtx) if err != nil { - o.logger.Errorf("Error listing nodes: %v", err) + zap.L().Error("Error listing nodes", zap.Error(err)) return } @@ -67,7 +91,7 @@ func (o *Orchestrator) syncNodes(ctx context.Context, instanceCache *instance.In defer wg.Done() err = o.connectToNode(spanCtx, n) if err != nil { - o.logger.Errorf("Error connecting to node: %v", err) + zap.L().Error("Error connecting to node", zap.Error(err)) } }(n) } @@ -98,12 +122,12 @@ func (o *Orchestrator) syncNode(ctx context.Context, node *Node, nodes []*node.N } if !found { - o.logger.Infof("Node %s is not active anymore", node.Info.ID) + zap.L().Info("Node is not active anymore", zap.String("node_id", node.Info.ID)) // Close the connection to the node err := node.Client.Close() if err != nil { - o.logger.Errorf("Error closing connection to node: %v", err) + zap.L().Error("Error closing connection to node", zap.Error(err)) } o.nodes.Remove(node.Info.ID) @@ -111,17 +135,44 @@ func (o *Orchestrator) syncNode(ctx context.Context, node *Node, nodes []*node.N return } - activeInstances, instancesErr := o.getSandboxes(ctx, node.Info) - if instancesErr != nil { - o.logger.Errorf("Error getting instances: %v", instancesErr) - return + syncRetrySuccess := false + + for range syncMaxRetries { + nodeInfo, err := node.Client.Info.ServiceInfo(ctx, &emptypb.Empty{}) + if err != nil { + zap.L().Error("Error getting node info", zap.Error(err)) + continue + } + + // update node status (if changed) + nodeStatus, ok := OrchestratorToApiNodeStateMapper[nodeInfo.ServiceStatus] + if !ok { + zap.L().Error("Unknown service info status", zap.Any("status", nodeInfo.ServiceStatus), zap.String("node_id", node.Info.ID)) + nodeStatus = api.NodeStatusUnhealthy + } + node.setStatus(nodeStatus) + + activeInstances, instancesErr := o.getSandboxes(ctx, node.Info) + if instancesErr != nil { + zap.L().Error("Error getting instances", zap.Error(instancesErr)) + continue + } + + instanceCache.Sync(ctx, activeInstances, node.Info.ID) + + syncRetrySuccess = true + break } - instanceCache.Sync(activeInstances, node.Info.ID) + if !syncRetrySuccess { + zap.L().Error("Failed to sync node after max retries, temporarily marking as unhealthy", zap.String("node_id", node.Info.ID)) + node.setStatus(api.NodeStatusUnhealthy) + return + } builds, buildsErr := o.listCachedBuilds(ctx, node.Info.ID) if buildsErr != nil { - o.logger.Errorf("Error listing cached builds: %v", buildsErr) + zap.L().Error("Error listing cached builds", zap.Error(buildsErr)) return } @@ -131,70 +182,73 @@ func (o *Orchestrator) syncNode(ctx context.Context, node *Node, nodes []*node.N func (o *Orchestrator) getDeleteInstanceFunction( parentCtx context.Context, posthogClient *analyticscollector.PosthogClient, - logger *zap.SugaredLogger, timeout time.Duration, ) func(info *instance.InstanceInfo) error { return func(info *instance.InstanceInfo) error { ctx, cancel := context.WithTimeout(parentCtx, timeout) defer cancel() + sbxlogger.I(info).Debug("Deleting sandbox from cache hook", + zap.Time("start_time", info.StartTime), + zap.Time("end_time", info.GetEndTime()), + zap.Bool("auto_pause", info.AutoPause.Load()), + ) + defer o.instanceCache.UnmarkAsPausing(info) duration := time.Since(info.StartTime).Seconds() + stopTime := time.Now() - _, err := o.analytics.Client.InstanceStopped(ctx, &analyticscollector.InstanceStoppedEvent{ - TeamId: info.TeamID.String(), - EnvironmentId: info.Instance.TemplateID, - InstanceId: info.Instance.SandboxID, - Timestamp: timestamppb.Now(), - Duration: float32(duration), - }) - if err != nil { - logger.Errorf("error sending Analytics event: %v", err) - } - - var closeType string + var ct closeType if info.AutoPause.Load() { - closeType = "pause" + ct = ClosePause } else { - closeType = "delete" + ct = CloseDelete } - posthogClient.CreateAnalyticsTeamEvent( + // Run in separate goroutine to not block sandbox deletion + // Also use parentCtx to not cancel the request with this hook timeout + go reportInstanceStopAnalytics( + parentCtx, + posthogClient, + o.analytics, info.TeamID.String(), - "closed_instance", posthog.NewProperties(). - Set("instance_id", info.Instance.SandboxID). - Set("environment", info.Instance.TemplateID). - Set("type", closeType). - Set("duration", duration), + info.Instance.SandboxID, + info.ExecutionID, + info.Instance.TemplateID, + info.VCpu, + info.RamMB, + info.TotalDiskSizeMB, + stopTime, + ct, + duration, ) node := o.GetNode(info.Instance.ClientID) if node == nil { - logger.Errorf("failed to get node '%s'", info.Instance.ClientID) - } else { - node.CPUUsage.Add(-info.VCpu) - node.RamUsage.Add(-info.RamMB) + zap.L().Error("failed to get node", zap.String("node_id", info.Instance.ClientID)) - o.dns.Remove(ctx, info.Instance.SandboxID, node.Info.IPAddress) - } - - if node == nil { - log.Printf("node '%s' not found", info.Instance.ClientID) return fmt.Errorf("node '%s' not found", info.Instance.ClientID) } + node.CPUUsage.Add(-info.VCpu) + node.RamUsage.Add(-info.RamMB) + + o.dns.Remove(ctx, info.Instance.SandboxID, node.Info.IPAddress) + if node.Client == nil { - log.Printf("client for node '%s' not found", info.Instance.ClientID) + zap.L().Error("client for node not found", zap.String("node_id", info.Instance.ClientID)) + return fmt.Errorf("client for node '%s' not found", info.Instance.ClientID) } - if info.AutoPause.Load() { + if ct == ClosePause { o.instanceCache.MarkAsPausing(info) - err = o.PauseInstance(ctx, o.tracer, info, *info.TeamID) + err := o.PauseInstance(ctx, o.tracer, info, *info.TeamID) if err != nil { info.PauseDone(err) + return fmt.Errorf("failed to auto pause sandbox '%s': %w", info.Instance.SandboxID, err) } @@ -204,24 +258,79 @@ func (o *Orchestrator) getDeleteInstanceFunction( info.PauseDone(nil) } else { req := &orchestrator.SandboxDeleteRequest{SandboxId: info.Instance.SandboxID} - _, err = node.Client.Sandbox.Delete(ctx, req) + _, err := node.Client.Sandbox.Delete(ctx, req) if err != nil { return fmt.Errorf("failed to delete sandbox '%s': %w", info.Instance.SandboxID, err) } } + sbxlogger.I(info).Debug("Deleted sandbox from cache hook", + zap.Time("start_time", info.StartTime), + zap.Time("end_time", info.GetEndTime()), + zap.Bool("auto_pause", info.AutoPause.Load()), + ) + return nil } } -func (o *Orchestrator) getInsertInstanceFunction(parentCtx context.Context, logger *zap.SugaredLogger, timeout time.Duration) func(info *instance.InstanceInfo) error { - return func(info *instance.InstanceInfo) error { +func reportInstanceStopAnalytics( + ctx context.Context, + posthogClient *analyticscollector.PosthogClient, + analytics *analyticscollector.Analytics, + teamID string, + sandboxID string, + executionID string, + templateID string, + cpuCount int64, + ramMB int64, + diskSizeMB int64, + stopTime time.Time, + ct closeType, + duration float64, +) { + childCtx, cancel := context.WithTimeout(ctx, reportTimeout) + defer cancel() + + posthogClient.CreateAnalyticsTeamEvent( + teamID, + "closed_instance", posthog.NewProperties(). + Set("instance_id", sandboxID). + Set("environment", templateID). + Set("type", ct). + Set("duration", duration), + ) + + _, err := analytics.InstanceStopped(childCtx, &analyticscollector.InstanceStoppedEvent{ + TeamId: teamID, + EnvironmentId: templateID, + InstanceId: sandboxID, + ExecutionId: executionID, + Timestamp: timestamppb.New(stopTime), + Duration: float32(duration), + CpuCount: cpuCount, + RamMb: ramMB, + DiskSizeMb: diskSizeMB, + }) + if err != nil { + zap.L().Error("error sending Analytics event", zap.Error(err)) + } +} + +func (o *Orchestrator) getInsertInstanceFunction(parentCtx context.Context, timeout time.Duration) func(info *instance.InstanceInfo, created bool) error { + return func(info *instance.InstanceInfo, created bool) error { ctx, cancel := context.WithTimeout(parentCtx, timeout) defer cancel() + sbxlogger.I(info).Debug("Inserting sandbox to cache hook", + zap.Time("start_time", info.StartTime), + zap.Time("end_time", info.GetEndTime()), + zap.Bool("auto_pause", info.AutoPause.Load()), + ) + node := o.GetNode(info.Instance.ClientID) if node == nil { - logger.Errorf("failed to get node '%s'", info.Instance.ClientID) + zap.L().Error("failed to get node", zap.String("node_id", info.Instance.ClientID)) } else { node.CPUUsage.Add(info.VCpu) node.RamUsage.Add(info.RamMB) @@ -229,21 +338,64 @@ func (o *Orchestrator) getInsertInstanceFunction(parentCtx context.Context, logg o.dns.Add(ctx, info.Instance.SandboxID, node.Info.IPAddress) } - _, err := o.analytics.Client.InstanceStarted(ctx, &analyticscollector.InstanceStartedEvent{ - InstanceId: info.Instance.SandboxID, - EnvironmentId: info.Instance.TemplateID, - BuildId: info.BuildID.String(), - TeamId: info.TeamID.String(), - Timestamp: timestamppb.Now(), - }) - if err != nil { - logger.Errorf("Error sending Analytics event: %v", err) - } - if info.AutoPause.Load() { o.instanceCache.MarkAsPausing(info) } + if created { + // Run in separate goroutine to not block sandbox creation + // Also use parentCtx to not cancel the request with this hook timeout + go reportInstanceStartAnalytics( + parentCtx, + o.analytics, + info.TeamID.String(), + info.Instance.SandboxID, + info.ExecutionID, + info.Instance.TemplateID, + info.BuildID.String(), + info.VCpu, + info.RamMB, + info.TotalDiskSizeMB, + ) + } + + sbxlogger.I(info).Debug("Inserted sandbox to cache hook", + zap.Time("start_time", info.StartTime), + zap.Time("end_time", info.GetEndTime()), + zap.Bool("auto_pause", info.AutoPause.Load()), + ) + return nil } } + +func reportInstanceStartAnalytics( + ctx context.Context, + analytics *analyticscollector.Analytics, + teamID string, + sandboxID string, + executionID string, + templateID string, + buildID string, + cpuCount int64, + ramMB int64, + diskSizeMB int64, +) { + childCtx, cancel := context.WithTimeout(ctx, reportTimeout) + defer cancel() + + _, err := analytics.InstanceStarted(childCtx, &analyticscollector.InstanceStartedEvent{ + InstanceId: sandboxID, + ExecutionId: executionID, + EnvironmentId: templateID, + BuildId: buildID, + TeamId: teamID, + CpuCount: cpuCount, + RamMb: ramMB, + DiskSizeMb: diskSizeMB, + Timestamp: timestamppb.Now(), + }) + if err != nil { + zap.L().Error("Error sending Analytics event", zap.Error(err)) + } +} diff --git a/packages/api/internal/orchestrator/client.go b/packages/api/internal/orchestrator/client.go index 97058b8..ba03991 100644 --- a/packages/api/internal/orchestrator/client.go +++ b/packages/api/internal/orchestrator/client.go @@ -2,45 +2,65 @@ package orchestrator import ( "context" + "encoding/json" "fmt" + "net/http" "sync/atomic" "time" "github.com/jellydator/ttlcache/v3" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" + "google.golang.org/protobuf/types/known/emptypb" "github.com/e2b-dev/infra/packages/api/internal/api" + grpclient "github.com/e2b-dev/infra/packages/api/internal/grpc" "github.com/e2b-dev/infra/packages/api/internal/node" - e2bgrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc" "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator" + orchestratorinfo "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" + e2bhealth "github.com/e2b-dev/infra/packages/shared/pkg/health" "github.com/e2b-dev/infra/packages/shared/pkg/smap" ) -type GRPCClient struct { - Sandbox orchestrator.SandboxServiceClient - connection e2bgrpc.ClientConnInterface -} +const nodeHealthCheckTimeout = time.Second * 2 -func NewClient(host string) (*GRPCClient, error) { - conn, err := e2bgrpc.GetConnection(host, false, grpc.WithStatsHandler(otelgrpc.NewClientHandler()), grpc.WithBlock(), grpc.WithTimeout(time.Second)) - if err != nil { - return nil, fmt.Errorf("failed to establish GRPC connection: %w", err) +var ( + OrchestratorToApiNodeStateMapper = map[orchestratorinfo.ServiceInfoStatus]api.NodeStatus{ + orchestratorinfo.ServiceInfoStatus_OrchestratorHealthy: api.NodeStatusReady, + orchestratorinfo.ServiceInfoStatus_OrchestratorDraining: api.NodeStatusDraining, + orchestratorinfo.ServiceInfoStatus_OrchestratorUnhealthy: api.NodeStatusUnhealthy, } - client := orchestrator.NewSandboxServiceClient(conn) - - return &GRPCClient{Sandbox: client, connection: conn}, nil -} + ApiNodeToOrchestratorStateMapper = map[api.NodeStatus]orchestratorinfo.ServiceInfoStatus{ + api.NodeStatusReady: orchestratorinfo.ServiceInfoStatus_OrchestratorHealthy, + api.NodeStatusDraining: orchestratorinfo.ServiceInfoStatus_OrchestratorDraining, + api.NodeStatusUnhealthy: orchestratorinfo.ServiceInfoStatus_OrchestratorUnhealthy, + } +) -func (a *GRPCClient) Close() error { - err := a.connection.Close() +func NewClient(tracerProvider trace.TracerProvider, meterProvider metric.MeterProvider, host string) (*grpclient.GRPCClient, error) { + conn, err := grpc.NewClient(host, + grpc.WithTransportCredentials(insecure.NewCredentials()), + grpc.WithStatsHandler( + otelgrpc.NewClientHandler( + otelgrpc.WithTracerProvider(tracerProvider), + otelgrpc.WithMeterProvider(meterProvider), + ), + ), + ) if err != nil { - return fmt.Errorf("failed to close connection: %w", err) + return nil, fmt.Errorf("failed to establish GRPC connection: %w", err) } - return nil + sandboxClient := orchestrator.NewSandboxServiceClient(conn) + infoClient := orchestratorinfo.NewInfoServiceClient(conn) + + return &grpclient.GRPCClient{Sandbox: sandboxClient, Info: infoClient, Connection: conn}, nil } func (o *Orchestrator) connectToNode(ctx context.Context, node *node.NodeInfo) error { @@ -49,7 +69,7 @@ func (o *Orchestrator) connectToNode(ctx context.Context, node *node.NodeInfo) e defer childSpan.End() - client, err := NewClient(node.OrchestratorAddress) + client, err := NewClient(o.tel.TracerProvider, o.tel.MeterProvider, node.OrchestratorAddress) if err != nil { return err } @@ -57,21 +77,53 @@ func (o *Orchestrator) connectToNode(ctx context.Context, node *node.NodeInfo) e buildCache := ttlcache.New[string, interface{}]() go buildCache.Start() - n := &Node{ - Client: client, - buildCache: buildCache, - sbxsInProgress: smap.New[*sbxInProgress](), - status: api.NodeStatusReady, - Info: node, - createFails: atomic.Uint64{}, + nodeStatus := api.NodeStatusUnhealthy + nodeVersion := "unknown" + nodeCommit := "unknown" + orchestratorID := node.ID + + ok, err := o.getNodeHealth(node) + if err != nil { + zap.L().Error("Failed to get node health, connecting and marking as unhealthy", zap.Error(err)) } - o.nodes.Insert(n.Info.ID, n) + if !ok { + zap.L().Error("Node is not healthy", zap.String("node_id", node.ID)) + } + + nodeInfo, err := client.Info.ServiceInfo(ctx, &emptypb.Empty{}) + if err != nil { + zap.L().Error("Failed to get node info", zap.Error(err)) + } else { + nodeStatus, ok = OrchestratorToApiNodeStateMapper[nodeInfo.ServiceStatus] + if !ok { + zap.L().Error("Unknown service info status", zap.Any("status", nodeInfo.ServiceStatus), zap.String("node_id", node.ID)) + nodeStatus = api.NodeStatusUnhealthy + } + + nodeVersion = nodeInfo.ServiceVersion + nodeCommit = nodeInfo.ServiceCommit + orchestratorID = nodeInfo.NodeId + } + + o.nodes.Insert( + node.ID, &Node{ + Client: client, + Info: node, + orchestratorID: orchestratorID, + buildCache: buildCache, + status: nodeStatus, + version: nodeVersion, + commit: nodeCommit, + sbxsInProgress: smap.New[*sbxInProgress](), + createFails: atomic.Uint64{}, + }, + ) return nil } -func (o *Orchestrator) GetClient(nodeID string) (*GRPCClient, error) { +func (o *Orchestrator) GetClient(nodeID string) (*grpclient.GRPCClient, error) { n := o.GetNode(nodeID) if n == nil { return nil, fmt.Errorf("node '%s' not found", nodeID) @@ -79,3 +131,25 @@ func (o *Orchestrator) GetClient(nodeID string) (*GRPCClient, error) { return n.Client, nil } + +func (o *Orchestrator) getNodeHealth(node *node.NodeInfo) (bool, error) { + resp, err := o.httpClient.Get(fmt.Sprintf("http://%s/health", node.OrchestratorAddress)) + if err != nil { + return false, fmt.Errorf("failed to check node health: %w", err) + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + return false, fmt.Errorf("node is not healthy: %s", resp.Status) + } + + // Check if the node is healthy + var healthResp e2bhealth.Response + err = json.NewDecoder(resp.Body).Decode(&healthResp) + if err != nil { + return false, fmt.Errorf("failed to decode health response: %w", err) + } + + isUsable := healthResp.Status == e2bhealth.Healthy || healthResp.Status == e2bhealth.Draining + return isUsable, nil +} diff --git a/packages/api/internal/orchestrator/create_instance.go b/packages/api/internal/orchestrator/create_instance.go index 162edb8..e28dab1 100644 --- a/packages/api/internal/orchestrator/create_instance.go +++ b/packages/api/internal/orchestrator/create_instance.go @@ -3,11 +3,14 @@ package orchestrator import ( "context" _ "embed" + "errors" "fmt" "log" + "net/http" "time" "go.opentelemetry.io/otel/attribute" + "go.uber.org/zap" "google.golang.org/protobuf/types/known/timestamppb" "github.com/e2b-dev/infra/packages/api/internal/api" @@ -15,9 +18,9 @@ import ( "github.com/e2b-dev/infra/packages/api/internal/cache/instance" "github.com/e2b-dev/infra/packages/api/internal/sandbox" "github.com/e2b-dev/infra/packages/api/internal/utils" + "github.com/e2b-dev/infra/packages/db/queries" "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator" - "github.com/e2b-dev/infra/packages/shared/pkg/logs" - "github.com/e2b-dev/infra/packages/shared/pkg/models" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) @@ -28,49 +31,75 @@ const ( maxStartingInstancesPerNode = 3 ) -var ( - sandboxCreateFailedError = fmt.Errorf("failed to create a new sandbox, if the problem persists, contact us") -) +var errSandboxCreateFailed = fmt.Errorf("failed to create a new sandbox, if the problem persists, contact us") func (o *Orchestrator) CreateSandbox( ctx context.Context, sandboxID, + executionID, alias string, team authcache.AuthTeamInfo, - build *models.EnvBuild, - metadata, + build queries.EnvBuild, + metadata map[string]string, envVars map[string]string, startTime time.Time, endTime time.Time, timeout time.Duration, - logger *logs.SandboxLogger, isResume bool, clientID *string, baseTemplateID string, autoPause bool, -) (*api.Sandbox, error) { + envdAuthToken *string, +) (*api.Sandbox, *api.APIError) { childCtx, childSpan := o.tracer.Start(ctx, "create-sandbox") defer childSpan.End() - // // Check if team has reached max instances - // err, releaseTeamSandboxReservation := o.instanceCache.Reserve(sandboxID, teamID, maxInstancesPerTeam) - // if err != nil { - // errMsg := fmt.Errorf("team '%s' has reached the maximum number of instances (%d)", teamID, maxInstancesPerTeam) - // telemetry.ReportCriticalError(ctx, fmt.Errorf("%w (error: %w)", errMsg, err)) - // - // return nil, fmt.Errorf( - // "you have reached the maximum number of concurrent E2B sandboxes (%d). If you need more, "+ - // "please contact us at 'https://e2b.dev/docs/getting-help'", maxInstancesPerTeam) - // } - // - // telemetry.ReportEvent(childCtx, "Reserved sandbox for team") - // defer releaseTeamSandboxReservation() + // Check if team has reached max instances + releaseTeamSandboxReservation, err := o.instanceCache.Reserve(sandboxID, team.Team.ID, team.Tier.ConcurrentInstances) + if err != nil { + var limitErr *instance.ErrSandboxLimitExceeded + var alreadyErr *instance.ErrAlreadyBeingStarted + + telemetry.ReportCriticalError(ctx, "failed to reserve sandbox for team", err) + + switch { + case errors.As(err, &limitErr): + return nil, &api.APIError{ + Code: http.StatusTooManyRequests, + ClientMsg: fmt.Sprintf( + "you have reached the maximum number of concurrent E2B sandboxes (%d). If you need more, "+ + "please contact us at 'https://e2b.dev/docs/getting-help'", team.Tier.ConcurrentInstances), + Err: fmt.Errorf("team '%s' has reached the maximum number of instances (%d)", team.Team.ID, team.Tier.ConcurrentInstances), + } + case errors.As(err, &alreadyErr): + zap.L().Warn("sandbox already being started", logger.WithSandboxID(sandboxID), zap.Error(err)) + return nil, &api.APIError{ + Code: http.StatusConflict, + ClientMsg: fmt.Sprintf("Sandbox %s is already being started", sandboxID), + Err: err, + } + default: + zap.L().Error("failed to reserve sandbox for team", logger.WithSandboxID(sandboxID), zap.Error(err)) + return nil, &api.APIError{ + Code: http.StatusInternalServerError, + ClientMsg: fmt.Sprintf("Failed to create sandbox: %s", err), + Err: err, + } + } + } + + telemetry.ReportEvent(childCtx, "Reserved sandbox for team") + defer releaseTeamSandboxReservation() features, err := sandbox.NewVersionInfo(build.FirecrackerVersion) if err != nil { errMsg := fmt.Errorf("failed to get features for firecracker version '%s': %w", build.FirecrackerVersion, err) - return nil, errMsg + return nil, &api.APIError{ + Code: http.StatusInternalServerError, + ClientMsg: "Failed to get build information for the template", + Err: errMsg, + } } telemetry.ReportEvent(childCtx, "Got FC version info") @@ -83,14 +112,16 @@ func (o *Orchestrator) CreateSandbox( TeamId: team.Team.ID.String(), BuildId: build.ID.String(), SandboxId: sandboxID, + ExecutionId: executionID, KernelVersion: build.KernelVersion, FirecrackerVersion: build.FirecrackerVersion, EnvdVersion: *build.EnvdVersion, Metadata: metadata, EnvVars: envVars, + EnvdAccessToken: envdAuthToken, MaxSandboxLength: team.Tier.MaxLengthHours, HugePages: features.HasHugePages(), - RamMb: build.RAMMB, + RamMb: build.RamMb, Vcpu: build.Vcpu, Snapshot: isResume, AutoPause: &autoPause, @@ -115,28 +146,39 @@ func (o *Orchestrator) CreateSandbox( for { select { case <-childCtx.Done(): - return nil, sandboxCreateFailedError + return nil, &api.APIError{ + Code: http.StatusRequestTimeout, + ClientMsg: "Failed to create sandbox", + Err: fmt.Errorf("timeout while creating sandbox, attempt #%d", attempt), + } default: // Continue } if attempt > maxNodeRetries { - return nil, sandboxCreateFailedError + return nil, &api.APIError{ + Code: http.StatusInternalServerError, + ClientMsg: "Failed to create sandbox", + Err: errSandboxCreateFailed, + } } if node == nil { node, err = o.getLeastBusyNode(childCtx, nodesExcluded) if err != nil { - errMsg := fmt.Errorf("failed to get least busy node: %w", err) - telemetry.ReportError(childCtx, errMsg) + telemetry.ReportError(childCtx, "failed to get least busy node", err) - return nil, errMsg + return nil, &api.APIError{ + Code: http.StatusInternalServerError, + ClientMsg: "Failed to get node to place sandbox on.", + Err: fmt.Errorf("failed to get least busy node: %w", err), + } } } // To creating a lot of sandboxes at once on the same node node.sbxsInProgress.Insert(sandboxID, &sbxInProgress{ - MiBMemory: build.RAMMB, + MiBMemory: build.RamMb, CPUs: build.Vcpu, }) @@ -168,11 +210,12 @@ func (o *Orchestrator) CreateSandbox( telemetry.ReportEvent(childCtx, "Created sandbox") sbx := api.Sandbox{ - ClientID: node.Info.ID, - SandboxID: sandboxID, - TemplateID: *build.EnvID, - Alias: &alias, - EnvdVersion: *build.EnvdVersion, + ClientID: node.Info.ID, + SandboxID: sandboxID, + TemplateID: *build.EnvID, + Alias: &alias, + EnvdVersion: *build.EnvdVersion, + EnvdAccessToken: envdAuthToken, } // This is to compensate for the time it takes to start the instance @@ -181,8 +224,8 @@ func (o *Orchestrator) CreateSandbox( endTime = startTime.Add(timeout) instanceInfo := instance.NewInstanceInfo( - logger, &sbx, + executionID, &team.Team.ID, &build.ID, metadata, @@ -190,31 +233,37 @@ func (o *Orchestrator) CreateSandbox( startTime, endTime, build.Vcpu, - *build.TotalDiskSizeMB, - build.RAMMB, + *build.TotalDiskSizeMb, + build.RamMb, build.KernelVersion, build.FirecrackerVersion, *build.EnvdVersion, node.Info, autoPause, + envdAuthToken, + baseTemplateID, ) - cacheErr := o.instanceCache.Add(instanceInfo, true) + cacheErr := o.instanceCache.Add(childCtx, instanceInfo, true) if cacheErr != nil { - errMsg := fmt.Errorf("error when adding instance to cache: %w", cacheErr) - telemetry.ReportError(ctx, errMsg) + telemetry.ReportError(ctx, "error when adding instance to cache", cacheErr) deleted := o.DeleteInstance(childCtx, sbx.SandboxID, false) if !deleted { telemetry.ReportEvent(ctx, "instance wasn't found in cache when deleting") } - return nil, errMsg + return nil, &api.APIError{ + Code: http.StatusInternalServerError, + ClientMsg: "Failed to create sandbox", + Err: fmt.Errorf("error when adding instance to cache: %w", cacheErr), + } } return &sbx, nil } +// getLeastBusyNode returns the least busy node, if there are no eligible nodes, it tries until one is available or the context timeouts func (o *Orchestrator) getLeastBusyNode(parentCtx context.Context, nodesExcluded map[string]*Node) (leastBusyNode *Node, err error) { ctx, cancel := context.WithTimeout(parentCtx, leastBusyNodeTimeout) defer cancel() @@ -222,47 +271,65 @@ func (o *Orchestrator) getLeastBusyNode(parentCtx context.Context, nodesExcluded childCtx, childSpan := o.tracer.Start(ctx, "get-least-busy-node") defer childSpan.End() + // Try to find a node without waiting + leastBusyNode, err = o.findLeastBusyNode(nodesExcluded) + if err == nil { + return leastBusyNode, nil + } + + // If no node is available, wait for a bit and try again + ticker := time.NewTicker(10 * time.Millisecond) for { select { case <-childCtx.Done(): return nil, childCtx.Err() - case <-time.After(10 * time.Millisecond): + case <-ticker.C: // If no node is available, wait for a bit and try again + leastBusyNode, err = o.findLeastBusyNode(nodesExcluded) + if err == nil { + return leastBusyNode, nil + } + } + } +} - for _, node := range o.nodes.Items() { - // The node might be nil if it was removed from the list while iterating - if node == nil { - continue - } - - // If the node is not ready, skip it - if node.Status() != api.NodeStatusReady { - continue - } +// findLeastBusyNode finds the least busy node that is ready and not in the excluded list +// if no node is available, returns an error +func (o *Orchestrator) findLeastBusyNode(nodesExcluded map[string]*Node) (leastBusyNode *Node, err error) { + for _, node := range o.nodes.Items() { + // The node might be nil if it was removed from the list while iterating + if node == nil { + continue + } - // Skip already tried nodes - if nodesExcluded[node.Info.ID] != nil { - continue - } + // If the node is not ready, skip it + if node.Status() != api.NodeStatusReady { + continue + } - // To prevent overloading the node - if node.sbxsInProgress.Count() > maxStartingInstancesPerNode { - continue - } + // Skip already tried nodes + if nodesExcluded[node.Info.ID] != nil { + continue + } - cpuUsage := int64(0) - for _, sbx := range node.sbxsInProgress.Items() { - cpuUsage += sbx.CPUs - } + // To prevent overloading the node + if node.sbxsInProgress.Count() > maxStartingInstancesPerNode { + continue + } - if leastBusyNode == nil || (node.CPUUsage.Load()+cpuUsage) < leastBusyNode.CPUUsage.Load() { - leastBusyNode = node - } - } + cpuUsage := int64(0) + for _, sbx := range node.sbxsInProgress.Items() { + cpuUsage += sbx.CPUs + } - if leastBusyNode != nil { - return leastBusyNode, nil - } + if leastBusyNode == nil || (node.CPUUsage.Load()+cpuUsage) < leastBusyNode.CPUUsage.Load() { + leastBusyNode = node } } + + if leastBusyNode != nil { + return leastBusyNode, nil + } + + return nil, fmt.Errorf("no node available") } diff --git a/packages/api/internal/orchestrator/delete_instance.go b/packages/api/internal/orchestrator/delete_instance.go index 16b0c4c..91cae56 100644 --- a/packages/api/internal/orchestrator/delete_instance.go +++ b/packages/api/internal/orchestrator/delete_instance.go @@ -2,11 +2,20 @@ package orchestrator import ( "context" + + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/shared/pkg/logger" ) func (o *Orchestrator) DeleteInstance(ctx context.Context, sandboxID string, pause bool) bool { _, childSpan := o.tracer.Start(ctx, "delete-instance") defer childSpan.End() + zap.L().Debug("Delete instance from cache", + logger.WithSandboxID(sandboxID), + zap.Bool("pause", pause), + ) + return o.instanceCache.Delete(sandboxID, pause) } diff --git a/packages/api/internal/orchestrator/keep_alive.go b/packages/api/internal/orchestrator/keep_alive.go index 2c3d9c4..21600bd 100644 --- a/packages/api/internal/orchestrator/keep_alive.go +++ b/packages/api/internal/orchestrator/keep_alive.go @@ -2,16 +2,26 @@ package orchestrator import ( "context" - "fmt" + "net/http" "time" + + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/api/internal/api" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" ) -func (o *Orchestrator) KeepAliveFor(ctx context.Context, sandboxID string, duration time.Duration, allowShorter bool) error { - sbx, err := o.instanceCache.KeepAliveFor(sandboxID, duration, allowShorter) +func (o *Orchestrator) KeepAliveFor(ctx context.Context, sandboxID string, duration time.Duration, allowShorter bool) *api.APIError { + sbx, apiErr := o.instanceCache.KeepAliveFor(sandboxID, duration, allowShorter) + if apiErr != nil { + return apiErr + } + + err := o.UpdateSandbox(ctx, sbx.Instance.SandboxID, sbx.GetEndTime(), sbx.Instance.ClientID) if err != nil { - return fmt.Errorf("failed to keep alive for sandbox '%s': %w", sandboxID, err) + zap.L().Error("Error when setting sandbox timeout", zap.Error(err), logger.WithSandboxID(sandboxID)) + return &api.APIError{Code: http.StatusInternalServerError, ClientMsg: "Error when setting sandbox timeout", Err: err} } - err = o.UpdateSandbox(ctx, sbx.Instance.SandboxID, sbx.GetEndTime(), sbx.Instance.ClientID) - return err + return nil } diff --git a/packages/api/internal/orchestrator/list_instances.go b/packages/api/internal/orchestrator/list_instances.go index cff641d..4b9892c 100644 --- a/packages/api/internal/orchestrator/list_instances.go +++ b/packages/api/internal/orchestrator/list_instances.go @@ -13,7 +13,6 @@ import ( "github.com/e2b-dev/infra/packages/api/internal/cache/instance" nNode "github.com/e2b-dev/infra/packages/api/internal/node" "github.com/e2b-dev/infra/packages/api/internal/utils" - "github.com/e2b-dev/infra/packages/shared/pkg/logs" ) func (o *Orchestrator) getSandboxes(ctx context.Context, node *nNode.NodeInfo) ([]*instance.InstanceInfo, error) { @@ -58,16 +57,21 @@ func (o *Orchestrator) getSandboxes(ctx context.Context, node *nNode.NodeInfo) ( autoPause = *config.AutoPause } + // TODO: Temporary workaround, until all orchestrators report this + if config.ExecutionId == "" { + config.ExecutionId = uuid.New().String() + } + sandboxesInfo = append( sandboxesInfo, instance.NewInstanceInfo( - logs.NewSandboxLogger(config.SandboxId, config.TemplateId, teamID.String(), config.Vcpu, config.RamMb, false), &api.Sandbox{ SandboxID: config.SandboxId, TemplateID: config.TemplateId, Alias: config.Alias, - ClientID: sbx.ClientId, + ClientID: node.ID, // to prevent mismatch use the node ID which we use for the request }, + config.ExecutionId, &teamID, &buildID, config.Metadata, @@ -82,6 +86,8 @@ func (o *Orchestrator) getSandboxes(ctx context.Context, node *nNode.NodeInfo) ( config.EnvdVersion, node, autoPause, + config.EnvdAccessToken, + config.BaseTemplateId, ), ) } @@ -97,6 +103,6 @@ func (o *Orchestrator) GetSandboxes(ctx context.Context, teamID *uuid.UUID) []*i return o.instanceCache.GetInstances(teamID) } -func (o *Orchestrator) GetInstance(ctx context.Context, id string) (*instance.InstanceInfo, error) { +func (o *Orchestrator) GetInstance(_ context.Context, id string) (*instance.InstanceInfo, error) { return o.instanceCache.Get(id) } diff --git a/packages/api/internal/orchestrator/metrics.go b/packages/api/internal/orchestrator/metrics.go new file mode 100644 index 0000000..466ba5b --- /dev/null +++ b/packages/api/internal/orchestrator/metrics.go @@ -0,0 +1,36 @@ +package orchestrator + +import ( + "context" + "fmt" + + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/metric" + + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +func (o *Orchestrator) setupMetrics(meterProvider metric.MeterProvider) (metric.Registration, error) { + meter := meterProvider.Meter("api.orchestrator") + gauge, err := telemetry.GetGaugeInt(meter, telemetry.ApiOrchestratorCountMeterName) + if err != nil { + return nil, fmt.Errorf("failed to create orchestrators gauge: %w", err) + } + + registration, err := meter.RegisterCallback( + func(ctx context.Context, obs metric.Observer) error { + for _, node := range o.nodes.Items() { + obs.ObserveInt64(gauge, 1, metric.WithAttributes( + attribute.String("status", string(node.status)), + attribute.String("node.id", node.orchestratorID), + )) + } + + return nil + }, gauge) + if err != nil { + return nil, fmt.Errorf("failed to register orchestrators gauge: %w", err) + } + + return registration, nil +} diff --git a/packages/api/internal/orchestrator/node.go b/packages/api/internal/orchestrator/node.go index 8fe43e8..90a8691 100644 --- a/packages/api/internal/orchestrator/node.go +++ b/packages/api/internal/orchestrator/node.go @@ -3,19 +3,21 @@ package orchestrator import ( "context" "fmt" - "google.golang.org/grpc/connectivity" - "os" "sync" "sync/atomic" "time" nomadapi "github.com/hashicorp/nomad/api" "github.com/jellydator/ttlcache/v3" + "go.uber.org/zap" + "google.golang.org/grpc/connectivity" "github.com/e2b-dev/infra/packages/api/internal/api" + grpclient "github.com/e2b-dev/infra/packages/api/internal/grpc" "github.com/e2b-dev/infra/packages/api/internal/node" "github.com/e2b-dev/infra/packages/shared/pkg/consts" "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator" + orchestratorinfo "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" "github.com/e2b-dev/infra/packages/shared/pkg/smap" ) @@ -27,12 +29,14 @@ type sbxInProgress struct { type Node struct { CPUUsage atomic.Int64 RamUsage atomic.Int64 - Client *GRPCClient + Client *grpclient.GRPCClient - Info *node.NodeInfo - - status api.NodeStatus - statusMu sync.RWMutex + Info *node.NodeInfo + orchestratorID string + commit string + version string + status api.NodeStatus + statusMu sync.RWMutex sbxsInProgress *smap.Map[*sbxInProgress] @@ -49,18 +53,44 @@ func (n *Node) Status() api.NodeStatus { return n.status } - if n.Client.connection.GetState() != connectivity.Ready { + switch n.Client.Connection.GetState() { + case connectivity.Shutdown: + return api.NodeStatusUnhealthy + case connectivity.TransientFailure: + return api.NodeStatusConnecting + case connectivity.Connecting: return api.NodeStatusConnecting + default: + break } return n.status } -func (n *Node) SetStatus(status api.NodeStatus) { +func (n *Node) setStatus(status api.NodeStatus) { n.statusMu.Lock() defer n.statusMu.Unlock() - n.status = status + if n.status != status { + zap.L().Info("Node status changed", zap.String("node_id", n.Info.ID), zap.String("status", string(status))) + n.status = status + } +} + +func (n *Node) SendStatusChange(ctx context.Context, s api.NodeStatus) error { + nodeStatus, ok := ApiNodeToOrchestratorStateMapper[s] + if !ok { + zap.L().Error("Unknown service info status", zap.Any("status", s), zap.String("node_id", n.Info.ID)) + return fmt.Errorf("unknown service info status: %s", s) + } + + _, err := n.Client.Info.ServiceStatusOverride(ctx, &orchestratorinfo.ServiceStatusChangeRequest{ServiceStatus: nodeStatus}) + if err != nil { + zap.L().Error("Failed to send status change", zap.Error(err)) + return err + } + + return nil } func (o *Orchestrator) listNomadNodes(ctx context.Context) ([]*node.NodeInfo, error) { @@ -101,13 +131,15 @@ func (o *Orchestrator) GetNodes() []*api.Node { Status: n.Status(), CreateFails: n.createFails.Load(), SandboxStartingCount: n.sbxsInProgress.Count(), + Version: n.version, + Commit: n.commit, } } for _, sbx := range o.instanceCache.Items() { n, ok := nodes[sbx.Instance.ClientID] if !ok { - fmt.Fprintf(os.Stderr, "node [%s] for sandbox [%s] wasn't found \n", sbx.Instance.ClientID, sbx.Instance.SandboxID) + zap.L().Error("node for sandbox wasn't found", zap.String("client_id", sbx.Instance.ClientID), zap.String("sandbox_id", sbx.Instance.SandboxID)) continue } @@ -135,6 +167,8 @@ func (o *Orchestrator) GetNodeDetail(nodeID string) *api.NodeDetail { Status: n.Status(), CachedBuilds: builds, CreateFails: n.createFails.Load(), + Version: n.version, + Commit: n.commit, } } } @@ -150,7 +184,7 @@ func (o *Orchestrator) GetNodeDetail(nodeID string) *api.NodeDetail { meta := api.SandboxMetadata(sbx.Metadata) metadata = &meta } - node.Sandboxes = append(node.Sandboxes, api.RunningSandbox{ + node.Sandboxes = append(node.Sandboxes, api.ListedSandbox{ Alias: sbx.Instance.Alias, ClientID: nodeID, CpuCount: api.CPUCount(sbx.VCpu), @@ -169,17 +203,20 @@ func (o *Orchestrator) GetNodeDetail(nodeID string) *api.NodeDetail { func (n *Node) SyncBuilds(builds []*orchestrator.CachedBuildInfo) { for _, build := range builds { - n.buildCache.Set(build.BuildId, struct{}{}, build.ExpirationTime.AsTime().Sub(time.Now())) + n.buildCache.Set(build.BuildId, struct{}{}, time.Until(build.ExpirationTime.AsTime())) } } -func (t *Node) InsertBuild(buildID string) { - exists := t.buildCache.Has(buildID) +func (n *Node) InsertBuild(buildID string) { + exists := n.buildCache.Has(buildID) if exists { return } // Set the build in the cache for 2 minutes, it should get updated with the correct time from the orchestrator during sync - t.buildCache.Set(buildID, struct{}{}, 2*time.Minute) - return + n.buildCache.Set(buildID, struct{}{}, 2*time.Minute) +} + +func (o *Orchestrator) NodeCount() int { + return o.nodes.Count() } diff --git a/packages/api/internal/orchestrator/orchestrator.go b/packages/api/internal/orchestrator/orchestrator.go index 340acbe..7728aec 100644 --- a/packages/api/internal/orchestrator/orchestrator.go +++ b/packages/api/internal/orchestrator/orchestrator.go @@ -3,11 +3,14 @@ package orchestrator import ( "context" "errors" + "fmt" + "net/http" "os" "time" - "github.com/go-redis/redis/v8" nomadapi "github.com/hashicorp/nomad/api" + "github.com/redis/go-redis/v9" + "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" @@ -15,80 +18,105 @@ import ( "github.com/e2b-dev/infra/packages/api/internal/cache/instance" "github.com/e2b-dev/infra/packages/api/internal/dns" "github.com/e2b-dev/infra/packages/api/internal/node" + "github.com/e2b-dev/infra/packages/shared/pkg/consts" "github.com/e2b-dev/infra/packages/shared/pkg/db" "github.com/e2b-dev/infra/packages/shared/pkg/env" "github.com/e2b-dev/infra/packages/shared/pkg/smap" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) const ( - // cacheHookTimeout is the timeout for all requests inside cache insert/delete hooks + // cacheHookTimeout is the timeout for all requests inside cache insert/delete hooks. cacheHookTimeout = 5 * time.Minute statusLogInterval = time.Second * 20 ) type Orchestrator struct { - nomadClient *nomadapi.Client - instanceCache *instance.InstanceCache - nodes *smap.Map[*Node] - tracer trace.Tracer - logger *zap.SugaredLogger - analytics *analyticscollector.Analytics - dns *dns.DNS - dbClient *db.DB + httpClient *http.Client + nomadClient *nomadapi.Client + instanceCache *instance.InstanceCache + nodes *smap.Map[*Node] + tracer trace.Tracer + analytics *analyticscollector.Analytics + dns *dns.DNS + dbClient *db.DB + tel *telemetry.Client + metricsRegistration metric.Registration } func New( ctx context.Context, + tel *telemetry.Client, tracer trace.Tracer, nomadClient *nomadapi.Client, - logger *zap.Logger, posthogClient *analyticscollector.PosthogClient, - redisClient *redis.Client, + redisClient redis.UniversalClient, dbClient *db.DB, ) (*Orchestrator, error) { analyticsInstance, err := analyticscollector.NewAnalytics() if err != nil { - logger.Error("Error initializing Analytics client", zap.Error(err)) + zap.L().Error("Error initializing Analytics client", zap.Error(err)) } - dnsServer := dns.New(ctx, redisClient, logger) + dnsServer := dns.New(ctx, redisClient) if env.IsLocal() { - logger.Info("Running locally, skipping starting DNS server") + zap.L().Info("Running locally, skipping starting DNS server") } else { - logger.Info("Starting DNS server") + zap.L().Info("Starting DNS server") dnsServer.Start(ctx, "0.0.0.0", os.Getenv("DNS_PORT")) } - slogger := logger.Sugar() + httpClient := &http.Client{ + Timeout: nodeHealthCheckTimeout, + } o := Orchestrator{ + httpClient: httpClient, analytics: analyticsInstance, nomadClient: nomadClient, - logger: slogger, tracer: tracer, nodes: smap.New[*Node](), dns: dnsServer, dbClient: dbClient, + tel: tel, } cache := instance.NewCache( ctx, - analyticsInstance.Client, - slogger, - o.getInsertInstanceFunction(ctx, slogger, cacheHookTimeout), - o.getDeleteInstanceFunction(ctx, posthogClient, slogger, cacheHookTimeout), + tel.MeterProvider, + o.getInsertInstanceFunction(ctx, cacheHookTimeout), + o.getDeleteInstanceFunction(ctx, posthogClient, cacheHookTimeout), ) o.instanceCache = cache if env.IsLocal() { - logger.Info("Skipping syncing sandboxes, running locally") + zap.L().Info("Skipping syncing sandboxes, running locally") + // Add a local node for local development, if there isn't any, it fails silently + err := o.connectToNode(ctx, &node.NodeInfo{ + ID: "testclient", + OrchestratorAddress: fmt.Sprintf("%s:%s", "127.0.0.1", consts.OrchestratorPort), + IPAddress: "127.0.0.1", + }) + if err != nil { + zap.L().Error("Error connecting to local node. If you're starting the API server locally, make sure you run 'make connect-orchestrator' to connect to the node remotely before starting the local API server.", zap.Error(err)) + return nil, err + } } else { go o.keepInSync(ctx, cache) + go o.reportLongRunningSandboxes(ctx) + } + + registration, err := o.setupMetrics(tel.MeterProvider) + if err != nil { + zap.L().Error("Failed to setup metrics", zap.Error(err)) + return nil, fmt.Errorf("failed to setup metrics: %w", err) } + o.metricsRegistration = registration + go o.startStatusLogging(ctx) return &o, nil @@ -101,7 +129,7 @@ func (o *Orchestrator) startStatusLogging(ctx context.Context) { for { select { case <-ctx.Done(): - o.logger.Infof("Stopping status logging") + zap.L().Info("Stopping status logging") return case <-ticker.C: @@ -116,7 +144,7 @@ func (o *Orchestrator) startStatusLogging(ctx context.Context) { nodes = append(nodes, map[string]interface{}{ "id": nodeItem.Info.ID, "status": nodeItem.Status(), - "socket_status": nodeItem.Client.connection.GetState().String(), + "socket_status": nodeItem.Client.Connection.GetState().String(), "in_progress_count": nodeItem.sbxsInProgress.Count(), "failed_to_start_count": nodeItem.createFails.Load(), }) @@ -142,7 +170,13 @@ func (o *Orchestrator) Close(ctx context.Context) error { } } - o.logger.Infof("shutting down node clients: %d of %d nodes had errors", len(errs), len(nodes)) + zap.L().Info("Shutting down node clients", zap.Int("error_count", len(errs)), zap.Int("node_count", len(nodes))) + + if o.metricsRegistration != nil { + if err := o.metricsRegistration.Unregister(); err != nil { + errs = append(errs, fmt.Errorf("failed to unregister metrics: %w", err)) + } + } if err := o.analytics.Close(); err != nil { errs = append(errs, err) @@ -151,7 +185,6 @@ func (o *Orchestrator) Close(ctx context.Context) error { if o.dns != nil { if err := o.dns.Close(ctx); err != nil { errs = append(errs, err) - } } diff --git a/packages/api/internal/orchestrator/pause_instance.go b/packages/api/internal/orchestrator/pause_instance.go index d45c15f..f59ed0f 100644 --- a/packages/api/internal/orchestrator/pause_instance.go +++ b/packages/api/internal/orchestrator/pause_instance.go @@ -35,6 +35,7 @@ func (o *Orchestrator) PauseInstance( snapshotConfig := &db.SnapshotInfo{ BaseTemplateID: sbx.Instance.TemplateID, SandboxID: sbx.Instance.SandboxID, + SandboxStartedAt: sbx.StartTime, VCPU: sbx.VCpu, RAMMB: sbx.RamMB, TotalDiskSizeMB: sbx.TotalDiskSizeMB, @@ -42,6 +43,7 @@ func (o *Orchestrator) PauseInstance( KernelVersion: sbx.KernelVersion, FirecrackerVersion: sbx.FirecrackerVersion, EnvdVersion: sbx.Instance.EnvdVersion, + EnvdSecured: sbx.EnvdAccessToken != nil, } envBuild, err := o.dbClient.NewSnapshotBuild( @@ -50,33 +52,29 @@ func (o *Orchestrator) PauseInstance( teamID, ) if err != nil { - errMsg := fmt.Errorf("error pausing sandbox: %w", err) + telemetry.ReportCriticalError(ctx, "error pausing sandbox", err) - telemetry.ReportCriticalError(ctx, errMsg) - - return errMsg + return err } err = snapshotInstance(ctx, o, sbx, *envBuild.EnvID, envBuild.ID.String()) if errors.Is(err, ErrPauseQueueExhausted{}) { - telemetry.ReportCriticalError(ctx, fmt.Errorf("pause queue exhausted %w", err)) + telemetry.ReportCriticalError(ctx, "pause queue exhausted", err) return ErrPauseQueueExhausted{} } if err != nil && !errors.Is(err, ErrPauseQueueExhausted{}) { - errMsg := fmt.Errorf("error pausing sandbox: %w", err) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "error pausing sandbox", err) - return errMsg + return fmt.Errorf("error pausing sandbox: %w", err) } err = o.dbClient.EnvBuildSetStatus(ctx, *envBuild.EnvID, envBuild.ID, envbuild.StatusSuccess) if err != nil { - errMsg := fmt.Errorf("error pausing sandbox: %w", err) - telemetry.ReportCriticalError(ctx, errMsg) + telemetry.ReportCriticalError(ctx, "error pausing sandbox", err) - return errMsg + return fmt.Errorf("error pausing sandbox: %w", err) } return nil diff --git a/packages/api/internal/sandbox/sandbox_envd_secret.go b/packages/api/internal/sandbox/sandbox_envd_secret.go new file mode 100644 index 0000000..7390734 --- /dev/null +++ b/packages/api/internal/sandbox/sandbox_envd_secret.go @@ -0,0 +1,29 @@ +package sandbox + +import ( + "errors" + "os" + + "github.com/e2b-dev/infra/packages/api/internal/api" + "github.com/e2b-dev/infra/packages/shared/pkg/keys" +) + +var seedKey = os.Getenv("SANDBOX_ACCESS_TOKEN_HASH_SEED") + +type EnvdAccessTokenGenerator struct { + hasher *keys.HMACSha256Hashing +} + +func NewEnvdAccessTokenGenerator() (*EnvdAccessTokenGenerator, error) { + if seedKey == "" { + return nil, errors.New("seed key is not set") + } + + return &EnvdAccessTokenGenerator{ + hasher: keys.NewHMACSHA256Hashing([]byte(seedKey)), + }, nil +} + +func (g *EnvdAccessTokenGenerator) GenerateAccessToken(id api.SandboxID) (string, error) { + return g.hasher.Hash([]byte(id)) +} diff --git a/packages/api/internal/team/apikeys.go b/packages/api/internal/team/apikeys.go new file mode 100644 index 0000000..cfa448d --- /dev/null +++ b/packages/api/internal/team/apikeys.go @@ -0,0 +1,45 @@ +package team + +import ( + "context" + "fmt" + "time" + + "github.com/google/uuid" + + "github.com/e2b-dev/infra/packages/shared/pkg/db" + "github.com/e2b-dev/infra/packages/shared/pkg/keys" + "github.com/e2b-dev/infra/packages/shared/pkg/models" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +func CreateAPIKey(ctx context.Context, db *db.DB, teamID uuid.UUID, userID uuid.UUID, name string) (*models.TeamAPIKey, error) { + teamApiKey, err := keys.GenerateKey(keys.ApiKeyPrefix) + if err != nil { + telemetry.ReportCriticalError(ctx, "error when generating team API key", err) + + return nil, fmt.Errorf("error when generating team API key: %w", err) + } + + apiKey, err := db.Client.TeamAPIKey. + Create(). + SetTeamID(teamID). + SetCreatedBy(userID). + SetLastUsed(time.Now()). + SetUpdatedAt(time.Now()). + SetAPIKey(teamApiKey.PrefixedRawValue). + SetAPIKeyHash(teamApiKey.HashedValue). + SetAPIKeyPrefix(teamApiKey.Masked.Prefix). + SetAPIKeyLength(teamApiKey.Masked.ValueLength). + SetAPIKeyMaskPrefix(teamApiKey.Masked.MaskedValuePrefix). + SetAPIKeyMaskSuffix(teamApiKey.Masked.MaskedValueSuffix). + SetName(name). + Save(ctx) + if err != nil { + telemetry.ReportCriticalError(ctx, "error when creating API key", err) + + return nil, fmt.Errorf("error when creating API key: %w", err) + } + + return apiKey, nil +} diff --git a/packages/api/internal/template-manager/client.go b/packages/api/internal/template-manager/client.go index c132986..2a1749a 100644 --- a/packages/api/internal/template-manager/client.go +++ b/packages/api/internal/template-manager/client.go @@ -1,49 +1,48 @@ package template_manager import ( - "fmt" "os" "time" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/trace" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/keepalive" - e2bgrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc" - template_manager "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" + grpclient "github.com/e2b-dev/infra/packages/api/internal/grpc" + infogrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" + templatemanagergrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" ) -var ( - host = os.Getenv("TEMPLATE_MANAGER_ADDRESS") -) - -type GRPCClient struct { - Client template_manager.TemplateServiceClient - connection e2bgrpc.ClientConnInterface -} - -func NewClient() (*GRPCClient, error) { - keepaliveParam := grpc.WithKeepaliveParams(keepalive.ClientParameters{ - Time: 10 * time.Second, // Send ping every 10s - Timeout: 2 * time.Second, // Wait 2s for response - PermitWithoutStream: true, - }) - - conn, err := e2bgrpc.GetConnection(host, false, grpc.WithStatsHandler(otelgrpc.NewClientHandler()), keepaliveParam) +var templateManagerHost = os.Getenv("TEMPLATE_MANAGER_HOST") + +func createClient(tracerProvider trace.TracerProvider, meterProvider metric.MeterProvider) (*grpclient.GRPCClient, error) { + conn, err := grpc.NewClient(templateManagerHost, + grpc.WithTransportCredentials(insecure.NewCredentials()), + grpc.WithStatsHandler( + otelgrpc.NewClientHandler( + otelgrpc.WithTracerProvider(tracerProvider), + otelgrpc.WithMeterProvider(meterProvider), + ), + ), + grpc.WithKeepaliveParams(keepalive.ClientParameters{ + Time: 10 * time.Second, // Send ping every 10s + Timeout: 2 * time.Second, // Wait 2s for response + PermitWithoutStream: true, + }), + ) if err != nil { - return nil, fmt.Errorf("failed to establish GRPC connection: %w", err) + return nil, err } - client := template_manager.NewTemplateServiceClient(conn) - - return &GRPCClient{Client: client, connection: conn}, nil -} - -func (a *GRPCClient) Close() error { - err := a.connection.Close() - if err != nil { - return fmt.Errorf("failed to close connection: %w", err) + client := &grpclient.GRPCClient{ + Sandbox: nil, + Info: infogrpc.NewInfoServiceClient(conn), + Template: templatemanagergrpc.NewTemplateServiceClient(conn), + Connection: conn, } - return nil + return client, nil } diff --git a/packages/api/internal/template-manager/create_template.go b/packages/api/internal/template-manager/create_template.go deleted file mode 100644 index 01172fd..0000000 --- a/packages/api/internal/template-manager/create_template.go +++ /dev/null @@ -1,121 +0,0 @@ -package template_manager - -import ( - "context" - _ "embed" - "fmt" - "io" - "strconv" - - "github.com/google/uuid" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/trace" - - "github.com/e2b-dev/infra/packages/api/internal/api" - "github.com/e2b-dev/infra/packages/api/internal/cache/builds" - "github.com/e2b-dev/infra/packages/api/internal/sandbox" - "github.com/e2b-dev/infra/packages/api/internal/utils" - "github.com/e2b-dev/infra/packages/shared/pkg/db" - "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" - "github.com/e2b-dev/infra/packages/shared/pkg/storage" - "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" -) - -func (tm *TemplateManager) CreateTemplate( - t trace.Tracer, - ctx context.Context, - db *db.DB, - buildCache *builds.BuildCache, - templateID string, - buildID uuid.UUID, - kernelVersion, - firecrackerVersion, - startCommand string, - vCpuCount, - diskSizeMB, - memoryMB int64, -) error { - childCtx, childSpan := t.Start(ctx, "create-template", - trace.WithAttributes( - attribute.String("env.id", templateID), - ), - ) - defer childSpan.End() - - features, err := sandbox.NewVersionInfo(firecrackerVersion) - if err != nil { - errMsg := fmt.Errorf("failed to get features for firecracker version '%s': %w", firecrackerVersion, err) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "Got FC version info") - - logs, err := tm.grpc.Client.TemplateCreate(ctx, &template_manager.TemplateCreateRequest{ - Template: &template_manager.TemplateConfig{ - TemplateID: templateID, - BuildID: buildID.String(), - VCpuCount: int32(vCpuCount), - MemoryMB: int32(memoryMB), - DiskSizeMB: int32(diskSizeMB), - KernelVersion: kernelVersion, - FirecrackerVersion: firecrackerVersion, - HugePages: features.HasHugePages(), - StartCommand: startCommand, - }, - }) - err = utils.UnwrapGRPCError(err) - if err != nil { - return fmt.Errorf("failed to create template '%s': %w", templateID, err) - } - - // Wait for the build to finish and save logs - for { - log, receiveErr := logs.Recv() - if receiveErr == io.EOF { - break - } else if receiveErr != nil { - // There was an error during the build - return fmt.Errorf("error when building env: %w", receiveErr) - - } - logErr := buildCache.Append(templateID, buildID, log.Log) - if logErr != nil { - // There was an error saving the logs, the build wasn't found - return fmt.Errorf("error when saving docker build logs: %w", logErr) - } - } - - trailer := logs.Trailer() - rootfsSizeStr, ok := trailer[storage.RootfsSizeKey] - if !ok { - return fmt.Errorf("rootfs size not found in trailer") - } - - diskSize, parseErr := strconv.ParseInt(rootfsSizeStr[0], 10, 64) - if parseErr != nil { - return fmt.Errorf("error when parsing rootfs size: %w", parseErr) - } - - envdVersion, ok := trailer[storage.EnvdVersionKey] - if !ok { - return fmt.Errorf("envd version not found in trailer") - } - - err = db.FinishEnvBuild(childCtx, templateID, buildID, diskSize, envdVersion[0]) - if err != nil { - return fmt.Errorf("error when finishing build: %w", err) - } - - telemetry.ReportEvent(childCtx, "created new environment", attribute.String("env.id", templateID)) - - cacheErr := buildCache.SetDone(templateID, buildID, api.TemplateBuildStatusReady) - if cacheErr != nil { - err = fmt.Errorf("error when setting build done in logs: %w", cacheErr) - telemetry.ReportCriticalError(childCtx, cacheErr) - } - - telemetry.ReportEvent(childCtx, "Template build started") - - return nil -} diff --git a/packages/api/internal/template-manager/delete_template.go b/packages/api/internal/template-manager/delete_template.go deleted file mode 100644 index e52ed73..0000000 --- a/packages/api/internal/template-manager/delete_template.go +++ /dev/null @@ -1,35 +0,0 @@ -package template_manager - -import ( - "context" - "fmt" - - "github.com/e2b-dev/infra/packages/api/internal/utils" - template_manager "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" - "github.com/google/uuid" -) - -func (tm *TemplateManager) DeleteBuild(ctx context.Context, templateId string, buildId uuid.UUID) error { - _, err := tm.grpc.Client.TemplateBuildDelete(ctx, &template_manager.TemplateBuildDeleteRequest{ - BuildID: buildId.String(), - TemplateID: templateId, - }) - - err = utils.UnwrapGRPCError(err) - if err != nil { - return fmt.Errorf("failed to delete env build '%s': %w", buildId.String(), err) - } - - return nil -} - -func (tm *TemplateManager) DeleteBuilds(ctx context.Context, templateId string, buildIds []uuid.UUID) error { - for _, buildId := range buildIds { - err := tm.DeleteBuild(ctx, templateId, buildId) - if err != nil { - return fmt.Errorf("failed to delete env build '%s': %w", buildId, err) - } - } - - return nil -} diff --git a/packages/api/internal/template-manager/logs.go b/packages/api/internal/template-manager/logs.go new file mode 100644 index 0000000..f44c637 --- /dev/null +++ b/packages/api/internal/template-manager/logs.go @@ -0,0 +1,114 @@ +package template_manager + +import ( + "context" + "encoding/json" + "errors" + "fmt" + "strings" + "time" + + loki "github.com/grafana/loki/pkg/logcli/client" + "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/pkg/logproto" + "go.uber.org/zap" + + api "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +const ( + lokiTemplateBuildLogsLimit = 1_000 + lokiTemplateBuildOldestLogsLimit = 24 * time.Hour // 1 day +) + +type PlacementLogsProvider interface { + GetLogs(ctx context.Context, buildId string, templateId string, offset *int32) ([]string, error) +} + +type LokiPlacementLogsProvider struct { + lokiClient *loki.DefaultClient +} + +type ClusterPlacementLogsProvider struct { + edgeHttpClient *api.ClientWithResponses + nodeID string +} + +func NewClusterPlacementLogsProvider(edgeHttpClient *api.ClientWithResponses, nodeID string) PlacementLogsProvider { + return &ClusterPlacementLogsProvider{edgeHttpClient: edgeHttpClient, nodeID: nodeID} +} + +func (l *ClusterPlacementLogsProvider) GetLogs(ctx context.Context, buildID string, templateID string, offset *int32) ([]string, error) { + res, err := l.edgeHttpClient.V1TemplateBuildLogsWithResponse( + ctx, buildID, &api.V1TemplateBuildLogsParams{TemplateID: templateID, OrchestratorID: l.nodeID, Offset: offset}, + ) + if err != nil { + return nil, fmt.Errorf("failed to get build logs in template manager: %w", err) + } + + if res.StatusCode() != 200 { + zap.L().Error("failed to get build logs in template manager", zap.String("body", string(res.Body))) + return nil, errors.New("failed to get build logs in template manager") + } + + return res.JSON200.Logs, nil +} + +func NewLokiPlacementLogsProvider(lokiClient *loki.DefaultClient) PlacementLogsProvider { + return &LokiPlacementLogsProvider{lokiClient: lokiClient} +} + +func (l *LokiPlacementLogsProvider) GetLogs(ctx context.Context, buildID string, templateID string, offset *int32) ([]string, error) { + if l.lokiClient == nil { + return nil, fmt.Errorf("loki edgeHttpClient is not configured") + } + + // Sanitize env ID + // https://grafana.com/blog/2021/01/05/how-to-escape-special-characters-with-lokis-logql/ + templateIdSanitized := strings.ReplaceAll(templateID, "`", "") + query := fmt.Sprintf("{service=\"template-manager\", buildID=\"%s\", envID=`%s`}", buildID, templateIdSanitized) + + end := time.Now() + start := end.Add(-lokiTemplateBuildOldestLogsLimit) + logs := make([]string, 0) + + res, err := l.lokiClient.QueryRange(query, lokiTemplateBuildLogsLimit, start, end, logproto.FORWARD, time.Duration(0), time.Duration(0), true) + if err == nil { + logsCrawled := 0 + logsOffset := 0 + if offset != nil { + logsOffset = int(*offset) + } + + if res.Data.Result.Type() != loghttp.ResultTypeStream { + zap.L().Error("unexpected value type received from loki query fetch", zap.String("type", string(res.Data.Result.Type()))) + return nil, fmt.Errorf("unexpected value type received from loki query fetch") + } + + for _, stream := range res.Data.Result.(loghttp.Streams) { + for _, entry := range stream.Entries { + logsCrawled++ + + // loki does not support offset pagination, so we need to skip logs manually + if logsCrawled <= logsOffset { + continue + } + + line := make(map[string]interface{}) + err := json.Unmarshal([]byte(entry.Line), &line) + if err != nil { + zap.L().Error("error parsing log line", zap.Error(err), logger.WithBuildID(buildID), zap.String("line", entry.Line)) + } + + logs = append(logs, line["message"].(string)) + } + } + } else { + telemetry.ReportError(ctx, "error when returning logs for template build", err) + zap.L().Error("error when returning logs for template build", zap.Error(err), logger.WithBuildID(buildID)) + } + + return logs, nil +} diff --git a/packages/api/internal/template-manager/template_manager.go b/packages/api/internal/template-manager/template_manager.go index ed84e1d..1229cbc 100644 --- a/packages/api/internal/template-manager/template_manager.go +++ b/packages/api/internal/template-manager/template_manager.go @@ -1,20 +1,327 @@ package template_manager +import ( + "context" + "errors" + "fmt" + "sync" + "time" + + "github.com/google/uuid" + loki "github.com/grafana/loki/pkg/logcli/client" + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + "google.golang.org/grpc/metadata" + + templatecache "github.com/e2b-dev/infra/packages/api/internal/cache/templates" + "github.com/e2b-dev/infra/packages/api/internal/edge" + grpclient "github.com/e2b-dev/infra/packages/api/internal/grpc" + "github.com/e2b-dev/infra/packages/api/internal/sandbox" + "github.com/e2b-dev/infra/packages/api/internal/utils" + sqlcdb "github.com/e2b-dev/infra/packages/db/client" + "github.com/e2b-dev/infra/packages/db/queries" + "github.com/e2b-dev/infra/packages/shared/pkg/db" + infogrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" + templatemanagergrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +type processingBuilds struct { + templateID string +} + type TemplateManager struct { - grpc *GRPCClient + grpc *grpclient.GRPCClient + edgePool *edge.Pool + db *db.DB + + lock sync.Mutex + tracer trace.Tracer + processing map[uuid.UUID]processingBuilds + buildCache *templatecache.TemplatesBuildCache + lokiClient *loki.DefaultClient + sqlcDB *sqlcdb.Client + + localClient *grpclient.GRPCClient + localClientMutex sync.RWMutex + localClientStatus infogrpc.ServiceInfoStatus +} + +type DeleteBuild struct { + BuildID uuid.UUID + TemplateID string + + ClusterID *uuid.UUID + ClusterNodeID *string } -func New() (*TemplateManager, error) { - client, err := NewClient() +const ( + syncInterval = time.Minute * 1 +) + +var ErrLocalTemplateManagerNotAvailable = errors.New("local template manager is not available") + +func New(ctx context.Context, tracer trace.Tracer, tracerProvider trace.TracerProvider, meterProvider metric.MeterProvider, db *db.DB, sqlcDB *sqlcdb.Client, edgePool *edge.Pool, lokiClient *loki.DefaultClient, buildCache *templatecache.TemplatesBuildCache) (*TemplateManager, error) { + client, err := createClient(tracerProvider, meterProvider) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to establish GRPC connection: %w", err) + } + + tm := &TemplateManager{ + grpc: client, + db: db, + sqlcDB: sqlcDB, + tracer: tracer, + buildCache: buildCache, + edgePool: edgePool, + lokiClient: lokiClient, + + localClient: client, + localClientMutex: sync.RWMutex{}, + localClientStatus: infogrpc.ServiceInfoStatus_OrchestratorUnhealthy, + + lock: sync.Mutex{}, + processing: make(map[uuid.UUID]processingBuilds), } - return &TemplateManager{ - grpc: client, - }, nil + // Periodically check for local template manager health status + go tm.localClientPeriodicHealthSync(ctx) + + return tm, nil } func (tm *TemplateManager) Close() error { return tm.grpc.Close() } + +func (tm *TemplateManager) BuildsStatusPeriodicalSync(ctx context.Context) { + ticker := time.NewTicker(syncInterval) + for { + select { + case <-ctx.Done(): + return + case <-ticker.C: + dbCtx, dbxCtxCancel := context.WithTimeout(ctx, 5*time.Second) + buildsRunning, err := tm.sqlcDB.GetInProgressTemplateBuilds(dbCtx) + if err != nil { + zap.L().Error("Error getting running builds for periodical sync", zap.Error(err)) + dbxCtxCancel() + continue + } + + zap.L().Info("Running periodical sync of builds statuses", zap.Int("count", len(buildsRunning))) + for _, b := range buildsRunning { + go func(b queries.GetInProgressTemplateBuildsRow) { + err := tm.BuildStatusSync(ctx, b.EnvBuild.ID, b.Env.ID, b.Team.ClusterID, b.EnvBuild.ClusterNodeID) + if err != nil { + zap.L().Error("Error syncing build status", zap.Error(err), zap.String("buildID", b.EnvBuild.ID.String())) + } + }(b) + } + + dbxCtxCancel() + } + } +} + +func (tm *TemplateManager) getBuilderClient(clusterID *uuid.UUID, nodeID *string, placement bool) (*grpclient.GRPCClient, metadata.MD, PlacementLogsProvider, error) { + if clusterID == nil || nodeID == nil { + tm.localClientMutex.RLock() + defer tm.localClientMutex.RUnlock() + + zap.L().Info("使用本地template manager", + zap.Bool("placement", placement), + zap.String("localClientStatus", tm.GetLocalClientStatus().String()), + zap.String("templateManagerHost", templateManagerHost)) + + // build placement requires healthy template builder + if placement && tm.GetLocalClientStatus() != infogrpc.ServiceInfoStatus_OrchestratorHealthy { + zap.L().Error("本地template manager不健康，无法用于放置新构建", + zap.String("status", tm.GetLocalClientStatus().String())) + return nil, nil, nil, ErrLocalTemplateManagerNotAvailable + } + + // for getting build information only not valid state is getting already unhealthy builder + if tm.GetLocalClientStatus() == infogrpc.ServiceInfoStatus_OrchestratorUnhealthy { + zap.L().Error("本地template manager不健康") + return nil, nil, nil, ErrLocalTemplateManagerNotAvailable + } + + meta := metadata.New(map[string]string{}) + logs := NewLokiPlacementLogsProvider(tm.lokiClient) + return tm.grpc, meta, logs, nil + } + + zap.L().Info("使用集群template manager", + zap.String("clusterID", clusterID.String()), + zap.String("nodeID", *nodeID)) + + cluster, ok := tm.edgePool.GetClusterById(*clusterID) + if !ok { + zap.L().Error("找不到集群", zap.String("clusterID", clusterID.String())) + return nil, nil, nil, errors.New("cluster not found") + } + + node, err := cluster.GetTemplateBuilderByID(*nodeID) + if err != nil { + zap.L().Error("无法通过ID获取构建器", + zap.String("nodeID", *nodeID), + zap.Error(err)) + return nil, nil, nil, fmt.Errorf("failed to get builder by id '%s': %w", *nodeID, err) + } + + logs := NewClusterPlacementLogsProvider(cluster.GetHttpClient(), *nodeID) + client, clientMetadata := cluster.GetGrpcClient(node.ServiceInstanceID) + + return client, clientMetadata, logs, nil +} + +func (tm *TemplateManager) DeleteBuild(ctx context.Context, t trace.Tracer, buildID uuid.UUID, templateID string, clusterID *uuid.UUID, clusterNodeID *string) error { + ctx, span := t.Start(ctx, "delete-template", + trace.WithAttributes( + telemetry.WithBuildID(buildID.String()), + ), + ) + defer span.End() + + client, clientMd, _, err := tm.getBuilderClient(clusterID, clusterNodeID, false) + if err != nil { + return fmt.Errorf("failed to get builder edgeHttpClient: %w", err) + } + + reqCtx := metadata.NewOutgoingContext(ctx, clientMd) + _, err = client.Template.TemplateBuildDelete( + reqCtx, &templatemanagergrpc.TemplateBuildDeleteRequest{ + BuildID: buildID.String(), + TemplateID: templateID, + }, + ) + + err = utils.UnwrapGRPCError(err) + if err != nil { + return fmt.Errorf("failed to delete env build '%s': %w", buildID, err) + } + + return nil +} + +func (tm *TemplateManager) DeleteBuilds(ctx context.Context, builds []DeleteBuild) error { + for _, build := range builds { + err := tm.DeleteBuild(ctx, tm.tracer, build.BuildID, build.TemplateID, build.ClusterID, build.ClusterNodeID) + if err != nil { + return fmt.Errorf("failed to delete env build '%s': %w", build.BuildID, err) + } + } + + return nil +} + +func (tm *TemplateManager) CreateTemplate(t trace.Tracer, ctx context.Context, templateID string, buildID uuid.UUID, kernelVersion, firecrackerVersion, startCommand string, vCpuCount, diskSizeMB, memoryMB int64, readyCommand string, clusterID *uuid.UUID, clusterNodeID *string) error { + ctx, span := t.Start(ctx, "create-template", + trace.WithAttributes( + telemetry.WithTemplateID(templateID), + ), + ) + defer span.End() + + zap.L().Info("开始创建模板 - template-manager", + zap.String("templateID", templateID), + zap.String("buildID", buildID.String()), + zap.String("templateManagerHost", templateManagerHost)) + + features, err := sandbox.NewVersionInfo(firecrackerVersion) + if err != nil { + zap.L().Error("获取Firecracker版本特性失败", + zap.String("firecrackerVersion", firecrackerVersion), + zap.Error(err)) + return fmt.Errorf("failed to get features for firecracker version '%s': %w", firecrackerVersion, err) + } + + zap.L().Info("获取builder客户端", + zap.String("templateID", templateID), + zap.String("buildID", buildID.String()), + zap.Bool("hasClusterID", clusterID != nil), + zap.Bool("hasClusterNodeID", clusterNodeID != nil)) + + client, clientMd, _, err := tm.getBuilderClient(clusterID, clusterNodeID, true) + if err != nil { + zap.L().Error("获取builder客户端失败", + zap.String("templateID", templateID), + zap.String("buildID", buildID.String()), + zap.Error(err)) + return fmt.Errorf("failed to get builder edgeHttpClient: %w", err) + } + + zap.L().Info("准备发送模板创建请求", + zap.String("templateID", templateID), + zap.String("buildID", buildID.String())) + + reqCtx := metadata.NewOutgoingContext(ctx, clientMd) + _, err = client.Template.TemplateCreate( + reqCtx, &templatemanagergrpc.TemplateCreateRequest{ + Template: &templatemanagergrpc.TemplateConfig{ + TemplateID: templateID, + BuildID: buildID.String(), + VCpuCount: int32(vCpuCount), + MemoryMB: int32(memoryMB), + DiskSizeMB: int32(diskSizeMB), + KernelVersion: kernelVersion, + FirecrackerVersion: firecrackerVersion, + HugePages: features.HasHugePages(), + StartCommand: startCommand, + ReadyCommand: readyCommand, + }, + }, + ) + + if err != nil { + zap.L().Error("发送模板创建请求失败", + zap.String("templateID", templateID), + zap.String("buildID", buildID.String()), + zap.Error(err)) + err = utils.UnwrapGRPCError(err) + return fmt.Errorf("failed to create template '%s': %w", templateID, err) + } + + zap.L().Info("模板创建请求发送成功", + zap.String("templateID", templateID), + zap.String("buildID", buildID.String())) + + telemetry.ReportEvent(ctx, "Template build started") + return nil +} + +func (tm *TemplateManager) GetStatus(ctx context.Context, buildID uuid.UUID, templateID string, clusterID *uuid.UUID, clusterNodeID *string) (*templatemanagergrpc.TemplateBuildStatusResponse, error) { + client, clientMd, _, err := tm.getBuilderClient(clusterID, clusterNodeID, false) + if err != nil { + return nil, fmt.Errorf("failed to get builder edgeHttpClient: %w", err) + } + + reqCtx := metadata.NewOutgoingContext(ctx, clientMd) + + // error unwrapping is done in the caller + return client.Template.TemplateBuildStatus( + reqCtx, + &templatemanagergrpc.TemplateStatusRequest{ + BuildID: buildID.String(), TemplateID: templateID, + }, + ) +} + +func (tm *TemplateManager) GetLogs(ctx context.Context, buildID uuid.UUID, templateID string, clusterID *uuid.UUID, clusterNodeID *string, offset *int32) ([]string, error) { + ctx, span := tm.tracer.Start(ctx, "get-build-logs", + trace.WithAttributes( + telemetry.WithTemplateID(templateID), + telemetry.WithBuildID(buildID.String()), + ), + ) + defer span.End() + + _, _, logs, err := tm.getBuilderClient(clusterID, clusterNodeID, false) + if err != nil { + return nil, fmt.Errorf("failed to get builder edgeHttpClient: %w", err) + } + + return logs.GetLogs(ctx, buildID.String(), templateID, offset) +} diff --git a/packages/api/internal/template-manager/template_manager_local.go b/packages/api/internal/template-manager/template_manager_local.go new file mode 100644 index 0000000..aabf237 --- /dev/null +++ b/packages/api/internal/template-manager/template_manager_local.go @@ -0,0 +1,77 @@ +package template_manager + +import ( + "context" + "time" + + "go.uber.org/zap" + "google.golang.org/protobuf/types/known/emptypb" + + "github.com/e2b-dev/infra/packages/api/internal/utils" + orchestratorinfo "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" +) + +var ( + healthCheckInterval = 5 * time.Second + healthCheckTimeout = 5 * time.Second +) + +func (tm *TemplateManager) localClientPeriodicHealthSync(ctx context.Context) { + // Initial health check to set the initial status + tm.localClientHealthSync(ctx) + + ticker := time.NewTicker(healthCheckInterval) + defer ticker.Stop() + + for { + select { + case <-ctx.Done(): + return + case <-ticker.C: + tm.localClientHealthSync(ctx) + } + } +} + +func (tm *TemplateManager) localClientHealthSync(ctx context.Context) { + zap.L().Debug("开始检查template manager健康状态", + zap.String("templateManagerHost", templateManagerHost)) + + reqCtx, reqCtxCancel := context.WithTimeout(ctx, healthCheckTimeout) + res, err := tm.localClient.Info.ServiceInfo(reqCtx, &emptypb.Empty{}) + reqCtxCancel() + + err = utils.UnwrapGRPCError(err) + if err != nil { + zap.L().Error("获取template manager健康状态失败", + zap.String("templateManagerHost", templateManagerHost), + zap.Error(err)) + tm.setLocalClientStatus(orchestratorinfo.ServiceInfoStatus_OrchestratorUnhealthy) + return + } + + zap.L().Debug("成功获取template manager健康状态", + zap.String("templateManagerHost", templateManagerHost), + zap.String("status", res.ServiceStatus.String())) + tm.setLocalClientStatus(res.ServiceStatus) +} + +func (tm *TemplateManager) setLocalClientStatus(s orchestratorinfo.ServiceInfoStatus) { + tm.localClientMutex.Lock() + defer tm.localClientMutex.Unlock() + + oldStatus := tm.localClientStatus + tm.localClientStatus = s + + if oldStatus != s { + zap.L().Info("template manager健康状态变更", + zap.String("oldStatus", oldStatus.String()), + zap.String("newStatus", s.String())) + } +} + +func (tm *TemplateManager) GetLocalClientStatus() orchestratorinfo.ServiceInfoStatus { + tm.localClientMutex.RLock() // 改为读锁 + defer tm.localClientMutex.RUnlock() + return tm.localClientStatus +} diff --git a/packages/api/internal/template-manager/template_manager_test.go b/packages/api/internal/template-manager/template_manager_test.go new file mode 100644 index 0000000..885d3f7 --- /dev/null +++ b/packages/api/internal/template-manager/template_manager_test.go @@ -0,0 +1,297 @@ +package template_manager + +import ( + "context" + "testing" + + "github.com/google/uuid" + "github.com/pkg/errors" + "go.uber.org/zap" + + templatemanagergrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" + "github.com/e2b-dev/infra/packages/shared/pkg/models/envbuild" +) + +type fakeTemplateManagerClient struct { + setStatusError error + setFinishedError error + + getStatusResponse *templatemanagergrpc.TemplateBuildStatusResponse + getStatusErr error +} + +func (f fakeTemplateManagerClient) SetStatus(ctx context.Context, templateID string, buildID uuid.UUID, status envbuild.Status, reason string) error { + return f.setStatusError +} + +func (f fakeTemplateManagerClient) SetFinished(ctx context.Context, templateID string, buildID uuid.UUID, rootfsSize int64, envdVersion string) error { + return f.setFinishedError +} + +func (f fakeTemplateManagerClient) GetStatus(ctx context.Context, buildID uuid.UUID, templateID string, clusterID *uuid.UUID, clusterNodeID *string) (*templatemanagergrpc.TemplateBuildStatusResponse, error) { + return f.getStatusResponse, f.getStatusErr +} + +func TestPollBuildStatus_setStatus(t *testing.T) { + type fields struct { + buildID uuid.UUID + templateManagerClient *fakeTemplateManagerClient + } + + tests := []struct { + name string + fields fields + wantErr bool + status *templatemanagergrpc.TemplateBuildStatusResponse + err error + }{ + { + name: "should return error if status is nil", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{ + getStatusResponse: nil, + }, + buildID: uuid.New(), + }, + wantErr: true, + }, + // return context deadline exceeded + { + name: "should return context deadline exceeded", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{ + getStatusErr: errors.New("context deadline exceeded"), + }, + }, + wantErr: true, + status: nil, + }, + // if error is not context deadline exceeded, return error + { + name: "should return error if error is not context deadline exceeded", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{ + getStatusErr: errors.New("some other error"), + }, + }, + wantErr: true, + status: nil, + }, + // if status client present and err is nil, return nil + { + name: "should return nil if status client present and err is nil", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{ + getStatusErr: nil, + getStatusResponse: &templatemanagergrpc.TemplateBuildStatusResponse{ + Status: templatemanagergrpc.TemplateBuildState_Completed, + }, + }, + }, + wantErr: false, + status: &templatemanagergrpc.TemplateBuildStatusResponse{ + Status: templatemanagergrpc.TemplateBuildState_Completed, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + c := &PollBuildStatus{ + client: tt.fields.templateManagerClient, + logger: zap.NewNop(), + } + err := c.setStatus(context.TODO()) + if tt.wantErr { + if err == nil { + t.Errorf("PollBuildStatus.getSetStatusFn() = %v", err) + } + } + if !tt.wantErr { + if err != nil { + t.Errorf("PollBuildStatus.getSetStatusFn() = %v", err) + } + } + if tt.status.GetStatus() != c.status.GetStatus() { + t.Errorf("PollBuildStatus.getSetStatusFn() = %v, want %v", c.status, tt.status) + } + }) + } +} + +func TestPollBuildStatus_dispatchBasedOnStatus(t *testing.T) { + type fields struct { + templateManagerClient *fakeTemplateManagerClient + } + type args struct { + status *templatemanagergrpc.TemplateBuildStatusResponse + } + tests := []struct { + name string + fields fields + args args + wantCompleteState bool + wantErr bool + }{ + { + name: "should return error if status is nil", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{}, + }, + args: args{ + status: nil, + }, + wantCompleteState: false, + wantErr: true, + }, + { + name: "should handle failed status", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{ + setStatusError: errors.New("failed to set status"), + }, + }, + args: args{ + status: &templatemanagergrpc.TemplateBuildStatusResponse{ + Status: templatemanagergrpc.TemplateBuildState_Failed, + }, + }, + wantCompleteState: false, + wantErr: true, + }, + { + name: "should handle completed status with nil metadata", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{}, + }, + args: args{ + status: &templatemanagergrpc.TemplateBuildStatusResponse{ + Status: templatemanagergrpc.TemplateBuildState_Completed, + }, + }, + wantCompleteState: false, + wantErr: true, + }, + { + name: "should handle completed status successfully", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{ + setFinishedError: errors.New("failed to set finished"), + }, + }, + args: args{ + status: &templatemanagergrpc.TemplateBuildStatusResponse{ + Status: templatemanagergrpc.TemplateBuildState_Completed, + Metadata: &templatemanagergrpc.TemplateBuildMetadata{ + RootfsSizeKey: 100, + EnvdVersionKey: "1.0.0", + }, + }, + }, + wantCompleteState: false, + wantErr: true, + }, + { + name: "should not send to done channel for building status", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{}, + }, + args: args{ + status: &templatemanagergrpc.TemplateBuildStatusResponse{ + Status: templatemanagergrpc.TemplateBuildState_Building, + }, + }, + wantCompleteState: false, + wantErr: false, + }, + // should not get error when no error setting status + { + name: "should not get error when no error setting status", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{}, + }, + args: args{ + status: &templatemanagergrpc.TemplateBuildStatusResponse{ + Status: templatemanagergrpc.TemplateBuildState_Building, + }, + }, + wantErr: false, + wantCompleteState: false, + }, + // should not get error when no error setting finished + { + name: "should not get error when no error setting finished", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{}, + }, + args: args{ + status: &templatemanagergrpc.TemplateBuildStatusResponse{ + Status: templatemanagergrpc.TemplateBuildState_Completed, + Metadata: &templatemanagergrpc.TemplateBuildMetadata{ + RootfsSizeKey: 100, + EnvdVersionKey: "1.0.0", + }, + }, + }, + wantErr: false, + wantCompleteState: true, + }, + // should error when nil metadata + { + name: "should error when nil metadata", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{}, + }, + args: args{ + status: &templatemanagergrpc.TemplateBuildStatusResponse{ + Status: templatemanagergrpc.TemplateBuildState_Completed, + }, + }, + wantErr: true, + wantCompleteState: false, + }, + // should not error when status is failure + { + name: "should not error when status is failure", + fields: fields{ + templateManagerClient: &fakeTemplateManagerClient{}, + }, + args: args{ + status: &templatemanagergrpc.TemplateBuildStatusResponse{ + Status: templatemanagergrpc.TemplateBuildState_Failed, + }, + }, + + wantErr: false, + wantCompleteState: true, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + c := &PollBuildStatus{ + client: tt.fields.templateManagerClient, + logger: zap.NewNop(), + } + + err, completed := c.dispatchBasedOnStatus(context.TODO(), tt.args.status) + if tt.wantErr { + if err == nil { + t.Errorf("Expected error, got no error") + } + } else { + if err != nil { + t.Errorf("Expected no error, got %v", err) + } + } + + if tt.wantCompleteState { + if !completed { + t.Errorf("Expected completed, got failure") + } + } else { + if completed { + t.Errorf("Expected failure, got completed") + } + } + }) + } +} diff --git a/packages/api/internal/template-manager/template_status.go b/packages/api/internal/template-manager/template_status.go new file mode 100644 index 0000000..c81f5c8 --- /dev/null +++ b/packages/api/internal/template-manager/template_status.go @@ -0,0 +1,247 @@ +package template_manager + +import ( + "context" + "fmt" + "time" + + "github.com/flowchartsman/retry" + "github.com/google/uuid" + "github.com/pkg/errors" + "go.uber.org/zap" + + templatemanagergrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" + "github.com/e2b-dev/infra/packages/shared/pkg/models/envbuild" +) + +var ( + syncTimeout = time.Minute * 15 + syncWaitingStateDeadline = time.Minute * 40 +) + +func (tm *TemplateManager) BuildStatusSync(ctx context.Context, buildID uuid.UUID, templateID string, clusterID *uuid.UUID, clusterNodeID *string) error { + childCtx, childCtxCancel := context.WithTimeout(ctx, syncTimeout) + defer childCtxCancel() + + if tm.createInProcessingQueue(buildID, templateID) { + // already processing, skip + return nil + } + + // remove from processing queue when done + defer tm.removeFromProcessingQueue(buildID) + + envBuildDb, err := tm.db.GetEnvBuild(childCtx, buildID) + if err != nil { + return fmt.Errorf("failed to get env build: %w", err) + } + + // waiting for build to start, local docker build and push can take some time + // so just check if it's not too long + if envBuildDb.Status == envbuild.StatusWaiting { + // if waiting for too long, fail the build + if time.Since(envBuildDb.CreatedAt) > syncWaitingStateDeadline { + err = tm.SetStatus(childCtx, templateID, buildID, envbuild.StatusFailed, "build is in waiting state for too long") + return fmt.Errorf("build is in waiting state for too long, failing it: %w", err) + } + + // just wait for next sync + return nil + } + + checker := &PollBuildStatus{ + client: tm, + logger: zap.L().With(logger.WithBuildID(buildID.String()), logger.WithTemplateID(templateID)), + + templateID: templateID, + buildID: buildID, + + clusterID: clusterID, + clusterNodeID: clusterNodeID, + } + + checker.poll(ctx) + return nil +} + +type templateManagerClient interface { + SetStatus(ctx context.Context, templateID string, buildID uuid.UUID, status envbuild.Status, reason string) error + SetFinished(ctx context.Context, templateID string, buildID uuid.UUID, rootfsSize int64, envdVersion string) error + GetStatus(ctx context.Context, buildId uuid.UUID, templateID string, clusterID *uuid.UUID, clusterNodeID *string) (*templatemanagergrpc.TemplateBuildStatusResponse, error) +} + +type PollBuildStatus struct { + logger *zap.Logger + client templateManagerClient + + templateID string + buildID uuid.UUID + + clusterID *uuid.UUID + clusterNodeID *string + + status *templatemanagergrpc.TemplateBuildStatusResponse +} + +func (c *PollBuildStatus) poll(ctx context.Context) { + ticker := time.NewTicker(time.Second) + defer ticker.Stop() + + for { + select { + case <-ctx.Done(): + return + case <-ticker.C: + c.logger.Debug("Checking template build status") + + err, buildCompleted := c.checkBuildStatus(ctx) + if err != nil { + c.logger.Error("Build status polling received unrecoverable error", zap.Error(err)) + + statusErr := c.client.SetStatus(ctx, c.templateID, c.buildID, envbuild.StatusFailed, fmt.Sprintf("polling received unrecoverable error: %s", err)) + if statusErr != nil { + c.logger.Error("error when setting build status", zap.Error(statusErr)) + } + return + } + + // build status can return empty error when build is still in progress + // this will cause fast return to avoid pooling when build is already finished + if buildCompleted { + return + } + } + } +} + +// terminalError is a terminal error that should not be retried +// set like this so that we can check for it using errors.As +type terminalError struct { + err error +} + +func (e terminalError) Error() string { + return e.err.Error() +} + +func newTerminalError(err error) error { + return terminalError{ + err: retry.Stop(errors.WithStack(err)), + } +} + +func (c *PollBuildStatus) setStatus(ctx context.Context) error { + status, err := c.client.GetStatus(ctx, c.buildID, c.templateID, c.clusterID, c.clusterNodeID) + if err != nil && errors.Is(err, context.DeadlineExceeded) { + return errors.Wrap(err, "context deadline exceeded") + } else if err != nil { // retry only on context deadline exceeded + c.logger.Error("terminal error when polling build status", zap.Error(err)) + return newTerminalError(err) + } + + if status == nil { + return errors.New("nil status") // this should never happen + } + + // debug log the status + c.logger.Debug("setting status pointer", zap.Any("status", status)) + + c.status = status + return nil +} + +func (c *PollBuildStatus) dispatchBasedOnStatus(ctx context.Context, status *templatemanagergrpc.TemplateBuildStatusResponse) (error, bool) { + if status == nil { + return errors.New("nil status"), false + } + switch status.GetStatus() { + case templatemanagergrpc.TemplateBuildState_Failed: + // build failed + err := c.client.SetStatus(ctx, c.templateID, c.buildID, envbuild.StatusFailed, "template build failed according to status") + if err != nil { + return errors.Wrap(err, "error when setting build status"), false + } + return nil, true + case templatemanagergrpc.TemplateBuildState_Completed: + // build completed + meta := status.GetMetadata() + if meta == nil { + return errors.New("nil metadata"), false + } + + err := c.client.SetFinished(ctx, c.templateID, c.buildID, int64(meta.RootfsSizeKey), meta.EnvdVersionKey) + if err != nil { + return errors.Wrap(err, "error when finishing build"), false + } + return nil, true + default: + c.logger.Debug("skipping status", zap.Any("status", status)) + return nil, false + } +} + +func (c *PollBuildStatus) checkBuildStatus(ctx context.Context) (error, bool) { + c.logger.Debug("Checking template build status") + + retrier := retry.NewRetrier( + 10, + 100*time.Millisecond, + time.Second, + ) + + err := retrier.RunContext(ctx, c.setStatus) + if err != nil { + c.logger.Error("error when calling setStatus", zap.Error(err)) + return err, false + } + + c.logger.Debug("dispatching based on status", zap.Any("status", c.status)) + + err, buildCompleted := c.dispatchBasedOnStatus(ctx, c.status) + if err != nil { + return errors.Wrap(err, "error when dispatching build status"), false + } + + return nil, buildCompleted +} + +func (tm *TemplateManager) removeFromProcessingQueue(buildID uuid.UUID) { + tm.lock.Lock() + delete(tm.processing, buildID) + tm.lock.Unlock() +} + +func (tm *TemplateManager) createInProcessingQueue(buildID uuid.UUID, templateID string) bool { + tm.lock.Lock() + defer tm.lock.Unlock() + + _, exists := tm.processing[buildID] + if exists { + // already in processing queue, skip + return true + } + + tm.processing[buildID] = processingBuilds{templateID: templateID} + return false +} + +func (tm *TemplateManager) SetStatus(ctx context.Context, templateID string, buildID uuid.UUID, status envbuild.Status, reason string) error { + // first do database update to prevent race condition while calling status + err := tm.db.EnvBuildSetStatus(ctx, templateID, buildID, status) + tm.buildCache.SetStatus(buildID, status, reason) + return err +} + +func (tm *TemplateManager) SetFinished(ctx context.Context, templateID string, buildID uuid.UUID, rootfsSize int64, envdVersion string) error { + // first do database update to prevent race condition while calling status + err := tm.db.FinishEnvBuild(ctx, templateID, buildID, rootfsSize, envdVersion) + if err != nil { + tm.buildCache.SetStatus(buildID, envbuild.StatusFailed, "error when finishing build") + return err + } + + tm.buildCache.SetStatus(buildID, envbuild.StatusUploaded, "build finished") + + return nil +} diff --git a/packages/api/internal/utils/body.go b/packages/api/internal/utils/body.go index 62921d0..adbd674 100644 --- a/packages/api/internal/utils/body.go +++ b/packages/api/internal/utils/body.go @@ -6,19 +6,17 @@ import ( "fmt" "io" - "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" - "github.com/gin-gonic/gin" + + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) func ParseBody[B any](ctx context.Context, c *gin.Context) (body B, err error) { err = c.Bind(&body) if err != nil { - bodyErr := fmt.Errorf("error when parsing request: %w", err) - - telemetry.ReportCriticalError(ctx, bodyErr) + telemetry.ReportCriticalError(ctx, "error when parsing request", err) - return body, bodyErr + return body, fmt.Errorf("error when parsing request: %w", err) } return body, nil diff --git a/packages/api/internal/utils/counter.go b/packages/api/internal/utils/counter.go index b29e0cd..ab58c25 100644 --- a/packages/api/internal/utils/counter.go +++ b/packages/api/internal/utils/counter.go @@ -2,10 +2,11 @@ package utils import ( "context" - "log" "sync" "time" + "go.uber.org/zap" + "github.com/e2b-dev/infra/packages/shared/pkg/db" ) @@ -69,7 +70,7 @@ func (t *TemplateSpawnCounter) flushCounters(dbClient *db.DB) { for templateID, counter := range updates { err := dbClient.UpdateEnvLastUsed(context.Background(), int64(counter.count), counter.lastUpdate, templateID) if err != nil { - log.Println("Error updating template spawn count:", err) + zap.L().Error("error updating template spawn count", zap.Error(err)) } } } diff --git a/packages/api/internal/utils/db.go b/packages/api/internal/utils/db.go new file mode 100644 index 0000000..65c2144 --- /dev/null +++ b/packages/api/internal/utils/db.go @@ -0,0 +1,42 @@ +package utils + +import ( + "database/sql" + "fmt" + "os" + + "github.com/pressly/goose/v3" + "go.uber.org/zap" +) + +const trackingTable = "_migrations" + +func CheckMigrationVersion(expectedMigration int64) error { + connectionString := os.Getenv("POSTGRES_CONNECTION_STRING") + db, err := sql.Open("postgres", connectionString) + if err != nil { + return fmt.Errorf("failed to connect: %w", err) + } + defer func() { + dbErr := db.Close() + if dbErr != nil { + zap.L().Error("Failed to close database connection", zap.Error(dbErr)) + } + }() + + goose.SetTableName(trackingTable) + + version, err := goose.GetDBVersion(db) + if err != nil { + return fmt.Errorf("failed to get database version: %w", err) + } + + // Check if the database version is less than the expected migration + // We allow higher versions to account for future migrations and rollbacks + if version < expectedMigration { + return fmt.Errorf("database version %d is less than expected %d", version, expectedMigration) + } + + zap.L().Info("Database version", zap.Int64("version", version), zap.Int64("expected_migration", expectedMigration)) + return nil +} diff --git a/packages/api/internal/utils/error.go b/packages/api/internal/utils/error.go index 7c404a8..a9670a0 100644 --- a/packages/api/internal/utils/error.go +++ b/packages/api/internal/utils/error.go @@ -1,15 +1,26 @@ package utils import ( + "errors" "fmt" "net/http" "strings" + "github.com/getkin/kin-openapi/openapi3" + "github.com/getkin/kin-openapi/openapi3filter" "github.com/gin-gonic/gin" + "github.com/e2b-dev/infra/packages/api/internal/auth" + "github.com/e2b-dev/infra/packages/shared/pkg/db" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) +const ( + securityErrPrefix = "error in openapi3filter.SecurityRequirementsError: security requirements failed: " + forbiddenErrPrefix = "team forbidden: " + blockedErrPrefix = "team blocked: " +) + func ErrorHandler(c *gin.Context, message string, statusCode int) { var errMsg error @@ -31,15 +42,97 @@ func ErrorHandler(c *gin.Context, message string, statusCode int) { } } - telemetry.ReportError(ctx, errMsg) + telemetry.ReportError(ctx, message, errMsg) c.Error(errMsg) - if strings.HasPrefix(message, "error in openapi3filter.SecurityRequirementsError: security requirements failed: ") { - c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"code": http.StatusUnauthorized, "message": strings.TrimPrefix(message, "error in openapi3filter.SecurityRequirementsError: security requirements failed: ")}) + // Handle forbidden errors + if strings.HasPrefix(message, forbiddenErrPrefix) { + c.AbortWithStatusJSON( + http.StatusForbidden, + gin.H{ + "code": http.StatusForbidden, + "message": strings.TrimPrefix(message, forbiddenErrPrefix), + }, + ) + + return + } + + // Handle blocked errors + if strings.HasPrefix(message, blockedErrPrefix) { + c.AbortWithStatusJSON( + http.StatusForbidden, + gin.H{ + "code": http.StatusForbidden, + "message": strings.TrimPrefix(message, blockedErrPrefix), + }, + ) + + return + } + + // Handle security requirements errors from the openapi3filter + if strings.HasPrefix(message, securityErrPrefix) { + c.AbortWithStatusJSON( + http.StatusUnauthorized, + gin.H{ + "code": http.StatusUnauthorized, + "message": strings.TrimPrefix(message, securityErrPrefix), + }, + ) return } c.AbortWithStatusJSON(statusCode, gin.H{"code": statusCode, "message": fmt.Errorf("validation error: %s", message).Error()}) } + +// MultiErrorHandler handles wrapped SecurityRequirementsError, so there are no multiple errors returned to the user. +func MultiErrorHandler(me openapi3.MultiError) error { + if len(me) == 0 { + return nil + } + err := me[0] + + // Recreate logic from oapi-codegen/gin-middleware to handle the error + // Source: https://github.com/oapi-codegen/gin-middleware/blob/main/oapi_validate.go + switch e := err.(type) { + case *openapi3filter.RequestError: + // We've got a bad request + // Split up the verbose error by lines and return the first one + // openapi errors seem to be multi-line with a decent message on the first + errorLines := strings.Split(e.Error(), "\n") + return fmt.Errorf("error in openapi3filter.RequestError: %s", errorLines[0]) + case *openapi3filter.SecurityRequirementsError: + // Return only one security requirement error (there may be multiple securitySchemes) + unwrapped := e.Errors + err = unwrapped[0] + + var teamForbidden *db.TeamForbiddenError + var teamBlocked *db.TeamBlockedError + // Return only the first non-missing authorization header error (if possible) + for _, errW := range unwrapped { + if errors.Is(errW, auth.ErrNoAuthHeader) { + continue + } + + if errors.As(errW, &teamForbidden) { + return fmt.Errorf("%s%s", forbiddenErrPrefix, err.Error()) + } + + if errors.As(errW, &teamBlocked) { + return fmt.Errorf("%s%s", blockedErrPrefix, err.Error()) + } + + err = errW + break + } + + return fmt.Errorf("%s%s", securityErrPrefix, err.Error()) + default: + // This should never happen today, but if our upstream code changes, + // we don't want to crash the server, so handle the unexpected error. + return fmt.Errorf("error validating request: %w", err) + } +} diff --git a/packages/api/internal/utils/map.go b/packages/api/internal/utils/map.go deleted file mode 100644 index a404b42..0000000 --- a/packages/api/internal/utils/map.go +++ /dev/null @@ -1,31 +0,0 @@ -package utils - -import ( - cmap "github.com/orcaman/concurrent-map/v2" -) - -type Map[V any] struct { - m cmap.ConcurrentMap[string, V] -} - -func NewMap[V any]() *Map[V] { - return &Map[V]{ - m: cmap.New[V](), - } -} - -func (m *Map[V]) Remove(key string) { - m.m.Remove(key) -} - -func (m *Map[V]) Get(key string) (V, bool) { - return m.m.Get(key) -} - -func (m *Map[V]) Insert(key string, value V) { - m.m.Set(key, value) -} - -func (m *Map[V]) Items() map[string]V { - return m.m.Items() -} diff --git a/packages/api/internal/utils/sandboxes_list.go b/packages/api/internal/utils/sandboxes_list.go new file mode 100644 index 0000000..ee8636a --- /dev/null +++ b/packages/api/internal/utils/sandboxes_list.go @@ -0,0 +1,160 @@ +package utils + +import ( + "encoding/base64" + "fmt" + "net/url" + "strings" + "time" + + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/api/internal/api" +) + +const maxSandboxID = "zzzzzzzzzzzzzzzzzzzz" + +// extend the api.ListedSandbox with a timestamp to use for pagination +type PaginatedSandbox struct { + api.ListedSandbox + PaginationTimestamp time.Time `json:"-"` +} + +func (p *PaginatedSandbox) GenerateCursor() string { + cursor := fmt.Sprintf("%s__%s", p.PaginationTimestamp.Format(time.RFC3339Nano), p.SandboxID) + return base64.URLEncoding.EncodeToString([]byte(cursor)) +} + +func ParseNextToken(token *string) (time.Time, string, error) { + if token != nil && *token != "" { + cursorTime, cursorID, err := ParseCursor(*token) + if err != nil { + return time.Time{}, "", err + } + + return cursorTime, cursorID, nil + } + + // default to all sandboxes (older than now) and always lexically after any sandbox ID (the sort is descending) + return time.Now(), maxSandboxID, nil +} + +func ParseMetadata(metadata *string) (*map[string]string, error) { + // Parse metadata filter (query) if provided + var metadataFilter *map[string]string + if metadata != nil { + parsedMetadataFilter, err := parseFilters(*metadata) + if err != nil { + zap.L().Error("Error parsing metadata", zap.Error(err)) + + return nil, fmt.Errorf("error parsing metadata: %w", err) + } + + metadataFilter = &parsedMetadataFilter + } + + return metadataFilter, nil +} + +func ParseCursor(cursor string) (time.Time, string, error) { + decoded, err := base64.URLEncoding.DecodeString(cursor) + if err != nil { + return time.Time{}, "", fmt.Errorf("error decoding cursor: %w", err) + } + + parts := strings.Split(string(decoded), "__") + if len(parts) != 2 { + return time.Time{}, "", fmt.Errorf("invalid cursor format") + } + + cursorTime, err := time.Parse(time.RFC3339Nano, parts[0]) + if err != nil { + return time.Time{}, "", fmt.Errorf("invalid timestamp format in cursor: %w", err) + } + + return cursorTime, parts[1], nil +} + +func FilterBasedOnCursor(sandboxes []PaginatedSandbox, cursorTime time.Time, cursorID string, limit int32) []PaginatedSandbox { + // Apply cursor-based filtering if cursor is provided + var filteredSandboxes []PaginatedSandbox + for _, sandbox := range sandboxes { + // Take sandboxes with start time before cursor time OR + // same start time but sandboxID greater than cursor ID (for stability) + if sandbox.StartedAt.Before(cursorTime) || + (sandbox.StartedAt.Equal(cursorTime) && sandbox.SandboxID > cursorID) { + filteredSandboxes = append(filteredSandboxes, sandbox) + } + } + sandboxes = filteredSandboxes + + // Apply limit if provided (get limit + 1 for pagination if possible) + if len(sandboxes) > int(limit) { + sandboxes = sandboxes[:limit+1] + } + + return sandboxes +} + +func FilterSandboxesOnMetadata(sandboxes []PaginatedSandbox, metadata *map[string]string) []PaginatedSandbox { + if metadata == nil { + return sandboxes + } + + // Filter instances to match all metadata + n := 0 + for _, sbx := range sandboxes { + if sbx.Metadata == nil { + continue + } + + matchesAll := true + for key, value := range *metadata { + if metadataValue, ok := (*sbx.Metadata)[key]; !ok || metadataValue != value { + matchesAll = false + break + } + } + + if matchesAll { + sandboxes[n] = sbx + n++ + } + } + + // Trim slice + sandboxes = sandboxes[:n] + + return sandboxes +} + +func parseFilters(query string) (map[string]string, error) { + query, err := url.QueryUnescape(query) + if err != nil { + return nil, fmt.Errorf("error when unescaping query: %w", err) + } + + // Parse filters, both key and value are also unescaped + filters := make(map[string]string) + + for _, filter := range strings.Split(query, "&") { + parts := strings.Split(filter, "=") + if len(parts) != 2 { + return nil, fmt.Errorf("invalid key value pair in query") + } + + key, err := url.QueryUnescape(parts[0]) + if err != nil { + return nil, fmt.Errorf("error when unescaping key: %w", err) + } + + value, err := url.QueryUnescape(parts[1]) + if err != nil { + return nil, fmt.Errorf("error when unescaping value: %w", err) + } + + filters[key] = value + } + + return filters, nil +} diff --git a/packages/api/main.go b/packages/api/main.go index a5cbf86..102febc 100644 --- a/packages/api/main.go +++ b/packages/api/main.go @@ -10,6 +10,7 @@ import ( "net/http" "os" "os/signal" + // "strconv" "sync" "sync/atomic" "syscall" @@ -19,19 +20,25 @@ import ( "github.com/getkin/kin-openapi/openapi3filter" "github.com/gin-contrib/cors" limits "github.com/gin-contrib/size" + ginzap "github.com/gin-contrib/zap" "github.com/gin-gonic/gin" + "github.com/google/uuid" middleware "github.com/oapi-codegen/gin-middleware" + "go.uber.org/zap" + "go.uber.org/zap/zapcore" "github.com/e2b-dev/infra/packages/api/internal/api" "github.com/e2b-dev/infra/packages/api/internal/auth" + authcache "github.com/e2b-dev/infra/packages/api/internal/cache/auth" "github.com/e2b-dev/infra/packages/api/internal/handlers" + customMiddleware "github.com/e2b-dev/infra/packages/api/internal/middleware" + metricsMiddleware "github.com/e2b-dev/infra/packages/api/internal/middleware/otel/metrics" + tracingMiddleware "github.com/e2b-dev/infra/packages/api/internal/middleware/otel/tracing" "github.com/e2b-dev/infra/packages/api/internal/utils" "github.com/e2b-dev/infra/packages/shared/pkg/env" + l "github.com/e2b-dev/infra/packages/shared/pkg/logger" + sbxlogger "github.com/e2b-dev/infra/packages/shared/pkg/logger/sandbox" "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" - - customMiddleware "github.com/e2b-dev/infra/packages/shared/pkg/gin_utils/middleware" - metricsMiddleware "github.com/e2b-dev/infra/packages/shared/pkg/gin_utils/middleware/otel/metrics" - tracingMiddleware "github.com/e2b-dev/infra/packages/shared/pkg/gin_utils/middleware/otel/tracing" ) const ( @@ -39,16 +46,21 @@ const ( maxMultipartMemory = 1 << 27 // 128 MiB maxUploadLimit = 1 << 28 // 256 MiB - maxReadHeaderTimeout = 60 * time.Second - maxReadTimeout = 75 * time.Second - maxWriteTimeout = 75 * time.Second + maxReadTimeout = 75 * time.Second + maxWriteTimeout = 75 * time.Second + // This timeout should be > 600 (GCP LB upstream idle timeout) to prevent race condition + // https://cloud.google.com/load-balancing/docs/https#timeouts_and_retries%23:~:text=The%20load%20balancer%27s%20backend%20keepalive,is%20greater%20than%20600%20seconds + idleTimeout = 620 * time.Second defaultPort = 80 ) -var commitSHA string +var ( + commitSHA string + // expectedMigrationTimestamp string +) -func NewGinServer(ctx context.Context, apiStore *handlers.APIStore, swagger *openapi3.T, port int) *http.Server { +func NewGinServer(ctx context.Context, tel *telemetry.Client, logger *zap.Logger, apiStore *handlers.APIStore, swagger *openapi3.T, port int) *http.Server { // Clear out the servers array in the swagger spec, that skips validating // that server names match. We don't know how this thing will be run. swagger.Servers = nil @@ -57,18 +69,19 @@ func NewGinServer(ctx context.Context, apiStore *handlers.APIStore, swagger *ope r.Use( // We use custom otel gin middleware because we want to log 4xx errors in the otel - customMiddleware.ExcludeRoutes(tracingMiddleware.Middleware(serviceName), + customMiddleware.ExcludeRoutes( + tracingMiddleware.Middleware(tel.TracerProvider, serviceName), "/health", "/sandboxes/:sandboxID/refreshes", "/templates/:templateID/builds/:buildID/logs", "/templates/:templateID/builds/:buildID/status", ), - customMiddleware.IncludeRoutes(metricsMiddleware.Middleware(serviceName), "/sandboxes"), - customMiddleware.ExcludeRoutes(gin.LoggerWithWriter(gin.DefaultWriter), - "/health", - "/sandboxes/:sandboxID/refreshes", - "/templates/:templateID/builds/:buildID/logs", - "/templates/:templateID/builds/:buildID/status", + customMiddleware.IncludeRoutes( + metricsMiddleware.Middleware(tel.MeterProvider, serviceName), + "/sandboxes", + "/sandboxes/:sandboxID", + "/sandboxes/:sandboxID/pause", + "/sandboxes/:sandboxID/resume", ), gin.Recovery(), ) @@ -84,6 +97,9 @@ func NewGinServer(ctx context.Context, apiStore *handlers.APIStore, swagger *ope // API Key header "Authorization", "X-API-Key", + // Supabase headers + "X-Supabase-Token", + "X-Supabase-Team", // Custom headers sent from SDK "browser", "lang", @@ -104,6 +120,8 @@ func NewGinServer(ctx context.Context, apiStore *handlers.APIStore, swagger *ope apiStore.Tracer, apiStore.GetTeamFromAPIKey, apiStore.GetUserFromAccessToken, + apiStore.GetUserIDFromSupabaseToken, + apiStore.GetTeamFromSupabaseToken, ) // Use our validation middleware to check all requests against the @@ -112,31 +130,66 @@ func NewGinServer(ctx context.Context, apiStore *handlers.APIStore, swagger *ope limits.RequestSizeLimiter(maxUploadLimit), middleware.OapiRequestValidatorWithOptions(swagger, &middleware.Options{ - ErrorHandler: utils.ErrorHandler, + ErrorHandler: utils.ErrorHandler, + MultiErrorHandler: utils.MultiErrorHandler, Options: openapi3filter.Options{ AuthenticationFunc: AuthenticationFunc, + // Handle multiple errors as MultiError type + MultiError: true, }, }), ) + r.Use( + // Request logging must be executed after authorization (if required) is done, + // so that we can log team ID. + customMiddleware.ExcludeRoutes( + func(c *gin.Context) { + teamID := "" + + // Get team from context, use TeamContextKey + teamInfo := c.Value(auth.TeamContextKey) + if teamInfo != nil { + teamID = teamInfo.(authcache.AuthTeamInfo).Team.ID.String() + } + + reqLogger := logger + if teamID != "" { + reqLogger = logger.With(l.WithTeamID(teamID)) + } + + ginzap.Ginzap(reqLogger, time.RFC3339Nano, true)(c) + }, + "/health", + "/sandboxes/:sandboxID/refreshes", + "/templates/:templateID/builds/:buildID/logs", + "/templates/:templateID/builds/:buildID/status", + ), + ) + // We now register our store above as the handler for the interface - api.RegisterHandlers(r, apiStore) + api.RegisterHandlersWithOptions(r, apiStore, api.GinServerOptions{ + ErrorHandler: func(c *gin.Context, err error, statusCode int) { + utils.ErrorHandler(c, err.Error(), statusCode) + }, + }) r.MaxMultipartMemory = maxMultipartMemory s := &http.Server{ - Handler: r, - Addr: fmt.Sprintf("0.0.0.0:%d", port), - ReadHeaderTimeout: maxReadHeaderTimeout, - ReadTimeout: maxReadTimeout, - WriteTimeout: maxWriteTimeout, - BaseContext: func(net.Listener) context.Context { return ctx }, + Handler: r, + Addr: fmt.Sprintf("0.0.0.0:%d", port), + // Configure timeouts to be greater than the proxy timeouts. + ReadTimeout: maxReadTimeout, + WriteTimeout: maxWriteTimeout, + IdleTimeout: idleTimeout, + BaseContext: func(net.Listener) context.Context { return ctx }, } return s } -func main() { +func run() int { ctx, cancel := context.WithCancel(context.Background()) // root context defer cancel() @@ -153,10 +206,75 @@ func main() { debug string ) flag.IntVar(&port, "port", defaultPort, "Port for test HTTP server") - flag.StringVar(&debug, "true", "false", "is debug") + flag.StringVar(&debug, "debug", "false", "is debug") flag.Parse() - log.Println("Starting API service...", "commit_sha", commitSHA) + instanceID := uuid.New().String() + var tel *telemetry.Client + if env.IsLocal() { + tel = telemetry.NewNoopClient() + } else { + var err error + tel, err = telemetry.New(ctx, serviceName, commitSHA, instanceID) + if err != nil { + zap.L().Fatal("failed to create metrics exporter", zap.Error(err)) + } + } + defer func() { + err := tel.Shutdown(ctx) + if err != nil { + log.Printf("telemetry shutdown:%v\n", err) + } + }() + + logger := zap.Must(l.NewLogger(ctx, l.LoggerConfig{ + ServiceName: serviceName, + IsInternal: true, + IsDebug: env.IsDebug(), + Cores: []zapcore.Core{l.GetOTELCore(tel.LogsProvider, serviceName)}, + EnableConsole: true, + })) + defer logger.Sync() + zap.ReplaceGlobals(logger) + + sbxLoggerExternal := sbxlogger.NewLogger( + ctx, + tel.LogsProvider, + sbxlogger.SandboxLoggerConfig{ + ServiceName: serviceName, + IsInternal: false, + CollectorAddress: os.Getenv("LOGS_COLLECTOR_ADDRESS"), + }, + ) + defer sbxLoggerExternal.Sync() + sbxlogger.SetSandboxLoggerExternal(sbxLoggerExternal) + + sbxLoggerInternal := sbxlogger.NewLogger( + ctx, + tel.LogsProvider, + sbxlogger.SandboxLoggerConfig{ + ServiceName: serviceName, + IsInternal: true, + CollectorAddress: os.Getenv("LOGS_COLLECTOR_ADDRESS"), + }, + ) + defer sbxLoggerInternal.Sync() + sbxlogger.SetSandboxLoggerInternal(sbxLoggerInternal) + + // Convert the string expectedMigrationTimestamp to a int64 + // expectedMigration, err := strconv.ParseInt(expectedMigrationTimestamp, 10, 64) + // if err != nil { + // // If expectedMigrationTimestamp is not set, we set it to 0 + // logger.Warn("Failed to parse expected migration timestamp", zap.Error(err)) + // expectedMigration = 0 + // } + + // err = utils.CheckMigrationVersion(expectedMigration) + // if err != nil { + // logger.Fatal("failed to check migration version", zap.Error(err)) + // } + + logger.Info("Starting API service...", zap.String("commit_sha", commitSHA), zap.String("instance_id", instanceID)) if debug != "true" { gin.SetMode(gin.ReleaseMode) } @@ -165,7 +283,8 @@ func main() { if err != nil { // this will call os.Exit: defers won't run, but none // need to yet. Change this if this is called later. - log.Fatalf("Error loading swagger spec:\n%v", err) + logger.Error("Error loading swagger spec", zap.Error(err)) + return 1 } var cleanupFns []func(context.Context) error @@ -193,7 +312,7 @@ func main() { defer cwg.Done() if err := op(ctx); err != nil { exitCode.Add(1) - log.Printf("cleanup operation %d, error: %v", idx, err) + logger.Error("Cleanup operation error", zap.Int("index", idx), zap.Error(err)) } }(cleanup, idx) @@ -201,29 +320,25 @@ func main() { } } if count == 0 { - log.Println("no cleanup operations") + logger.Info("no cleanup operations") return } - log.Printf("running %d cleanup operations", count) + logger.Info("Running cleanup operations", zap.Int("count", count)) cwg.Wait() // this doesn't have a timeout - log.Printf("%d cleanup operations completed in %s", count, time.Since(start)) + logger.Info("Cleanup operations completed", zap.Int("count", count), zap.Duration("duration", time.Since(start))) } cleanupOnce := &sync.Once{} cleanup := func() { cleanupOnce.Do(cleanupOp) } defer cleanup() - if !env.IsLocal() { - cleanupFns = append(cleanupFns, telemetry.InitOTLPExporter(ctx, serviceName, swagger.Info.Version)) - } - // Create an instance of our handler which satisfies the generated interface // (use the outer context rather than the signal handling // context so it doesn't exit first.) - apiStore := handlers.NewAPIStore(ctx) + apiStore := handlers.NewAPIStore(ctx, tel) cleanupFns = append(cleanupFns, apiStore.Close) // pass the signal context so that handlers know when shutdown is happening. - s := NewGinServer(ctx, apiStore, swagger, port) + s := NewGinServer(ctx, tel, logger, apiStore, swagger, port) // //////////////////////// // @@ -254,22 +369,21 @@ func main() { // signaled. defer cancel() - log.Printf("http service (%d) starting", port) + logger.Info("Http service starting", zap.Int("port", port)) // Serve HTTP until shutdown. err := s.ListenAndServe() switch { case errors.Is(err, http.ErrServerClosed): - log.Printf("http service (%d) shutdown successfully", port) + logger.Info("Http service shutdown successfully", zap.Int("port", port)) case err != nil: exitCode.Add(1) - log.Printf("http service (%d) encountered error: %v", port, err) + logger.Error("Http service encountered error", zap.Int("port", port), zap.Error(err)) default: // this probably shouldn't happen... - log.Printf("http service (%d) exited without error", port) + logger.Info("Http service exited without error", zap.Int("port", port)) } - }() wg.Add(1) @@ -282,7 +396,11 @@ func main() { // This is a bit of a hack, but this way we can properly propagate // the health status to the load balancer. apiStore.Healthy = false - time.Sleep(15 * time.Second) + + // Skip the delay in local environment for instant shutdown + if !env.IsLocal() { + time.Sleep(15 * time.Second) + } // if the parent context `ctx` is canceled the // shutdown will return early. This should only happen @@ -294,9 +412,8 @@ func main() { if err := s.Shutdown(ctx); err != nil { exitCode.Add(1) - log.Printf("http service (%d) shutdown error: %v", port, err) + logger.Error("Http service shutdown error", zap.Int("port", port), zap.Error(err)) } - }() // wait for the HTTP service to complete shutting down first @@ -317,5 +434,9 @@ func main() { // coordinator running to manage and track that work. // Exit, with appropriate code. - os.Exit(int(exitCode.Load())) + return int(exitCode.Load()) +} + +func main() { + os.Exit(run()) } diff --git a/packages/api/main.tf b/packages/api/main.tf index ea1839f..a4c0932 100644 --- a/packages/api/main.tf +++ b/packages/api/main.tf @@ -1,99 +1,125 @@ -terraform { - required_providers { - docker = { - source = "kreuzwerker/docker" - version = "3.0.2" - } - random = { - source = "hashicorp/random" - version = "3.5.1" - } - aws = { - source = "hashicorp/aws" - version = "5.34.0" - } - } +resource "google_artifact_registry_repository" "custom_environments_repository" { + format = "DOCKER" + repository_id = "${var.prefix}custom-environments" + labels = var.labels +} + +resource "google_artifact_registry_repository_iam_member" "custom_environments_repository_member" { + repository = google_artifact_registry_repository.custom_environments_repository.name + role = "roles/artifactregistry.repoAdmin" + member = "serviceAccount:${var.google_service_account_email}" } -# Create ECR repository for custom environments -resource "aws_ecr_repository" "custom_environments_repository" { - name = "${var.prefix}custom-environments" - image_tag_mutability = "MUTABLE" +resource "google_secret_manager_secret" "postgres_connection_string" { + secret_id = "${var.prefix}postgres-connection-string" - image_scanning_configuration { - scan_on_push = true + replication { + auto {} } +} - tags = var.tags +resource "google_secret_manager_secret" "supabase_jwt_secrets" { + secret_id = "${var.prefix}supabase-jwt-secrets" + + replication { + auto {} + } } -locals { - # Set a default digest for first-time deployment - default_image_digest = "sha256:0000000000000000000000000000000000000000000000000000000000000000" +resource "google_secret_manager_secret_version" "supabase_jwt_secrets" { + secret = google_secret_manager_secret.supabase_jwt_secrets.name + secret_data = " " + + lifecycle { + ignore_changes = [secret_data] + } } -# Make this data source optional since the image may not exist yet during first deployment -data "aws_ecr_image" "api_image" { - count = 0 # Skip this data source until images are uploaded - repository_name = var.ecr_repository_name - image_tag = "latest" +resource "google_secret_manager_secret" "redis_url" { + secret_id = "${var.prefix}redis-url" + + replication { + auto {} + } } -# Create AWS Secrets Manager secret for postgres connection string -resource "aws_secretsmanager_secret" "postgres_connection_string" { - name = "${var.prefix}-postgres-connection-string-2" - description = "PostgreSQL connection string for the API" - tags = var.tags +resource "google_secret_manager_secret_version" "redis_url" { + secret = google_secret_manager_secret.redis_url.name + secret_data = "redis.service.consul" + + lifecycle { + ignore_changes = [secret_data] + } } -# Create AWS Secrets Manager secret for posthog API key -resource "aws_secretsmanager_secret" "posthog_api_key" { - name = "${var.prefix}-posthog-api-key-2" - description = "PostHog API key for analytics" - tags = var.tags +resource "google_secret_manager_secret" "posthog_api_key" { + secret_id = "${var.prefix}posthog-api-key" + + replication { + auto {} + } } -resource "aws_secretsmanager_secret_version" "posthog_api_key" { - secret_id = aws_secretsmanager_secret.posthog_api_key.id - secret_string = " " +resource "google_secret_manager_secret_version" "posthog_api_key" { + secret = google_secret_manager_secret.posthog_api_key.name + secret_data = " " lifecycle { - ignore_changes = [secret_string] + ignore_changes = [secret_data] } } -# Generate random password for API secret resource "random_password" "api_secret" { length = 32 special = false } -# Create AWS Secrets Manager secret for API secret -resource "aws_secretsmanager_secret" "api_secret" { - name = "${var.prefix}-api-secret-2" - description = "Secret for the API service" - tags = var.tags +resource "google_secret_manager_secret" "api_secret" { + secret_id = "${var.prefix}api-secret" + + replication { + auto {} + } } -resource "aws_secretsmanager_secret_version" "api_secret_value" { - secret_id = aws_secretsmanager_secret.api_secret.id - secret_string = random_password.api_secret.result +resource "google_secret_manager_secret_version" "api_secret_value" { + secret = google_secret_manager_secret.api_secret.id + + secret_data = random_password.api_secret.result } -# Generate random password for API admin token resource "random_password" "api_admin_secret" { length = 32 special = true } -# Create AWS Secrets Manager secret for API admin token -resource "aws_secretsmanager_secret" "api_admin_token" { - name = "${var.prefix}-api-admin-token-2" - description = "Admin token for the API service" - tags = var.tags + +resource "google_secret_manager_secret" "api_admin_token" { + secret_id = "${var.prefix}api-admin-token" + replication { + auto {} + } } -resource "aws_secretsmanager_secret_version" "api_admin_token_value" { - secret_id = aws_secretsmanager_secret.api_admin_token.id - secret_string = random_password.api_admin_secret.result +resource "google_secret_manager_secret_version" "api_admin_token_value" { + secret = google_secret_manager_secret.api_admin_token.id + secret_data = random_password.api_admin_secret.result } + +resource "random_password" "sandbox_access_token_hash_seed" { + length = 32 + special = false +} + + +resource "google_secret_manager_secret" "sandbox_access_token_hash_seed" { + secret_id = "${var.prefix}sandbox-access-token-hash-seed" + replication { + auto {} + } +} + +resource "google_secret_manager_secret_version" "sandbox_access_token_hash_seed" { + secret = google_secret_manager_secret.sandbox_access_token_hash_seed.id + secret_data = random_password.sandbox_access_token_hash_seed.result +} \ No newline at end of file diff --git a/packages/api/outputs.tf b/packages/api/outputs.tf index 48f6bfc..11d6278 100644 --- a/packages/api/outputs.tf +++ b/packages/api/outputs.tf @@ -1,23 +1,31 @@ -output "api_ecr_image_digest" { - value = length(data.aws_ecr_image.api_image) > 0 ? data.aws_ecr_image.api_image[0].image_digest : local.default_image_digest +output "api_secret" { + value = random_password.api_secret.result } -output "api_secret_arn" { - value = aws_secretsmanager_secret.api_secret.arn +output "postgres_connection_string_secret_name" { + value = google_secret_manager_secret.postgres_connection_string.name } -output "rds_connection_string_secret_name" { - value = aws_secretsmanager_secret.postgres_connection_string.name +output "supabase_jwt_secrets_secret_name" { + value = google_secret_manager_secret.supabase_jwt_secrets.name +} + +output "redis_url_secret_version" { + value = google_secret_manager_secret_version.redis_url } output "posthog_api_key_secret_name" { - value = aws_secretsmanager_secret.posthog_api_key.name + value = google_secret_manager_secret.posthog_api_key.name +} + +output "custom_envs_repository_name" { + value = google_artifact_registry_repository.custom_environments_repository.name } -output "custom_envs_ecr_repository_name" { - value = aws_ecr_repository.custom_environments_repository.name +output "api_admin_token" { + value = random_password.api_admin_secret.result } -output "api_admin_token_arn" { - value = aws_secretsmanager_secret.api_admin_token.arn +output "sandbox_access_token_hash_seed" { + value = random_password.sandbox_access_token_hash_seed.result } \ No newline at end of file diff --git a/packages/api/variables.tf b/packages/api/variables.tf index daa0e93..8ad28e6 100644 --- a/packages/api/variables.tf +++ b/packages/api/variables.tf @@ -2,23 +2,11 @@ variable "prefix" { type = string } -variable "aws_account_id" { +variable "google_service_account_email" { type = string } -variable "aws_region" { - type = string -} - -variable "iam_role_arn" { - type = string -} - -variable "ecr_repository_name" { - type = string -} - -variable "tags" { - description = "The tags to attach to AWS resources created by this module" +variable "labels" { + description = "The labels to attach to resources created by this module" type = map(string) -} \ No newline at end of file +} diff --git a/packages/build.sh b/packages/build.sh index a528a97..9669d9a 100644 --- a/packages/build.sh +++ b/packages/build.sh @@ -37,27 +37,18 @@ echo "Current directory: $(pwd)" make build-and-upload echo "orchestrator module build and upload completed successfully" -# Build and upload template-manager module -echo "=== Building and uploading template-manager module ===" -cd "$PROJECT_ROOT/template-manager" || { echo "template-manager directory not found"; exit 1; } +# Build and upload envd module +echo "=== Building envd module ===" +cd "$PROJECT_ROOT/envd" || { echo "envd directory not found"; exit 1; } echo "Current directory: $(pwd)" make build-and-upload -echo "template-manager module build and upload completed successfully" +echo "envd module build-and-upload completed successfully" -# Build and upload template-manager module -# echo "=== Building envd module ===" -# cd "$PROJECT_ROOT/envd" || { echo "envd directory not found"; exit 1; } -# echo "Current directory: $(pwd)" -# make build -# echo "envd module build completed successfully" - -# Upload envd and other required files -echo "=== Uploading envd and required files ===" +# Upload other required files +echo "=== Uploading required files ===" cd "$PROJECT_ROOT" || { echo "Cannot return to project root"; exit 1; } echo "Current directory: $(pwd)" -chmod u+x upload.sh -./upload.sh +bash ./upload.sh echo "envd upload completed successfully" - echo "=== All builds and uploads completed successfully ===" \ No newline at end of file diff --git a/packages/client-proxy/Dockerfile b/packages/client-proxy/Dockerfile index d72f3c1..11d0fab 100644 --- a/packages/client-proxy/Dockerfile +++ b/packages/client-proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24-alpine3.21 AS builder +FROM golang:1.24-alpine3.20 AS builder RUN apk add --no-cache make @@ -14,12 +14,14 @@ WORKDIR /build/proxy COPY go.mod go.sum Makefile ./ RUN go mod download +COPY internal/ ./internal/ COPY main.go main.go -RUN go mod tidy -RUN --mount=type=cache,target=/root/.cache/go-build make build + +ARG COMMIT_SHA +RUN --mount=type=cache,target=/root/.cache/go-build make build COMMIT_SHA=${COMMIT_SHA} RUN chmod +x /build/proxy/bin/client-proxy -FROM alpine:3.21 +FROM alpine:3.17 COPY --from=builder /build/proxy/bin/client-proxy . diff --git a/packages/client-proxy/Makefile b/packages/client-proxy/Makefile index c4bbd15..7663e64 100644 --- a/packages/client-proxy/Makefile +++ b/packages/client-proxy/Makefile @@ -4,41 +4,38 @@ IMAGE := e2b-orchestration/client-proxy build: # Allow for passing commit sha directly for docker builds $(eval COMMIT_SHA ?= $(shell git rev-parse --short HEAD)) - go mod tidy - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/client-proxy . + CGO_ENABLED=0 GOOS=linux go build -o bin/client-proxy -ldflags "-X=main.commitSHA=$(COMMIT_SHA)" . .PHONY: build-and-upload build-and-upload: + $(eval COMMIT_SHA := $(shell git rev-parse --short HEAD)) @rm -rf .shared/ @cp -r ../shared .shared/ - @sudo docker buildx install || true # sets up the buildx as default docker builder - - @if [ -n "$(GCP_PROJECT_ID)" ] && [ -n "$(GCP_REGION)" ]; then \ - sudo docker build --platform linux/amd64 --tag "$(GCP_REGION)-docker.pkg.dev/$(GCP_PROJECT_ID)/$(IMAGE)" . && \ - sudo docker push "$(GCP_REGION)-docker.pkg.dev/$(GCP_PROJECT_ID)/$(IMAGE)"; \ - elif [ -n "$(AWS_ACCOUNT_ID)" ]; then \ - aws ecr describe-repositories --repository-names $(IMAGE) --region $(AWS_REGION) || \ - aws ecr create-repository --repository-name $(IMAGE) --region $(AWS_REGION); \ - aws ecr get-login-password --region $(AWS_REGION) | sudo docker login --username AWS --password-stdin $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com; \ - sudo docker build --platform linux/amd64 --tag "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" . && \ - sudo docker push "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest"; \ - else \ - echo "Either GCP_PROJECT_ID and GCP_REGION or AWS_ACCOUNT_ID must be set"; \ - exit 1; \ - fi - + @docker buildx install # sets up the buildx as default docker builder (otherwise the command below won't work) + @docker build --platform linux/amd64 --tag "$(GCP_REGION)-docker.pkg.dev/$(GCP_PROJECT_ID)/$(IMAGE)" --push --build-arg COMMIT_SHA="$(COMMIT_SHA)" . @rm -rf .shared/ +openapi := ../../spec/openapi-edge.yml +codegen := go tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen + +.PHONY: generate +generate: + $(codegen) -old-config-style -generate gin --package api $(openapi) > ../shared/pkg/http/edge/api.gen.go + $(codegen) -old-config-style -generate types --package api $(openapi) > ../shared/pkg/http/edge/types.gen.go + $(codegen) -old-config-style -generate spec --package api $(openapi) > ../shared/pkg/http/edge/spec.gen.go + $(codegen) -old-config-style -generate client --package api $(openapi) > ../shared/pkg/http/edge/client.gen.go + .PHONY: test test: go test -v ./... - .PHONY: build-and-upload-aws build-and-upload-aws: $(eval AWS_ACCOUNT_ID := $(shell grep "^account_id=" /opt/config.properties | cut -d= -f2)) $(eval AWS_REGION := $(shell grep "^AWSREGION=" /opt/config.properties | cut -d= -f2)) + $(eval ARCHITECTURE := $(shell grep "^CFNARCHITECTURE=" /opt/config.properties | cut -d= -f2 || echo "amd64")) + @rm -rf .shared/ @cp -r ../shared .shared/ @docker buildx install || true # sets up the buildx as default docker builder @@ -47,6 +44,15 @@ build-and-upload-aws: # Login to ECR @aws ecr get-login-password --region $(AWS_REGION) | docker login --username AWS --password-stdin $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com # Build and push the image - @docker build --platform linux/amd64 --tag "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" . + @echo "Building for architecture: $(ARCHITECTURE)" + + @if [ "$(ARCHITECTURE)" = "arm64" ]; then \ + echo "Building for ARM64 architecture"; \ + docker build --platform linux/arm64 --tag "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" .; \ + else \ + echo "Building for x86_64 architecture"; \ + docker build --platform linux/amd64 --tag "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" .; \ + fi + @docker push "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" - @rm -rf .shared/ + @rm -rf .shared/ \ No newline at end of file diff --git a/packages/client-proxy/go.mod b/packages/client-proxy/go.mod index cb99adc..394717e 100644 --- a/packages/client-proxy/go.mod +++ b/packages/client-proxy/go.mod @@ -1,30 +1,258 @@ module github.com/e2b-dev/infra/packages/proxy -go 1.24.0 - -toolchain go1.24.3 +go 1.24.3 require ( + github.com/aws/aws-sdk-go-v2 v1.36.3 + github.com/aws/aws-sdk-go-v2/config v1.29.14 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.222.0 github.com/e2b-dev/infra/packages/shared v0.0.0 + github.com/getkin/kin-openapi v0.132.0 + github.com/gin-contrib/size v1.0.2 + github.com/gin-contrib/zap v1.1.5 + github.com/gin-gonic/gin v1.10.1 + github.com/go-redsync/redsync/v4 v4.13.0 + github.com/google/uuid v1.6.0 + github.com/jellydator/ttlcache/v3 v3.3.1-0.20250207140243-aefc35918359 github.com/miekg/dns v1.1.63 - go.uber.org/zap v1.18.1 + github.com/oapi-codegen/gin-middleware v1.0.2 + github.com/redis/go-redis/v9 v9.8.0 + github.com/soheilhy/cmux v0.1.5 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 + go.opentelemetry.io/otel/metric v1.36.0 + go.opentelemetry.io/otel/trace v1.36.0 + go.uber.org/zap v1.27.0 + google.golang.org/grpc v1.72.1 + google.golang.org/protobuf v1.36.6 ) require ( - github.com/golang/protobuf v1.5.3 // indirect - github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect - github.com/pkg/errors v0.9.1 // indirect - go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.6.0 // indirect - golang.org/x/mod v0.18.0 // indirect - golang.org/x/net v0.33.0 // indirect + github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect + github.com/aws/smithy-go v1.22.3 // indirect + github.com/bytedance/sonic v1.13.2 // indirect + github.com/bytedance/sonic/loader v0.2.4 // indirect + github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cloudwego/base64x v0.1.5 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/gabriel-vasile/mimetype v1.4.8 // indirect + github.com/gin-contrib/sse v1.0.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.26.0 // indirect + github.com/goccy/go-json v0.10.5 // indirect + github.com/gorilla/mux v1.8.1 // indirect + github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.10 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect + github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect + github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect + github.com/pelletier/go-toml/v2 v2.2.4 // indirect + github.com/perimeterx/marshmallow v1.1.5 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/contrib/bridges/otelzap v0.9.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect + go.opentelemetry.io/otel/log v0.10.0 // indirect + go.opentelemetry.io/otel/sdk v1.36.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.10.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect + go.opentelemetry.io/proto/otlp v1.6.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/arch v0.16.0 // indirect + golang.org/x/crypto v0.38.0 // indirect + golang.org/x/mod v0.24.0 // indirect + golang.org/x/net v0.40.0 // indirect golang.org/x/sync v0.14.0 // indirect golang.org/x/sys v0.33.0 // indirect golang.org/x/text v0.25.0 // indirect - golang.org/x/tools v0.22.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect - google.golang.org/grpc v1.67.1 // indirect - google.golang.org/protobuf v1.35.1 // indirect + golang.org/x/tools v0.33.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +require ( + github.com/Masterminds/semver/v3 v3.2.1 // indirect + github.com/go-redis/redis/v8 v8.11.5 // indirect + github.com/gogo/status v1.1.1 // indirect + // https://github.com/grafana/loki/issues/2826. This is the equivalent of the main branch at 2023/11/27 (d62d4e37d1f3dba83cf10a1f6db82830794e1c05) + github.com/grafana/loki v0.0.0-20231124145642-d62d4e37d1f3 +) + +require ( + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/fsnotify/fsnotify v1.9.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/stretchr/testify v1.10.0 // indirect + go.uber.org/goleak v1.3.0 // indirect + golang.org/x/oauth2 v0.30.0 // indirect ) +require ( + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect + github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect + github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/sprig/v3 v3.2.3 // indirect + github.com/OneOfOne/xxhash v1.2.8 // indirect + github.com/Workiva/go-datastructures v1.1.0 // indirect + github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect + github.com/armon/go-metrics v0.4.1 // indirect + github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect + github.com/aws/aws-sdk-go v1.55.7 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/buger/jsonparser v1.1.1 // indirect + github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b // indirect + github.com/cespare/xxhash v1.1.0 // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.5.0 // indirect + github.com/dennwc/varint v1.0.0 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/edsrzf/mmap-go v1.2.0 // indirect + github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect + github.com/fatih/color v1.18.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-kit/log v0.2.1 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect + github.com/go-openapi/analysis v0.23.0 // indirect + github.com/go-openapi/errors v0.22.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/loads v0.22.0 // indirect + github.com/go-openapi/spec v0.21.0 // indirect + github.com/go-openapi/strfmt v0.23.0 // indirect + github.com/go-openapi/validate v0.24.0 // indirect + github.com/gogo/googleapis v1.4.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-jwt/jwt/v4 v4.5.2 // indirect + github.com/golang-jwt/jwt/v5 v5.2.2 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/google/btree v1.1.3 // indirect + github.com/gorilla/websocket v1.5.3 // indirect + github.com/grafana/dskit v0.0.0-20231120170505-765e343eda4f // indirect + github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586 // indirect + github.com/grafana/loki/pkg/push v0.0.0-20231124142027-e52380921608 // indirect + github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect + github.com/hashicorp/consul/api v1.30.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-hclog v1.6.3 // indirect + github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/go-msgpack v1.1.5 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-sockaddr v1.0.2 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect + github.com/hashicorp/golang-lru v1.0.2 // indirect + github.com/hashicorp/memberlist v0.5.0 // indirect + github.com/hashicorp/nomad/api v0.0.0-20231208134655-099ee06a607c // indirect + github.com/hashicorp/serf v0.10.1 // indirect + github.com/huandu/xstrings v1.4.0 // indirect + github.com/imdario/mergo v0.3.16 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jpillora/backoff v1.0.0 // indirect + github.com/julienschmidt/httprouter v1.3.0 // indirect + github.com/klauspost/compress v1.18.0 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect + github.com/mattn/go-colorable v0.1.14 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect + github.com/oapi-codegen/runtime v1.1.1 // indirect + github.com/oklog/ulid v1.3.1 // indirect + github.com/onsi/gomega v1.36.3 // indirect + github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect + github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect + github.com/pierrec/lz4/v4 v4.1.22 // indirect + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect + github.com/prometheus/alertmanager v0.26.0 // indirect + github.com/prometheus/client_golang v1.20.2 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common/sigv4 v0.1.0 // indirect + github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97 // indirect + github.com/prometheus/procfs v0.16.0 // indirect + github.com/prometheus/prometheus v1.8.2-0.20200727090838-6f296594a852 // indirect + github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect + github.com/sercand/kuberesolver/v5 v5.1.1 // indirect + github.com/shopspring/decimal v1.4.0 // indirect + github.com/sony/gobreaker v0.5.0 // indirect + github.com/spaolacci/murmur3 v1.1.0 // indirect + github.com/spf13/cast v1.8.0 // indirect + github.com/spf13/pflag v1.0.6 // indirect + github.com/stretchr/objx v0.5.2 // indirect + github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect + github.com/uber/jaeger-lib v2.4.1+incompatible // indirect + github.com/willf/bitset v1.1.11 // indirect + github.com/willf/bloom v2.0.3+incompatible // indirect + go.etcd.io/bbolt v1.3.10 // indirect + go.etcd.io/etcd/api/v3 v3.5.4 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect + go.etcd.io/etcd/client/v3 v3.5.4 // indirect + go.mongodb.org/mongo-driver v1.17.1 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 // indirect + go.opentelemetry.io/collector/semconv v0.81.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect + go.opentelemetry.io/otel v1.36.0 // indirect + go.uber.org/atomic v1.11.0 // indirect + go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect + golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect + golang.org/x/time v0.11.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect +) + +replace github.com/ugorji/go v1.1.4 => github.com/ugorji/go/codec v1.2.12 + +// https://github.com/grafana/loki/issues/2826 +replace github.com/hashicorp/consul => github.com/hashicorp/consul v1.14.5 + +// https://github.com/grafana/loki/issues/2826 +replace k8s.io/client-go => k8s.io/client-go v0.28.1 + +// https://github.com/grafana/loki/issues/2826 +exclude k8s.io/client-go v8.0.0+incompatible + +// https://github.com/grafana/loki/issues/2826 +replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.47.2-0.20231010075449-4b9c19fe5510 + +// https://github.com/grafana/loki/issues/2826 +replace github.com/grafana/loki/pkg/push => github.com/grafana/loki/pkg/push v0.0.0-20231124145642-d62d4e37d1f3 + replace github.com/e2b-dev/infra/packages/shared v0.0.0 => ../shared diff --git a/packages/client-proxy/go.sum b/packages/client-proxy/go.sum index 16149dc..8d50e5a 100644 --- a/packages/client-proxy/go.sum +++ b/packages/client-proxy/go.sum @@ -1,160 +1,1229 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= +github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 h1:nyQWyZvwGTvunIMxi1Y9uXkcyr+I7TeNrr/foo4Kpk8= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0/go.mod h1:l38EPgmsp71HHLq9j7De57JcKOWPyhrsW1Awm1JS6K0= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY= +github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= +github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.11.29 h1:I4+HL/JDvErx2LjyzaVxllw2lRDB5/BT2Bm4g20iqYw= +github.com/Azure/go-autorest/autorest v0.11.29/go.mod h1:ZtEzC4Jy2JDrZLxvWs8LrBWEBycl1hbT1eknI8MtfAs= +github.com/Azure/go-autorest/autorest/adal v0.9.23 h1:Yepx8CvFxwNKpH6ja7RZ+sKX+DWYNldbLiALMC3BTz8= +github.com/Azure/go-autorest/autorest/adal v0.9.23/go.mod h1:5pcMqFkdPhviJdlEy3kC/v1ZLnQl0MH6XA5YCcMhy4c= +github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= +github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= +github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= +github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= +github.com/Azure/go-autorest/autorest/validation v0.3.1 h1:AgyqjAd94fwNAoTjl/WQXg4VvFeRFpO+UhNyRXqF1ac= +github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E= +github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= +github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= +github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU= +github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= +github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= +github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= +github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= +github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= +github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8= +github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= +github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= +github.com/Workiva/go-datastructures v1.1.0 h1:hu20UpgZneBhQ3ZvwiOGlqJSKIosin2Rd5wAKUHEO/k= +github.com/Workiva/go-datastructures v1.1.0/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= +github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= +github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= +github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= +github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI= +github.com/alicebob/miniredis/v2 v2.30.4 h1:8S4/o1/KoUArAGbGwPxcwf0krlzceva2XVOSchFS7Eo= +github.com/alicebob/miniredis/v2 v2.30.4/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= +github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= +github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE= +github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM= +github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg= +github.com/aws/aws-sdk-go-v2/config v1.29.14 h1:f+eEi/2cKCg9pqKBoAIwRGzVb70MRKqWX4dg1BDcSJM= +github.com/aws/aws-sdk-go-v2/config v1.29.14/go.mod h1:wVPHWcIFv3WO89w0rE10gzf17ZYy+UVS1Geq8Iei34g= +github.com/aws/aws-sdk-go-v2/credentials v1.17.67 h1:9KxtdcIA/5xPNQyZRgUSpYOE6j9Bc4+D7nZua0KGYOM= +github.com/aws/aws-sdk-go-v2/credentials v1.17.67/go.mod h1:p3C44m+cfnbv763s52gCqrjaqyPikj9Sg47kUVaNZQQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.222.0 h1:qPVuEWzRvc/Z8UA0CKG4QczxORbgYTbWwlviUAmVmgs= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.222.0/go.mod h1:ouvGEfHbLaIlWwpDpOVWPWR+YwO0HDv3vm5tYLq8ImY= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY= +github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 h1:1Gw+9ajCV1jogloEv1RRnvfRFia2cL6c9cuKV2Ps+G8= +github.com/aws/aws-sdk-go-v2/service/sso v1.25.3/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 h1:hXmVKytPfTy5axZ+fYbR5d0cFmC3JvwLm5kM83luako= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs= +github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 h1:1XuUZ8mYJw9B6lzAkXhqHlJd/XvaX32evhproijJEZY= +github.com/aws/aws-sdk-go-v2/service/sts v1.33.19/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4= +github.com/aws/smithy-go v1.22.3 h1:Z//5NuZCSW6R4PhQ93hShNbyBbn8BWCmCVCt+Q8Io5k= +github.com/aws/smithy-go v1.22.3/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= +github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= +github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= +github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= +github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= +github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= +github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= +github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ= +github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY= +github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= +github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b h1:6+ZFm0flnudZzdSE0JxlhR2hKnGPcNB35BjQf4RYQDY= +github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= +github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 h1:Om6kYQYDUk5wWbT0t0q6pvyM49i9XZAv9dDrkDA7gjk= +github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= +github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= +github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/digitalocean/godo v1.99.0 h1:gUHO7n9bDaZFWvbzOum4bXE0/09ZuYA9yA8idQHX57E= +github.com/digitalocean/godo v1.99.0/go.mod h1:SsS2oXo2rznfM/nORlZ/6JaUJZFhmKTib1YhopUc8NA= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I= +github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84= +github.com/edsrzf/mmap-go v1.2.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= +github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE= +github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M= +github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A= +github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8= +github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU= +github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb h1:IT4JYU7k4ikYg1SCxNI1/Tieq/NFvh6dzLdgi7eu0tM= +github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/go.mod h1:bH6Xx7IW64qjjJq8M2u4dxNaBiDfKK+z/3eGDpXEQhc= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= +github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= +github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= +github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= +github.com/getkin/kin-openapi v0.132.0 h1:3ISeLMsQzcb5v26yeJrBcdTCEQTag36ZjaGk7MIRUwk= +github.com/getkin/kin-openapi v0.132.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gin-contrib/size v1.0.2 h1:rW5bgj7+SwDmnOlZ9lJV8lDYWTrllQAspi3WP8GtqHE= +github.com/gin-contrib/size v1.0.2/go.mod h1:kKbz/Ervg8tpnrhrBpTO5m4wuQNTVlEqTb1MgkRrmFY= +github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E= +github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0= +github.com/gin-contrib/zap v1.1.5 h1:qKwhWb4DQgPriCl1AHLLob6hav/KUIctKXIjTmWIN3I= +github.com/gin-contrib/zap v1.1.5/go.mod h1:lAchUtGz9M2K6xDr1rwtczyDrThmSx6c9F384T45iOE= +github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ= +github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= +github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU= +github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo= +github.com/go-openapi/errors v0.22.0 h1:c4xY/OLxUBSTiepAg3j/MHuAv5mJhnf53LLMWFB+u/w= +github.com/go-openapi/errors v0.22.0/go.mod h1:J3DmZScxCDufmIMsdOuDHxJbdOGC0xtUynjIx092vXE= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +github.com/go-openapi/loads v0.22.0 h1:ECPGd4jX1U6NApCGG1We+uEozOAvXvJSF4nnwHZ8Aco= +github.com/go-openapi/loads v0.22.0/go.mod h1:yLsaTCS92mnSAZX5WWoxszLj0u+Ojl+Zs5Stn1oF+rs= +github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY= +github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk= +github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c= +github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58= +github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k= +github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= +github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= +github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= +github.com/go-redis/redis/v7 v7.4.1 h1:PASvf36gyUpr2zdOUS/9Zqc80GbM+9BDyiJSJDDOrTI= +github.com/go-redis/redis/v7 v7.4.1/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= +github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= +github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= +github.com/go-redsync/redsync/v4 v4.13.0 h1:49X6GJfnbLGaIpBBREM/zA4uIMDXKAh1NDkvQ1EkZKA= +github.com/go-redsync/redsync/v4 v4.13.0/go.mod h1:HMW4Q224GZQz6x1Xc7040Yfgacukdzu7ifTDAKiyErQ= +github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY= +github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= +github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= +github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg= +github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= +github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= +github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.4.0 h1:zgVt4UpGxcqVOw97aRGxT4svlcmdK35fynLNctY32zI= +github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg= +github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= +github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws= +github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gophercloud/gophercloud v1.5.0 h1:cDN6XFCLKiiqvYpjQLq9AiM7RDRbIC9450WpPH+yvXo= +github.com/gophercloud/gophercloud v1.5.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grafana/dskit v0.0.0-20231120170505-765e343eda4f h1:gyojr97YeWZ70pKNakWv5/tKwBHuLy3icnIeCo9gQr4= +github.com/grafana/dskit v0.0.0-20231120170505-765e343eda4f/go.mod h1:8dsy5tQOkeNQyjXpm5mQsbCu3H5uzeBD35MzRQFznKU= +github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586 h1:/of8Z8taCPftShATouOrBVy6GaTTjgQd/VfNiZp/VXQ= +github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586/go.mod h1:PGk3RjYHpxMM8HFPhKKo+vve3DdlPUELZLSDEFehPuU= +github.com/grafana/loki v0.0.0-20231124145642-d62d4e37d1f3 h1:HMcPr8MOTUpfeMl5dNpUpeIcgkmczAqUm9dV/ei6jNo= +github.com/grafana/loki v0.0.0-20231124145642-d62d4e37d1f3/go.mod h1:XqfcXeDasnaSJKCjlmKUqBSzTbA8/45uaRgzwRKvTco= +github.com/grafana/loki/pkg/push v0.0.0-20231124145642-d62d4e37d1f3 h1:bx7QUKXVnLYTSVlDcPXXSAR1MDO+FnZel7UwgsQRqj0= +github.com/grafana/loki/pkg/push v0.0.0-20231124145642-d62d4e37d1f3/go.mod h1:f3JSoxBTPXX5ec4FxxeC19nTBSxoTz+cBgS3cYLMcr0= +github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD0O/HjhShYuM6XE0i/lbE6J94kww= +github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= +github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 h1:FbSCl+KggFl+Ocym490i/EyXF4lPgLoUtcSWquBM0Rs= +github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI= +github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= +github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= +github.com/hashicorp/consul/api v1.30.0 h1:ArHVMMILb1nQv8vZSGIwwQd2gtc+oSQZ6CalyiyH2XQ= +github.com/hashicorp/consul/api v1.30.0/go.mod h1:B2uGchvaXVW2JhFoS8nqTxMD5PBykr4ebY4JWHTTeLM= +github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg= +github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s= +github.com/hashicorp/cronexpr v1.1.2 h1:wG/ZYIKT+RT3QkOdgYc+xsKWVRgnxJ1OJtjjy84fJ9A= +github.com/hashicorp/cronexpr v1.1.2/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs= +github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA= +github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= +github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= +github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= +github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM= +github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= +github.com/hashicorp/nomad/api v0.0.0-20231208134655-099ee06a607c h1:7QPAGE7GJfSqaSvr7/mKOGYwohz3/dfs5nt/cu0sdyI= +github.com/hashicorp/nomad/api v0.0.0-20231208134655-099ee06a607c/go.mod h1:ijDwa6o1uG1jFSq6kERiX2PamKGpZzTmo0XOFNeFZgw= +github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= +github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= +github.com/hetznercloud/hcloud-go/v2 v2.0.0 h1:Sg1DJ+MAKvbYAqaBaq9tPbwXBS2ckPIaMtVdUjKu+4g= +github.com/hetznercloud/hcloud-go/v2 v2.0.0/go.mod h1:4iUG2NG8b61IAwNx6UsMWQ6IfIf/i1RsG0BbsKAyR5Q= +github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= +github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/ionos-cloud/sdk-go/v6 v6.1.8 h1:493wE/BkZxJf7x79UCE0cYGPZoqQcPiEBALvt7uVGY0= +github.com/ionos-cloud/sdk-go/v6 v6.1.8/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k= +github.com/jellydator/ttlcache/v3 v3.3.1-0.20250207140243-aefc35918359 h1:uzTOUCYbGERlXB3wX2/u9AsMeXnZCd8yLl2DMAY1Wxs= +github.com/jellydator/ttlcache/v3 v3.3.1-0.20250207140243-aefc35918359/go.mod h1:aqa3CYl8S7MwpMXtFH3uNIEEfOjcn1MUNO+bQIGbFAQ= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= +github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= +github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00= +github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/linode/linodego v1.19.0 h1:n4WJrcr9+30e9JGZ6DI0nZbm5SdAj1kSwvvt/998YUw= +github.com/linode/linodego v1.19.0/go.mod h1:XZFR+yJ9mm2kwf6itZ6SCpu+6w3KnIevV0Uu5HNWJgQ= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY= github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= +github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= +github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/oapi-codegen/gin-middleware v1.0.2 h1:/H99UzvHQAUxXK8pzdcGAZgjCVeXdFDAUUWaJT0k0eI= +github.com/oapi-codegen/gin-middleware v1.0.2/go.mod h1:2HJDQjH8jzK2/k/VKcWl+/T41H7ai2bKa6dN3AA2GpA= +github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro= +github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= +github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//JalHPu/3yz+De2J+4aLtSRlHiY= +github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw= +github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c= +github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= +github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU= +github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= +github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= +github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e h1:4cPxUYdgaGzZIT5/j0IfqOrrXmq6bG8AwvwisMXpdrg= +github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= +github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w= +github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c= +github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM= +github.com/ovh/go-ovh v1.4.1 h1:VBGa5wMyQtTP7Zb+w97zRCh9sLtM/2YKRyy+MEJmWaM= +github.com/ovh/go-ovh v1.4.1/go.mod h1:6bL6pPyUT7tBfI0pqOegJgRjgjuO+mOo+MyXd1EEC0M= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= +github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= +github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= +github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= +github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= +github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= +github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/prometheus/alertmanager v0.26.0 h1:uOMJWfIwJguc3NaM3appWNbbrh6G/OjvaHMk22aBBYc= +github.com/prometheus/alertmanager v0.26.0/go.mod h1:rVcnARltVjavgVaNnmevxK7kOn7IZavyf0KNgHkbEpU= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= +github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= +github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= +github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97 h1:oHcfzdJnM/SFppy2aUlvomk37GI33x9vgJULihE5Dt8= +github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97/go.mod h1:LoBCZeRh+5hX+fSULNyFnagYlQG/gBsyA/deNzROkq8= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM= +github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg= +github.com/prometheus/prometheus v0.47.2-0.20231010075449-4b9c19fe5510 h1:6ksZ7t1hNOzGPPs8DK7SvXQf6UfWzi+W5Z7PCBl8gx4= +github.com/prometheus/prometheus v0.47.2-0.20231010075449-4b9c19fe5510/go.mod h1:UC0TwJiF90m2T3iYPQBKnGu8gv3s55dF/EgpTq8gyvo= +github.com/redis/go-redis/v9 v9.8.0 h1:q3nRvjrlge/6UD7eTu/DSg2uYiU2mCL0G/uzBWqhicI= +github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= +github.com/redis/rueidis v1.0.19 h1:s65oWtotzlIFN8eMPhyYwxlwLR1lUdhza2KtWprKYSo= +github.com/redis/rueidis v1.0.19/go.mod h1:8B+r5wdnjwK3lTFml5VtxjzGOQAC+5UmujoD12pDrEo= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20 h1:a9hSJdJcd16e0HoMsnFvaHvxB3pxSD+SC7+CISp7xY0= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM= +github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= +github.com/sercand/kuberesolver/v5 v5.1.1 h1:CYH+d67G0sGBj7q5wLK61yzqJJ8gLLC8aeprPTHb6yY= +github.com/sercand/kuberesolver/v5 v5.1.1/go.mod h1:Fs1KbKhVRnB2aDWN12NjKCB+RgYMWZJ294T3BtmVCpQ= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= +github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= +github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/sony/gobreaker v0.5.0 h1:dRCvqm0P490vZPmy7ppEk2qCnCieBooFJ+YoXGYB+yg= +github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= +github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.8.0 h1:gEN9K4b8Xws4EX0+a0reLmhq8moKn7ntRlQYgjPeCDk= +github.com/spf13/cast v1.8.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM= +github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8= +github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= +github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= +github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= +github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= +github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= +github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= +github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= +github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= +github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE= +github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= +github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX8Wdm2/JPA= +github.com/willf/bloom v2.0.3+incompatible/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE= +github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= +go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0= +go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ= +go.etcd.io/etcd/api/v3 v3.5.4 h1:OHVyt3TopwtUQ2GKdd5wu3PmmipR4FTwCqoEjSyRdIc= +go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= +go.etcd.io/etcd/client/pkg/v3 v3.5.4 h1:lrneYvz923dvC14R54XcA7FXoZ3mlGZAgmwhfm7HqOg= +go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v3 v3.5.4 h1:p83BUL3tAYS0OT/r0qglgc3M1JjhM0diV8DSWAhVXv4= +go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= +go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM= +go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 h1:8PzrQFk3oKiT1Sd5EmNEcagdMyt1KcBy5/OyF5He5gY= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0015/go.mod h1:I1PqyHJlsXjANC73tp43nDId7/jiv82NoZZ6uS0xdwM= +go.opentelemetry.io/collector/semconv v0.81.0 h1:lCYNNo3powDvFIaTPP2jDKIrBiV1T92NK4QgL/aHYXw= +go.opentelemetry.io/collector/semconv v0.81.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= +go.opentelemetry.io/contrib/bridges/otelzap v0.9.0 h1:f+xpAfhQTjR8beiSMe1bnT/25PkeyWmOcI+SjXWguNw= +go.opentelemetry.io/contrib/bridges/otelzap v0.9.0/go.mod h1:T1Z1jyS5FttgQoF6UcGhnM+gF9wU32B4lHO69nXw4FE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 h1:PS8wXpbyaDJQ2VDHHncMe9Vct0Zn1fEjpsjrLxGJoSc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0/go.mod h1:HDBUsEjOuRC0EzKZ1bSaRGZWUBAzo+MhAcUUORSr4D0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= +go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= +go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 h1:5dTKu4I5Dn4P2hxyW3l3jTaZx9ACgg0ECos1eAVrheY= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0/go.mod h1:P5HcUI8obLrCCmM3sbVBohZFH34iszk/+CPWuakZWL8= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 h1:ajl4QczuJVA2TU9W9AGw++86Xga/RKt//16z/yxPgdk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0/go.mod h1:Vn3/rlOJ3ntf/Q3zAI0V5lDnTbHGaUsNUeF6nZmm7pA= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 h1:dNzwXjZKpMpE2JhmO+9HsPl42NIXFIFSUSSs0fiqra0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0/go.mod h1:90PoxvaEB5n6AOdZvi+yWJQoE95U8Dhhw2bSyRqnTD0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE= +go.opentelemetry.io/otel/log v0.10.0 h1:1CXmspaRITvFcjA4kyVszuG4HjA61fPDxMb7q3BuyF0= +go.opentelemetry.io/otel/log v0.10.0/go.mod h1:PbVdm9bXKku/gL0oFfUF4wwsQsOPlpo4VEqjvxih+FM= +go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= +go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= +go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs= +go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY= +go.opentelemetry.io/otel/sdk/log v0.10.0 h1:lR4teQGWfeDVGoute6l0Ou+RpFqQ9vaPdrNJlST0bvw= +go.opentelemetry.io/otel/sdk/log v0.10.0/go.mod h1:A+V1UTWREhWAittaQEG4bYm4gAZa6xnvVu+xKrIRkzo= +go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o= +go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w= +go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= +go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= +go.opentelemetry.io/proto/otlp v1.6.0 h1:jQjP+AQyTf+Fe7OKj/MfkDrmK4MNVtw2NpXsf9fefDI= +go.opentelemetry.io/proto/otlp v1.6.0/go.mod h1:cicgGehlFuNdgZkcALOCh3VE6K/u2tAjzlRhDwmVpZc= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.18.1 h1:CSUJ2mjFszzEWt4CdKISEuChVIXGBn3lAPwkRGyVrc4= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go4.org/netipx v0.0.0-20230125063823-8449b0a6169f h1:ketMxHg+vWm3yccyYiq+uK8D3fRmna2Fcj+awpQp84s= +go4.org/netipx v0.0.0-20230125063823-8449b0a6169f/go.mod h1:tgPU4N2u9RByaTN3NC2p9xOzyFpte4jYwsIIRF7XlSc= +golang.org/x/arch v0.16.0 h1:foMtLTdyOmIniqWCHjY6+JxuC54XP1fDwx4N0ASyW+U= +golang.org/x/arch v0.16.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= +golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b h1:QoALfVG9rhQ/M7vYDScfPdWjGL9dlsVVM5VGh7aKoAA= +golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ= +golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= -golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= +golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= +golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= +golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= +golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= +golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= +golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= -golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= +golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= +gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 h1:Kog3KlB4xevJlAcbbbzPfRG0+X9fdoGM+UBRKVz6Wr0= +google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237/go.mod h1:ezi0AVyMKDWy5xAncvjLWH7UcLBB5n7y2fQ8MzjJcto= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 h1:cJfm9zPbe1e873mHJzmQ1nwVEeRDU/T1wXDK2kUSU34= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= -google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA= +google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= +google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= +k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= +k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= +k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= +k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= +k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= +k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= +k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= +k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= +k8s.io/utils v0.0.0-20230711102312-30195339c3c7 h1:ZgnF1KZsYxWIifwSNZFZgNtWE89WI5yiP5WwlfDoIyc= +k8s.io/utils v0.0.0-20230711102312-30195339c3c7/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk= +sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/packages/client-proxy/internal/consts.go b/packages/client-proxy/internal/consts.go new file mode 100644 index 0000000..78e5850 --- /dev/null +++ b/packages/client-proxy/internal/consts.go @@ -0,0 +1,65 @@ +package internal + +import ( + "os" + + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/shared/pkg/env" + "github.com/e2b-dev/infra/packages/shared/pkg/utils" +) + +const ( + edgePortEnv = "EDGE_PORT" + edgeSecretEnv = "EDGE_SECRET" + proxyPortEnv = "PROXY_PORT" + orchestratorPortEnv = "ORCHESTRATOR_PORT" + + defaultEdgePort = 3001 + defaultProxyPort = 3002 + defaultOrchestratorPort = 5008 +) + +func GetEdgeServicePort() int { + p, err := env.GetEnvAsInt(edgePortEnv, defaultEdgePort) + if err != nil { + zap.L().Fatal("Failed to get environment variable", zap.Error(err), zap.String("env", edgePortEnv)) + } + + return p +} + +func GetEdgeServiceSecret() string { + secret := os.Getenv(edgeSecretEnv) + if secret == "" { + zap.L().Fatal("Failed to get edge service secret") + } + + return secret +} + +func GetProxyServicePort() int { + p, err := env.GetEnvAsInt(proxyPortEnv, defaultProxyPort) + if err != nil { + zap.L().Fatal("Failed to get environment variable", zap.Error(err), zap.String("env", proxyPortEnv)) + } + + return p +} + +func GetOrchestratorServicePort() int { + p, err := env.GetEnvAsInt(orchestratorPortEnv, defaultOrchestratorPort) + if err != nil { + zap.L().Fatal("Failed to get environment variable", zap.Error(err), zap.String("env", orchestratorPortEnv)) + } + + return p +} + +func GetNodeIP() string { + return utils.RequiredEnv("NODE_IP", "Node IP of the instance node is required") +} + +func GetNodeID() string { + return utils.RequiredEnv("NODE_ID", "Node ID of the instance node is required") +} diff --git a/packages/client-proxy/internal/edge-pass-through/proxy.go b/packages/client-proxy/internal/edge-pass-through/proxy.go new file mode 100644 index 0000000..db6212f --- /dev/null +++ b/packages/client-proxy/internal/edge-pass-through/proxy.go @@ -0,0 +1,206 @@ +package edgepassthrough + +import ( + "context" + "io" + + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/metadata" + "google.golang.org/grpc/status" + "google.golang.org/protobuf/types/known/emptypb" + + "github.com/e2b-dev/infra/packages/proxy/internal/edge/authorization" + e2binfo "github.com/e2b-dev/infra/packages/proxy/internal/edge/info" + e2borchestrators "github.com/e2b-dev/infra/packages/proxy/internal/edge/pool" + "github.com/e2b-dev/infra/packages/shared/pkg/consts" + api "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" +) + +type NodePassThroughServer struct { + nodes *e2borchestrators.OrchestratorsPool + info *e2binfo.ServiceInfo + server *grpc.Server + + ctx context.Context + authorization authorization.AuthorizationService +} + +const ( + grpcMaxMsgSize = 5 * 1024 * 1024 // 5 MiB + grpcHealthMethodName = "/EdgePassThrough/healthcheck" +) + +var clientStreamDescForProxying = &grpc.StreamDesc{ServerStreams: true, ClientStreams: true} + +func NewNodePassThroughServer(ctx context.Context, nodes *e2borchestrators.OrchestratorsPool, info *e2binfo.ServiceInfo, authorization authorization.AuthorizationService) *grpc.Server { + nodePassThrough := &NodePassThroughServer{ + authorization: authorization, + nodes: nodes, + info: info, + ctx: ctx, + } + + return grpc.NewServer( + grpc.UnknownServiceHandler(nodePassThrough.Handler), + grpc.MaxRecvMsgSize(grpcMaxMsgSize), + ) +} + +func (s *NodePassThroughServer) director(ctx context.Context) (*grpc.ClientConn, error) { + md, ok := metadata.FromIncomingContext(ctx) + if !ok { + return nil, status.Error(codes.InvalidArgument, "error getting metadata from context") + } + + auths := md.Get(consts.EdgeRpcAuthHeader) + if len(auths) == 0 || len(auths) > 1 { + return nil, status.Error(codes.Unauthenticated, "error getting authentication metadata from context") + } + + // Verify authorization header + auth := auths[0] + err := s.authorization.VerifyAuthorization(auth) + if err != nil { + return nil, status.Error(codes.PermissionDenied, err.Error()) + } + + serviceInstanceIDs := md.Get(consts.EdgeRpcServiceInstanceIDHeader) + if len(serviceInstanceIDs) == 0 || len(serviceInstanceIDs) > 1 { + return nil, status.Error(codes.InvalidArgument, "service instance id header missing or invalid") + } + + serviceInstanceID := serviceInstanceIDs[0] + serviceInstance, ok := s.nodes.GetOrchestrator(serviceInstanceID) + if !ok { + return nil, status.Error(codes.NotFound, "service instance not found") + } + + return serviceInstance.Client.Connection, nil +} + +// Handler - following code implement a gRPC pass-through proxy that forwards requests to the appropriate node +// Code is based on following source: https://github.com/siderolabs/grpc-proxy/tree/main +// +// Core implementation is just following methods that are handling forwarding, proper closing and propagating of errors from both sides of the stream. +// The handler is called for every request that is not handled by any other gRPC service. +func (s *NodePassThroughServer) Handler(srv interface{}, serverStream grpc.ServerStream) error { + fullMethodName, ok := grpc.MethodFromServerStream(serverStream) + if !ok { + return status.Errorf(codes.Internal, "low lever server stream not exists in context") + } + + // AWS ALB health check does not allow us to do health check on different HTTP protocol that + // on that that is used for actually proxying. So we cannot use edge API for health check as in other cases. + if fullMethodName == grpcHealthMethodName { + // we don't want to directly return error when service is marked as unhealthy + // state should be managed by load balancer that will stop sending requests to this service + if s.info.GetStatus() != api.Unhealthy { + return status.Error(codes.OK, "healthy") + } + + return status.Error(codes.Unavailable, "unhealthy") + } + + // We require that the director's returned context inherits from the serverStream.Context(). + clientConnection, err := s.director(serverStream.Context()) + if err != nil { + return err + } + + clientCtx, clientCancel := context.WithCancel(s.ctx) + defer clientCancel() + + clientStream, err := grpc.NewClientStream(clientCtx, clientStreamDescForProxying, clientConnection, fullMethodName) + if err != nil { + return err + } + + // Explicitly *do not close* s2cErrChan and c2sErrChan, otherwise the select below will not terminate. + // Channels do not have to be closed, it is just a control flow mechanism, see + // https://groups.google.com/forum/#!msg/golang-nuts/pZwdYRGxCIk/qpbHxRRPJdUJ + s2cErrChan := s.forwardServerToClient(serverStream, clientStream) + c2sErrChan := s.forwardClientToServer(clientStream, serverStream) + + // We don't know which side is going to stop sending first, so we need a select between the two. + for i := 0; i < 2; i++ { + select { + case s2cErr := <-s2cErrChan: + if s2cErr == io.EOF { + // this is the happy case where the sender has encountered io.EOF, and won't be sending anymore./ + // the clientStream>serverStream may continue pumping though. + clientStream.CloseSend() + } else { + // however, we may have gotten a receive error (stream disconnected, a read error etc) in which case we need + // to cancel the clientStream to the backend, let all of its goroutines be freed up by the CancelFunc and + // exit with an error to the stack + clientCancel() + return status.Errorf(codes.Internal, "failed proxying s2c: %v", s2cErr) + } + case c2sErr := <-c2sErrChan: + // This happens when the clientStream has nothing else to offer (io.EOF), returned a gRPC error. In those two + // cases we may have received Trailers as part of the call. In case of other errors (stream closed) the trailers + // will be nil. + serverStream.SetTrailer(clientStream.Trailer()) + // c2sErr will contain RPC error from client code. If not io.EOF return the RPC error as server stream error. + if c2sErr != io.EOF { + return c2sErr + } + return nil + } + } + + return status.Errorf(codes.Internal, "gRPC proxying should never reach this stage.") +} + +func (s *NodePassThroughServer) forwardClientToServer(src grpc.ClientStream, dst grpc.ServerStream) chan error { + ret := make(chan error, 1) + + go func() { + md, err := src.Header() + if err != nil { + ret <- err + return + } + + if err := dst.SendHeader(md); err != nil { + ret <- err + return + } + + f := &emptypb.Empty{} + for { + if err := src.RecvMsg(f); err != nil { + ret <- err // this can be io.EOF which is happy case + break + } + + if err := dst.SendMsg(f); err != nil { + ret <- err + break + } + } + }() + + return ret +} + +func (s *NodePassThroughServer) forwardServerToClient(src grpc.ServerStream, dst grpc.ClientStream) chan error { + ret := make(chan error, 1) + + go func() { + f := &emptypb.Empty{} + for { + if err := src.RecvMsg(f); err != nil { + ret <- err // this can be io.EOF which is happy case + break + } + if err := dst.SendMsg(f); err != nil { + ret <- err + break + } + } + }() + + return ret +} diff --git a/packages/client-proxy/internal/edge/authorization/authorization.go b/packages/client-proxy/internal/edge/authorization/authorization.go new file mode 100644 index 0000000..c6825e4 --- /dev/null +++ b/packages/client-proxy/internal/edge/authorization/authorization.go @@ -0,0 +1,27 @@ +package authorization + +import ( + "errors" +) + +type AuthorizationService interface { + VerifyAuthorization(token string) error +} + +type StaticTokenAuthorizationService struct { + secret string +} + +var ErrInvalidAuthorizationToken = errors.New("invalid authorization token") + +func NewStaticTokenAuthorizationService(secret string) AuthorizationService { + return &StaticTokenAuthorizationService{secret: secret} +} + +func (s *StaticTokenAuthorizationService) VerifyAuthorization(token string) error { + if token != s.secret { + return ErrInvalidAuthorizationToken + } + + return nil +} diff --git a/packages/client-proxy/internal/edge/handlers/healthy.go b/packages/client-proxy/internal/edge/handlers/healthy.go new file mode 100644 index 0000000..7166531 --- /dev/null +++ b/packages/client-proxy/internal/edge/handlers/healthy.go @@ -0,0 +1,47 @@ +package handlers + +import ( + "net/http" + + "github.com/gin-gonic/gin" + + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" +) + +// HealthCheck is used by load balancer to check if the Edge API and Edge GRPC proxy services are healthy. +func (a *APIStore) HealthCheck(c *gin.Context) { + status := a.info.GetStatus() + + if status == api.Healthy || status == api.Draining { + c.Status(http.StatusOK) + c.Writer.Write([]byte("healthy")) + return + } + + c.Status(http.StatusServiceUnavailable) + c.Writer.Write([]byte("unhealthy")) +} + +// HealthCheckTraffic is used by load balancer target group to check if sandbox traffic should be routed to this instance. +func (a *APIStore) HealthCheckTraffic(c *gin.Context) { + if a.info.GetStatus() == api.Healthy { + c.Status(http.StatusOK) + c.Writer.Write([]byte("healthy")) + return + } + + c.Status(http.StatusServiceUnavailable) + c.Writer.Write([]byte("unhealthy")) +} + +// HealthCheckMachine is used mainly for instances management such as autoscaling group to notify instance is ready for safe termination. +func (a *APIStore) HealthCheckMachine(c *gin.Context) { + if a.info.IsTerminating() { + c.Status(http.StatusServiceUnavailable) + c.Writer.Write([]byte("service is terminating")) + return + } + + c.Status(http.StatusOK) + c.Writer.Write([]byte("running")) +} diff --git a/packages/client-proxy/internal/edge/handlers/info.go b/packages/client-proxy/internal/edge/handlers/info.go new file mode 100644 index 0000000..5819c07 --- /dev/null +++ b/packages/client-proxy/internal/edge/handlers/info.go @@ -0,0 +1,25 @@ +package handlers + +import ( + "net/http" + + "github.com/gin-gonic/gin" + + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" +) + +func (a *APIStore) V1Info(c *gin.Context) { + info := a.info + + c.JSON( + http.StatusOK, + api.ClusterNodeInfo{ + NodeID: info.NodeID, + ServiceInstanceID: info.ServiceInstanceID, + ServiceStatus: info.GetStatus(), + ServiceStartup: info.ServiceStartup, + ServiceVersion: info.ServiceVersion, + ServiceVersionCommit: info.ServiceVersionCommit, + }, + ) +} diff --git a/packages/client-proxy/internal/edge/handlers/sandbox-catalog-create-entry.go b/packages/client-proxy/internal/edge/handlers/sandbox-catalog-create-entry.go new file mode 100644 index 0000000..724998b --- /dev/null +++ b/packages/client-proxy/internal/edge/handlers/sandbox-catalog-create-entry.go @@ -0,0 +1,49 @@ +package handlers + +import ( + "fmt" + "net/http" + "time" + + "github.com/gin-gonic/gin" + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/proxy/internal/edge/sandboxes" + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" + l "github.com/e2b-dev/infra/packages/shared/pkg/logger" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +func (a *APIStore) V1SandboxCatalogCreate(c *gin.Context) { + ctx := c.Request.Context() + + body, err := parseBody[api.V1SandboxCatalogCreateJSONRequestBody](ctx, c) + if err != nil { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing request: %s", err)) + telemetry.ReportCriticalError(ctx, "error when parsing request", err) + return + } + + _, span := a.tracer.Start(ctx, "create-sandbox-catalog-entry-handler") + defer span.End() + + sbxMaxLifetime := time.Duration(body.SandboxMaxLength) * time.Hour + sbxInfo := &sandboxes.SandboxInfo{ + OrchestratorId: body.OrchestratorId, + ExecutionId: body.ExecutionId, + + SandboxMaxLengthInHours: body.SandboxMaxLength, + SandboxStartedAt: body.SandboxStartTime, + } + + err = a.sandboxes.StoreSandbox(body.SandboxId, sbxInfo, sbxMaxLifetime) + if err != nil { + zap.L().Error("Error when storing sandbox in catalog", zap.Error(err)) + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when storing sandbox in catalog") + telemetry.ReportCriticalError(ctx, "error when storing sandbox in catalog", err) + return + } + + zap.L().Info("Sandbox successfully stored in catalog", l.WithSandboxID(body.SandboxId)) + c.Status(http.StatusOK) +} diff --git a/packages/client-proxy/internal/edge/handlers/sandbox-catalog-delete-entry.go b/packages/client-proxy/internal/edge/handlers/sandbox-catalog-delete-entry.go new file mode 100644 index 0000000..26db952 --- /dev/null +++ b/packages/client-proxy/internal/edge/handlers/sandbox-catalog-delete-entry.go @@ -0,0 +1,38 @@ +package handlers + +import ( + "fmt" + "net/http" + + "github.com/gin-gonic/gin" + "go.uber.org/zap" + + api "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" + l "github.com/e2b-dev/infra/packages/shared/pkg/logger" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +func (a *APIStore) V1SandboxCatalogDelete(c *gin.Context) { + ctx := c.Request.Context() + + body, err := parseBody[api.V1SandboxCatalogDeleteJSONRequestBody](ctx, c) + if err != nil { + a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing request: %s", err)) + telemetry.ReportCriticalError(ctx, "error when parsing request", err) + return + } + + _, span := a.tracer.Start(ctx, "delete-sandbox-catalog-entry-handler") + defer span.End() + + err = a.sandboxes.DeleteSandbox(body.SandboxId, body.ExecutionId) + if err != nil { + zap.L().Error("Error when deleting sandbox from catalog", zap.Error(err)) + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when deleting sandbox from catalog") + telemetry.ReportCriticalError(ctx, "error when deleting sandbox from catalog", err) + return + } + + zap.L().Info("Sandbox successfully removed from catalog", l.WithSandboxID(body.SandboxId)) + c.Status(http.StatusOK) +} diff --git a/packages/client-proxy/internal/edge/handlers/service-discovery-node-drain.go b/packages/client-proxy/internal/edge/handlers/service-discovery-node-drain.go new file mode 100644 index 0000000..3a6c9a3 --- /dev/null +++ b/packages/client-proxy/internal/edge/handlers/service-discovery-node-drain.go @@ -0,0 +1,98 @@ +package handlers + +import ( + "context" + "errors" + "net/http" + "time" + + "github.com/gin-gonic/gin" + "go.uber.org/zap" + + orchestratorinfo "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" +) + +func (a *APIStore) V1ServiceDiscoveryNodeDrain(c *gin.Context, serviceID string) { + _, templateSpan := a.tracer.Start(c, "service-discovery-node-drain-handler") + defer templateSpan.End() + + // requests was for this node + if serviceID == a.info.ServiceInstanceID { + a.info.SetStatus(api.Draining) + c.Status(http.StatusOK) + return + } + + reqTimeout, reqTimeoutCancel := context.WithTimeout(c.Request.Context(), 5*time.Second) + defer reqTimeoutCancel() + + // send request to neighboring node + err := a.sendNodeRequest(reqTimeout, serviceID, api.Draining) + if err != nil { + a.sendAPIStoreError(c, http.StatusBadRequest, "Error when calling service discovery service") + return + } + + c.Status(http.StatusOK) +} + +func (a *APIStore) sendNodeRequest(ctx context.Context, serviceID string, status api.ClusterNodeStatus) error { + findCtx, findCtxCancel := context.WithTimeout(ctx, 5*time.Second) + defer findCtxCancel() + + logger := a.logger.With(zap.String("service_id", serviceID)) + + // try to find orchestrator node first + o, ok := a.orchestratorPool.GetOrchestrator(serviceID) + if ok { + logger.Info("found orchestrator node, calling status change request") + + var orchestratorStatus orchestratorinfo.ServiceInfoStatus + + switch status { + case api.Draining: + orchestratorStatus = orchestratorinfo.ServiceInfoStatus_OrchestratorDraining + case api.Unhealthy: + orchestratorStatus = orchestratorinfo.ServiceInfoStatus_OrchestratorUnhealthy + case api.Healthy: + orchestratorStatus = orchestratorinfo.ServiceInfoStatus_OrchestratorHealthy + default: + logger.Error("failed to transform node status to orchestrator status", zap.String("status", string(status))) + return errors.New("failed to transform node status to orchestrator status") + } + + _, err := o.Client.Info.ServiceStatusOverride( + findCtx, &orchestratorinfo.ServiceStatusChangeRequest{ServiceStatus: orchestratorStatus}, + ) + if err != nil { + logger.Error("failed to request orchestrator status change", zap.Error(err)) + return errors.New("failed to request orchestrator status change") + } + + return nil + } + + // try to find edge node + e, err := a.edgePool.GetNode(serviceID) + if err != nil { + logger.Error("failed to get node from edge pool", zap.Error(err)) + return errors.New("failed to get edge node") + } + + switch status { + case api.Draining: + _, err = e.Client.V1ServiceDiscoveryNodeDrain(ctx, serviceID) + case api.Unhealthy: + _, err = e.Client.V1ServiceDiscoveryNodeKill(ctx, serviceID) + default: + return errors.New("failed to transform node status to api call") + } + + if err != nil { + logger.Error("failed to request edge node status change", zap.Error(err)) + return errors.New("failed to request edge node status change") + } + + return nil +} diff --git a/packages/client-proxy/internal/edge/handlers/service-discovery-node-kill.go b/packages/client-proxy/internal/edge/handlers/service-discovery-node-kill.go new file mode 100644 index 0000000..bb528e8 --- /dev/null +++ b/packages/client-proxy/internal/edge/handlers/service-discovery-node-kill.go @@ -0,0 +1,35 @@ +package handlers + +import ( + "context" + "net/http" + "time" + + "github.com/gin-gonic/gin" + + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" +) + +func (a *APIStore) V1ServiceDiscoveryNodeKill(c *gin.Context, serviceID string) { + _, templateSpan := a.tracer.Start(c, "service-discovery-node-kill-handler") + defer templateSpan.End() + + // requests was for this node + if serviceID == a.info.ServiceInstanceID { + a.info.SetStatus(api.Unhealthy) + c.Status(http.StatusOK) + return + } + + reqTimeout, reqTimeoutCancel := context.WithTimeout(c.Request.Context(), 5*time.Second) + defer reqTimeoutCancel() + + // send request to neighboring node + err := a.sendNodeRequest(reqTimeout, serviceID, api.Unhealthy) + if err != nil { + a.sendAPIStoreError(c, http.StatusBadRequest, "Error when calling service discovery node") + return + } + + c.Status(http.StatusOK) +} diff --git a/packages/client-proxy/internal/edge/handlers/service-discovery-nodes-list.go b/packages/client-proxy/internal/edge/handlers/service-discovery-nodes-list.go new file mode 100644 index 0000000..0347c62 --- /dev/null +++ b/packages/client-proxy/internal/edge/handlers/service-discovery-nodes-list.go @@ -0,0 +1,76 @@ +package handlers + +import ( + "net/http" + "sort" + + "github.com/gin-gonic/gin" + + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" +) + +func (a *APIStore) V1ServiceDiscoveryNodes(c *gin.Context) { + _, templateSpan := a.tracer.Start(c, "service-discovery-list-nodes-handler") + defer templateSpan.End() + + response := make([]api.ClusterNode, 0) + + // iterate orchestrator pool + for _, orchestrator := range a.orchestratorPool.GetOrchestrators() { + response = append( + response, + api.ClusterNode{ + NodeID: orchestrator.NodeID, + ServiceInstanceID: orchestrator.ServiceInstanceId, + ServiceStatus: getOrchestratorStatusResolved(orchestrator.ServiceStatus), + ServiceType: api.ClusterNodeTypeOrchestrator, + ServiceVersion: orchestrator.ServiceVersion, + ServiceVersionCommit: orchestrator.ServiceVersionCommit, + ServiceHost: orchestrator.Host, + ServiceStartedAt: orchestrator.ServiceStartup, + }, + ) + } + + // iterate edge apis + for _, edge := range a.edgePool.GetNodes() { + response = append( + response, + api.ClusterNode{ + NodeID: edge.NodeID, + ServiceInstanceID: edge.ServiceInstanceID, + ServiceStatus: edge.ServiceStatus, + ServiceType: api.ClusterNodeTypeEdge, + ServiceVersion: edge.ServiceVersion, + ServiceVersionCommit: edge.ServiceVersionCommit, + ServiceHost: edge.Host, + ServiceStartedAt: edge.ServiceStartup, + }, + ) + } + + // append itself + response = append( + response, + api.ClusterNode{ + NodeID: a.info.NodeID, + ServiceInstanceID: a.info.ServiceInstanceID, + ServiceStatus: a.info.GetStatus(), + ServiceType: api.ClusterNodeTypeEdge, + ServiceVersion: a.info.ServiceVersion, + ServiceVersionCommit: a.info.ServiceVersionCommit, + ServiceHost: a.info.Host, + ServiceStartedAt: a.info.ServiceStartup, + }, + ) + + sort.Slice( + response, + func(i, j int) bool { + // older dates first + return response[i].ServiceStartedAt.Before(response[j].ServiceStartedAt) + }, + ) + + c.JSON(http.StatusOK, response) +} diff --git a/packages/client-proxy/internal/edge/handlers/service-discovery-orchestrators.go b/packages/client-proxy/internal/edge/handlers/service-discovery-orchestrators.go new file mode 100644 index 0000000..c9d1353 --- /dev/null +++ b/packages/client-proxy/internal/edge/handlers/service-discovery-orchestrators.go @@ -0,0 +1,84 @@ +package handlers + +import ( + "net/http" + "sort" + + "github.com/gin-gonic/gin" + "go.uber.org/zap" + + e2borchestrators "github.com/e2b-dev/infra/packages/proxy/internal/edge/pool" + e2bgrpcorchestratorinfo "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" +) + +func (a *APIStore) V1ServiceDiscoveryGetOrchestrators(c *gin.Context) { + _, templateSpan := a.tracer.Start(c, "service-discovery-list-orchestrators-handler") + defer templateSpan.End() + + response := make([]api.ClusterOrchestratorNode, 0) + + for _, node := range a.orchestratorPool.GetOrchestrators() { + response = append( + response, + api.ClusterOrchestratorNode{ + NodeID: node.NodeID, + ServiceInstanceID: node.ServiceInstanceId, + + ServiceVersion: node.ServiceVersion, + ServiceVersionCommit: node.ServiceVersionCommit, + ServiceHost: node.Host, + ServiceStartedAt: node.ServiceStartup, + ServiceStatus: getOrchestratorStatusResolved(node.ServiceStatus), + + Roles: getOrchestratorRolesResolved(node.Roles), + + MetricRamMBUsed: node.MetricMemoryUsedInMB.Load(), + MetricVCpuUsed: node.MetricVCpuUsed.Load(), + MetricDiskMBUsed: node.MetricDiskUsedInMB.Load(), + MetricSandboxesRunning: node.MetricSandboxesRunning.Load(), + }, + ) + } + + sort.Slice( + response, + func(i, j int) bool { + // older dates first + return response[i].ServiceStartedAt.Before(response[j].ServiceStartedAt) + }, + ) + + c.JSON(http.StatusOK, response) +} + +func getOrchestratorStatusResolved(s e2borchestrators.OrchestratorStatus) api.ClusterNodeStatus { + switch s { + case e2borchestrators.OrchestratorStatusHealthy: + return api.Healthy + case e2borchestrators.OrchestratorStatusDraining: + return api.Draining + case e2borchestrators.OrchestratorStatusUnhealthy: + return api.Unhealthy + default: + zap.L().Error("Unknown orchestrator status", zap.String("status", string(s))) + return api.Unhealthy + } +} + +func getOrchestratorRolesResolved(r []e2bgrpcorchestratorinfo.ServiceInfoRole) []api.ClusterOrchestratorRole { + roles := make([]api.ClusterOrchestratorRole, 0) + + for _, role := range r { + switch role { + case e2bgrpcorchestratorinfo.ServiceInfoRole_Orchestrator: + roles = append(roles, api.ClusterOrchestratorRoleOrchestrator) + case e2bgrpcorchestratorinfo.ServiceInfoRole_TemplateBuilder: + roles = append(roles, api.ClusterOrchestratorRoleTemplateBuilder) + default: + zap.L().Error("Unknown orchestrator role", zap.String("role", string(role))) + } + } + + return roles +} diff --git a/packages/client-proxy/internal/edge/handlers/store.go b/packages/client-proxy/internal/edge/handlers/store.go new file mode 100644 index 0000000..7b42fb4 --- /dev/null +++ b/packages/client-proxy/internal/edge/handlers/store.go @@ -0,0 +1,132 @@ +package handlers + +import ( + "context" + "errors" + "fmt" + "os" + "time" + + "github.com/gin-gonic/gin" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/proxy/internal/edge/info" + logger_provider "github.com/e2b-dev/infra/packages/proxy/internal/edge/logger-provider" + e2borchestrators "github.com/e2b-dev/infra/packages/proxy/internal/edge/pool" + "github.com/e2b-dev/infra/packages/proxy/internal/edge/sandboxes" + "github.com/e2b-dev/infra/packages/shared/pkg/env" + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +type APIStore struct { + tracer trace.Tracer + logger *zap.Logger + info *info.ServiceInfo + orchestratorPool *e2borchestrators.OrchestratorsPool + edgePool *e2borchestrators.EdgePool + sandboxes sandboxes.SandboxesCatalog + queryLogsProvider logger_provider.LogsQueryProvider +} + +type APIUserFacingError struct { + internalError error + + prettyErrorMessage string + prettyErrorCode int +} + +const ( + orchestratorsReadinessCheckInterval = 100 * time.Millisecond +) + +var skipInitialOrchestratorCheck = os.Getenv("SKIP_ORCHESTRATOR_READINESS_CHECK") == "true" + +func NewStore(ctx context.Context, logger *zap.Logger, tracer trace.Tracer, info *info.ServiceInfo, orchestratorsPool *e2borchestrators.OrchestratorsPool, edgePool *e2borchestrators.EdgePool, catalog sandboxes.SandboxesCatalog) (*APIStore, error) { + queryLogsProvider, err := logger_provider.GetLogsQueryProvider() + if err != nil { + return nil, fmt.Errorf("error when getting logs query provider: %w", err) + } + + store := &APIStore{ + orchestratorPool: orchestratorsPool, + edgePool: edgePool, + queryLogsProvider: queryLogsProvider, + + info: info, + tracer: tracer, + logger: logger, + sandboxes: catalog, + } + + // Wait till there's at least one orchestrator available + // we don't want to source API until we are sure service discovery and pool is ready to use + go func() { + if env.IsDebug() { + zap.L().Info("Skipping orchestrator readiness check in debug mode") + store.info.SetStatus(api.Healthy) + return + } + + // we don't want to skip it entirely, and we want to wait few seconds in case of cluster already contains orchestrators + // so we are not propagating API without not yet registered orchestrators + if skipInitialOrchestratorCheck { + time.Sleep(10 * time.Second) + store.info.SetStatus(api.Healthy) + return + } + + zap.L().Info("Waiting for at least one orchestrator to be available before marking API as healthy") + ticker := time.NewTicker(orchestratorsReadinessCheckInterval) + for { + select { + case <-ctx.Done(): + return + case <-ticker.C: + list := orchestratorsPool.GetOrchestrators() + if len(list) > 0 { + zap.L().Info("Marking API as healthy, at least one orchestrator is available") + store.info.SetStatus(api.Healthy) + return + } + } + } + }() + + return store, nil +} + +func (a *APIStore) SetDraining() { + a.info.SetStatus(api.Draining) +} + +func (a *APIStore) SetUnhealthy() { + a.info.SetStatus(api.Unhealthy) +} + +func (a *APIStore) SetTerminating() { + a.info.SetTerminating() + a.info.SetStatus(api.Unhealthy) +} + +func (a *APIStore) sendAPIStoreError(c *gin.Context, code int, message string) { + apiErr := api.Error{ + Code: int32(code), + Message: message, + } + + c.Error(errors.New(message)) + c.JSON(code, apiErr) +} + +func parseBody[B any](ctx context.Context, c *gin.Context) (body B, err error) { + err = c.Bind(&body) + if err != nil { + bodyErr := fmt.Errorf("error when parsing request: %w", err) + telemetry.ReportCriticalError(ctx, "error when parsing request", err) + return body, bodyErr + } + + return body, nil +} diff --git a/packages/client-proxy/internal/edge/handlers/template-build-logs.go b/packages/client-proxy/internal/edge/handlers/template-build-logs.go new file mode 100644 index 0000000..a56fa3e --- /dev/null +++ b/packages/client-proxy/internal/edge/handlers/template-build-logs.go @@ -0,0 +1,50 @@ +package handlers + +import ( + "net/http" + "time" + + "github.com/gin-gonic/gin" + + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +const ( + templateBuildLogsLimit = 1_000 + templateBuildOldestLogsLimit = 24 * time.Hour // 1 day +) + +func (a *APIStore) V1TemplateBuildLogs(c *gin.Context, buildID string, params api.V1TemplateBuildLogsParams) { + ctx := c.Request.Context() + + _, templateSpan := a.tracer.Start(c, "template-build-logs-handler") + defer templateSpan.End() + + end := time.Now() + start := end.Add(-templateBuildOldestLogsLimit) + + offset := 0 + if params.Offset != nil { + offset = int(*params.Offset) + } + + logsRaw, err := a.queryLogsProvider.QueryBuildLogs(ctx, params.TemplateID, buildID, start, end, templateBuildLogsLimit, offset) + if err != nil { + a.sendAPIStoreError(c, http.StatusInternalServerError, "Error when fetching template build logs") + telemetry.ReportCriticalError(ctx, "error when fetching template build logs", err) + return + } + + logs := make([]string, 0, len(logsRaw)) + for _, log := range logsRaw { + logs = append(logs, log.Line) + } + + c.JSON( + http.StatusOK, + api.TemplateBuildLogsResponse{ + Logs: logs, + }, + ) +} diff --git a/packages/client-proxy/internal/edge/http.go b/packages/client-proxy/internal/edge/http.go new file mode 100644 index 0000000..30fcc3b --- /dev/null +++ b/packages/client-proxy/internal/edge/http.go @@ -0,0 +1,161 @@ +package edge + +import ( + "context" + "errors" + "fmt" + "net/http" + "regexp" + "strings" + "time" + + "github.com/getkin/kin-openapi/openapi3" + "github.com/getkin/kin-openapi/openapi3filter" + limits "github.com/gin-contrib/size" + ginzap "github.com/gin-contrib/zap" + "github.com/gin-gonic/gin" + middleware "github.com/oapi-codegen/gin-middleware" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/proxy/internal/edge/authorization" + "github.com/e2b-dev/infra/packages/proxy/internal/edge/handlers" + "github.com/e2b-dev/infra/packages/shared/pkg/consts" + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +const ( + securitySchemaName = "ApiKeyAuth" + + forbiddenErrPrefix = "access forbidden: " + securityErrPrefix = "error in openapi3filter.SecurityRequirementsError: security requirements failed: " + + maxMultipartMemory = 1 << 27 // 128 MiB + maxUploadLimit = 1 << 28 // 256 MiB +) + +var ( + ErrMissingAuthHeader = errors.New("authorization header is missing") + ErrInvalidAuth = errors.New("authorization is invalid") + + skippedPaths = regexp.MustCompile(`^(?:/health(?:/.*)?|/v1/info)$`) +) + +func NewGinServer(logger *zap.Logger, store *handlers.APIStore, swagger *openapi3.T, tracer trace.Tracer, auth authorization.AuthorizationService) *gin.Engine { + // Clear out the servers array in the swagger spec, that skips validating + // that server names match. We don't know how this thing will be run. + swagger.Servers = nil + + gin.SetMode(gin.ReleaseMode) + + handler := gin.New() + handler.MaxMultipartMemory = maxMultipartMemory + + // Use our validation middleware to check all requests against the + // OpenAPI schema. + handler.Use( + gin.Recovery(), + limits.RequestSizeLimiter(maxUploadLimit), + middleware.OapiRequestValidatorWithOptions( + swagger, + &middleware.Options{ + ErrorHandler: ginErrorHandler, + Options: openapi3filter.Options{ + AuthenticationFunc: ginBuildAuthenticationHandler(tracer, auth), + MultiError: false, + }, + }, + ), + + func(c *gin.Context) { + if skippedPaths.MatchString(c.Request.URL.Path) { + c.Next() + return + } + + func(c *gin.Context) { + reqLogger := logger + ginzap.Ginzap(reqLogger, time.RFC3339Nano, true)(c) + }(c) + }, + ) + + api.RegisterHandlersWithOptions(handler, store, api.GinServerOptions{}) + return handler +} + +func ginBuildAuthenticationHandler(tracer trace.Tracer, auth authorization.AuthorizationService) func(ctx context.Context, input *openapi3filter.AuthenticationInput) error { + return func(ctx context.Context, input *openapi3filter.AuthenticationInput) error { + ginContext := ctx.Value(middleware.GinContextKey).(*gin.Context) + requestContext := ginContext.Request.Context() + + _, span := tracer.Start(requestContext, "authenticate") + defer span.End() + + if input.SecuritySchemeName != securitySchemaName { + return fmt.Errorf("invalid security scheme name '%s'", input.SecuritySchemeName) + } + + request := input.RequestValidationInput.Request + + // Check for the Authorization header. + key := request.Header.Get(consts.EdgeApiAuthHeader) + if key == "" { + return ErrMissingAuthHeader + } + + // Check if the key matches the secret. + err := auth.VerifyAuthorization(key) + if err != nil { + return ErrInvalidAuth + } + + return nil + } +} + +func ginErrorHandler(c *gin.Context, message string, statusCode int) { + var errMsg error + + ctx := c.Request.Context() + + data, err := c.GetRawData() + if err == nil { + errMsg = fmt.Errorf("OpenAPI validation error: %s, data: %s", message, data) + } else { + errMsg = fmt.Errorf("OpenAPI validation error: %s, body read error: %w", message, err) + } + + telemetry.ReportError(ctx, message, errMsg) + + c.Error(errMsg) + + // Handle forbidden errors + if strings.HasPrefix(message, forbiddenErrPrefix) { + c.AbortWithStatusJSON( + http.StatusForbidden, + gin.H{ + "code": http.StatusForbidden, + "message": strings.TrimPrefix(message, forbiddenErrPrefix), + }, + ) + + return + } + + // Handle security requirements errors from the openapi3filter + if strings.HasPrefix(message, securityErrPrefix) { + c.AbortWithStatusJSON( + http.StatusUnauthorized, + gin.H{ + "code": http.StatusUnauthorized, + "message": strings.TrimPrefix(message, securityErrPrefix), + }, + ) + + return + } + + c.AbortWithStatusJSON(statusCode, gin.H{"code": statusCode, "message": fmt.Errorf("validation error: %s", message).Error()}) +} diff --git a/packages/client-proxy/internal/edge/info/info.go b/packages/client-proxy/internal/edge/info/info.go new file mode 100644 index 0000000..a0fd346 --- /dev/null +++ b/packages/client-proxy/internal/edge/info/info.go @@ -0,0 +1,55 @@ +package info + +import ( + "sync" + "time" + + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" +) + +type ServiceInfo struct { + NodeID string + + ServiceInstanceID string + ServiceVersion string + ServiceVersionCommit string + ServiceStartup time.Time + + Host string + + terminating bool + status api.ClusterNodeStatus + statusMu sync.RWMutex +} + +func (s *ServiceInfo) GetStatus() api.ClusterNodeStatus { + s.statusMu.RLock() + defer s.statusMu.RUnlock() + + return s.status +} + +func (s *ServiceInfo) SetStatus(status api.ClusterNodeStatus) { + s.statusMu.Lock() + defer s.statusMu.Unlock() + + if s.status != status { + zap.L().Info("Service status changed", zap.String("status", string(status))) + s.status = status + } +} + +func (s *ServiceInfo) SetTerminating() { + s.statusMu.Lock() + defer s.statusMu.Unlock() + s.terminating = true +} + +func (s *ServiceInfo) IsTerminating() bool { + s.statusMu.RLock() + defer s.statusMu.RUnlock() + + return s.terminating +} diff --git a/packages/client-proxy/internal/edge/logger-provider/provider.go b/packages/client-proxy/internal/edge/logger-provider/provider.go new file mode 100644 index 0000000..4fb01e1 --- /dev/null +++ b/packages/client-proxy/internal/edge/logger-provider/provider.go @@ -0,0 +1,20 @@ +package logger_provider + +import ( + "context" + "time" +) + +type LogsQueryProvider interface { + QueryBuildLogs(ctx context.Context, templateId string, buildId string, start time.Time, end time.Time, limit int, offset int) ([]LogEntry, error) + QuerySandboxLogs(ctx context.Context, teamId string, sandboxId string, start time.Time, end time.Time, limit int, offset int) ([]LogEntry, error) +} + +type LogEntry struct { + Timestamp time.Time + Line string +} + +func GetLogsQueryProvider() (LogsQueryProvider, error) { + return NewLokiQueryProvider() +} diff --git a/packages/client-proxy/internal/edge/logger-provider/provider_loki.go b/packages/client-proxy/internal/edge/logger-provider/provider_loki.go new file mode 100644 index 0000000..daf3d90 --- /dev/null +++ b/packages/client-proxy/internal/edge/logger-provider/provider_loki.go @@ -0,0 +1,129 @@ +package logger_provider + +import ( + "context" + "encoding/json" + "fmt" + "os" + "slices" + "strings" + "time" + + loki "github.com/grafana/loki/pkg/logcli/client" + "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/pkg/logproto" + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +var ( + lokiAddressEnvName = "LOKI_URL" + lokiAddress = os.Getenv(lokiAddressEnvName) +) + +type LokiQueryProvider struct { + client *loki.DefaultClient +} + +func NewLokiQueryProvider() (*LokiQueryProvider, error) { + var lokiClient *loki.DefaultClient + + if lokiAddress == "" { + return nil, fmt.Errorf("loki address is empty, please set the %s environment variable", lokiAddressEnvName) + } + + // optional authentication supported + lokiUser := os.Getenv("LOKI_USER") + lokiPassword := os.Getenv("LOKI_PASSWORD") + + lokiClient = &loki.DefaultClient{ + Address: lokiAddress, + Username: lokiUser, + Password: lokiPassword, + } + + return &LokiQueryProvider{client: lokiClient}, nil +} + +func (l *LokiQueryProvider) QueryBuildLogs(ctx context.Context, templateId string, buildId string, start time.Time, end time.Time, limit int, offset int) ([]LogEntry, error) { + // https://grafana.com/blog/2021/01/05/how-to-escape-special-characters-with-lokis-logql/ + templateIdSanitized := strings.ReplaceAll(templateId, "`", "") + buildIdSanitized := strings.ReplaceAll(buildId, "`", "") + + // todo: service name is different here (because new merged orchestrator) + query := fmt.Sprintf("{service=\"template-manager\", buildID=\"%s\", envID=`%s`}", buildIdSanitized, templateIdSanitized) + + res, err := l.client.QueryRange(query, limit, start, end, logproto.FORWARD, time.Duration(0), time.Duration(0), true) + if err != nil { + telemetry.ReportError(ctx, "error when returning logs for template build", err) + zap.L().Error("error when returning logs for template build", zap.Error(err), zap.String("buildId", buildId)) + return make([]LogEntry, 0), nil + } + + logs, err := l.lokiResponseMapper(res, offset) + if err != nil { + telemetry.ReportError(ctx, "error when mapping build logs", err) + zap.L().Error("error when mapping logs for template build", zap.Error(err), zap.String("buildId", buildId)) + return make([]LogEntry, 0), nil + } + + return logs, nil +} + +func (l *LokiQueryProvider) QuerySandboxLogs(ctx context.Context, teamId string, sandboxId string, start time.Time, end time.Time, limit int, offset int) ([]LogEntry, error) { + // https://grafana.com/blog/2021/01/05/how-to-escape-special-characters-with-lokis-logql/ + sandboxIdSanitized := strings.ReplaceAll(sandboxId, "`", "") + teamIdSanitized := strings.ReplaceAll(teamId, "`", "") + + query := fmt.Sprintf("{teamID=`%s`, sandboxID=`%s`, category!=\"metrics\"}", teamIdSanitized, sandboxIdSanitized) + + res, err := l.client.QueryRange(query, limit, start, end, logproto.FORWARD, time.Duration(0), time.Duration(0), true) + if err != nil { + telemetry.ReportError(ctx, "error when returning logs for sandbox", err) + zap.L().Error("error when returning logs for sandbox", zap.Error(err), zap.String("sandboxId", sandboxId)) + return make([]LogEntry, 0), nil + } + + logs, err := l.lokiResponseMapper(res, offset) + if err != nil { + telemetry.ReportError(ctx, "error when mapping sandbox logs", err) + zap.L().Error("error when mapping logs for sandbox", zap.Error(err), zap.String("sandboxId", sandboxId)) + return make([]LogEntry, 0), nil + } + + return logs, nil +} + +func (l *LokiQueryProvider) lokiResponseMapper(res *loghttp.QueryResponse, offset int) ([]LogEntry, error) { + logsCrawled := 0 + logs := make([]LogEntry, 0) + + if res.Data.Result.Type() != loghttp.ResultTypeStream { + return nil, fmt.Errorf("unexpected value type received from loki query fetch: %s", res.Data.Result.Type()) + } + + for _, stream := range res.Data.Result.(loghttp.Streams) { + for _, entry := range stream.Entries { + logsCrawled++ + + // loki does not support offset pagination, so we need to skip logs manually + if logsCrawled <= offset { + continue + } + + line := make(map[string]interface{}) + err := json.Unmarshal([]byte(entry.Line), &line) + if err != nil { + zap.L().Error("error parsing log line", zap.Error(err), zap.String("line", entry.Line)) + } + + logs = append(logs, LogEntry{Line: line["message"].(string), Timestamp: entry.Timestamp}) + } + } + + // Sort logs by timestamp (they are returned by the time they arrived in Loki) + slices.SortFunc(logs, func(a, b LogEntry) int { return a.Timestamp.Compare(b.Timestamp) }) + + return logs, nil +} diff --git a/packages/client-proxy/internal/edge/pool/edge-pool.go b/packages/client-proxy/internal/edge/pool/edge-pool.go new file mode 100644 index 0000000..d96a099 --- /dev/null +++ b/packages/client-proxy/internal/edge/pool/edge-pool.go @@ -0,0 +1,208 @@ +package pool + +import ( + "context" + "errors" + "fmt" + "sync" + "time" + + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + + sd "github.com/e2b-dev/infra/packages/proxy/internal/service-discovery" + l "github.com/e2b-dev/infra/packages/shared/pkg/logger" + "github.com/e2b-dev/infra/packages/shared/pkg/smap" +) + +type EdgePool struct { + discovery sd.ServiceDiscoveryAdapter + + nodeSelfHost string + nodes *smap.Map[*EdgeNode] + mutex sync.RWMutex + + tracer trace.Tracer + logger *zap.Logger +} + +const ( + edgePoolCacheRefreshInterval = 10 * time.Second +) + +var ErrEdgeNodeNotFound = errors.New("edge node not found") + +func NewEdgePool(ctx context.Context, logger *zap.Logger, discovery sd.ServiceDiscoveryAdapter, tracer trace.Tracer, nodeSelfHost string) *EdgePool { + pool := &EdgePool{ + discovery: discovery, + + nodeSelfHost: nodeSelfHost, + nodes: smap.New[*EdgeNode](), + mutex: sync.RWMutex{}, + + logger: logger, + tracer: tracer, + } + + // Background synchronization of orchestrators available in pool + go func() { pool.keepInSync(ctx) }() + + return pool +} + +func (p *EdgePool) GetNodes() map[string]*EdgeNode { + p.mutex.RLock() + defer p.mutex.RUnlock() + + return p.nodes.Items() +} + +func (p *EdgePool) GetNode(id string) (*EdgeNode, error) { + p.mutex.RLock() + defer p.mutex.RUnlock() + + o, ok := p.nodes.Get(id) + if !ok { + return nil, ErrEdgeNodeNotFound + } + + return o, nil +} + +func (p *EdgePool) keepInSync(ctx context.Context) { + // Run the first sync immediately + p.syncNodes(ctx) + + ticker := time.NewTicker(edgePoolCacheRefreshInterval) + defer ticker.Stop() + + for { + select { + case <-ctx.Done(): + p.logger.Info("Stopping keep-in-sync") + return + case <-ticker.C: + p.syncNodes(ctx) + } + } +} + +func (p *EdgePool) syncNodes(ctx context.Context) { + ctxTimeout, cancel := context.WithTimeout(ctx, edgePoolCacheRefreshInterval) + defer cancel() + + spanCtx, span := p.tracer.Start(ctxTimeout, "pool-keep-in-sync") + defer span.End() + + // Service discovery targets + sdNodes, err := p.discovery.ListNodes(spanCtx) + if err != nil { + return + } + + var wg sync.WaitGroup + + // connect / refresh discovered orchestrators + for _, sdNode := range sdNodes { + wg.Add(1) + go func(sdNode *sd.ServiceDiscoveryItem) { + defer wg.Done() + + var found *EdgeNode = nil + + host := fmt.Sprintf("%s:%d", sdNode.NodeIp, sdNode.NodePort) + + // skip self registration + if host == p.nodeSelfHost { + return + } + + for _, node := range p.nodes.Items() { + if host == node.Host { + found = node + break + } + } + + if found == nil { + // newly discovered orchestrator + err := p.connectNode(ctx, sdNode) + if err != nil { + p.logger.Error("Error connecting to node", zap.String("host", host), zap.Error(err)) + } + + return + } + }(sdNode) + } + + // wait for all connections to finish + wg.Wait() + + // disconnect nodes that are not in the list anymore + for _, node := range p.GetNodes() { + wg.Add(1) + go func(node *EdgeNode) { + defer wg.Done() + + found := false + + for _, sdNode := range sdNodes { + host := fmt.Sprintf("%s:%d", sdNode.NodeIp, sdNode.NodePort) + if host == node.Host { + found = true + break + } + } + + // orchestrator is no longer in the list coming from service discovery + if !found { + err := p.removeNode(spanCtx, node) + if err != nil { + p.logger.Error("Error during edge node removal", zap.Error(err)) + } + } + }(node) + + } + + // wait for all node removals to finish + wg.Wait() +} + +func (p *EdgePool) connectNode(ctx context.Context, node *sd.ServiceDiscoveryItem) error { + ctx, childSpan := p.tracer.Start(ctx, "connect-edge-node") + defer childSpan.End() + + host := fmt.Sprintf("%s:%d", node.NodeIp, node.NodePort) + o, err := NewEdgeNode(ctx, host) + if err != nil { + return err + } + + p.mutex.Lock() + defer p.mutex.Unlock() + + p.nodes.Insert(o.ServiceInstanceID, o) + return nil +} + +func (p *EdgePool) removeNode(ctx context.Context, node *EdgeNode) error { + _, childSpan := p.tracer.Start(ctx, "remove-edge-node") + defer childSpan.End() + + p.logger.Info("Edge node connection is not active anymore, closing.", l.WithClusterNodeID(node.NodeID)) + + // stop background sync and close everything + err := node.Close() + if err != nil { + p.logger.Error("Error closing connection to node", zap.Error(err), l.WithClusterNodeID(node.NodeID)) + } + + p.mutex.Lock() + defer p.mutex.Unlock() + + p.nodes.Remove(node.ServiceInstanceID) + p.logger.Info("Edge node node connection has been closed.", l.WithClusterNodeID(node.NodeID)) + return nil +} diff --git a/packages/client-proxy/internal/edge/pool/edge.go b/packages/client-proxy/internal/edge/pool/edge.go new file mode 100644 index 0000000..c2e2dec --- /dev/null +++ b/packages/client-proxy/internal/edge/pool/edge.go @@ -0,0 +1,126 @@ +package pool + +import ( + "context" + "errors" + "fmt" + "sync" + "time" + + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" + l "github.com/e2b-dev/infra/packages/shared/pkg/logger" +) + +const ( + edgeSyncInterval = 10 * time.Second + edgeSyncMaxRetries = 3 +) + +type EdgeNode struct { + NodeID string + + ServiceInstanceID string + ServiceVersion string + ServiceVersionCommit string + ServiceStatus api.ClusterNodeStatus + ServiceStartup time.Time + + Host string + Client *api.ClientWithResponses + + mutex sync.Mutex + + ctx context.Context + ctxCancel context.CancelFunc +} + +func NewEdgeNode(ctx context.Context, host string) (*EdgeNode, error) { + ctx, ctxCancel := context.WithCancel(ctx) + + client, err := newEdgeApiClient(host) + if err != nil { + ctxCancel() + return nil, fmt.Errorf("failed to create http client: %w", err) + } + + o := &EdgeNode{ + Host: host, + Client: client, + + ctx: ctx, + ctxCancel: ctxCancel, + } + + // run the first sync immediately + err = o.syncRun() + if err != nil { + return nil, fmt.Errorf("failed to fetch inital setup of edge node, maybe its not ready yet: %w", err) + } + + // initialize background sync to update orchestrator running sandboxes + go func() { o.sync() }() + + return o, nil +} + +func (o *EdgeNode) sync() { + ticker := time.NewTicker(orchestratorSyncInterval) + defer ticker.Stop() + + for { + select { + case <-o.ctx.Done(): + return + case <-ticker.C: + o.syncRun() + } + } +} + +func (o *EdgeNode) syncRun() error { + o.mutex.Lock() + defer o.mutex.Unlock() + + ctx, cancel := context.WithTimeout(o.ctx, edgeSyncInterval) + defer cancel() + + for i := 0; i < edgeSyncMaxRetries; i++ { + res, err := o.Client.V1InfoWithResponse(ctx) + if err != nil { + zap.L().Error("failed to check edge node status", l.WithClusterNodeID(o.NodeID), zap.Error(err)) + continue + } + + if res.JSON200 == nil { + zap.L().Error("failed to check edge node status", l.WithClusterNodeID(o.NodeID), zap.Int("status", res.StatusCode())) + continue + } + + body := res.JSON200 + + o.NodeID = body.NodeID + o.ServiceInstanceID = body.ServiceInstanceID + o.ServiceStartup = body.ServiceStartup + o.ServiceStatus = body.ServiceStatus + o.ServiceVersion = body.ServiceVersion + o.ServiceVersionCommit = body.ServiceVersionCommit + + return nil + } + + return errors.New("failed to check edge node status") +} + +func (o *EdgeNode) Close() error { + // close sync context + o.ctxCancel() + o.ServiceStatus = api.Unhealthy + return nil +} + +func newEdgeApiClient(host string) (*api.ClientWithResponses, error) { + hostUrl := fmt.Sprintf("http://%s", host) + return api.NewClientWithResponses(hostUrl) +} diff --git a/packages/client-proxy/internal/edge/pool/orchestrator-pool.go b/packages/client-proxy/internal/edge/pool/orchestrator-pool.go new file mode 100644 index 0000000..e73e26d --- /dev/null +++ b/packages/client-proxy/internal/edge/pool/orchestrator-pool.go @@ -0,0 +1,226 @@ +package pool + +import ( + "context" + "fmt" + "sync" + "time" + + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + + sd "github.com/e2b-dev/infra/packages/proxy/internal/service-discovery" + l "github.com/e2b-dev/infra/packages/shared/pkg/logger" + "github.com/e2b-dev/infra/packages/shared/pkg/smap" +) + +type OrchestratorsPool struct { + discovery sd.ServiceDiscoveryAdapter + + nodes *smap.Map[*OrchestratorNode] + mutex sync.RWMutex + + tracer trace.Tracer + logger *zap.Logger + + metricProvider metric.MeterProvider + tracerProvider trace.TracerProvider +} + +const ( + orchestratorsCacheRefreshInterval = 10 * time.Second + statusLogInterval = 1 * time.Minute +) + +func NewOrchestratorsPool( + ctx context.Context, + logger *zap.Logger, + tracerProvider trace.TracerProvider, + metricProvider metric.MeterProvider, + discovery sd.ServiceDiscoveryAdapter, +) *OrchestratorsPool { + pool := &OrchestratorsPool{ + discovery: discovery, + + nodes: smap.New[*OrchestratorNode](), + mutex: sync.RWMutex{}, + + tracer: tracerProvider.Tracer("orchestrators-pool"), + logger: logger, + + metricProvider: metricProvider, + tracerProvider: tracerProvider, + } + + // Background synchronization of orchestrators available in pool + go func() { pool.keepInSync(ctx) }() + go func() { pool.statusLogSync(ctx) }() + + return pool +} + +func (p *OrchestratorsPool) GetOrchestrators() map[string]*OrchestratorNode { + p.mutex.RLock() + defer p.mutex.RUnlock() + + return p.nodes.Items() +} + +func (p *OrchestratorsPool) GetOrchestrator(instanceID string) (node *OrchestratorNode, ok bool) { + p.mutex.RLock() + defer p.mutex.RUnlock() + + return p.nodes.Get(instanceID) +} + +func (p *OrchestratorsPool) keepInSync(ctx context.Context) { + // Run the first sync immediately + p.syncNodes(ctx) + + ticker := time.NewTicker(orchestratorsCacheRefreshInterval) + defer ticker.Stop() + + for { + select { + case <-ctx.Done(): + p.logger.Info("Stopping orchestrators keep-in-sync") + return + case <-ticker.C: + p.syncNodes(ctx) + } + } +} + +func (p *OrchestratorsPool) statusLogSync(ctx context.Context) { + ticker := time.NewTicker(statusLogInterval) + defer ticker.Stop() + + for { + select { + case <-ctx.Done(): + p.logger.Info("Stopping analytics sync") + return + case <-ticker.C: + orchestrators := len(p.GetOrchestrators()) + if orchestrators > 0 { + p.logger.Info(fmt.Sprintf("Orchestrator pool: %d nodes currently in pool", orchestrators)) + } else { + p.logger.Warn("Orchestrator pool: no orchestrators currently in pool") + } + } + } +} + +func (p *OrchestratorsPool) syncNodes(ctx context.Context) { + ctxTimeout, cancel := context.WithTimeout(ctx, orchestratorsCacheRefreshInterval) + defer cancel() + + spanCtx, span := p.tracer.Start(ctxTimeout, "pool-keep-in-sync") + defer span.End() + + // Service discovery targets + sdNodes, err := p.discovery.ListNodes(spanCtx) + if err != nil { + return + } + + var wg sync.WaitGroup + + // connect / refresh discovered orchestrators + for _, sdNode := range sdNodes { + wg.Add(1) + go func(sdNode *sd.ServiceDiscoveryItem) { + defer wg.Done() + + var found *OrchestratorNode = nil + + host := fmt.Sprintf("%s:%d", sdNode.NodeIp, sdNode.NodePort) + for _, node := range p.nodes.Items() { + if host == node.Host { + found = node + break + } + } + + if found == nil { + // newly discovered orchestrator + err := p.connectNode(ctx, sdNode) + if err != nil { + p.logger.Error("Error connecting to node", zap.Error(err), zap.String("host", host)) + } + + return + } + }(sdNode) + } + + // wait for all connections to finish + wg.Wait() + + // disconnect nodes that are not in the list anymore + for _, node := range p.GetOrchestrators() { + wg.Add(1) + go func(node *OrchestratorNode) { + defer wg.Done() + + found := false + + for _, sdNode := range sdNodes { + host := fmt.Sprintf("%s:%d", sdNode.NodeIp, sdNode.NodePort) + if host == node.Host { + found = true + break + } + } + + // orchestrator is no longer in the list coming from service discovery + if !found { + err := p.removeNode(spanCtx, node) + if err != nil { + p.logger.Error("Error during node removal", zap.Error(err), l.WithClusterNodeID(node.NodeID)) + } + } + }(node) + + } + + // wait for all node removals to finish + wg.Wait() +} + +func (p *OrchestratorsPool) connectNode(ctx context.Context, node *sd.ServiceDiscoveryItem) error { + ctx, childSpan := p.tracer.Start(ctx, "connect-orchestrator-node") + defer childSpan.End() + + o, err := NewOrchestrator(ctx, p.tracerProvider, p.metricProvider, node.NodeIp, node.NodePort) + if err != nil { + return err + } + + p.mutex.Lock() + defer p.mutex.Unlock() + + p.nodes.Insert(o.ServiceInstanceId, o) + return nil +} + +func (p *OrchestratorsPool) removeNode(ctx context.Context, node *OrchestratorNode) error { + _, childSpan := p.tracer.Start(ctx, "remove-orchestrator-node") + defer childSpan.End() + + p.logger.Info("Orchestrator node node connection is not active anymore, closing.", l.WithClusterNodeID(node.NodeID)) + + // stop background sync and close everything + err := node.Close() + if err != nil { + p.logger.Error("Error closing connection to node", zap.Error(err), l.WithClusterNodeID(node.NodeID)) + } + + p.mutex.Lock() + defer p.mutex.Unlock() + + p.nodes.Remove(node.ServiceInstanceId) + p.logger.Info("Orchestrator node node connection has been closed.", l.WithClusterNodeID(node.NodeID)) + return nil +} diff --git a/packages/client-proxy/internal/edge/pool/orchestrator.go b/packages/client-proxy/internal/edge/pool/orchestrator.go new file mode 100644 index 0000000..a05461b --- /dev/null +++ b/packages/client-proxy/internal/edge/pool/orchestrator.go @@ -0,0 +1,209 @@ +package pool + +import ( + "context" + "errors" + "fmt" + "sync" + "sync/atomic" + "time" + + "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" + "google.golang.org/protobuf/types/known/emptypb" + + e2bgrpcorchestrator "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator" + e2bgrpcorchestratorinfo "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator-info" + e2bgrpctemplatemanager "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" + l "github.com/e2b-dev/infra/packages/shared/pkg/logger" +) + +type OrchestratorStatus string + +const ( + orchestratorSyncInterval = 10 * time.Second + orchestratorSyncMaxRetries = 3 + + OrchestratorStatusHealthy OrchestratorStatus = "healthy" + OrchestratorStatusDraining OrchestratorStatus = "draining" + OrchestratorStatusUnhealthy OrchestratorStatus = "unhealthy" +) + +type OrchestratorNode struct { + ServiceInstanceId string + NodeID string + + ServiceVersion string + ServiceVersionCommit string + + Host string + Ip string + + ServiceStatus OrchestratorStatus + ServiceStartup time.Time + Roles []e2bgrpcorchestratorinfo.ServiceInfoRole + + Client *OrchestratorGRPCClient + + MetricVCpuUsed atomic.Int64 + MetricMemoryUsedInMB atomic.Int64 + MetricDiskUsedInMB atomic.Int64 + MetricSandboxesRunning atomic.Int64 + + mutex sync.Mutex + + ctx context.Context + ctxCancel context.CancelFunc +} + +type OrchestratorGRPCClient struct { + Sandbox e2bgrpcorchestrator.SandboxServiceClient + Template e2bgrpctemplatemanager.TemplateServiceClient + Info e2bgrpcorchestratorinfo.InfoServiceClient + + Connection *grpc.ClientConn +} + +func NewOrchestrator(ctx context.Context, tracerProvider trace.TracerProvider, meterProvider metric.MeterProvider, ip string, port int) (*OrchestratorNode, error) { + host := fmt.Sprintf("%s:%d", ip, port) + + client, err := newClient(tracerProvider, meterProvider, host) + if err != nil { + return nil, fmt.Errorf("failed to create GRPC client: %w", err) + } + + ctx, ctxCancel := context.WithCancel(ctx) + + o := &OrchestratorNode{ + Host: host, + Ip: ip, + Client: client, + + ctx: ctx, + ctxCancel: ctxCancel, + } + + // run the first sync immediately + err = o.syncRun() + if err != nil { + return nil, fmt.Errorf("failed to initialize orchestrator, maybe its not ready yet: %w", err) + } + + // initialize background sync to update orchestrator running sandboxes + go func() { o.sync() }() + + return o, nil +} + +func (o *OrchestratorNode) sync() { + ticker := time.NewTicker(orchestratorSyncInterval) + defer ticker.Stop() + + for { + select { + case <-o.ctx.Done(): + return + case <-ticker.C: + o.syncRun() + } + } +} + +func (o *OrchestratorNode) syncRun() error { + o.mutex.Lock() + defer o.mutex.Unlock() + + ctx, cancel := context.WithTimeout(o.ctx, orchestratorSyncInterval) + defer cancel() + + for i := 0; i < orchestratorSyncMaxRetries; i++ { + status, err := o.Client.Info.ServiceInfo(ctx, &emptypb.Empty{}) + if err != nil { + zap.L().Error("failed to check orchestrator health", l.WithClusterNodeID(o.ServiceInstanceId), zap.Error(err)) + continue + } + + o.NodeID = status.NodeId + o.ServiceInstanceId = status.ServiceId + o.ServiceStartup = status.ServiceStartup.AsTime() + o.ServiceStatus = getMappedStatus(status.ServiceStatus) + o.ServiceVersion = status.ServiceVersion + o.ServiceVersionCommit = status.ServiceCommit + + o.Roles = status.ServiceRoles + + o.MetricSandboxesRunning.Store(status.MetricSandboxesRunning) + o.MetricMemoryUsedInMB.Store(status.MetricMemoryUsedMb) + o.MetricDiskUsedInMB.Store(status.MetricDiskMb) + o.MetricVCpuUsed.Store(status.MetricVcpuUsed) + + return nil + } + + return errors.New("failed to check orchestrator status") +} + +func (o *OrchestratorNode) Close() error { + // close sync context + o.ctxCancel() + o.ServiceStatus = OrchestratorStatusUnhealthy + + // close grpc client + if o.Client != nil { + err := o.Client.close() + if err != nil { + return err + } + } + + return nil +} + +func getMappedStatus(s e2bgrpcorchestratorinfo.ServiceInfoStatus) OrchestratorStatus { + switch s { + case e2bgrpcorchestratorinfo.ServiceInfoStatus_OrchestratorHealthy: + return OrchestratorStatusHealthy + case e2bgrpcorchestratorinfo.ServiceInfoStatus_OrchestratorDraining: + return OrchestratorStatusDraining + case e2bgrpcorchestratorinfo.ServiceInfoStatus_OrchestratorUnhealthy: + return OrchestratorStatusUnhealthy + } + + zap.L().Error("Unknown service info status", zap.Any("status", s)) + return OrchestratorStatusUnhealthy +} + +func newClient(tracerProvider trace.TracerProvider, meterProvider metric.MeterProvider, host string) (*OrchestratorGRPCClient, error) { + conn, err := grpc.NewClient(host, + grpc.WithTransportCredentials(insecure.NewCredentials()), + grpc.WithStatsHandler( + otelgrpc.NewClientHandler( + otelgrpc.WithTracerProvider(tracerProvider), + otelgrpc.WithMeterProvider(meterProvider), + ), + ), + ) + if err != nil { + return nil, fmt.Errorf("failed to create GRPC client: %w", err) + } + + return &OrchestratorGRPCClient{ + Sandbox: e2bgrpcorchestrator.NewSandboxServiceClient(conn), + Template: e2bgrpctemplatemanager.NewTemplateServiceClient(conn), + Info: e2bgrpcorchestratorinfo.NewInfoServiceClient(conn), + Connection: conn, + }, nil +} + +func (a *OrchestratorGRPCClient) close() error { + err := a.Connection.Close() + if err != nil { + return fmt.Errorf("failed to close connection: %w", err) + } + + return nil +} diff --git a/packages/client-proxy/internal/edge/sandboxes/catalog.go b/packages/client-proxy/internal/edge/sandboxes/catalog.go new file mode 100644 index 0000000..4a83687 --- /dev/null +++ b/packages/client-proxy/internal/edge/sandboxes/catalog.go @@ -0,0 +1,31 @@ +package sandboxes + +import ( + "errors" + "time" +) + +type SandboxInfo struct { + OrchestratorId string `json:"orchestrator_id"` + ExecutionId string `json:"execution_id"` + + SandboxStartedAt time.Time `json:"sandbox_started_at"` // when sandbox was started + SandboxMaxLengthInHours int64 `json:"sandbox_max_length_in_hours"` // how long can sandbox can possibly run (in hours) +} + +type SandboxesCatalog interface { + GetSandbox(sandboxId string) (*SandboxInfo, error) + StoreSandbox(sandboxId string, sandboxInfo *SandboxInfo, expiration time.Duration) error + DeleteSandbox(sandboxId string, executionId string) error +} + +type CatalogProvider string + +const ( + // We want to have some buffer so redis ttl will not expire exactly before api will try to shut down or do some other operation + // with sandbox running behind edge node. For resume this should not be problem because for both redis and memory backed catalogs + // we will re-write sandbox info with new one and local machine-level cache is tiny. + sandboxTtlBuffer = 1 * time.Minute +) + +var ErrSandboxNotFound = errors.New("sandbox not found") diff --git a/packages/client-proxy/internal/edge/sandboxes/catalog_memory.go b/packages/client-proxy/internal/edge/sandboxes/catalog_memory.go new file mode 100644 index 0000000..d4075d6 --- /dev/null +++ b/packages/client-proxy/internal/edge/sandboxes/catalog_memory.go @@ -0,0 +1,77 @@ +package sandboxes + +import ( + "context" + "sync" + "time" + + "github.com/jellydator/ttlcache/v3" + "go.opentelemetry.io/otel/trace" +) + +type MemorySandboxCatalog struct { + cache *ttlcache.Cache[string, *SandboxInfo] + mtx sync.RWMutex + ctx context.Context + tracer trace.Tracer +} + +func NewMemorySandboxesCatalog(ctx context.Context, tracer trace.Tracer) SandboxesCatalog { + cache := ttlcache.New[string, *SandboxInfo](ttlcache.WithDisableTouchOnHit[string, *SandboxInfo]()) + go cache.Start() + + return &MemorySandboxCatalog{ + tracer: tracer, + cache: cache, + ctx: ctx, + } +} + +func (c *MemorySandboxCatalog) GetSandbox(sandboxId string) (*SandboxInfo, error) { + _, span := c.tracer.Start(c.ctx, "sandbox-catalog-get") + defer span.End() + + c.mtx.RLock() + defer c.mtx.RUnlock() + + sandboxInfo := c.cache.Get(sandboxId) + if sandboxInfo != nil { + return sandboxInfo.Value(), nil + } + + return nil, ErrSandboxNotFound +} + +func (c *MemorySandboxCatalog) StoreSandbox(sandboxId string, sandboxInfo *SandboxInfo, expiration time.Duration) error { + _, span := c.tracer.Start(c.ctx, "sandbox-catalog-store") + defer span.End() + + c.mtx.Lock() + defer c.mtx.Unlock() + + c.cache.Set(sandboxId, sandboxInfo, expiration) + return nil +} + +func (c *MemorySandboxCatalog) DeleteSandbox(sandboxId string, executionId string) error { + _, span := c.tracer.Start(c.ctx, "sandbox-catalog-delete") + defer span.End() + + c.mtx.Lock() + defer c.mtx.Unlock() + + item := c.cache.Get(sandboxId) + + // No need for removal here + if item.IsExpired() || item.Value() == nil { + return nil + } + + // Different execution is stored in the cache, we don't want to remove it + if item.Value().ExecutionId != executionId { + return nil + } + + c.cache.Delete(sandboxId) + return nil +} diff --git a/packages/client-proxy/internal/edge/sandboxes/catalog_redis.go b/packages/client-proxy/internal/edge/sandboxes/catalog_redis.go new file mode 100644 index 0000000..85c0317 --- /dev/null +++ b/packages/client-proxy/internal/edge/sandboxes/catalog_redis.go @@ -0,0 +1,155 @@ +package sandboxes + +import ( + "context" + "encoding/json" + "fmt" + "time" + + "github.com/go-redsync/redsync/v4" + "github.com/jellydator/ttlcache/v3" + "github.com/redis/go-redis/v9" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/shared/pkg/logger" +) + +const ( + catalogClusterLockName = "sandboxes-catalog-cluster-lock" + catalogRedisTimeout = time.Second * 5 + + // this is just how long we are keeping sandbox in local cache so we don't have to query redis every time + // we don't want to go too high because then sbx can be run on different orchestrator, and we will not be able to find it + catalogRedisLocalCacheTtl = time.Second * 5 +) + +type RedisSandboxCatalog struct { + // todo: ideally we want to support per sandbox locking, but for now we are using one global lock per cluster + clusterMutex *redsync.Mutex + redisClient redis.UniversalClient + + cache *ttlcache.Cache[string, *SandboxInfo] + ctx context.Context + tracer trace.Tracer +} + +func NewRedisSandboxesCatalog(ctx context.Context, tracer trace.Tracer, redisClient redis.UniversalClient, redisSync *redsync.Redsync) SandboxesCatalog { + clusterLockMutex := redisSync.NewMutex(catalogClusterLockName) + + cache := ttlcache.New(ttlcache.WithTTL[string, *SandboxInfo](catalogRedisLocalCacheTtl), ttlcache.WithDisableTouchOnHit[string, *SandboxInfo]()) + go cache.Start() + + return &RedisSandboxCatalog{ + redisClient: redisClient, + clusterMutex: clusterLockMutex, + tracer: tracer, + cache: cache, + ctx: ctx, + } +} + +func (c *RedisSandboxCatalog) GetSandbox(sandboxId string) (*SandboxInfo, error) { + spanCtx, span := c.tracer.Start(c.ctx, "sandbox-catalog-get") + defer span.End() + + sandboxInfo := c.cache.Get(sandboxId) + if sandboxInfo != nil { + return sandboxInfo.Value(), nil + } + + ctx, ctxCancel := context.WithTimeout(spanCtx, catalogRedisTimeout) + defer ctxCancel() + + data, err := c.redisClient.Get(ctx, c.getCatalogKey(sandboxId)).Bytes() + if err != nil { + return nil, ErrSandboxNotFound + } + + var info *SandboxInfo + err = json.Unmarshal(data, &info) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal sandbox info: %w", err) + } + + deadline := info.SandboxStartedAt. + Add(time.Duration(info.SandboxMaxLengthInHours) * time.Hour). + Add(sandboxTtlBuffer) + + err = c.StoreSandbox(sandboxId, info, time.Until(deadline)) + if err != nil { + return nil, fmt.Errorf("failed to store sandbox info taken from redis: %w", err) + } + + return info, nil +} + +func (c *RedisSandboxCatalog) StoreSandbox(sandboxId string, sandboxInfo *SandboxInfo, expiration time.Duration) error { + spanCtx, span := c.tracer.Start(c.ctx, "sandbox-catalog-store") + defer span.End() + + err := c.clusterMutex.Lock() + if err != nil { + return fmt.Errorf("error while locking the cluster mutex: %w", err) + } + + defer c.clusterMutex.Unlock() + + ctx, ctxCancel := context.WithTimeout(spanCtx, catalogRedisTimeout) + defer ctxCancel() + + bytes, err := json.Marshal(*sandboxInfo) + if err != nil { + return fmt.Errorf("failed to marshal sandbox info: %w", err) + } + + status := c.redisClient.Set(ctx, c.getCatalogKey(sandboxId), string(bytes), expiration) + if status.Err() != nil { + zap.L().Error("Error while storing sandbox in redis", logger.WithSandboxID(sandboxId), zap.Error(status.Err())) + return fmt.Errorf("failed to store sandbox info in redis: %w", status.Err()) + } + + c.cache.Set(sandboxId, sandboxInfo, catalogRedisLocalCacheTtl) + + return nil +} + +func (c *RedisSandboxCatalog) DeleteSandbox(sandboxId string, executionId string) error { + spanCtx, span := c.tracer.Start(c.ctx, "sandbox-catalog-delete") + defer span.End() + + err := c.clusterMutex.Lock() + if err != nil { + return fmt.Errorf("error while locking the cluster mutex: %w", err) + } + + defer c.clusterMutex.Unlock() + + ctx, ctxCancel := context.WithTimeout(spanCtx, catalogRedisTimeout) + defer ctxCancel() + + data, err := c.redisClient.Get(ctx, c.getCatalogKey(sandboxId)).Bytes() + // If sandbox does not exist, we can return early + if err != nil { + return nil + } + + var info *SandboxInfo + err = json.Unmarshal(data, &info) + if err != nil { + return fmt.Errorf("failed to unmarshal sandbox info: %w", err) + } + + // Different execution is stored in the cache, we don't want to remove it + if info.ExecutionId != executionId { + return nil + } + + c.redisClient.Del(ctx, c.getCatalogKey(sandboxId)) + c.cache.Delete(sandboxId) + return nil +} + +func (c *RedisSandboxCatalog) getCatalogKey(sandboxId string) string { + return fmt.Sprintf("sandbox-%s", sandboxId) +} diff --git a/packages/client-proxy/internal/edge/service.go b/packages/client-proxy/internal/edge/service.go new file mode 100644 index 0000000..8a86a19 --- /dev/null +++ b/packages/client-proxy/internal/edge/service.go @@ -0,0 +1,32 @@ +package edge + +import ( + "context" + + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/proxy/internal/edge/handlers" + e2binfo "github.com/e2b-dev/infra/packages/proxy/internal/edge/info" + e2borchestrators "github.com/e2b-dev/infra/packages/proxy/internal/edge/pool" + "github.com/e2b-dev/infra/packages/proxy/internal/edge/sandboxes" + "github.com/e2b-dev/infra/packages/proxy/internal/service-discovery" +) + +func NewEdgeAPIStore( + ctx context.Context, + logger *zap.Logger, + tracer trace.Tracer, + info *e2binfo.ServiceInfo, + edgeSD service_discovery.ServiceDiscoveryAdapter, + orchestrators *e2borchestrators.OrchestratorsPool, + catalog sandboxes.SandboxesCatalog, +) (*handlers.APIStore, error) { + edges := e2borchestrators.NewEdgePool(ctx, logger, edgeSD, tracer, info.Host) + store, err := handlers.NewStore(ctx, logger, tracer, info, orchestrators, edges, catalog) + if err != nil { + return nil, err + } + + return store, nil +} diff --git a/packages/client-proxy/internal/proxy/proxy.go b/packages/client-proxy/internal/proxy/proxy.go new file mode 100644 index 0000000..3dd5ff9 --- /dev/null +++ b/packages/client-proxy/internal/proxy/proxy.go @@ -0,0 +1,201 @@ +package proxy + +import ( + "context" + "errors" + "fmt" + "math/rand" + "net/http" + "net/url" + "time" + + "github.com/miekg/dns" + "go.opentelemetry.io/otel/metric" + "go.uber.org/zap" + + orchestratorspool "github.com/e2b-dev/infra/packages/proxy/internal/edge/pool" + "github.com/e2b-dev/infra/packages/proxy/internal/edge/sandboxes" + l "github.com/e2b-dev/infra/packages/shared/pkg/logger" + reverseproxy "github.com/e2b-dev/infra/packages/shared/pkg/proxy" + "github.com/e2b-dev/infra/packages/shared/pkg/proxy/pool" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" +) + +const ( + dnsServer = "api.service.consul:5353" + orchestratorProxyPort = 5007 // orchestrator proxy port + maxRetries = 3 + + // This timeout should be > 600 (GCP LB upstream idle timeout) to prevent race condition + // Also it's a good practice to set it to a value higher than the idle timeout of the backend service + // https://cloud.google.com/load-balancing/docs/https#timeouts_and_retries%23:~:text=The%20load%20balancer%27s%20backend%20keepalive,is%20greater%20than%20600%20seconds + idleTimeout = 610 * time.Second + + // We use a constant connection key, because we don't have to separate connection pools + // as we need to do when connecting to sandboxes (from orchestrator proxy) to prevent reuse of pool connections + // by different sandboxes cause failed connections. + clientProxyConnectionKey = "client-proxy" +) + +var ( + dnsClient = dns.Client{} + + ErrNodeNotFound = errors.New("node not found") +) + +func dnsResolution(sandboxId string, logger *zap.Logger) (string, error) { + var err error + + msg := new(dns.Msg) + msg.SetQuestion(fmt.Sprintf("%s.", sandboxId), dns.TypeA) + + var node string + for i := range maxRetries { + // send the query to the server + resp, _, dnsErr := dnsClient.Exchange(msg, dnsServer) + + // the api server wasn't found, maybe the API server is rolling and the DNS server is not updated yet + if dnsErr != nil || len(resp.Answer) == 0 { + err = dnsErr + logger.Warn(fmt.Sprintf("host for sandbox %s not found: %s", sandboxId, err), zap.Error(err), zap.Int("retry", i+1)) + + // Jitter + time.Sleep(time.Duration(rand.Intn(10)) * time.Millisecond) + continue + } + + node = resp.Answer[0].(*dns.A).A.String() + + // the sandbox was not found, we want to return this information to the user + if node == "127.0.0.1" { + return "", ErrNodeNotFound + } + + break + } + + // there's no answer, we can't proxy the request + if err != nil { + return "", ErrNodeNotFound + } + + return node, nil +} + +func catalogResolution(sandboxId string, catalog sandboxes.SandboxesCatalog, orchestrators *orchestratorspool.OrchestratorsPool) (string, error) { + s, err := catalog.GetSandbox(sandboxId) + if err != nil { + if errors.Is(err, sandboxes.ErrSandboxNotFound) { + return "", ErrNodeNotFound + } + + return "", fmt.Errorf("failed to get sandbox from catalog: %w", err) + } + + o, ok := orchestrators.GetOrchestrator(s.OrchestratorId) + if !ok { + return "", errors.New("orchestrator not found") + } + + return o.Ip, nil +} + +func NewClientProxy(meterProvider metric.MeterProvider, serviceName string, port uint, catalog sandboxes.SandboxesCatalog, orchestrators *orchestratorspool.OrchestratorsPool, useCatalogResolution bool, useDnsResolution bool) (*reverseproxy.Proxy, error) { + if !useCatalogResolution && !useDnsResolution { + return nil, errors.New("catalog resolution and DNS resolution are both disabled, at least one must be enabled") + } + + proxy := reverseproxy.New( + port, + idleTimeout, + func(r *http.Request) (*pool.Destination, error) { + sandboxId, port, err := reverseproxy.ParseHost(r.Host) + if err != nil { + return nil, err + } + + logger := zap.L().With( + zap.String("host", r.Host), + l.WithSandboxID(sandboxId), + zap.Uint64("sandbox_req_port", port), + zap.String("sandbox_req_path", r.URL.Path), + ) + + var nodeIP string + + if useCatalogResolution { + nodeIP, err = catalogResolution(sandboxId, catalog, orchestrators) + if err != nil { + if !errors.Is(err, ErrNodeNotFound) { + logger.Warn("failed to resolve node ip with Redis resolution", zap.Error(err)) + } + + if !useDnsResolution { + return nil, reverseproxy.NewErrSandboxNotFound(sandboxId) + } else { + nodeIP, err = dnsResolution(sandboxId, logger) + if err != nil { + if !errors.Is(err, ErrNodeNotFound) { + logger.Warn("failed to resolve node ip with DNS resolution", zap.Error(err)) + } + + return nil, reverseproxy.NewErrSandboxNotFound(sandboxId) + } + } + } + } else { + nodeIP, err = dnsResolution(sandboxId, logger) + if err != nil { + if !errors.Is(err, ErrNodeNotFound) { + logger.Warn("failed to resolve node ip with DNS resolution", zap.Error(err)) + } + + return nil, reverseproxy.NewErrSandboxNotFound(sandboxId) + } + } + + logger.Debug("Proxying request", zap.String("node_ip", nodeIP)) + + return &pool.Destination{ + SandboxId: sandboxId, + RequestLogger: logger, + SandboxPort: port, + ConnectionKey: clientProxyConnectionKey, + Url: &url.URL{ + Scheme: "http", + Host: fmt.Sprintf("%s:%d", nodeIP, orchestratorProxyPort), + }, + }, nil + }, + ) + + meter := meterProvider.Meter(serviceName) + _, err := telemetry.GetObservableUpDownCounter(meter, telemetry.ClientProxyPoolConnectionsMeterCounterName, func(ctx context.Context, observer metric.Int64Observer) error { + observer.Observe(proxy.CurrentServerConnections()) + return nil + }, + ) + if err != nil { + return nil, fmt.Errorf("error registering client proxy connections metric (%s): %w", telemetry.ClientProxyPoolConnectionsMeterCounterName, err) + } + + _, err = telemetry.GetObservableUpDownCounter(meter, telemetry.ClientProxyPoolSizeMeterCounterName, func(ctx context.Context, observer metric.Int64Observer) error { + observer.Observe(int64(proxy.CurrentPoolSize())) + return nil + }, + ) + if err != nil { + return nil, fmt.Errorf("error registering client proxy pool size metric (%s): %w", telemetry.ClientProxyPoolSizeMeterCounterName, err) + } + + _, err = telemetry.GetObservableUpDownCounter(meter, telemetry.ClientProxyServerConnectionsMeterCounterName, func(ctx context.Context, observer metric.Int64Observer) error { + observer.Observe(proxy.CurrentPoolConnections()) + return nil + }, + ) + if err != nil { + return nil, fmt.Errorf("error registering client proxy server connections metric (%s): %w", telemetry.ClientProxyServerConnectionsMeterCounterName, err) + } + + return proxy, nil +} diff --git a/packages/client-proxy/internal/service-discovery/adapter.go b/packages/client-proxy/internal/service-discovery/adapter.go new file mode 100644 index 0000000..5f0185f --- /dev/null +++ b/packages/client-proxy/internal/service-discovery/adapter.go @@ -0,0 +1,14 @@ +package service_discovery + +import ( + "context" +) + +type ServiceDiscoveryItem struct { + NodeIp string `json:"node_ip"` + NodePort int `json:"node_port"` +} + +type ServiceDiscoveryAdapter interface { + ListNodes(ctx context.Context) ([]*ServiceDiscoveryItem, error) +} diff --git a/packages/client-proxy/internal/service-discovery/builder.go b/packages/client-proxy/internal/service-discovery/builder.go new file mode 100644 index 0000000..59f667f --- /dev/null +++ b/packages/client-proxy/internal/service-discovery/builder.go @@ -0,0 +1,99 @@ +package service_discovery + +import ( + "context" + "fmt" + "os" + "strings" + + "go.uber.org/zap" +) + +const ( + orchestratorConfigPrefix = "SERVICE_DISCOVERY_ORCHESTRATOR" + edgeConfigPrefix = "SERVICE_DISCOVERY_EDGE" + + DnsProviderKey = "DNS" + StaticProviderKey = "STATIC" + Ec2ProviderKey = "EC2-INSTANCES" +) + +func NewServiceDiscoveryProvider(ctx context.Context, edgePort int, orchestratorPort int, logger *zap.Logger) (edges ServiceDiscoveryAdapter, orchestrators ServiceDiscoveryAdapter, err error) { + edgeNodes, err := resolveServiceDiscoveryConfig(ctx, edgeConfigPrefix, edgePort, logger) + if err != nil { + return nil, nil, fmt.Errorf("failed to resolve edge service discovery config: %w", err) + } + + orchestratorNodes, err := resolveServiceDiscoveryConfig(ctx, orchestratorConfigPrefix, orchestratorPort, logger) + if err != nil { + return nil, nil, fmt.Errorf("failed to resolve orchestrator service discovery config: %w", err) + } + + return edgeNodes, orchestratorNodes, nil +} + +func resolveServiceDiscoveryConfig(ctx context.Context, prefix string, port int, logger *zap.Logger) (ServiceDiscoveryAdapter, error) { + providerEnv := fmt.Sprintf("%s_PROVIDER", prefix) + provider := os.Getenv(providerEnv) + if provider == "" { + return nil, fmt.Errorf("missing %s environment variable", providerEnv) + } + + switch provider { + case DnsProviderKey: + return createDnsProvider(ctx, prefix, port, logger) + case Ec2ProviderKey: + return createEc2Provider(ctx, prefix, port, logger) + case StaticProviderKey: + return createStaticProvider(prefix, port) + } + + return nil, fmt.Errorf("unsupported service discovery provider: %s", provider) +} + +func createDnsProvider(ctx context.Context, prefix string, port int, logger *zap.Logger) (ServiceDiscoveryAdapter, error) { + dnsHostsEnv := fmt.Sprintf("%s_DNS_QUERY", prefix) + dnsHostsRaw := os.Getenv(dnsHostsEnv) + if dnsHostsRaw == "" { + return nil, fmt.Errorf("missing %s environment variable", dnsHostsEnv) + } + + var dnsResolverAddress string + dnsResolverEnv := fmt.Sprintf("%s_DNS_RESOLVER_ADDRESS", prefix) + dnsResolverRaw := os.Getenv(dnsResolverEnv) + if dnsResolverRaw == "" { + return nil, fmt.Errorf("missing %s environment variable", dnsResolverEnv) + } + + dnsResolverAddress = dnsResolverRaw + dnsHosts := strings.Split(dnsHostsRaw, ",") + return NewDnsServiceDiscovery(ctx, logger, dnsHosts, dnsResolverAddress, port), nil +} + +func createEc2Provider(ctx context.Context, prefix string, port int, logger *zap.Logger) (ServiceDiscoveryAdapter, error) { + regionEnv := fmt.Sprintf("%s_EC2_REGION", prefix) + region := os.Getenv(regionEnv) + if region == "" { + return nil, fmt.Errorf("missing %s environment variable", regionEnv) + } + + tagsEnv := fmt.Sprintf("%s_EC2_TAGS", prefix) + tagsRaw := os.Getenv(tagsEnv) + if tagsRaw == "" { + return nil, fmt.Errorf("missing %s environment variable", tagsEnv) + } + + tags := strings.Split(tagsRaw, ",") + return NewAwsEc2ServiceDiscovery(ctx, region, tags, port, logger) +} + +func createStaticProvider(prefix string, port int) (ServiceDiscoveryAdapter, error) { + env := fmt.Sprintf("%s_STATIC", prefix) + staticRaw := os.Getenv(env) + if staticRaw == "" { + return nil, fmt.Errorf("missing %s environment variable", env) + } + + static := strings.Split(staticRaw, ",") + return NewStaticServiceDiscovery(static, port), nil +} diff --git a/packages/client-proxy/internal/service-discovery/dns-service-discovery.go b/packages/client-proxy/internal/service-discovery/dns-service-discovery.go new file mode 100644 index 0000000..526a146 --- /dev/null +++ b/packages/client-proxy/internal/service-discovery/dns-service-discovery.go @@ -0,0 +1,128 @@ +package service_discovery + +import ( + "context" + "fmt" + "time" + + "github.com/miekg/dns" + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/shared/pkg/smap" +) + +type DnsServiceDiscovery struct { + logger *zap.Logger + entries *smap.Map[*ServiceDiscoveryItem] + resolver string + + hosts []string + servicePort int +} + +const ( + dnsMaxRetries = 3 + dnsRetryWait = 5 * time.Millisecond + + cacheRefreshInterval = 10 * time.Second +) + +var dnsClient = dns.Client{ + Net: "udp", + Timeout: time.Second * 2, +} + +func NewDnsServiceDiscovery(ctx context.Context, logger *zap.Logger, hosts []string, resolver string, servicePort int) *DnsServiceDiscovery { + sd := &DnsServiceDiscovery{ + hosts: hosts, + logger: logger, + resolver: resolver, + servicePort: servicePort, + + entries: smap.New[*ServiceDiscoveryItem](), + } + + go func() { sd.keepInSync(ctx) }() + + return sd +} + +func (sd *DnsServiceDiscovery) ListNodes(_ context.Context) ([]*ServiceDiscoveryItem, error) { + entries := sd.entries.Items() + items := make([]*ServiceDiscoveryItem, 0) + + for _, item := range entries { + items = append(items, item) + } + + return items, nil +} + +func (sd *DnsServiceDiscovery) keepInSync(ctx context.Context) { + // Run the first sync immediately + sd.sync(ctx) + + ticker := time.NewTicker(cacheRefreshInterval) + defer ticker.Stop() + + for { + select { + case <-ctx.Done(): + sd.logger.Info("Stopping service discovery keep-in-sync") + return + case <-ticker.C: + sd.sync(ctx) + } + } +} + +func (sd *DnsServiceDiscovery) sync(ctx context.Context) { + ctxTimeout, ctxCancel := context.WithTimeout(ctx, cacheRefreshInterval) + defer ctxCancel() + + ips := make(map[string]struct{}) + + select { + case <-ctxTimeout.Done(): + sd.logger.Error("Service discovery sync timed out") + return + default: + for _, host := range sd.hosts { + msg := new(dns.Msg) + msg.SetQuestion(dns.Fqdn(host), dns.TypeA) + + for range dnsMaxRetries { + response, _, err := dnsClient.Exchange(msg, sd.resolver) + if err != nil { + sd.logger.Error("DNS service discovery failed", zap.Error(err)) + time.Sleep(dnsRetryWait) + continue + } + + for _, ans := range response.Answer { + switch rr := ans.(type) { + case *dns.A: + ips[rr.A.String()] = struct{}{} + } + } + + break + } + } + } + + // create or update the entries + for ip := range ips { + key := fmt.Sprintf("%s:%d", ip, sd.servicePort) + sd.entries.Insert( + key, &ServiceDiscoveryItem{NodeIp: ip, NodePort: sd.servicePort}, + ) + } + + // remove entries that are no longer in DNS response + for key, item := range sd.entries.Items() { + if _, ok := ips[item.NodeIp]; !ok { + sd.entries.Remove(key) + } + } +} diff --git a/packages/client-proxy/internal/service-discovery/ec2-service-discovery.go b/packages/client-proxy/internal/service-discovery/ec2-service-discovery.go new file mode 100644 index 0000000..888cc10 --- /dev/null +++ b/packages/client-proxy/internal/service-discovery/ec2-service-discovery.go @@ -0,0 +1,134 @@ +package service_discovery + +import ( + "context" + "fmt" + "time" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/config" + "github.com/aws/aws-sdk-go-v2/service/ec2" + "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "go.uber.org/zap" + + "github.com/e2b-dev/infra/packages/shared/pkg/smap" +) + +type AwsEc2ServiceDiscovery struct { + logger *zap.Logger + entries *smap.Map[*ServiceDiscoveryItem] + client *ec2.Client + + port int + filters []types.Filter +} + +const ( + ec2QueryRefreshInterval = 10 * time.Second +) + +func NewAwsEc2ServiceDiscovery(ctx context.Context, region string, filterTagsKeys []string, port int, logger *zap.Logger) (*AwsEc2ServiceDiscovery, error) { + cfg, err := config.LoadDefaultConfig(ctx, config.WithRegion(region)) + if err != nil { + return nil, fmt.Errorf("failed to load AWS config: %w", err) + } + + client := ec2.NewFromConfig(cfg) + + filters := make([]types.Filter, 0) + filters = append( + filters, + types.Filter{ + Name: aws.String("tag-key"), + Values: filterTagsKeys, + }, + ) + + sd := &AwsEc2ServiceDiscovery{ + client: client, + logger: logger, + port: port, + filters: filters, + + entries: smap.New[*ServiceDiscoveryItem](), + } + + go func() { sd.keepInSync(ctx) }() + + return sd, nil +} + +func (sd *AwsEc2ServiceDiscovery) ListNodes(_ context.Context) ([]*ServiceDiscoveryItem, error) { + entries := sd.entries.Items() + items := make([]*ServiceDiscoveryItem, 0) + + for _, item := range entries { + items = append(items, item) + } + + return items, nil +} + +func (sd *AwsEc2ServiceDiscovery) keepInSync(ctx context.Context) { + // Run the first sync immediately + sd.sync(ctx) + + ticker := time.NewTicker(ec2QueryRefreshInterval) + defer ticker.Stop() + + for { + select { + case <-ctx.Done(): + sd.logger.Info("Stopping service discovery keep-in-sync") + return + case <-ticker.C: + sd.sync(ctx) + } + } +} + +func (sd *AwsEc2ServiceDiscovery) sync(ctx context.Context) { + ctxTimeout, ctxCancel := context.WithTimeout(ctx, ec2QueryRefreshInterval) + defer ctxCancel() + + select { + case <-ctxTimeout.Done(): + sd.logger.Info("Service discovery sync timed out") + return + default: + input := &ec2.DescribeInstancesInput{Filters: sd.filters} + + instancesHosts := make(map[string]string) + instances, err := sd.client.DescribeInstances(ctx, input) + if err != nil { + sd.logger.Error("Failed to describe instances", zap.Error(err)) + return + } + + // Create or update the entries + for _, reservation := range instances.Reservations { + for _, instance := range reservation.Instances { + // Filter only running instances + if instance.State.Name != types.InstanceStateNameRunning { + continue + } + + ip := *instance.PrivateIpAddress + key := fmt.Sprintf("%s:%d", ip, sd.port) + + sd.entries.Insert( + key, &ServiceDiscoveryItem{NodeIp: ip, NodePort: sd.port}, + ) + + instancesHosts[key] = key + } + } + + // Remove entries that are no longer in EC2 response + for key := range sd.entries.Items() { + if _, ok := instancesHosts[key]; !ok { + sd.entries.Remove(key) + } + } + } +} diff --git a/packages/client-proxy/internal/service-discovery/static-service-discovery.go b/packages/client-proxy/internal/service-discovery/static-service-discovery.go new file mode 100644 index 0000000..a2ae245 --- /dev/null +++ b/packages/client-proxy/internal/service-discovery/static-service-discovery.go @@ -0,0 +1,23 @@ +package service_discovery + +import "context" + +type StaticServiceDiscovery struct { + items []*ServiceDiscoveryItem +} + +func NewStaticServiceDiscovery(results []string, port int) *StaticServiceDiscovery { + items := make([]*ServiceDiscoveryItem, 0) + + for _, result := range results { + items = append( + items, &ServiceDiscoveryItem{NodeIp: result, NodePort: port}, + ) + } + + return &StaticServiceDiscovery{items: items} +} + +func (s StaticServiceDiscovery) ListNodes(_ context.Context) ([]*ServiceDiscoveryItem, error) { + return s.items, nil +} diff --git a/packages/client-proxy/main.go b/packages/client-proxy/main.go index 036b236..8584bd1 100644 --- a/packages/client-proxy/main.go +++ b/packages/client-proxy/main.go @@ -2,227 +2,358 @@ package main import ( "context" + _ "embed" "errors" "fmt" - "math/rand" + "log" + "net" "net/http" - "net/http/httputil" - "net/url" "os" "os/signal" - "strings" "sync" "sync/atomic" "syscall" "time" - "github.com/miekg/dns" + "github.com/go-redsync/redsync/v4" + "github.com/go-redsync/redsync/v4/redis/goredis/v9" + "github.com/google/uuid" + "github.com/redis/go-redis/v9" + "github.com/soheilhy/cmux" "go.uber.org/zap" - + "go.uber.org/zap/zapcore" + + "github.com/e2b-dev/infra/packages/proxy/internal" + "github.com/e2b-dev/infra/packages/proxy/internal/edge" + "github.com/e2b-dev/infra/packages/proxy/internal/edge-pass-through" + "github.com/e2b-dev/infra/packages/proxy/internal/edge/authorization" + e2binfo "github.com/e2b-dev/infra/packages/proxy/internal/edge/info" + e2borchestrators "github.com/e2b-dev/infra/packages/proxy/internal/edge/pool" + "github.com/e2b-dev/infra/packages/proxy/internal/edge/sandboxes" + e2bproxy "github.com/e2b-dev/infra/packages/proxy/internal/proxy" + service_discovery "github.com/e2b-dev/infra/packages/proxy/internal/service-discovery" "github.com/e2b-dev/infra/packages/shared/pkg/env" - "github.com/e2b-dev/infra/packages/shared/pkg/logging" + "github.com/e2b-dev/infra/packages/shared/pkg/http/edge" + e2bLogger "github.com/e2b-dev/infra/packages/shared/pkg/logger" + "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" ) const ( - dnsServer = "api.service.consul:5353" - healthCheckPort = 3001 - port = 3002 - sandboxPort = 3003 - maxRetries = 3 + serviceName = "client-proxy" + + shutdownDrainingWait = 15 * time.Second + shutdownUnhealthyWait = 15 * time.Second + + version = "1.0.0" ) -var commitSHA string +var ( + commitSHA string -// Create a DNS client -var client = new(dns.Client) + useProxyCatalogResolution = os.Getenv("USE_CATALOG_RESOLUTION") == "true" + useDnsResolution = os.Getenv("USE_DNS_RESOLUTION") != "true" +) -func proxyHandler(logger *zap.SugaredLogger) func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - logger.Debug(fmt.Sprintf("request for %s %s", r.Host, r.URL.Path)) +func run() int { + ctx, ctxCancel := context.WithCancel(context.Background()) + defer ctxCancel() - // Extract sandbox id from the sandboxID (--.e2b.dev) - hostSplit := strings.Split(r.Host, "-") - if len(hostSplit) < 2 { - logger.Warn("invalid host", zap.String("host", r.Host)) - http.Error(w, "Invalid host", http.StatusBadRequest) + instanceID := uuid.New().String() - return + // Setup telemetry + var tel *telemetry.Client + if env.IsLocal() { + tel = telemetry.NewNoopClient() + } else { + var err error + tel, err = telemetry.New(ctx, serviceName, commitSHA, instanceID) + if err != nil { + zap.L().Fatal("failed to create metrics exporter", zap.Error(err)) } + } - sandboxID := hostSplit[1] - msg := new(dns.Msg) + defer func() { + err := tel.Shutdown(ctx) + if err != nil { + log.Printf("telemetry shutdown:%v\n", err) + } + }() - // Set the question - msg.SetQuestion(fmt.Sprintf("%s.", sandboxID), dns.TypeA) + logger := zap.Must( + e2bLogger.NewLogger( + ctx, e2bLogger.LoggerConfig{ + ServiceName: serviceName, + IsInternal: true, + IsDebug: env.IsDebug(), + Cores: []zapcore.Core{e2bLogger.GetOTELCore(tel.LogsProvider, serviceName)}, + EnableConsole: true, + }, + ), + ) + + defer func() { + err := logger.Sync() + if err != nil { + log.Printf("logger sync error: %v\n", err) + } + }() - var node string - var err error - for i := range maxRetries { - // Send the query to the server - resp, _, dnsErr := client.Exchange(msg, dnsServer) - - // The api server wasn't found, maybe the API server is rolling and the DNS server is not updated yet - if dnsErr != nil || len(resp.Answer) == 0 { - err = dnsErr - logger.Warn(fmt.Sprintf("host for sandbox %s not found: %s", sandboxID, err), zap.String("sandbox_id", sandboxID), zap.Error(err), zap.Int("retry", i+1)) - // Jitter - time.Sleep(time.Duration(rand.Intn(10)) * time.Millisecond) - - continue - } + zap.ReplaceGlobals(logger) - node = resp.Answer[0].(*dns.A).A.String() - // The sandbox was not found, we want to return this information to the user - if node == "127.0.0.1" { - logger.Warn("Sandbox not found", zap.String("sandbox_id", sandboxID)) - w.WriteHeader(http.StatusBadGateway) - w.Write([]byte("Sandbox not found")) + proxyPort := internal.GetProxyServicePort() + edgePort := internal.GetEdgeServicePort() + edgeSecret := internal.GetEdgeServiceSecret() + orchestratorPort := internal.GetOrchestratorServicePort() - return - } + exitCode := atomic.Int32{} - break - } + wg := sync.WaitGroup{} - // There's no answer, we can't proxy the request - if err != nil { - logger.Error("DNS resolving for failed", zap.String("sandbox_id", sandboxID), zap.Error(err)) - http.Error(w, "Host not found", http.StatusBadGateway) - return - } + signalCtx, sigCancel := signal.NotifyContext(ctx, syscall.SIGTERM, syscall.SIGINT) + defer sigCancel() - // We've resolved the node to proxy the request to - logger.Debug("Proxying request", zap.String("sandbox_id", sandboxID), zap.String("node", node)) - targetUrl := &url.URL{ - Scheme: "http", - Host: fmt.Sprintf("%s:%d", node, sandboxPort), - } + logger.Info("Starting client proxy", zap.String("commit", commitSHA), zap.String("instance_id", instanceID)) + tracer := tel.TracerProvider.Tracer(serviceName) - // Proxy the request - proxy := httputil.NewSingleHostReverseProxy(targetUrl) + edgeSD, orchestratorsSD, err := service_discovery.NewServiceDiscoveryProvider(ctx, edgePort, orchestratorPort, logger) + if err != nil { + logger.Error("Failed to resolve service discovery config", zap.Error(err)) + return 1 + } - // Custom error handler for logging proxy errors - proxy.ErrorHandler = func(w http.ResponseWriter, r *http.Request, err error) { - logger.Error("Reverse proxy error", zap.Error(err), zap.String("sandbox_id", sandboxID)) - http.Error(w, "Proxy error", http.StatusBadGateway) - } + var catalog sandboxes.SandboxesCatalog + + if redisClusterUrl := os.Getenv("REDIS_CLUSTER_URL"); redisClusterUrl != "" { + redisClient := redis.NewClusterClient(&redis.ClusterOptions{Addrs: []string{redisClusterUrl}, MinIdleConns: 1}) + redisSync := redsync.New(goredis.NewPool(redisClient)) + catalog = sandboxes.NewRedisSandboxesCatalog(ctx, tracer, redisClient, redisSync) + } else if redisUrl := os.Getenv("REDIS_URL"); redisUrl != "" { + redisClient := redis.NewClient(&redis.Options{Addr: redisUrl, MinIdleConns: 1}) + redisSync := redsync.New(goredis.NewPool(redisClient)) + catalog = sandboxes.NewRedisSandboxesCatalog(ctx, tracer, redisClient, redisSync) + } else { + logger.Warn("Redis environment variable is not set, will fallback to in-memory sandboxes catalog that works only with one instance setup") + catalog = sandboxes.NewMemorySandboxesCatalog(ctx, tracer) + } - // Modify response for logging or additional processing - proxy.ModifyResponse = func(resp *http.Response) error { - if resp.StatusCode >= 500 { - logger.Error("Backend responded with error", zap.Int("status_code", resp.StatusCode), zap.String("sandbox_id", sandboxID)) - } else { - logger.Info("Backend responded", zap.Int("status_code", resp.StatusCode), zap.String("sandbox_id", sandboxID), zap.String("node", node), zap.String("path", r.URL.Path)) - } + orchestrators := e2borchestrators.NewOrchestratorsPool(ctx, logger, tel.TracerProvider, tel.MeterProvider, orchestratorsSD) - return nil - } + info := &e2binfo.ServiceInfo{ + NodeID: internal.GetNodeID(), + ServiceInstanceID: uuid.NewString(), + ServiceVersion: version, + ServiceVersionCommit: commitSHA, + ServiceStartup: time.Now(), + Host: fmt.Sprintf("%s:%d", internal.GetNodeIP(), edgePort), + } - // Set the transport options (with values similar to our old the nginx configuration) - proxy.Transport = &http.Transport{ - Proxy: http.ProxyFromEnvironment, - MaxIdleConns: 1024, // Matches worker_connections - MaxIdleConnsPerHost: 8192, // Matches keepalive_requests - IdleConnTimeout: 620 * time.Second, // Matches keepalive_timeout - TLSHandshakeTimeout: 10 * time.Second, // Similar to client_header_timeout - ResponseHeaderTimeout: 24 * time.Hour, // Matches proxy_read_timeout - DisableKeepAlives: false, // Allow keep-alives - } + // service starts in unhealthy state, and we are waiting for initial health check to pass + info.SetStatus(api.Unhealthy) - proxy.ServeHTTP(w, r) + if !useProxyCatalogResolution { + logger.Warn("Skipping proxy catalog resolution, using just DNS resolution instead. This is not recommended for production use, as it may lead to issues with sandbox resolution.") } -} -func main() { - exitCode := atomic.Int32{} - wg := sync.WaitGroup{} + // Proxy sandbox http traffic to orchestrator nodes + trafficProxy, err := e2bproxy.NewClientProxy(tel.MeterProvider, serviceName, uint(proxyPort), catalog, orchestrators, useProxyCatalogResolution, useDnsResolution) + if err != nil { + logger.Error("Failed to create client proxy", zap.Error(err)) + return 1 + } - ctx := context.Background() - signalCtx, sigCancel := signal.NotifyContext(ctx, syscall.SIGTERM, syscall.SIGINT) - defer sigCancel() + authorizationManager := authorization.NewStaticTokenAuthorizationService(edgeSecret) + edgeApiStore, err := edge.NewEdgeAPIStore(ctx, logger, tracer, info, edgeSD, orchestrators, catalog) + if err != nil { + logger.Error("failed to create edge api store", zap.Error(err)) + return 1 + } - logger, err := logging.New(env.IsLocal()) + edgeApiSwagger, err := api.GetSwagger() if err != nil { - panic(fmt.Errorf("error creating logger: %v", err)) + logger.Error("Failed to get swagger", zap.Error(err)) + return 1 } - logger.Info("Starting client proxy", zap.String("commit", commitSHA)) + lisAddr := fmt.Sprintf("0.0.0.0:%d", edgePort) + lis, err := net.Listen("tcp", lisAddr) + if err != nil { + logger.Error("Failed to listen on edge port", zap.Int("port", edgePort), zap.Error(err)) + return 1 + } + + muxServer := cmux.New(lis) + + // Edge Pass Through Proxy for direct communication with orchestrator nodes + grpcListener := muxServer.MatchWithWriters(cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc")) // handler requests for gRPC pass through + grpcSrv := edgepassthrough.NewNodePassThroughServer(ctx, orchestrators, info, authorizationManager) - healthServer := &http.Server{Addr: fmt.Sprintf(":%d", healthCheckPort)} - healthServer.Handler = http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) { - writer.WriteHeader(http.StatusOK) - }) + // Edge REST API + restHttpHandler := edge.NewGinServer(logger, edgeApiStore, edgeApiSwagger, tracer, authorizationManager) + restListener := muxServer.Match(cmux.Any()) + restSrv := &http.Server{Handler: restHttpHandler} // handler requests for REST API wg.Add(1) go func() { - // Health check defer wg.Done() - logger.Info("starting health check server", zap.Int("port", healthCheckPort)) - err := healthServer.ListenAndServe() + err := grpcSrv.Serve(grpcListener) switch { case errors.Is(err, http.ErrServerClosed): - logger.Info("http service shutdown successfully", zap.Int("port", healthCheckPort)) + zap.L().Info("Edge grpc service shutdown successfully") case err != nil: exitCode.Add(1) - logger.Error("http service encountered error", zap.Int("port", healthCheckPort), zap.Error(err)) + zap.L().Error("Edge grpc service encountered error", zap.Error(err)) default: // this probably shouldn't happen... - logger.Error("http service exited without error", zap.Int("port", healthCheckPort)) + zap.L().Error("Edge grpc service exited without error") } }() - // Proxy request to the correct node - server := &http.Server{Addr: fmt.Sprintf(":%d", port)} - server.Handler = http.HandlerFunc(proxyHandler(logger)) + wg.Add(1) + go func() { + defer wg.Done() + + err := restSrv.Serve(restListener) + switch { + case errors.Is(err, http.ErrServerClosed): + zap.L().Info("Edge api service shutdown successfully") + case err != nil: + exitCode.Add(1) + zap.L().Error("Edge api service encountered error", zap.Error(err)) + default: + // this probably shouldn't happen... + zap.L().Error("Edge api service exited without error") + } + }() wg.Add(1) go func() { defer wg.Done() + // make sure to cancel the parent context before this // goroutine returns, so that in the case of a panic // or error here, the other thread won't block until // signaled. defer sigCancel() - logger.Info("http service starting", zap.Int("port", port)) - err := server.ListenAndServe() + edgeRunLogger := logger.With(zap.Int("edge_port", edgePort)) + edgeRunLogger.Info("Edge api starting") + + err := muxServer.Serve() + if err != nil { + switch { + case errors.Is(err, http.ErrServerClosed): + edgeRunLogger.Info("Edge api shutdown successfully") + case err != nil: + exitCode.Add(1) + edgeRunLogger.Error("Edge api encountered error", zap.Error(err)) + default: + edgeRunLogger.Info("Edge api exited without error") + } + } + }() + + wg.Add(1) + go func() { + defer wg.Done() + + // make sure to cancel the parent context before this + // goroutine returns, so that in the case of a panic + // or error here, the other thread won't block until + // signaled. + defer sigCancel() + + proxyRunLogger := logger.With(zap.Int("proxy_port", proxyPort)) + proxyRunLogger.Info("Http proxy starting") + + err := trafficProxy.ListenAndServe() // Add different handling for the error switch { case errors.Is(err, http.ErrServerClosed): - logger.Info("http service shutdown successfully", zap.Int("port", port)) + proxyRunLogger.Info("Http proxy shutdown successfully") case err != nil: exitCode.Add(1) - logger.Error("http service encountered error", zap.Int("port", port), zap.Error(err)) + proxyRunLogger.Error("Http proxy encountered error", zap.Error(err)) default: // this probably shouldn't happen... - logger.Error("http service exited without error", zap.Int("port", port)) + proxyRunLogger.Error("Http proxy exited without error") } }() + // Service gracefully shutdown flow + // + // Endpoints reporting health status for different consumers + // -> Edge API and GRPC proxy /health + // -> Sandbox traffic proxy /health/traffic + // -> Edge machine /health/machine + // + // When service shut-downs we need to info all services that depends on us gracefully shutting down existing connections. + // Shutdown phase starts with marking sandbox traffic as draining. + // After that we will wait some time so all dependent services will recognize that we are draining and will stop sending new requests. + // Following phase marks the service as unhealthy, we are waiting for some time to let dependent services recognize new state. + // After that we are shutting down the GRPC proxy and edge API servers. This can take some time, + // because we are waiting for all in-progress requests to finish. + // After GRPC proxy and edge API servers are gracefully shutdown, we are marking the service as terminating, + // this is message primary for instances management that we are ready to be terminated and everything is properly cleaned up. + // Finally, we are closing the mux server just to clean up, new connections will not be accepted anymore because we already closed listeners. wg.Add(1) go func() { defer wg.Done() <-signalCtx.Done() - logger.Info("shutting down http service", zap.Int("port", healthCheckPort)) - if err := healthServer.Shutdown(ctx); err != nil { + + shutdownLogger := logger.With(zap.Int("proxy_port", proxyPort), zap.Int("edge_port", edgePort)) + shutdownLogger.Info("Shutting down services") + + edgeApiStore.SetDraining() + + // we should wait for health check manager to notice that we are not ready for new traffic + shutdownLogger.Info("Waiting for draining state propagation", zap.Float64("wait_in_seconds", shutdownDrainingWait.Seconds())) + time.Sleep(shutdownDrainingWait) + + proxyShutdownCtx, proxyShutdownCtxCancel := context.WithTimeout(ctx, 24*time.Hour) + defer proxyShutdownCtxCancel() + + // gracefully shutdown the proxy http server + err := trafficProxy.Shutdown(proxyShutdownCtx) + if err != nil { exitCode.Add(1) - logger.Error("http service shutdown error", zap.Int("port", healthCheckPort), zap.Error(err)) + shutdownLogger.Error("Http proxy shutdown error", zap.Error(err)) + } else { + shutdownLogger.Info("Http proxy shutdown successfully") } - logger.Info("waiting 15 seconds before shutting down http service") - time.Sleep(15 * time.Second) + edgeApiStore.SetUnhealthy() - logger.Info("shutting down http service", zap.Int("port", port)) + // wait for the health check manager to notice that we are not healthy at all + shutdownLogger.Info("Waiting for unhealthy state propagation", zap.Float64("wait_in_seconds", shutdownUnhealthyWait.Seconds())) + time.Sleep(shutdownUnhealthyWait) - if err := server.Shutdown(ctx); err != nil { - exitCode.Add(1) - logger.Error("http service shutdown error", zap.Int("port", port), zap.Error(err)) + // wait for graceful shutdown of the gRPC server with pass through proxy + // it can take some time, because we are waiting for all in-progress requests to finish (sandbox spawning, pausing...) + grpcSrv.GracefulStop() + + // wait for graceful shutdown of the rest api server with health check + restShutdownCtx, restShutdownCtxCancel := context.WithTimeout(ctx, shutdownDrainingWait) + defer restShutdownCtxCancel() + + err = restSrv.Shutdown(restShutdownCtx) + if err != nil { + shutdownLogger.Error("Edge rest api shutdown error", zap.Error(err)) } + + // used by instances management for notify that instance is ready for termination + edgeApiStore.SetTerminating() + + // close the mux server + muxServer.Close() }() wg.Wait() + return int(exitCode.Load()) +} + +func main() { // Exit, with appropriate code. - os.Exit(int(exitCode.Load())) + os.Exit(run()) } diff --git a/packages/client-proxy/main.tf b/packages/client-proxy/main.tf index e9923aa..1207f2e 100644 --- a/packages/client-proxy/main.tf +++ b/packages/client-proxy/main.tf @@ -1,20 +1,16 @@ -terraform { - required_providers { - aws = { - source = "hashicorp/aws" - version = "5.34.0" - } - } +resource "random_password" "edge_api_secret" { + length = 32 + special = false } -locals { - # Set a default digest for first-time deployment - default_image_digest = "sha256:0000000000000000000000000000000000000000000000000000000000000000" +resource "google_secret_manager_secret" "edge_api_secret" { + secret_id = "${var.prefix}edge-api-secret" + replication { + auto {} + } } -# Make this data source optional since the image may not exist yet during first deployment -data "aws_ecr_image" "client_proxy_image" { - count = 0 # Skip this data source until images are uploaded - repository_name = var.ecr_repository_name - image_tag = "client-proxy" -} +resource "google_secret_manager_secret_version" "edge_api_secret" { + secret = google_secret_manager_secret.edge_api_secret.id + secret_data = random_password.edge_api_secret.result +} \ No newline at end of file diff --git a/packages/client-proxy/outputs.tf b/packages/client-proxy/outputs.tf index da002fe..2ab8b2f 100644 --- a/packages/client-proxy/outputs.tf +++ b/packages/client-proxy/outputs.tf @@ -1,3 +1,3 @@ -output "client_proxy_ecr_image_digest" { - value = length(data.aws_ecr_image.client_proxy_image) > 0 ? data.aws_ecr_image.client_proxy_image[0].image_digest : local.default_image_digest +output "edge_api_secret" { + value = random_password.edge_api_secret.result } \ No newline at end of file diff --git a/packages/client-proxy/variables.tf b/packages/client-proxy/variables.tf index 9d6a8e8..92f0a7c 100644 --- a/packages/client-proxy/variables.tf +++ b/packages/client-proxy/variables.tf @@ -1,14 +1,12 @@ -variable "aws_account_id" { - description = "The AWS account ID to deploy the cluster in" - type = string +variable "prefix" { + type = string } -variable "aws_region" { - description = "The AWS region to deploy resources in" +variable "gcp_project_id" { + description = "The project to deploy the cluster in" type = string } -variable "ecr_repository_name" { - description = "The ECR repository name for orchestration" - type = string -} \ No newline at end of file +variable "gcp_region" { + type = string +} diff --git a/packages/cluster-disk-image/Makefile b/packages/cluster-disk-image/Makefile index e29d69a..8474f71 100644 --- a/packages/cluster-disk-image/Makefile +++ b/packages/cluster-disk-image/Makefile @@ -4,13 +4,26 @@ ENV := $(shell cat ../../.last_used_env || echo "not-set") init: packer init -upgrade . +# Detect system architecture +ARCH := $(arch) +ifeq ($(ARCH),x86_64) + ARCHITECTURE := x86_64 + AWS_INSTANCE_TYPE_DEFAULT := t3.xlarge +else ifeq ($(ARCH),aarch64) + ARCHITECTURE := arm64 + AWS_INSTANCE_TYPE_DEFAULT := t4g.xlarge +else + $(error Unsupported architecture: $(ARCH)) +endif + +# Use architecture-specific instance type if not specified +CLIENT_MACHINE_TYPE ?= $(AWS_INSTANCE_TYPE_DEFAULT) + build: - if [ -n "$(GCP_PROJECT_ID)" ] && [ -n "$(GCP_ZONE)" ]; then \ - packer build -only=googlecompute.orch -var "gcp_project_id=$(GCP_PROJECT_ID)" -var "gcp_zone=$(GCP_ZONE)" .; \ - elif [ -n "$(AWS_REGION)" ]; then \ + if [ -n "$(AWS_REGION)" ]; then \ PACKER_LOG=1 packer build -only=amazon-ebs.orch -var "aws_region=$(AWS_REGION)" -var "aws_instance_type=$(CLIENT_MACHINE_TYPE)" .; \ else \ - echo "Error: Either GCP_PROJECT_ID and GCP_ZONE or AWS_REGION must be set"; \ + echo "Error: AWS_REGION must be set"; \ exit 1; \ fi diff --git a/packages/create_template.sh b/packages/create_template.sh index 8acbd79..6cea9d2 100644 --- a/packages/create_template.sh +++ b/packages/create_template.sh @@ -222,4 +222,4 @@ while true; do sleep 10 done -echo "Script completed successfully!" \ No newline at end of file +echo "Building completed successfully!" \ No newline at end of file diff --git a/packages/db/Dockerfile b/packages/db/Dockerfile new file mode 100644 index 0000000..8b5a5bd --- /dev/null +++ b/packages/db/Dockerfile @@ -0,0 +1,31 @@ +# Builder stage +FROM golang:1.24-alpine AS builder + +# Shared +WORKDIR /build/shared + +COPY .shared/go.mod .shared/go.sum ./ +RUN go mod download + +COPY .shared/pkg pkg + +# +WORKDIR /build/db + +COPY go.mod go.sum ./ +RUN go mod download + +COPY scripts/migrator.go . + +RUN go build -o ./migrator ./migrator.go +RUN chmod +x ./migrator + +# Final stage +FROM alpine:latest + +COPY --from=builder /build/db/migrator /usr/local/bin/migrator + +WORKDIR /app +COPY /migrations ./migrations + +ENTRYPOINT ["migrator"] diff --git a/packages/db/Makefile b/packages/db/Makefile new file mode 100644 index 0000000..94b7603 --- /dev/null +++ b/packages/db/Makefile @@ -0,0 +1,43 @@ +ENV := $(shell cat ../../.last_used_env || echo "not-set") +-include ../../.env.${ENV} + +goose := GOOSE_DBSTRING=$(POSTGRES_CONNECTION_STRING) go tool goose -table "_migrations" -dir "migrations" postgres +IMAGE := e2b-orchestration/db-migrator + +.PHONY: migrate +migrate:migrate/up +migrate:migrate/down +migrate/%: + @echo "Applying Postgres migration *$(notdir $@)*" + @$(goose) $(notdir $@) + @echo "Done" + +.PHONY: build-debug +build-debug: + go mod download + go vet ./... + +.PHONE: create-migration +create-migration: +ifeq ($(origin NAME), undefined) + @echo "The expected syntax is: make migration-create NAME=your-migration-name" + @exit 1 +endif + @$(goose) create $(NAME) sql + +.PHONE: status +status: + @$(goose) status + +.PHONY: generate +generate: + rm -rf queries/*.go + go tool sqlc generate + + +.PHONY: build-and-upload +build-and-upload: + @rm -rf .shared/ + @cp -r ../shared .shared/ + @docker build --platform linux/amd64 --tag "$(GCP_REGION)-docker.pkg.dev/$(GCP_PROJECT_ID)/$(IMAGE)" --push . + @rm -rf .shared/ diff --git a/packages/db/client/client.go b/packages/db/client/client.go new file mode 100644 index 0000000..1080075 --- /dev/null +++ b/packages/db/client/client.go @@ -0,0 +1,76 @@ +package client + +import ( + "context" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgxpool" + _ "github.com/lib/pq" + "go.uber.org/zap" + + database "github.com/e2b-dev/infra/packages/db/queries" + "github.com/e2b-dev/infra/packages/shared/pkg/utils" +) + +type Client struct { + *database.Queries + ctx context.Context + conn *pgxpool.Pool +} + +type Option func(config *pgxpool.Config) + +func WithMaxConnections(maxConns int32) Option { + return func(config *pgxpool.Config) { + config.MaxConns = maxConns + } +} + +func WithMinIdle(minIdle int32) Option { + return func(config *pgxpool.Config) { + config.MinIdleConns = minIdle + } +} + +func NewClient(ctx context.Context, options ...Option) (*Client, error) { + databaseURL := utils.RequiredEnv("POSTGRES_CONNECTION_STRING", "Postgres connection string") + + // Parse the connection pool configuration + config, err := pgxpool.ParseConfig(databaseURL) + if err != nil { + zap.L().Error("Unable to parse database URL", zap.Error(err)) + + return nil, err + } + + // Set the default number of connections + for _, option := range options { + option(config) + } + + // Create the connection pool + pool, err := pgxpool.NewWithConfig(ctx, config) + if err != nil { + zap.L().Error("Unable to create connection pool", zap.Error(err)) + } + + queries := database.New(pool) + + return &Client{Queries: queries, ctx: ctx, conn: pool}, nil +} + +func (db *Client) Close() error { + db.conn.Close() + return nil +} + +// WithTx runs the given function in a transaction. +func (db *Client) WithTx(ctx context.Context) (*Client, pgx.Tx, error) { + tx, err := db.conn.BeginTx(ctx, pgx.TxOptions{}) + if err != nil { + return nil, nil, err + } + + client := &Client{Queries: db.Queries.WithTx(tx), conn: db.conn, ctx: db.ctx} + return client, tx, nil +} diff --git a/packages/db/go.mod b/packages/db/go.mod new file mode 100644 index 0000000..507c51c --- /dev/null +++ b/packages/db/go.mod @@ -0,0 +1,108 @@ +module github.com/e2b-dev/infra/packages/db + +go 1.24.3 + +require ( + github.com/e2b-dev/infra/packages/shared v0.0.0-20250324174051-3fb806938dc1 + github.com/google/uuid v1.6.0 + github.com/jackc/pgx/v5 v5.7.4 + github.com/lib/pq v1.10.9 + github.com/pressly/goose/v3 v3.24.2 + go.uber.org/zap v1.27.0 +) + +require ( + cel.dev/expr v0.24.0 // indirect + filippo.io/edwards25519 v1.1.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect + github.com/ClickHouse/ch-go v0.65.1 // indirect + github.com/ClickHouse/clickhouse-go/v2 v2.33.1 // indirect + github.com/andybalholm/brotli v1.1.1 // indirect + github.com/antlr4-go/antlr/v4 v4.13.1 // indirect + github.com/coder/websocket v1.8.13 // indirect + github.com/cubicdaiya/gonp v1.0.4 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/elastic/go-sysinfo v1.15.2 // indirect + github.com/elastic/go-windows v1.0.2 // indirect + github.com/fatih/structtag v1.2.0 // indirect + github.com/go-faster/city v1.0.1 // indirect + github.com/go-faster/errors v0.7.1 // indirect + github.com/go-sql-driver/mysql v1.9.2 // indirect + github.com/golang-jwt/jwt/v4 v4.5.2 // indirect + github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect + github.com/golang-sql/sqlexp v0.1.0 // indirect + github.com/google/cel-go v0.25.0 // indirect + github.com/google/pprof v0.0.0-20250501235452-c0086092b71a // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/joho/godotenv v1.5.1 // indirect + github.com/jonboulle/clockwork v0.5.0 // indirect + github.com/klauspost/compress v1.18.0 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mfridman/interpolate v0.0.2 // indirect + github.com/mfridman/xflag v0.1.0 // indirect + github.com/microsoft/go-mssqldb v1.8.0 // indirect + github.com/ncruces/go-strftime v0.1.9 // indirect + github.com/paulmach/orb v0.11.1 // indirect + github.com/pganalyze/pg_query_go/v6 v6.1.0 // indirect + github.com/pierrec/lz4/v4 v4.1.22 // indirect + github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb // indirect + github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect + github.com/pingcap/log v1.1.0 // indirect + github.com/pingcap/tidb/pkg/parser v0.0.0-20250324122243-d51e00e5bbf0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/prometheus/procfs v0.16.0 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + github.com/riza-io/grpc-go v0.2.0 // indirect + github.com/segmentio/asm v1.2.0 // indirect + github.com/sethvargo/go-retry v0.3.0 // indirect + github.com/shopspring/decimal v1.4.0 // indirect + github.com/spf13/cobra v1.9.1 // indirect + github.com/spf13/pflag v1.0.6 // indirect + github.com/sqlc-dev/sqlc v1.29.0 // indirect + github.com/stoewer/go-strcase v1.3.0 // indirect + github.com/tetratelabs/wazero v1.9.0 // indirect + github.com/tursodatabase/libsql-client-go v0.0.0-20240902231107-85af5b9d094d // indirect + github.com/vertica/vertica-sql-go v1.3.3 // indirect + github.com/wasilibs/go-pgquery v0.0.0-20250409022910-10ac41983c07 // indirect + github.com/wasilibs/wazero-helpers v0.0.0-20240620070341-3dff1577cd52 // indirect + github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77 // indirect + github.com/ydb-platform/ydb-go-sdk/v3 v3.104.7 // indirect + github.com/ziutek/mymysql v1.5.4 // indirect + go.opentelemetry.io/otel v1.36.0 // indirect + go.opentelemetry.io/otel/trace v1.36.0 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/mock v0.5.2 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/crypto v0.38.0 // indirect + golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect + golang.org/x/mod v0.24.0 // indirect + golang.org/x/net v0.40.0 // indirect + golang.org/x/sync v0.14.0 // indirect + golang.org/x/sys v0.33.0 // indirect + golang.org/x/text v0.25.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect + google.golang.org/grpc v1.72.1 // indirect + google.golang.org/protobuf v1.36.6 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + howett.net/plist v1.0.1 // indirect + modernc.org/libc v1.62.1 // indirect + modernc.org/mathutil v1.7.1 // indirect + modernc.org/memory v1.9.1 // indirect + modernc.org/sqlite v1.37.0 // indirect +) + +replace github.com/e2b-dev/infra/packages/shared => ../shared + +tool ( + github.com/pressly/goose/v3/cmd/goose + github.com/sqlc-dev/sqlc/cmd/sqlc +) diff --git a/packages/db/go.sum b/packages/db/go.sum new file mode 100644 index 0000000..e7d00a8 --- /dev/null +++ b/packages/db/go.sum @@ -0,0 +1,447 @@ +cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY= +cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw= +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 h1:nyQWyZvwGTvunIMxi1Y9uXkcyr+I7TeNrr/foo4Kpk8= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0/go.mod h1:l38EPgmsp71HHLq9j7De57JcKOWPyhrsW1Awm1JS6K0= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1 h1:MyVTgWR8qd/Jw1Le0NZebGBUCLbtak3bJ3z1OlqZBpw= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1/go.mod h1:GpPjLhVR9dnUoJMyHWSPy71xY9/lcmpzIPZXmF0FCVY= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occbWoio4EBLkbkevetNMAVX197GkzbUMtqjGWn80= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI= +github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU= +github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/ClickHouse/ch-go v0.65.1 h1:SLuxmLl5Mjj44/XbINsK2HFvzqup0s6rwKLFH347ZhU= +github.com/ClickHouse/ch-go v0.65.1/go.mod h1:bsodgURwmrkvkBe5jw1qnGDgyITsYErfONKAHn05nv4= +github.com/ClickHouse/clickhouse-go/v2 v2.33.1 h1:Z5nO/AnmUywcw0AvhAD0M1C2EaMspnXRK9vEOLxgmI0= +github.com/ClickHouse/clickhouse-go/v2 v2.33.1/go.mod h1:cb1Ss8Sz8PZNdfvEBwkMAdRhoyB6/HiB6o3We5ZIcE4= +github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= +github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= +github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE= +github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cubicdaiya/gonp v1.0.4 h1:ky2uIAJh81WiLcGKBVD5R7KsM/36W6IqqTy6Bo6rGws= +github.com/cubicdaiya/gonp v1.0.4/go.mod h1:iWGuP/7+JVTn02OWhRemVbMmG1DOUnmrGTYYACpOI0I= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/elastic/go-sysinfo v1.8.1/go.mod h1:JfllUnzoQV/JRYymbH3dO1yggI3mV2oTKSXsDHM+uIM= +github.com/elastic/go-sysinfo v1.15.2 h1:rgUFj4xRnxdAaxh4IhuGzHINWT8WrwUe5D338LLRC0s= +github.com/elastic/go-sysinfo v1.15.2/go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk= +github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU= +github.com/elastic/go-windows v1.0.2 h1:yoLLsAsV5cfg9FLhZ9EXZ2n2sQFKeDYrHenkcivY4vI= +github.com/elastic/go-windows v1.0.2/go.mod h1:bGcDpBzXgYSqM0Gx3DM4+UxFj300SZLixie9u9ixLM8= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= +github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= +github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= +github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= +github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-sql-driver/mysql v1.9.2 h1:4cNKDYQ1I84SXslGddlsrMhc8k4LeDVj6Ad6WRjiHuU= +github.com/go-sql-driver/mysql v1.9.2/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= +github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= +github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= +github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/cel-go v0.25.0 h1:jsFw9Fhn+3y2kBbltZR4VEz5xKkcIFRPDnuEzAGv5GY= +github.com/google/cel-go v0.25.0/go.mod h1:hjEb6r5SuOSlhCHmFoLzu8HGCERvIsDAbxDAyNU/MmI= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/pprof v0.0.0-20250501235452-c0086092b71a h1:rDA3FfmxwXR+BVKKdz55WwMJ1pD2hJQNW31d+l3mPk4= +github.com/google/pprof v0.0.0-20250501235452-c0086092b71a/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.7.4 h1:9wKznZrhWa2QiHL+NjTSPP6yjl3451BX3imWDnokYlg= +github.com/jackc/pgx/v5 v5.7.4/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I= +github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6BbAxPY= +github.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg= +github.com/mfridman/xflag v0.1.0 h1:TWZrZwG1QklFX5S4j1vxfF1sZbZeZSGofMwPMLAF29M= +github.com/mfridman/xflag v0.1.0/go.mod h1:/483ywM5ZO5SuMVjrIGquYNE5CzLrj5Ux/LxWWnjRaE= +github.com/microsoft/go-mssqldb v1.8.0 h1:7cyZ/AT7ycDsEoWPIXibd+aVKFtteUNhDGf3aobP+tw= +github.com/microsoft/go-mssqldb v1.8.0/go.mod h1:6znkekS3T2vp0waiMhen4GPU1BiAsrP+iXHcE7a7rFo= +github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= +github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= +github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU= +github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= +github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= +github.com/pganalyze/pg_query_go/v6 v6.1.0 h1:jG5ZLhcVgL1FAw4C/0VNQaVmX1SUJx71wBGdtTtBvls= +github.com/pganalyze/pg_query_go/v6 v6.1.0/go.mod h1:nvTHIuoud6e1SfrUaFwHqT0i4b5Nr+1rPWVds3B5+50= +github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= +github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb h1:3pSi4EDG6hg0orE1ndHkXvX6Qdq2cZn8gAPir8ymKZk= +github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb/go.mod h1:X2r9ueLEUZgtx2cIogM0v4Zj5uvvzhuuiu7Pn8HzMPg= +github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 h1:tdMsjOqUR7YXHoBitzdebTvOjs/swniBTOLy5XiMtuE= +github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86/go.mod h1:exzhVYca3WRtd6gclGNErRWb1qEgff3LYta0LvRmON4= +github.com/pingcap/log v1.1.0 h1:ELiPxACz7vdo1qAvvaWJg1NrYFoY6gqAh/+Uo6aXdD8= +github.com/pingcap/log v1.1.0/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4= +github.com/pingcap/tidb/pkg/parser v0.0.0-20250324122243-d51e00e5bbf0 h1:W3rpAI3bubR6VWOcwxDIG0Gz9G5rl5b3SL116T0vBt0= +github.com/pingcap/tidb/pkg/parser v0.0.0-20250324122243-d51e00e5bbf0/go.mod h1:+8feuexTKcXHZF/dkDfvCwEyBAmgb4paFc3/WeYV2eE= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pressly/goose/v3 v3.24.2 h1:c/ie0Gm8rnIVKvnDQ/scHErv46jrDv9b4I0WRcFJzYU= +github.com/pressly/goose/v3 v3.24.2/go.mod h1:kjefwFB0eR4w30Td2Gj2Mznyw94vSP+2jJYkOVNbD1k= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM= +github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg= +github.com/rekby/fixenv v0.6.1 h1:jUFiSPpajT4WY2cYuc++7Y1zWrnCxnovGCIX72PZniM= +github.com/rekby/fixenv v0.6.1/go.mod h1:/b5LRc06BYJtslRtHKxsPWFT/ySpHV+rWvzTg+XWk4c= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/riza-io/grpc-go v0.2.0 h1:2HxQKFVE7VuYstcJ8zqpN84VnAoJ4dCL6YFhJewNcHQ= +github.com/riza-io/grpc-go v0.2.0/go.mod h1:2bDvR9KkKC3KhtlSHfR3dAXjUMT86kg4UfWFyVGWqi8= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= +github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= +github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah2SE= +github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas= +github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= +github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= +github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= +github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= +github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/sqlc-dev/sqlc v1.29.0 h1:HQctoD7y/i29Bao53qXO7CZ/BV9NcvpGpsJWvz9nKWs= +github.com/sqlc-dev/sqlc v1.29.0/go.mod h1:BavmYw11px5AdPOjAVHmb9fctP5A8GTziC38wBF9tp0= +github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= +github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I= +github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM= +github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/tursodatabase/libsql-client-go v0.0.0-20240902231107-85af5b9d094d h1:dOMI4+zEbDI37KGb0TI44GUAwxHF9cMsIoDTJ7UmgfU= +github.com/tursodatabase/libsql-client-go v0.0.0-20240902231107-85af5b9d094d/go.mod h1:l8xTsYB90uaVdMHXMCxKKLSgw5wLYBwBKKefNIUnm9s= +github.com/vertica/vertica-sql-go v1.3.3 h1:fL+FKEAEy5ONmsvya2WH5T8bhkvY27y/Ik3ReR2T+Qw= +github.com/vertica/vertica-sql-go v1.3.3/go.mod h1:jnn2GFuv+O2Jcjktb7zyc4Utlbu9YVqpHH/lx63+1M4= +github.com/wasilibs/go-pgquery v0.0.0-20250409022910-10ac41983c07 h1:mJdDDPblDfPe7z7go8Dvv1AJQDI3eQ/5xith3q2mFlo= +github.com/wasilibs/go-pgquery v0.0.0-20250409022910-10ac41983c07/go.mod h1:Ak17IJ037caFp4jpCw/iQQ7/W74Sqpb1YuKJU6HTKfM= +github.com/wasilibs/wazero-helpers v0.0.0-20240620070341-3dff1577cd52 h1:OvLBa8SqJnZ6P+mjlzc2K7PM22rRUPE1x32G9DTPrC4= +github.com/wasilibs/wazero-helpers v0.0.0-20240620070341-3dff1577cd52/go.mod h1:jMeV4Vpbi8osrE/pKUxRZkVaA0EX7NZN0A9/oRzgpgY= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= +github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= +github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= +github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= +github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77 h1:LY6cI8cP4B9rrpTleZk95+08kl2gF4rixG7+V/dwL6Q= +github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I= +github.com/ydb-platform/ydb-go-sdk/v3 v3.104.7 h1:d05IBvxm7X+5xo6tdZ/vHdgJF6MV+cFBEtsAGo19CjE= +github.com/ydb-platform/ydb-go-sdk/v3 v3.104.7/go.mod h1:l5sSv153E18VvYcsmr51hok9Sjc16tEC8AXGbwrk+ho= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= +github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= +go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= +go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= +go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= +go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= +go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs= +go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY= +go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o= +go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w= +go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= +go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko= +go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= +golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b h1:QoALfVG9rhQ/M7vYDScfPdWjGL9dlsVVM5VGh7aKoAA= +golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= +golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= +golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= +golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= +golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= +golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 h1:Kog3KlB4xevJlAcbbbzPfRG0+X9fdoGM+UBRKVz6Wr0= +google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237/go.mod h1:ezi0AVyMKDWy5xAncvjLWH7UcLBB5n7y2fQ8MzjJcto= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 h1:cJfm9zPbe1e873mHJzmQ1nwVEeRDU/T1wXDK2kUSU34= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA= +google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= +google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= +gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= +gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= +howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM= +howett.net/plist v1.0.1/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= +modernc.org/cc/v4 v4.25.2 h1:T2oH7sZdGvTaie0BRNFbIYsabzCxUQg8nLqCdQ2i0ic= +modernc.org/cc/v4 v4.25.2/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0= +modernc.org/ccgo/v4 v4.25.1 h1:TFSzPrAGmDsdnhT9X2UrcPMI3N/mJ9/X9ykKXwLhDsU= +modernc.org/ccgo/v4 v4.25.1/go.mod h1:njjuAYiPflywOOrm3B7kCB444ONP5pAVr8PIEoE0uDw= +modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE= +modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ= +modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= +modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= +modernc.org/libc v1.62.1 h1:s0+fv5E3FymN8eJVmnk0llBe6rOxCu/DEU+XygRbS8s= +modernc.org/libc v1.62.1/go.mod h1:iXhATfJQLjG3NWy56a6WVU73lWOcdYVxsvwCgoPljuo= +modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= +modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= +modernc.org/memory v1.9.1 h1:V/Z1solwAVmMW1yttq3nDdZPJqV1rM05Ccq6KMSZ34g= +modernc.org/memory v1.9.1/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8= +modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= +modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= +modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= +modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI= +modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM= +modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= +modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= +modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= +modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= diff --git a/packages/db/migrations/20000101000000_auth.sql b/packages/db/migrations/20000101000000_auth.sql new file mode 100644 index 0000000..f49f968 --- /dev/null +++ b/packages/db/migrations/20000101000000_auth.sql @@ -0,0 +1,65 @@ +-- +goose Up +-- +goose StatementBegin +CREATE SCHEMA IF NOT EXISTS auth; + +-- Create RLS policies for user management +DO $$ + BEGIN + BEGIN + IF NOT EXISTS ( + SELECT 1 + FROM pg_roles + WHERE rolname = 'authenticated' + ) THEN + EXECUTE 'CREATE ROLE authenticated;'; + END IF; + END; + END $$; +; + +-- Create RLS policies for user management +DO $$ + BEGIN + IF NOT EXISTS ( + SELECT 1 + FROM pg_proc p + JOIN pg_namespace n ON p.pronamespace = n.oid + WHERE p.proname = 'uid' AND n.nspname = 'auth' + ) THEN + EXECUTE 'CREATE FUNCTION auth.uid() RETURNS uuid AS $func$ + BEGIN + RETURN gen_random_uuid(); + END; + $func$ LANGUAGE plpgsql;'; + END IF; + END; +$$; + + +-- Grant execute on auth.uid() to postgres role +GRANT EXECUTE ON FUNCTION auth.uid() TO postgres; + +-- Check if the table exists before trying to create it +DO $$ + BEGIN + IF NOT EXISTS ( + SELECT 1 + FROM information_schema.tables + WHERE table_schema = 'auth' + AND table_name = 'users' + ) THEN + EXECUTE ' + CREATE TABLE auth.users ( + id uuid NOT NULL DEFAULT gen_random_uuid(), + email text NOT NULL, + PRIMARY KEY (id) + );'; + END IF; + END; +$$; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20000101000001_rls_for_migration_table.sql b/packages/db/migrations/20000101000001_rls_for_migration_table.sql new file mode 100644 index 0000000..ad6f5a8 --- /dev/null +++ b/packages/db/migrations/20000101000001_rls_for_migration_table.sql @@ -0,0 +1,8 @@ +-- +goose Up +-- +goose StatementBegin +ALTER TABLE "public"."_migrations" ENABLE ROW LEVEL SECURITY; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20231124185944_create_schemas_and_tables.sql b/packages/db/migrations/20231124185944_create_schemas_and_tables.sql new file mode 100644 index 0000000..94af814 --- /dev/null +++ b/packages/db/migrations/20231124185944_create_schemas_and_tables.sql @@ -0,0 +1,158 @@ +-- +goose Up +-- +goose StatementBegin + +-- Add new schema named "auth" +CREATE SCHEMA IF NOT EXISTS "extensions"; + +-- Create "tiers" table +CREATE TABLE IF NOT EXISTS "public"."tiers" +( + "id" text NOT NULL, + "name" text NOT NULL, + "vcpu" bigint NOT NULL default '2'::bigint, + "ram_mb" bigint NOT NULL DEFAULT '512'::bigint, + "disk_mb" bigint NOT NULL DEFAULT '512'::bigint, + "concurrent_instances" bigint NOT NULL, + PRIMARY KEY ("id"), + constraint tiers_concurrent_sessions_check check ((concurrent_instances > 0)), + constraint tiers_disk_mb_check check ((disk_mb > 0)), + constraint tiers_ram_mb_check check ((ram_mb > 0)), + constraint tiers_vcpu_check check ((vcpu > 0)) +); +ALTER TABLE "public"."tiers" ENABLE ROW LEVEL SECURITY; + + +COMMENT ON COLUMN public.tiers.concurrent_instances + IS 'The number of instances the team can run concurrently'; + +-- Create "teams" table +CREATE TABLE IF NOT EXISTS "public"."teams" +( + "id" uuid DEFAULT gen_random_uuid(), + "created_at" timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP, + "is_default" boolean NOT NULL, + "is_blocked" boolean NOT NULL DEFAULT FALSE, + "name" text NOT NULL, + "tier" text NOT NULL, + PRIMARY KEY ("id"), + CONSTRAINT "teams_tiers_teams" FOREIGN KEY ("tier") REFERENCES "public"."tiers" ("id") ON UPDATE NO ACTION ON DELETE NO ACTION +); +ALTER TABLE "public"."teams" ENABLE ROW LEVEL SECURITY; + +-- Create "envs" table +CREATE TABLE IF NOT EXISTS "public"."envs" +( + "id" text NOT NULL, + "created_at" timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updated_at" timestamptz NOT NULL, + "dockerfile" text NOT NULL, + "public" boolean NOT NULL DEFAULT FALSE, + "build_id" uuid NOT NULL, + "build_count" integer NOT NULL DEFAULT 1, + "spawn_count" bigint NOT NULL DEFAULT '0'::bigint, + "last_spawned_at" timestamptz NULL, + "team_id" uuid NOT NULL, + PRIMARY KEY ("id"), + CONSTRAINT "envs_teams_envs" FOREIGN KEY ("team_id") REFERENCES "public"."teams" ("id") ON UPDATE NO ACTION ON DELETE NO ACTION +); +ALTER TABLE "public"."envs" ENABLE ROW LEVEL SECURITY; + +COMMENT ON COLUMN public.envs.last_spawned_at + IS 'Timestamp of the last time the env was spawned'; +COMMENT ON COLUMN public.envs.spawn_count + IS 'Number of times the env was spawned'; + +-- Create "env_aliases" table +CREATE TABLE IF NOT EXISTS "public"."env_aliases" +( + "alias" text NOT NULL, + "is_name" boolean NOT NULL DEFAULT true, + "env_id" text NULL, + PRIMARY KEY ("alias"), + CONSTRAINT "env_aliases_envs_env_aliases" FOREIGN KEY ("env_id") REFERENCES "public"."envs" ("id") ON UPDATE NO ACTION ON DELETE CASCADE +); +ALTER TABLE "public"."env_aliases" ENABLE ROW LEVEL SECURITY; + +-- Create "team_api_keys" table +CREATE TABLE IF NOT EXISTS "public"."team_api_keys" +( + "api_key" character varying(44) NOT NULL, + "created_at" timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP, + "team_id" uuid NOT NULL, + PRIMARY KEY ("api_key"), + CONSTRAINT "team_api_keys_teams_team_api_keys" FOREIGN KEY ("team_id") REFERENCES "public"."teams" ("id") ON UPDATE NO ACTION ON DELETE CASCADE +); +ALTER TABLE "public"."team_api_keys" ENABLE ROW LEVEL SECURITY; + +-- Create "access_tokens" table +CREATE TABLE IF NOT EXISTS "public"."access_tokens" +( + "access_token" text NOT NULL, + "user_id" uuid NOT NULL, + "created_at" timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY ("access_token"), + CONSTRAINT "access_tokens_users_access_tokens" FOREIGN KEY ("user_id") REFERENCES "auth"."users" ("id") ON UPDATE NO ACTION ON DELETE CASCADE +); +ALTER TABLE "public"."access_tokens" ENABLE ROW LEVEL SECURITY; + +-- Create "users_teams" table +CREATE TABLE IF NOT EXISTS "public"."users_teams" +( + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, + "user_id" uuid NOT NULL, + "team_id" uuid NOT NULL, + PRIMARY KEY ("id"), + CONSTRAINT "users_teams_teams_teams" FOREIGN KEY ("team_id") REFERENCES "public"."teams" ("id") ON UPDATE NO ACTION ON DELETE CASCADE, + CONSTRAINT "users_teams_users_users" FOREIGN KEY ("user_id") REFERENCES "auth"."users" ("id") ON UPDATE NO ACTION ON DELETE CASCADE +); +ALTER TABLE "public"."users_teams" ENABLE ROW LEVEL SECURITY; + +-- Create RLS policies +DO $$ +BEGIN + BEGIN + CREATE POLICY "Allow selection for users that are in the team" + ON "public"."teams" + AS PERMISSIVE + FOR SELECT + TO authenticated + USING ((auth.uid() IN ( SELECT users_teams.user_id + FROM users_teams + WHERE (users_teams.team_id = teams.id)))); + + CREATE POLICY "Enable select for users in relevant team" + ON "public"."users_teams" + AS PERMISSIVE + FOR SELECT + TO authenticated + USING ((auth.uid() = user_id)); + + CREATE POLICY "Enable select for users based on user_id" + ON public.access_tokens + AS PERMISSIVE + FOR SELECT + TO authenticated + USING ((auth.uid() = user_id)); + + + CREATE POLICY "Allow selection for users that are in the team" + ON "public"."team_api_keys" + AS PERMISSIVE + FOR SELECT + TO authenticated + USING ((auth.uid() IN ( SELECT users_teams.user_id + FROM users_teams + WHERE (users_teams.team_id = team_api_keys.team_id)))); + EXCEPTION WHEN undefined_function + THEN RAISE NOTICE 'Policy were not created, probably because the function auth.uid() does not exist.'; + END; +END $$; + +-- Create index "usersteams_team_id_user_id" to table: "users_teams" +CREATE UNIQUE INDEX IF NOT EXISTS "usersteams_team_id_user_id" ON "public"."users_teams" ("team_id", "user_id"); + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20231220094836_create_triggers_and_policies.sql b/packages/db/migrations/20231220094836_create_triggers_and_policies.sql new file mode 100644 index 0000000..0d4501a --- /dev/null +++ b/packages/db/migrations/20231220094836_create_triggers_and_policies.sql @@ -0,0 +1,128 @@ +-- +goose Up +-- +goose StatementBegin + +-- Add base tier +INSERT INTO public.tiers (id, name, vcpu, ram_mb, disk_mb, concurrent_instances) VALUES ('base_v1', 'Base tier', 2, 512, 512, 20); + +-- Create user for triggers +CREATE USER trigger_user; +GRANT trigger_user TO postgres; + +GRANT CREATE, USAGE ON SCHEMA public TO trigger_user; +GRANT USAGE ON SCHEMA extensions TO trigger_user; +GRANT USAGE ON SCHEMA auth TO trigger_user; + +GRANT SELECT, INSERT, TRIGGER ON public.teams TO trigger_user; +GRANT INSERT ON public.users_teams TO trigger_user; +GRANT INSERT ON public.team_api_keys TO trigger_user; +GRANT INSERT ON public.access_tokens TO trigger_user; + +-- +CREATE OR REPLACE FUNCTION public.generate_default_team_trigger() + RETURNS TRIGGER + LANGUAGE plpgsql + AS $create_default_team$ +DECLARE + team_id uuid; +BEGIN + RAISE NOTICE 'Creating default team for user %', NEW.id; + INSERT INTO public.teams(name, is_default, tier, email) VALUES (NEW.email, true, 'base_v1', NEW.email) RETURNING id INTO team_id; + INSERT INTO public.users_teams(user_id, team_id) VALUES (NEW.id, team_id); + RAISE NOTICE 'Created default team for user % and team %', NEW.id, team_id; + RETURN NEW; +END +$create_default_team$ SECURITY DEFINER SET search_path = public; + +ALTER FUNCTION public.generate_default_team_trigger() OWNER TO trigger_user; + +CREATE OR REPLACE TRIGGER create_default_team + AFTER INSERT ON auth.users + FOR EACH ROW EXECUTE FUNCTION generate_default_team_trigger(); + + +CREATE OR REPLACE FUNCTION public.generate_teams_api_keys_trigger() RETURNS TRIGGER + LANGUAGE plpgsql +AS $generate_teams_api_keys$ +DECLARE + key_prefix TEXT := 'e2b_'; + generated_key TEXT; +BEGIN + -- Generate a random 20 byte string and encode it as hex, so it's 40 characters + generated_key := encode(extensions.gen_random_bytes(20), 'hex'); + INSERT INTO public.team_api_keys (team_id, api_key) + VALUES (NEW.id, key_prefix || generated_key); + RETURN NEW; +END +$generate_teams_api_keys$ SECURITY DEFINER SET search_path = public; + +ALTER FUNCTION public.generate_teams_api_keys_trigger() OWNER TO trigger_user; + +CREATE OR REPLACE TRIGGER team_api_keys_trigger + AFTER INSERT ON public.teams + FOR EACH ROW EXECUTE FUNCTION generate_teams_api_keys_trigger(); + + + +CREATE OR REPLACE FUNCTION public.generate_access_token_trigger() RETURNS TRIGGER + LANGUAGE plpgsql + AS $generate_access_token$ +DECLARE + key_prefix TEXT := 'sk_e2b_'; + generated_key TEXT; +BEGIN + -- Generate a random 20 byte string and encode it as hex, so it's 40 characters + generated_key := encode(extensions.gen_random_bytes(20), 'hex'); + INSERT INTO public.access_tokens (user_id, access_token) + VALUES (NEW.id, key_prefix || generated_key); + RETURN NEW; +END; +$generate_access_token$ SECURITY DEFINER SET search_path = public; + +ALTER FUNCTION public.generate_access_token_trigger() OWNER TO trigger_user; + + +CREATE OR REPLACE TRIGGER create_access_token + AFTER INSERT ON auth.users + FOR EACH ROW EXECUTE FUNCTION generate_access_token_trigger(); + + +CREATE POLICY "Allow to create an access token to new user" + ON public.access_tokens + AS PERMISSIVE + FOR INSERT + TO trigger_user + WITH CHECK (TRUE); + +CREATE POLICY "Allow to create a team to new user" + ON public.teams + AS PERMISSIVE + FOR INSERT + TO trigger_user + WITH CHECK (TRUE); + +CREATE POLICY "Allow to create a user team connection to new user" + ON public.users_teams + AS PERMISSIVE + FOR INSERT + TO trigger_user + WITH CHECK (TRUE); + +CREATE POLICY "Allow to select a team for supabase auth admin" + ON public.teams + AS PERMISSIVE + FOR SELECT + TO trigger_user + USING (TRUE); + +CREATE POLICY "Allow to create a team api key to new user" + ON public.team_api_keys + AS PERMISSIVE + FOR INSERT + TO trigger_user + WITH CHECK (TRUE); + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20231222181015_add_env_resources.sql b/packages/db/migrations/20231222181015_add_env_resources.sql new file mode 100644 index 0000000..5003ae0 --- /dev/null +++ b/packages/db/migrations/20231222181015_add_env_resources.sql @@ -0,0 +1,15 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "envs" table +ALTER TABLE "public"."envs" + ADD COLUMN IF NOT EXISTS "vcpu" bigint NULL, + ADD COLUMN IF NOT EXISTS "ram_mb" bigint NULL, + ADD COLUMN IF NOT EXISTS "free_disk_size_mb" bigint NULL, + ADD COLUMN IF NOT EXISTS "total_disk_size_mb" bigint NULL; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240103104619_add_team_email.sql b/packages/db/migrations/20240103104619_add_team_email.sql new file mode 100644 index 0000000..b42d53e --- /dev/null +++ b/packages/db/migrations/20240103104619_add_team_email.sql @@ -0,0 +1,29 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "teams" table +ALTER TABLE "public"."teams" ADD COLUMN IF NOT EXISTS "email" character varying(255) NULL; + + +CREATE OR REPLACE FUNCTION public.generate_default_team() RETURNS TRIGGER + LANGUAGE plpgsql +AS $create_default_team$ +DECLARE + team_id uuid; +BEGIN + INSERT INTO public.teams(name, is_default, tier, email) VALUES (NEW.email, true, 'base', NEW.email) RETURNING id INTO team_id; + INSERT INTO public.users_teams(user_id, team_id) VALUES (NEW.id, team_id); + RAISE NOTICE 'Created default team for user % and team %', NEW.id, team_id; + RETURN NEW; +END +$create_default_team$ SECURITY DEFINER SET search_path = public; + +UPDATE "public"."teams" SET "email" = "name" WHERE "email" IS NULL; + +ALTER TABLE "public"."teams" ALTER COLUMN "email" SET NOT NULL; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240106121919_add_team_ban_fields.sql b/packages/db/migrations/20240106121919_add_team_ban_fields.sql new file mode 100644 index 0000000..3b2886c --- /dev/null +++ b/packages/db/migrations/20240106121919_add_team_ban_fields.sql @@ -0,0 +1,13 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "teams" table +ALTER TABLE "public"."teams" + ADD COLUMN IF NOT EXISTS "is_banned" boolean NOT NULL DEFAULT false, + ADD COLUMN IF NOT EXISTS "blocked_reason" text NULL; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240202120312_add_kernel_version.sql b/packages/db/migrations/20240202120312_add_kernel_version.sql new file mode 100644 index 0000000..6a35e52 --- /dev/null +++ b/packages/db/migrations/20240202120312_add_kernel_version.sql @@ -0,0 +1,19 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "envs" table +ALTER TABLE "public"."envs" ADD COLUMN IF NOT EXISTS "kernel_version" character varying NULL; + +-- Update existing records +UPDATE "public"."envs" SET "kernel_version" = 'vmlinux-5.10.186-old' WHERE "kernel_version" IS NULL; + +-- Make kernel_version NOT NULL and set default +ALTER TABLE "public"."envs" + ALTER COLUMN "kernel_version" SET NOT NULL, + ALTER COLUMN "kernel_version" SET DEFAULT 'vmlinux-5.10.186'; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240219190940_add_max_length_hours.sql b/packages/db/migrations/20240219190940_add_max_length_hours.sql new file mode 100644 index 0000000..2926a38 --- /dev/null +++ b/packages/db/migrations/20240219190940_add_max_length_hours.sql @@ -0,0 +1,17 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "tiers" table +ALTER TABLE "public"."tiers" ADD COLUMN IF NOT EXISTS "max_length_hours" bigint NULL; + +-- Update existing records +UPDATE "public"."tiers" SET "max_length_hours" = 1 WHERE "max_length_hours" IS NULL; + +-- Make max_length_hours NOT NULL +ALTER TABLE "public"."tiers" ALTER COLUMN "max_length_hours" SET NOT NULL; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240221023613_add_firecracker_version.sql b/packages/db/migrations/20240221023613_add_firecracker_version.sql new file mode 100644 index 0000000..41c7faa --- /dev/null +++ b/packages/db/migrations/20240221023613_add_firecracker_version.sql @@ -0,0 +1,12 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "envs" table +ALTER TABLE "public"."envs" ADD COLUMN IF NOT EXISTS "firecracker_version" character varying NOT NULL DEFAULT 'v1.5.0_8a43b32e'; + +COMMIT; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240221215408_update_firecracker_version.sql b/packages/db/migrations/20240221215408_update_firecracker_version.sql new file mode 100644 index 0000000..f1b5062 --- /dev/null +++ b/packages/db/migrations/20240221215408_update_firecracker_version.sql @@ -0,0 +1,12 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "envs" table +ALTER TABLE "public"."envs" +ALTER COLUMN "firecracker_version" SET DEFAULT 'v1.7.0-dev_8bb88311'; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240305221944_remove_tier_resources.sql b/packages/db/migrations/20240305221944_remove_tier_resources.sql new file mode 100644 index 0000000..5978cf4 --- /dev/null +++ b/packages/db/migrations/20240305221944_remove_tier_resources.sql @@ -0,0 +1,15 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "tiers" table +ALTER TABLE "public"."tiers" + DROP CONSTRAINT IF EXISTS "tiers_ram_mb_check", + DROP CONSTRAINT IF EXISTS "tiers_vcpu_check", + DROP COLUMN IF EXISTS "vcpu", + DROP COLUMN IF EXISTS "ram_mb"; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240315165236_create_env_builds.sql b/packages/db/migrations/20240315165236_create_env_builds.sql new file mode 100644 index 0000000..0c28d92 --- /dev/null +++ b/packages/db/migrations/20240315165236_create_env_builds.sql @@ -0,0 +1,32 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "env_aliases" table +ALTER TABLE IF EXISTS "public"."env_aliases" RENAME COLUMN "is_name" TO "is_renamable"; +ALTER TABLE IF EXISTS "public"."env_aliases" ALTER COLUMN "env_id" SET NOT NULL; + +-- Create "env_builds" table +CREATE TABLE "public"."env_builds" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP, "updated_at" timestamptz NOT NULL, "finished_at" timestamptz NULL, "status" text NOT NULL DEFAULT 'waiting', "dockerfile" text NULL, "start_cmd" text NULL, "vcpu" bigint NOT NULL, "ram_mb" bigint NOT NULL, "free_disk_size_mb" bigint NOT NULL, "total_disk_size_mb" bigint NULL, "kernel_version" text NOT NULL DEFAULT 'vmlinux-5.10.186', "firecracker_version" text NOT NULL DEFAULT 'v1.7.0-dev_8bb88311', "env_id" text NULL, PRIMARY KEY ("id"), CONSTRAINT "env_builds_envs_builds" FOREIGN KEY ("env_id") REFERENCES "public"."envs" ("id") ON UPDATE NO ACTION ON DELETE CASCADE); +ALTER TABLE "public"."env_builds" ENABLE ROW LEVEL SECURITY; + +-- Populate "env_builds" table +INSERT INTO "public"."env_builds"(updated_at, finished_at, status, dockerfile, start_cmd, vcpu, ram_mb, free_disk_size_mb, total_disk_size_mb, kernel_version, firecracker_version, env_id) +SELECT CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'success', dockerfile, NULL, vcpu, ram_mb, free_disk_size_mb, total_disk_size_mb, kernel_version, firecracker_version, id +FROM "public"."envs"; + +-- Modify "envs" table +ALTER TABLE IF EXISTS "public"."envs" + DROP COLUMN IF EXISTS "dockerfile", + DROP COLUMN IF EXISTS "build_id", + DROP COLUMN IF EXISTS "vcpu", + DROP COLUMN IF EXISTS "ram_mb", + DROP COLUMN IF EXISTS "free_disk_size_mb", + DROP COLUMN IF EXISTS "total_disk_size_mb", + DROP COLUMN IF EXISTS "kernel_version", + DROP COLUMN IF EXISTS "firecracker_version"; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240605070918_refactor_triggers_and_policies.sql b/packages/db/migrations/20240605070918_refactor_triggers_and_policies.sql new file mode 100644 index 0000000..e858f71 --- /dev/null +++ b/packages/db/migrations/20240605070918_refactor_triggers_and_policies.sql @@ -0,0 +1,147 @@ +-- +goose Up +-- +goose StatementBegin + +DROP TRIGGER IF EXISTS create_default_team ON auth.users; +DROP FUNCTION IF EXISTS generate_default_team_trigger(); +DROP TRIGGER IF EXISTS team_api_keys_trigger ON public.teams; +DROP FUNCTION IF EXISTS generate_teams_api_keys_trigger(); +DROP TRIGGER IF EXISTS create_access_token ON auth.users; +DROP FUNCTION IF EXISTS generate_access_token_trigger(); + +CREATE OR REPLACE FUNCTION public.extra_for_post_user_signup(user_id uuid, team_id uuid) + RETURNS void + LANGUAGE plpgsql +AS $extra_for_post_user_signup$ +DECLARE +BEGIN +END +$extra_for_post_user_signup$ SECURITY DEFINER SET search_path = public; + +CREATE OR REPLACE FUNCTION public.generate_team_api_key() + RETURNS TEXT + LANGUAGE plpgsql +AS $generate_team_api_key$ +DECLARE + team_api_key_prefix TEXT := 'e2b_'; + generated_key TEXT; +BEGIN + -- Generate a random 20 byte string and encode it as hex, so it's 40 characters + generated_key := encode(extensions.gen_random_bytes(20), 'hex'); + RETURN team_api_key_prefix || generated_key; +END +$generate_team_api_key$ SECURITY DEFINER SET search_path = public; + +ALTER TABLE public.team_api_keys ALTER COLUMN api_key SET DEFAULT public.generate_team_api_key(); + +CREATE OR REPLACE FUNCTION public.generate_access_token() + RETURNS TEXT + LANGUAGE plpgsql +AS $extra_for_post_user_signup$ +DECLARE + access_token_prefix TEXT := 'sk_e2b_'; + generated_token TEXT; +BEGIN + -- Generate a random 20 byte string and encode it as hex, so it's 40 characters + generated_token := encode(extensions.gen_random_bytes(20), 'hex'); + RETURN access_token_prefix || generated_token; +END +$extra_for_post_user_signup$ SECURITY DEFINER SET search_path = public; + +ALTER TABLE public.access_tokens ALTER COLUMN access_token SET DEFAULT public.generate_access_token(); + +ALTER FUNCTION public.extra_for_post_user_signup(uuid, uuid) OWNER TO trigger_user; + +CREATE OR REPLACE FUNCTION public.post_user_signup() + RETURNS TRIGGER + LANGUAGE plpgsql +AS $post_user_signup$ +DECLARE + team_id uuid; +BEGIN + RAISE NOTICE 'Creating default team for user %', NEW.id; + INSERT INTO public.teams(name, is_default, tier, email) VALUES (NEW.email, true, 'base_v1', NEW.email) RETURNING id INTO team_id; + INSERT INTO public.users_teams(user_id, team_id) VALUES (NEW.id, team_id); + RAISE NOTICE 'Created default team for user % and team %', NEW.id, team_id; + + -- Generate a random 20 byte string and encode it as hex, so it's 40 characters + INSERT INTO public.team_api_keys (team_id) + VALUES (team_id); + + INSERT INTO public.access_tokens (user_id) + VALUES (NEW.id); + + PERFORM public.extra_for_post_user_signup(NEW.id, team_id); + + RETURN NEW; +END +$post_user_signup$ SECURITY DEFINER SET search_path = public; + +ALTER FUNCTION public.post_user_signup() OWNER TO trigger_user; + +CREATE OR REPLACE TRIGGER post_user_signup + AFTER INSERT ON auth.users + FOR EACH ROW EXECUTE FUNCTION post_user_signup(); + +CREATE OR REPLACE FUNCTION is_member_of_team(_user_id uuid, _team_id uuid) RETURNS bool AS $$ +SELECT EXISTS ( + SELECT 1 + FROM public.users_teams ut + WHERE ut.user_id = _user_id + AND ut.team_id = _team_id +); +$$ LANGUAGE sql SECURITY DEFINER; + +-- Create RLS policies for user management +DO $$ + BEGIN + BEGIN + CREATE POLICY "Allow users to delete a team api key" + ON "public"."team_api_keys" + AS PERMISSIVE + FOR DELETE + TO authenticated + USING ((SELECT auth.uid()) IN ( SELECT users_teams.user_id + FROM users_teams + WHERE (users_teams.team_id = team_api_keys.team_id))); + + CREATE POLICY "Allow users to create a new team user entry" + ON "public"."users_teams" + AS PERMISSIVE + FOR INSERT + TO authenticated + WITH CHECK (team_id IN ( SELECT users_teams.team_id + FROM users_teams + WHERE (users_teams.user_id = (SELECT auth.uid())))); + + CREATE POLICY "Allow users to delete a team user entry" + ON public.users_teams + AS PERMISSIVE + FOR DELETE + TO authenticated + USING (team_id IN ( SELECT users_teams.team_id + FROM users_teams + WHERE (users_teams.user_id = auth.uid()))); + + CREATE POLICY "Allow update for users that are in the team" + ON "public"."teams" + AS PERMISSIVE + FOR UPDATE + TO authenticated + USING ((auth.uid() IN ( SELECT users_teams.user_id + FROM users_teams + WHERE (users_teams.team_id = teams.id)))); + + ALTER POLICY "Enable select for users in relevant team" + on "public"."users_teams" + to authenticated + using (is_member_of_team(auth.uid(), team_id) + ); + + END; + END $$; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240625095352_add_envd_version.sql b/packages/db/migrations/20240625095352_add_envd_version.sql new file mode 100644 index 0000000..4825621 --- /dev/null +++ b/packages/db/migrations/20240625095352_add_envd_version.sql @@ -0,0 +1,15 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "env_builds" table +ALTER TABLE "public"."env_builds" ADD COLUMN IF NOT EXISTS "envd_version" text NULL; + +-- Populate "envd_version" column if it was just added +UPDATE "public"."env_builds" SET "envd_version" = 'v0.0.1' +WHERE "envd_version" IS NULL; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240728094137_add_default_team_flag.sql b/packages/db/migrations/20240728094137_add_default_team_flag.sql new file mode 100644 index 0000000..8b07486 --- /dev/null +++ b/packages/db/migrations/20240728094137_add_default_team_flag.sql @@ -0,0 +1,46 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "users_teams" table +ALTER TABLE "public"."users_teams" ADD COLUMN IF NOT EXISTS "is_default" boolean NOT NULL DEFAULT false; + +-- Update existing records +UPDATE "public"."users_teams" ut +SET "is_default" = t."is_default" +FROM "public"."teams" t +WHERE ut."team_id" = t."id" +AND ut."is_default" = false; + +-- Create or replace function +CREATE OR REPLACE FUNCTION public.post_user_signup() + RETURNS TRIGGER + LANGUAGE plpgsql +AS $post_user_signup$ +DECLARE + team_id uuid; +BEGIN + RAISE NOTICE 'Creating default team for user %', NEW.id; + INSERT INTO public.teams(name, is_default, tier, email) VALUES (NEW.email, true, 'base_v1', NEW.email) RETURNING id INTO team_id; + INSERT INTO public.users_teams(user_id, team_id, is_default) VALUES (NEW.id, team_id, true); + RAISE NOTICE 'Created default team for user % and team %', NEW.id, team_id; + + -- Generate a random 20 byte string and encode it as hex, so it's 40 characters + INSERT INTO public.team_api_keys (team_id) + VALUES (team_id); + + INSERT INTO public.access_tokens (user_id) + VALUES (NEW.id); + + PERFORM public.extra_for_post_user_signup(NEW.id, team_id); + + RETURN NEW; +END +$post_user_signup$ SECURITY DEFINER SET search_path = public; + +ALTER FUNCTION public.post_user_signup() OWNER TO trigger_user; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20240909142106_drop_team_policies.sql b/packages/db/migrations/20240909142106_drop_team_policies.sql new file mode 100644 index 0000000..3643354 --- /dev/null +++ b/packages/db/migrations/20240909142106_drop_team_policies.sql @@ -0,0 +1,12 @@ +-- +goose Up +-- +goose StatementBegin + +DROP POLICY IF EXISTS "Allow update for users that are in the team" ON "public"."teams"; +DROP POLICY IF EXISTS "Allow users to delete a team user entry" ON "public"."users_teams"; +DROP POLICY IF EXISTS "Allow users to create a new team user entry" ON "public"."users_teams"; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20241120222814_add_team_api_key_metadata.sql b/packages/db/migrations/20241120222814_add_team_api_key_metadata.sql new file mode 100644 index 0000000..9d3b2b1 --- /dev/null +++ b/packages/db/migrations/20241120222814_add_team_api_key_metadata.sql @@ -0,0 +1,23 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "team_api_keys" table +ALTER TABLE "public"."team_api_keys" + ADD COLUMN IF NOT EXISTS "updated_at" timestamptz NULL, + ADD COLUMN IF NOT EXISTS "name" text NOT NULL DEFAULT 'Unnamed API Key', + ADD COLUMN IF NOT EXISTS "last_used" timestamptz NULL, + ADD COLUMN IF NOT EXISTS "created_by" uuid NULL; + +-- Add constraint separately +ALTER TABLE "public"."team_api_keys" + ADD CONSTRAINT "team_api_keys_users_created_api_keys" + FOREIGN KEY ("created_by") + REFERENCES "auth"."users" ("id") + ON UPDATE NO ACTION + ON DELETE SET NULL; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20241121225404_add_team_api_key_id.sql b/packages/db/migrations/20241121225404_add_team_api_key_id.sql new file mode 100644 index 0000000..3911e1e --- /dev/null +++ b/packages/db/migrations/20241121225404_add_team_api_key_id.sql @@ -0,0 +1,16 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "team_api_keys" table +ALTER TABLE "public"."team_api_keys" DROP CONSTRAINT IF EXISTS "team_api_keys_pkey"; +ALTER TABLE "public"."team_api_keys" ADD COLUMN IF NOT EXISTS "id" uuid NOT NULL DEFAULT gen_random_uuid(); +ALTER TABLE "public"."team_api_keys" ADD PRIMARY KEY ("id"); + +-- Create index if it doesn't exist +CREATE UNIQUE INDEX IF NOT EXISTS "team_api_keys_api_key_key" ON "public"."team_api_keys" ("api_key"); + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20241127174604_add_env_creator.sql b/packages/db/migrations/20241127174604_add_env_creator.sql new file mode 100644 index 0000000..e522069 --- /dev/null +++ b/packages/db/migrations/20241127174604_add_env_creator.sql @@ -0,0 +1,20 @@ +-- +goose Up +-- +goose StatementBegin + +-- Modify "envs" table +ALTER TABLE "public"."envs" + ADD COLUMN IF NOT EXISTS "created_by" uuid NULL; + +-- Add constraint +ALTER TABLE "public"."envs" + ADD CONSTRAINT "envs_users_created_envs" + FOREIGN KEY ("created_by") + REFERENCES "auth"."users" ("id") + ON UPDATE NO ACTION + ON DELETE SET NULL; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20241206124325_add_user_team_adder.sql b/packages/db/migrations/20241206124325_add_user_team_adder.sql new file mode 100644 index 0000000..09423e1 --- /dev/null +++ b/packages/db/migrations/20241206124325_add_user_team_adder.sql @@ -0,0 +1,21 @@ +-- +goose Up +-- +goose StatementBegin + +-- Add column to "users_teams" table +ALTER TABLE "public"."users_teams" + ADD COLUMN IF NOT EXISTS "added_by" uuid NULL; + +-- Add constraint +ALTER TABLE "public"."users_teams" + ADD CONSTRAINT "users_teams_added_by_user" + FOREIGN KEY ("added_by") + REFERENCES "auth"."users" ("id") + ON UPDATE NO ACTION + ON DELETE SET NULL; + +COMMIT; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20241213142106_create_snapshots.sql b/packages/db/migrations/20241213142106_create_snapshots.sql new file mode 100644 index 0000000..24565bd --- /dev/null +++ b/packages/db/migrations/20241213142106_create_snapshots.sql @@ -0,0 +1,21 @@ +-- +goose Up +-- +goose StatementBegin + +-- Create "snapshots" table +CREATE TABLE IF NOT EXISTS "public"."snapshots" ( + created_at timestamp with time zone null, + env_id text not null, + sandbox_id text not null, + id uuid not null default gen_random_uuid(), + metadata jsonb null, + base_env_id text not null, + constraint snapshots_pkey primary key (id) +); +ALTER TABLE "public"."snapshots" ENABLE ROW LEVEL SECURITY; + +COMMIT; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20250106142106_remove_team_is_default.sql b/packages/db/migrations/20250106142106_remove_team_is_default.sql new file mode 100644 index 0000000..9d62b62 --- /dev/null +++ b/packages/db/migrations/20250106142106_remove_team_is_default.sql @@ -0,0 +1,37 @@ +-- +goose Up +-- +goose StatementBegin + +-- Alter "teams" table +ALTER TABLE "public"."teams" DROP COLUMN IF EXISTS "is_default"; + +-- Create or replace function +CREATE OR REPLACE FUNCTION public.post_user_signup() + RETURNS TRIGGER + LANGUAGE plpgsql +AS $post_user_signup$ +DECLARE + team_id uuid; +BEGIN + RAISE NOTICE 'Creating default team for user %', NEW.id; + INSERT INTO public.teams(name, tier, email) VALUES (NEW.email, 'base_v1', NEW.email) RETURNING id INTO team_id; + INSERT INTO public.users_teams(user_id, team_id, is_default) VALUES (NEW.id, team_id, true); + RAISE NOTICE 'Created default team for user % and team %', NEW.id, team_id; + + -- Generate a random 20 byte string and encode it as hex, so it's 40 characters + INSERT INTO public.team_api_keys (team_id) + VALUES (team_id); + + INSERT INTO public.access_tokens (user_id) + VALUES (NEW.id); + + PERFORM public.extra_for_post_user_signup(NEW.id, team_id); + + RETURN NEW; +END +$post_user_signup$ SECURITY DEFINER SET search_path = public; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20250206105106_add_snapshot_constraints.sql b/packages/db/migrations/20250206105106_add_snapshot_constraints.sql new file mode 100644 index 0000000..b36ae1f --- /dev/null +++ b/packages/db/migrations/20250206105106_add_snapshot_constraints.sql @@ -0,0 +1,23 @@ +-- +goose Up +-- +goose StatementBegin + +ALTER TABLE "public"."snapshots" + ADD CONSTRAINT "snapshots_envs_env_id" + FOREIGN KEY ("env_id") + REFERENCES "public"."envs" ("id") + ON UPDATE NO ACTION + ON DELETE CASCADE; + +ALTER TABLE "public"."snapshots" + ADD CONSTRAINT "snapshots_envs_base_env_id" + FOREIGN KEY ("base_env_id") + REFERENCES "public"."envs" ("id") + ON UPDATE NO ACTION + ON DELETE CASCADE; + +COMMIT; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20250211160814_add_token_hashes.sql b/packages/db/migrations/20250211160814_add_token_hashes.sql new file mode 100644 index 0000000..cf74476 --- /dev/null +++ b/packages/db/migrations/20250211160814_add_token_hashes.sql @@ -0,0 +1,24 @@ +-- +goose Up +-- +goose StatementBegin + +-- Add new columns to team_api_keys table +ALTER TABLE team_api_keys + ADD COLUMN IF NOT EXISTS api_key_hash TEXT UNIQUE, + ADD COLUMN IF NOT EXISTS api_key_mask VARCHAR(44); + +-- Add new columns to access_tokens table +ALTER TABLE access_tokens + ADD COLUMN IF NOT EXISTS id UUID DEFAULT gen_random_uuid(), + ADD COLUMN IF NOT EXISTS access_token_hash TEXT UNIQUE, + ADD COLUMN IF NOT EXISTS access_token_mask TEXT, + ADD COLUMN IF NOT EXISTS name TEXT NOT NULL DEFAULT 'Unnamed Access Token'; + +-- Mark sensitive columns as sensitive +COMMENT ON COLUMN team_api_keys.api_key_hash IS 'sensitive'; +COMMENT ON COLUMN access_tokens.access_token_hash IS 'sensitive'; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20250306105106_add_indexes.sql b/packages/db/migrations/20250306105106_add_indexes.sql new file mode 100644 index 0000000..86326e5 --- /dev/null +++ b/packages/db/migrations/20250306105106_add_indexes.sql @@ -0,0 +1,16 @@ +-- +goose Up +-- +goose StatementBegin + +CREATE INDEX IF NOT EXISTS idx_envs_builds_envs ON public.env_builds (env_id); +CREATE INDEX IF NOT EXISTS idx_envs_envs_aliases ON public.env_aliases (env_id); +CREATE INDEX IF NOT EXISTS idx_users_access_tokens ON public.access_tokens (user_id); +CREATE INDEX IF NOT EXISTS idx_teams_envs ON public.envs (team_id); +CREATE INDEX IF NOT EXISTS idx_team_team_api_keys ON public.team_api_keys (team_id); +CREATE INDEX IF NOT EXISTS idx_teams_user_teams ON public.users_teams (team_id); +CREATE INDEX IF NOT EXISTS idx_users_user_teams ON public.users_teams (user_id); + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20250404151700_add_snapshots_sbx_started_at.sql b/packages/db/migrations/20250404151700_add_snapshots_sbx_started_at.sql new file mode 100644 index 0000000..9565e1b --- /dev/null +++ b/packages/db/migrations/20250404151700_add_snapshots_sbx_started_at.sql @@ -0,0 +1,37 @@ +-- +goose Up +-- +goose StatementBegin + +ALTER TABLE "public"."snapshots" + ADD COLUMN IF NOT EXISTS "sandbox_started_at" timestamp with time zone NOT NULL + DEFAULT TIMESTAMP WITH TIME ZONE '1970-01-01 00:00:00 UTC'; + +-- Update records with actual data only if billing schema and table exist +DO $$ +BEGIN + IF EXISTS ( + SELECT 1 FROM information_schema.schemata WHERE schema_name = 'billing' + ) AND EXISTS ( + SELECT 1 FROM information_schema.tables + WHERE table_schema = 'billing' AND table_name = 'sandbox_logs' + ) THEN + UPDATE public.snapshots s + SET sandbox_started_at = latest_starts.started_at + FROM ( + SELECT sandbox_id, MAX(started_at) as started_at + FROM billing.sandbox_logs + GROUP BY sandbox_id + ) latest_starts + WHERE s.sandbox_id = latest_starts.sandbox_id; + END IF; +END $$; + +-- Remove the default constraint after populating data +ALTER TABLE "public"."snapshots" +ALTER COLUMN "sandbox_started_at" DROP DEFAULT; + +COMMIT; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/packages/db/migrations/20250409113306_add_envd_secured_to_snapshot.sql b/packages/db/migrations/20250409113306_add_envd_secured_to_snapshot.sql new file mode 100644 index 0000000..595feb3 --- /dev/null +++ b/packages/db/migrations/20250409113306_add_envd_secured_to_snapshot.sql @@ -0,0 +1,19 @@ +-- +goose Up +-- +goose StatementBegin +BEGIN; + +ALTER TABLE snapshots +ADD COLUMN env_secure boolean NOT NULL DEFAULT false; + +COMMIT; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +BEGIN; + +ALTER TABLE snapshots +DROP COLUMN IF EXISTS env_secure; + +COMMIT; +-- +goose StatementEnd diff --git a/packages/db/migrations/20250506112836_builds_status_index.sql b/packages/db/migrations/20250506112836_builds_status_index.sql new file mode 100644 index 0000000..5d0c2c6 --- /dev/null +++ b/packages/db/migrations/20250506112836_builds_status_index.sql @@ -0,0 +1,7 @@ +-- +goose NO TRANSACTION +-- +goose Up +-- The index creation takes a lot of time +CREATE INDEX CONCURRENTLY idx_env_builds_status ON public.env_builds(status); + +-- +goose Down +DROP INDEX CONCURRENTLY public.idx_env_builds_status; diff --git a/packages/db/migrations/20250507134356_add_max_specs_to_tier.sql b/packages/db/migrations/20250507134356_add_max_specs_to_tier.sql new file mode 100644 index 0000000..b161e1a --- /dev/null +++ b/packages/db/migrations/20250507134356_add_max_specs_to_tier.sql @@ -0,0 +1,21 @@ +-- +goose Up +-- +goose StatementBegin +BEGIN; + +ALTER TABLE tiers + ADD COLUMN "max_vcpu" bigint NOT NULL default '8'::bigint, + ADD COLUMN "max_ram_mb" bigint NOT NULL DEFAULT '8096'::bigint; + +COMMIT; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +BEGIN; + +ALTER TABLE tiers + DROP COLUMN IF EXISTS "max_vcpu", + DROP COLUMN IF EXISTS "max_ram_mb"; + +COMMIT; +-- +goose StatementEnd diff --git a/packages/db/migrations/20250513111201_tier_fix_max_memory.sql b/packages/db/migrations/20250513111201_tier_fix_max_memory.sql new file mode 100644 index 0000000..08b7d7d --- /dev/null +++ b/packages/db/migrations/20250513111201_tier_fix_max_memory.sql @@ -0,0 +1,12 @@ +-- +goose Up +-- +goose StatementBegin +ALTER TABLE tiers + ALTER COLUMN "max_ram_mb" SET DEFAULT '8192'::bigint; +UPDATE tiers SET "max_ram_mb" = 8192 WHERE "max_ram_mb" = 8096; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +ALTER TABLE tiers + ALTER COLUMN "max_ram_mb" SET DEFAULT '8096'::bigint; +-- +goose StatementEnd diff --git a/packages/db/migrations/20250522105042_users_teams_add_created_at.sql b/packages/db/migrations/20250522105042_users_teams_add_created_at.sql new file mode 100644 index 0000000..b7e11c4 --- /dev/null +++ b/packages/db/migrations/20250522105042_users_teams_add_created_at.sql @@ -0,0 +1,9 @@ +-- +goose Up +-- +goose StatementBegin +ALTER TABLE public.users_teams ADD COLUMN created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +ALTER TABLE public.users_teams DROP COLUMN created_at; +-- +goose StatementEnd diff --git a/packages/db/migrations/20250528203546_ready_command.sql b/packages/db/migrations/20250528203546_ready_command.sql new file mode 100644 index 0000000..088de2c --- /dev/null +++ b/packages/db/migrations/20250528203546_ready_command.sql @@ -0,0 +1,11 @@ +-- +goose Up +-- +goose StatementBegin +ALTER TABLE public.env_builds + ADD COLUMN ready_cmd TEXT; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +ALTER TABLE public.env_builds +DROP COLUMN ready_cmd; +-- +goose StatementEnd \ No newline at end of file diff --git a/packages/db/migrations/20250606204750_optimize_hashed_key_schema.sql b/packages/db/migrations/20250606204750_optimize_hashed_key_schema.sql new file mode 100644 index 0000000..53e5447 --- /dev/null +++ b/packages/db/migrations/20250606204750_optimize_hashed_key_schema.sql @@ -0,0 +1,38 @@ +-- +goose Up +-- +goose StatementBegin + +-- Add new columns to team_api_keys table +ALTER TABLE team_api_keys + ADD COLUMN IF NOT EXISTS api_key_prefix VARCHAR(10), + ADD COLUMN IF NOT EXISTS api_key_length INTEGER, + ADD COLUMN IF NOT EXISTS api_key_mask_prefix VARCHAR(5), + ADD COLUMN IF NOT EXISTS api_key_mask_suffix VARCHAR(5); + +-- Add new columns to access_tokens table +ALTER TABLE access_tokens + ADD COLUMN IF NOT EXISTS access_token_prefix VARCHAR(10), + ADD COLUMN IF NOT EXISTS access_token_length INTEGER, + ADD COLUMN IF NOT EXISTS access_token_mask_prefix VARCHAR(5), + ADD COLUMN IF NOT EXISTS access_token_mask_suffix VARCHAR(5); + + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin + +-- Remove the added columns from team_api_keys table +ALTER TABLE team_api_keys +DROP COLUMN IF EXISTS api_key_prefix, + DROP COLUMN IF EXISTS api_key_length, + DROP COLUMN IF EXISTS api_key_mask_prefix, + DROP COLUMN IF EXISTS api_key_mask_suffix; + +-- Remove the added columns from access_tokens table +ALTER TABLE access_tokens +DROP COLUMN IF EXISTS access_token_prefix, + DROP COLUMN IF EXISTS access_token_length, + DROP COLUMN IF EXISTS access_token_mask_prefix, + DROP COLUMN IF EXISTS access_token_mask_suffix; + +-- +goose StatementEnd diff --git a/packages/db/migrations/20250606213446_deployment_cluster.sql b/packages/db/migrations/20250606213446_deployment_cluster.sql new file mode 100644 index 0000000..12d28ce --- /dev/null +++ b/packages/db/migrations/20250606213446_deployment_cluster.sql @@ -0,0 +1,26 @@ +-- +goose Up +-- +goose StatementBegin +CREATE TABLE IF NOT EXISTS clusters ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + endpoint TEXT NOT NULL, + endpoint_tls BOOLEAN NOT NULL DEFAULT TRUE, + token TEXT NOT NULL +); + +ALTER TABLE teams + ADD COLUMN IF NOT EXISTS cluster_id UUID NULL + REFERENCES clusters(id); + +CREATE INDEX IF NOT EXISTS teams_cluster_id_uq + ON teams (cluster_id) + WHERE cluster_id IS NOT NULL; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +DROP INDEX IF EXISTS teams_cluster_id_uq; + +ALTER TABLE teams DROP COLUMN IF EXISTS cluster_id; + +DROP TABLE IF EXISTS clusters CASCADE; +-- +goose StatementEnd diff --git a/packages/db/migrations/20250624001047_deploy_cluster_policy.sql b/packages/db/migrations/20250624001047_deploy_cluster_policy.sql new file mode 100644 index 0000000..7bd185e --- /dev/null +++ b/packages/db/migrations/20250624001047_deploy_cluster_policy.sql @@ -0,0 +1,9 @@ +-- +goose Up +-- +goose StatementBegin +ALTER TABLE "public"."clusters" ENABLE ROW LEVEL SECURITY; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +ALTER TABLE "public"."clusters" DISABLE ROW LEVEL SECURITY; +-- +goose StatementEnd diff --git a/packages/db/migrations/20250624001048_cluster_for_templates.sql b/packages/db/migrations/20250624001048_cluster_for_templates.sql new file mode 100644 index 0000000..beb9e13 --- /dev/null +++ b/packages/db/migrations/20250624001048_cluster_for_templates.sql @@ -0,0 +1,17 @@ +-- +goose Up +-- +goose StatementBegin +ALTER TABLE envs + ADD COLUMN IF NOT EXISTS cluster_id UUID NULL + REFERENCES clusters(id); + +CREATE INDEX IF NOT EXISTS envs_cluster_id + ON envs (cluster_id) + WHERE cluster_id IS NOT NULL; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +DROP INDEX IF EXISTS envs_cluster_id; + +ALTER TABLE envs DROP COLUMN IF EXISTS cluster_id; +-- +goose StatementEnd diff --git a/packages/db/migrations/20250624001049_cluster_for_builds.sql b/packages/db/migrations/20250624001049_cluster_for_builds.sql new file mode 100644 index 0000000..7e442a1 --- /dev/null +++ b/packages/db/migrations/20250624001049_cluster_for_builds.sql @@ -0,0 +1,10 @@ +-- +goose Up +-- +goose StatementBegin +ALTER TABLE env_builds + ADD COLUMN IF NOT EXISTS cluster_node_id TEXT NULL; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +ALTER TABLE env_builds DROP COLUMN IF EXISTS cluster_node_id; +-- +goose StatementEnd diff --git a/packages/db/migrations/check-tables.sh b/packages/db/migrations/check-tables.sh new file mode 100644 index 0000000..e7a92c8 --- /dev/null +++ b/packages/db/migrations/check-tables.sh @@ -0,0 +1,75 @@ +#!/bin/bash +set -e + +echo "=== 从配置文件加载数据库连接信息 ===" +# 加载配置文件，但只提取我们需要的变量 +CONFIG_FILE="/opt/config.properties" +if [ -f "$CONFIG_FILE" ]; then + echo "找到配置文件: $CONFIG_FILE" + # 只提取CFNDBURL变量，避免执行其他可能的命令 + CFNDBURL=$(grep "^CFNDBURL=" "$CONFIG_FILE" | cut -d'=' -f2-) + + if [ -z "$CFNDBURL" ]; then + echo "错误: 配置文件中没有找到 CFNDBURL" + exit 1 + fi + + echo "成功提取数据库连接信息" +else + echo "错误: 配置文件 $CONFIG_FILE 不存在" + exit 1 +fi + +# 从连接字符串中提取用户名、密码、主机和数据库名 +DB_USER=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/\([^:]*\):.*/\1/p') +DB_PASSWORD=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/[^:]*:\([^@]*\)@.*/\1/p') +DB_HOST=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/[^@]*@\([^\/]*\)\/.*/\1/p') +DB_NAME=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/[^\/]*\/\(.*\)$/\1/p') + +echo "检查数据库中的表..." + +# 提取所有SQL文件中的CREATE TABLE语句，获取表名 +echo "分析SQL文件中的表定义..." +expected_tables=$(grep -h -i "CREATE TABLE" *.sql | grep -v "IF NOT EXISTS" | sed -E 's/.*CREATE TABLE[[:space:]]+([^[:space:]()]+).*/\1/i' | sort | uniq) + +# 如果没有找到表，可能是因为表名格式不同，尝试另一种方式 +if [ -z "$expected_tables" ]; then + expected_tables=$(grep -h -i "CREATE TABLE" *.sql | grep -v "IF NOT EXISTS" | sed -E 's/.*CREATE TABLE[[:space:]]+"?([^"[:space:]()]+)"?.*/\1/i' | sort | uniq) +fi + +echo "预期的表:" +echo "$expected_tables" + +# 从数据库中获取实际表 +echo -e "\n从数据库获取实际表..." +actual_tables=$(PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -t -c " +SELECT table_name +FROM information_schema.tables +WHERE table_schema NOT IN ('pg_catalog', 'information_schema') +AND table_type = 'BASE TABLE' +ORDER BY table_name;") + +echo "数据库中的表:" +echo "$actual_tables" + +# 检查是否所有预期的表都存在 +echo -e "\n验证表是否存在..." +missing_tables=0 + +for table in $expected_tables; do + # 移除引号和模式前缀 + clean_table=$(echo $table | sed 's/"//g' | sed 's/.*\.//') + if ! echo "$actual_tables" | grep -q "$clean_table"; then + echo "❌ 表 '$clean_table' 不存在!" + missing_tables=$((missing_tables+1)) + else + echo "✅ 表 '$clean_table' 存在" + fi +done + +if [ $missing_tables -eq 0 ]; then + echo -e "\n✅ 所有表都已成功创建!" +else + echo -e "\n❌ 有 $missing_tables 个表未创建成功，请检查SQL文件" + exit 1 +fi diff --git a/packages/db/migrations/cleanup.sh b/packages/db/migrations/cleanup.sh new file mode 100644 index 0000000..7476167 --- /dev/null +++ b/packages/db/migrations/cleanup.sh @@ -0,0 +1,25 @@ +#!/bin/bash +set -e + +echo "=== 开始清理所有创建的内容 ===" + +# 停止并删除Docker容器和卷 +echo "停止并删除Docker容器和卷..." +docker-compose down -v || echo "Docker容器可能已经停止或不存在" + +# 删除Docker镜像（可选，取消注释以删除） +# echo "删除PostgreSQL Docker镜像..." +# docker rmi postgres:15 || echo "PostgreSQL镜像可能不存在或正在被使用" + +# 删除创建的脚本文件 +echo "删除创建的脚本文件..." +rm -f run-all-migrations.sh check-tables.sh migrate-and-verify.sh + +# 删除init-scripts目录 +echo "删除init-scripts目录..." +rm -rf init-scripts + +# 删除本清理脚本（最后执行） +echo "=== 清理完成 ===" +echo "注意：此脚本(cleanup.sh)将在执行后自删除" +echo "执行 'rm -f cleanup.sh' 删除此脚本" diff --git a/packages/db/migrations/config.properties b/packages/db/migrations/config.properties new file mode 100644 index 0000000..cbb7069 --- /dev/null +++ b/packages/db/migrations/config.properties @@ -0,0 +1,19 @@ +# Configuration generated on Tue Jun 17 02:31:53 UTC 2025 +CFNPUBLICSUBNET1=subnet-025a6a9d500271924 +CFNPUBLICSUBNET2=subnet-0661765984752e5df +CFNAZ2=us-east-1b +CFNAZ1=us-east-1a +CFNPRIVATESUBNET2=subnet-075988861fa221292 +CFNPRIVATESUBNET1=subnet-037bd6ae1beb5b600 +CFNREDISNAME=e2b-0617-redis +CFNDBURL=postgresql://postgres45:postgres23@e2b-postgres-db.cmlpk94hae6f.us-east-1.rds.amazonaws.com/postgres12 +CFNTERRAFORMBUCKET=terraform-e2b-0617-us-east-1-918380168589 +CFNVPCCIDR=10.0.0.0/16 +CFNVPCID=vpc-0ebd56273c0c8624b +CFNSTACKNAME=e2b-0617 +CFNREDISURL=e2b-0617-redis.serverless.us-east-1.cache.amazonaws.com:6379 +CFNCERTARN=arn:aws:acm:us-east-1:918380168589:certificate/cda75236-b1fd-417f-8c79-332b1e42cdf8 +CFNSOFTWAREBUCKET=software-e2b-0617-us-east-1-918380168589 +CFNSSHKEY=test-evn +CFNDOMAIN=jendencrazy.uk +AWSREGION=us-east-1 diff --git a/packages/db/migrations/docker-compose.yml b/packages/db/migrations/docker-compose.yml new file mode 100644 index 0000000..318beb3 --- /dev/null +++ b/packages/db/migrations/docker-compose.yml @@ -0,0 +1,19 @@ +version: '3.8' + +services: + postgres: + image: postgres:15 + container_name: migration-db + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: testdb + ports: + - "5432:5432" + volumes: + - ./init-scripts:/docker-entrypoint-initdb.d + - .:/sql + - postgres-data:/var/lib/postgresql/data + +volumes: + postgres-data: diff --git a/packages/db/migrations/migrate-and-verify.sh b/packages/db/migrations/migrate-and-verify.sh new file mode 100644 index 0000000..06b29d0 --- /dev/null +++ b/packages/db/migrations/migrate-and-verify.sh @@ -0,0 +1,48 @@ +#!/bin/bash +set -e + +echo "=== 开始数据库迁移和验证流程 ===" + +# 检查配置文件是否存在 +CONFIG_FILE="/opt/config.properties" +if [ ! -f "$CONFIG_FILE" ]; then + echo "错误: 配置文件 $CONFIG_FILE 不存在" + exit 1 +fi + +# 只提取CFNDBURL变量，避免执行其他可能的命令 +CFNDBURL=$(grep "^CFNDBURL=" "$CONFIG_FILE" | cut -d'=' -f2-) +AWSREGION=$(grep "^AWSREGION=" "$CONFIG_FILE" | cut -d'=' -f2-) + +if [ -z "$CFNDBURL" ]; then + echo "错误: 配置文件中没有找到 CFNDBURL" + exit 1 +fi + +# 从连接字符串中提取用户名、密码、主机和数据库名 +DB_USER=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/\([^:]*\):.*/\1/p') +DB_PASSWORD=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/[^:]*:\([^@]*\)@.*/\1/p') +DB_HOST=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/[^@]*@\([^\/]*\)\/.*/\1/p') +DB_NAME=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/[^\/]*\/\(.*\)$/\1/p') + +echo "数据库连接信息:" +echo "- 主机: $DB_HOST" +echo "- 数据库: $DB_NAME" +echo "- 用户: $DB_USER" +echo "- 密码: ********" +echo "- 区域: $AWSREGION" + +# 执行迁移 +echo -e "\n=== 执行SQL迁移 ===" +./run-all-migrations.sh + +# 验证表 +echo -e "\n=== 验证数据库表 ===" +./check-tables.sh + +echo -e "\n=== 迁移和验证完成 ===" +echo "数据库已成功初始化，所有表都已创建" +echo "数据库连接信息:" +echo "- 主机: $DB_HOST" +echo "- 数据库: $DB_NAME" +echo "- 用户: $DB_USER" diff --git a/packages/db/migrations/run-all-migrations.sh b/packages/db/migrations/run-all-migrations.sh new file mode 100644 index 0000000..8b21427 --- /dev/null +++ b/packages/db/migrations/run-all-migrations.sh @@ -0,0 +1,92 @@ +#!/bin/bash +set -e + +echo "=== 从配置文件加载数据库连接信息 ===" +# 加载配置文件，但只提取我们需要的变量 +CONFIG_FILE="/opt/config.properties" +if [ -f "$CONFIG_FILE" ]; then + echo "找到配置文件: $CONFIG_FILE" + # 只提取CFNDBURL变量，避免执行其他可能的命令 + CFNDBURL=$(grep "^CFNDBURL=" "$CONFIG_FILE" | cut -d'=' -f2-) + AWSREGION=$(grep "^AWSREGION=" "$CONFIG_FILE" | cut -d'=' -f2-) + + if [ -z "$CFNDBURL" ]; then + echo "错误: 配置文件中没有找到 CFNDBURL" + exit 1 + fi + + echo "成功提取数据库连接信息" +else + echo "错误: 配置文件 $CONFIG_FILE 不存在" + exit 1 +fi + +echo "解析数据库连接字符串: $CFNDBURL" +# 从连接字符串中提取用户名、密码、主机和数据库名 +DB_USER=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/\([^:]*\):.*/\1/p') +DB_PASSWORD=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/[^:]*:\([^@]*\)@.*/\1/p') +DB_HOST=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/[^@]*@\([^\/]*\)\/.*/\1/p') +DB_NAME=$(echo $CFNDBURL | sed -n 's/^postgresql:\/\/[^\/]*\/\(.*\)$/\1/p') + +echo "数据库连接信息:" +echo "- 主机: $DB_HOST" +echo "- 数据库: $DB_NAME" +echo "- 用户: $DB_USER" +echo "- 密码: ********" + +# 检查数据库连接 +echo -e "\n=== 检查数据库连接 ===" +max_attempts=5 +attempt=0 + +while [ $attempt -lt $max_attempts ]; do + attempt=$((attempt+1)) + echo "尝试连接数据库... 尝试 $attempt/$max_attempts" + + if PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -c "SELECT 1" > /dev/null 2>&1; then + echo "数据库连接成功!" + break + else + echo "连接失败，等待重试..." + if [ $attempt -eq $max_attempts ]; then + echo "错误: 无法连接到数据库，超过最大尝试次数" + echo "请检查数据库连接信息和网络连接" + exit 1 + fi + sleep 5 + fi +done + +# 按照文件名排序执行所有SQL文件 +echo -e "\n=== 开始执行SQL迁移 ===" +for sql_file in $(ls -v *.sql); do + echo "执行: $sql_file" + if ! PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -f $sql_file; then + echo "执行 $sql_file 失败，重试..." + # 重试最多3次 + for i in {1..3}; do + echo "重试 $i/3..." + if PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -f $sql_file; then + echo "重试成功!" + break + fi + if [ $i -eq 3 ]; then + echo "执行 $sql_file 失败，请检查SQL语法" + exit 1 + fi + sleep 2 + done + fi +done + +echo "所有SQL迁移已执行完成" + +# 检查所有表是否存在 +echo -e "\n=== 检查数据库表 ===" +PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -c " +SELECT table_schema, table_name +FROM information_schema.tables +WHERE table_schema NOT IN ('pg_catalog', 'information_schema') +ORDER BY table_schema, table_name;" + +echo -e "\n=== 迁移完成! ===" diff --git a/packages/db/queries/db.go b/packages/db/queries/db.go new file mode 100644 index 0000000..0591efe --- /dev/null +++ b/packages/db/queries/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 + +package queries + +import ( + "context" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" +) + +type DBTX interface { + Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) + Query(context.Context, string, ...interface{}) (pgx.Rows, error) + QueryRow(context.Context, string, ...interface{}) pgx.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx pgx.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/packages/db/queries/get_active_clusters.sql b/packages/db/queries/get_active_clusters.sql new file mode 100644 index 0000000..4333048 --- /dev/null +++ b/packages/db/queries/get_active_clusters.sql @@ -0,0 +1,4 @@ +-- name: GetActiveClusters :many +SELECT DISTINCT sqlc.embed(c) +FROM public.clusters c +JOIN public.teams t ON t.cluster_id = c.id; diff --git a/packages/db/queries/get_active_clusters.sql.go b/packages/db/queries/get_active_clusters.sql.go new file mode 100644 index 0000000..c51cdb9 --- /dev/null +++ b/packages/db/queries/get_active_clusters.sql.go @@ -0,0 +1,45 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: get_active_clusters.sql + +package queries + +import ( + "context" +) + +const getActiveClusters = `-- name: GetActiveClusters :many +SELECT DISTINCT c.id, c.endpoint, c.endpoint_tls, c.token +FROM public.clusters c +JOIN public.teams t ON t.cluster_id = c.id +` + +type GetActiveClustersRow struct { + Cluster Cluster +} + +func (q *Queries) GetActiveClusters(ctx context.Context) ([]GetActiveClustersRow, error) { + rows, err := q.db.Query(ctx, getActiveClusters) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetActiveClustersRow + for rows.Next() { + var i GetActiveClustersRow + if err := rows.Scan( + &i.Cluster.ID, + &i.Cluster.Endpoint, + &i.Cluster.EndpointTls, + &i.Cluster.Token, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/packages/db/queries/get_env_with_build.sql b/packages/db/queries/get_env_with_build.sql new file mode 100644 index 0000000..4f24001 --- /dev/null +++ b/packages/db/queries/get_env_with_build.sql @@ -0,0 +1,22 @@ +-- name: GetEnvWithBuild :one +-- get the env_id when querying by alias; if not, @alias_or_env_id should be env_id +WITH s AS NOT MATERIALIZED ( + SELECT ea.env_id as env_id + FROM public.env_aliases as ea + WHERE ea.alias = @alias_or_env_id + UNION + SELECT @alias_or_env_id as env_id +) + +SELECT sqlc.embed(e), sqlc.embed(eb), aliases +FROM s +JOIN public.envs AS e ON e.id = s.env_id +JOIN public.env_builds AS eb ON eb.env_id = e.id +AND eb.status = 'uploaded' +CROSS JOIN LATERAL ( + SELECT array_agg(alias)::text[] AS aliases + FROM public.env_aliases + WHERE env_id = e.id +) AS al +ORDER BY eb.finished_at DESC +LIMIT 1; diff --git a/packages/db/queries/get_env_with_build.sql.go b/packages/db/queries/get_env_with_build.sql.go new file mode 100644 index 0000000..bb34e17 --- /dev/null +++ b/packages/db/queries/get_env_with_build.sql.go @@ -0,0 +1,76 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: get_env_with_build.sql + +package queries + +import ( + "context" +) + +const getEnvWithBuild = `-- name: GetEnvWithBuild :one +WITH s AS NOT MATERIALIZED ( + SELECT ea.env_id as env_id + FROM public.env_aliases as ea + WHERE ea.alias = $1 + UNION + SELECT $1 as env_id +) + +SELECT e.id, e.created_at, e.updated_at, e.public, e.build_count, e.spawn_count, e.last_spawned_at, e.team_id, e.created_by, e.cluster_id, eb.id, eb.created_at, eb.updated_at, eb.finished_at, eb.status, eb.dockerfile, eb.start_cmd, eb.vcpu, eb.ram_mb, eb.free_disk_size_mb, eb.total_disk_size_mb, eb.kernel_version, eb.firecracker_version, eb.env_id, eb.envd_version, eb.ready_cmd, eb.cluster_node_id, aliases +FROM s +JOIN public.envs AS e ON e.id = s.env_id +JOIN public.env_builds AS eb ON eb.env_id = e.id +AND eb.status = 'uploaded' +CROSS JOIN LATERAL ( + SELECT array_agg(alias)::text[] AS aliases + FROM public.env_aliases + WHERE env_id = e.id +) AS al +ORDER BY eb.finished_at DESC +LIMIT 1 +` + +type GetEnvWithBuildRow struct { + Env Env + EnvBuild EnvBuild + Aliases []string +} + +// get the env_id when querying by alias; if not, @alias_or_env_id should be env_id +func (q *Queries) GetEnvWithBuild(ctx context.Context, aliasOrEnvID string) (GetEnvWithBuildRow, error) { + row := q.db.QueryRow(ctx, getEnvWithBuild, aliasOrEnvID) + var i GetEnvWithBuildRow + err := row.Scan( + &i.Env.ID, + &i.Env.CreatedAt, + &i.Env.UpdatedAt, + &i.Env.Public, + &i.Env.BuildCount, + &i.Env.SpawnCount, + &i.Env.LastSpawnedAt, + &i.Env.TeamID, + &i.Env.CreatedBy, + &i.Env.ClusterID, + &i.EnvBuild.ID, + &i.EnvBuild.CreatedAt, + &i.EnvBuild.UpdatedAt, + &i.EnvBuild.FinishedAt, + &i.EnvBuild.Status, + &i.EnvBuild.Dockerfile, + &i.EnvBuild.StartCmd, + &i.EnvBuild.Vcpu, + &i.EnvBuild.RamMb, + &i.EnvBuild.FreeDiskSizeMb, + &i.EnvBuild.TotalDiskSizeMb, + &i.EnvBuild.KernelVersion, + &i.EnvBuild.FirecrackerVersion, + &i.EnvBuild.EnvID, + &i.EnvBuild.EnvdVersion, + &i.EnvBuild.ReadyCmd, + &i.EnvBuild.ClusterNodeID, + &i.Aliases, + ) + return i, err +} diff --git a/packages/db/queries/get_inprogress_builds.sql b/packages/db/queries/get_inprogress_builds.sql new file mode 100644 index 0000000..4bfe261 --- /dev/null +++ b/packages/db/queries/get_inprogress_builds.sql @@ -0,0 +1,8 @@ +-- name: GetInProgressTemplateBuilds :many +SELECT sqlc.embed(t), sqlc.embed(e), sqlc.embed(b) +FROM public.env_builds b +JOIN public.envs e ON e.id = b.env_id +JOIN public.teams t ON e.team_id = t.id +WHERE b.status = 'waiting' OR b.status = 'building' +ORDER BY b.created_at DESC; + diff --git a/packages/db/queries/get_inprogress_builds.sql.go b/packages/db/queries/get_inprogress_builds.sql.go new file mode 100644 index 0000000..c5c6afd --- /dev/null +++ b/packages/db/queries/get_inprogress_builds.sql.go @@ -0,0 +1,82 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: get_inprogress_builds.sql + +package queries + +import ( + "context" +) + +const getInProgressTemplateBuilds = `-- name: GetInProgressTemplateBuilds :many +SELECT t.id, t.created_at, t.is_blocked, t.name, t.tier, t.email, t.is_banned, t.blocked_reason, t.cluster_id, e.id, e.created_at, e.updated_at, e.public, e.build_count, e.spawn_count, e.last_spawned_at, e.team_id, e.created_by, e.cluster_id, b.id, b.created_at, b.updated_at, b.finished_at, b.status, b.dockerfile, b.start_cmd, b.vcpu, b.ram_mb, b.free_disk_size_mb, b.total_disk_size_mb, b.kernel_version, b.firecracker_version, b.env_id, b.envd_version, b.ready_cmd, b.cluster_node_id +FROM public.env_builds b +JOIN public.envs e ON e.id = b.env_id +JOIN public.teams t ON e.team_id = t.id +WHERE b.status = 'waiting' OR b.status = 'building' +ORDER BY b.created_at DESC +` + +type GetInProgressTemplateBuildsRow struct { + Team Team + Env Env + EnvBuild EnvBuild +} + +func (q *Queries) GetInProgressTemplateBuilds(ctx context.Context) ([]GetInProgressTemplateBuildsRow, error) { + rows, err := q.db.Query(ctx, getInProgressTemplateBuilds) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetInProgressTemplateBuildsRow + for rows.Next() { + var i GetInProgressTemplateBuildsRow + if err := rows.Scan( + &i.Team.ID, + &i.Team.CreatedAt, + &i.Team.IsBlocked, + &i.Team.Name, + &i.Team.Tier, + &i.Team.Email, + &i.Team.IsBanned, + &i.Team.BlockedReason, + &i.Team.ClusterID, + &i.Env.ID, + &i.Env.CreatedAt, + &i.Env.UpdatedAt, + &i.Env.Public, + &i.Env.BuildCount, + &i.Env.SpawnCount, + &i.Env.LastSpawnedAt, + &i.Env.TeamID, + &i.Env.CreatedBy, + &i.Env.ClusterID, + &i.EnvBuild.ID, + &i.EnvBuild.CreatedAt, + &i.EnvBuild.UpdatedAt, + &i.EnvBuild.FinishedAt, + &i.EnvBuild.Status, + &i.EnvBuild.Dockerfile, + &i.EnvBuild.StartCmd, + &i.EnvBuild.Vcpu, + &i.EnvBuild.RamMb, + &i.EnvBuild.FreeDiskSizeMb, + &i.EnvBuild.TotalDiskSizeMb, + &i.EnvBuild.KernelVersion, + &i.EnvBuild.FirecrackerVersion, + &i.EnvBuild.EnvID, + &i.EnvBuild.EnvdVersion, + &i.EnvBuild.ReadyCmd, + &i.EnvBuild.ClusterNodeID, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/packages/db/queries/get_last_snapshot.sql b/packages/db/queries/get_last_snapshot.sql new file mode 100644 index 0000000..6ce496f --- /dev/null +++ b/packages/db/queries/get_last_snapshot.sql @@ -0,0 +1,13 @@ +-- name: GetLastSnapshot :one +SELECT COALESCE(ea.aliases, ARRAY[]::text[])::text[] AS aliases, sqlc.embed(s), sqlc.embed(eb) +FROM "public"."snapshots" s +JOIN "public"."envs" e ON s.env_id = e.id +JOIN "public"."env_builds" eb ON e.id = eb.env_id +LEFT JOIN LATERAL ( + SELECT ARRAY_AGG(alias ORDER BY alias) AS aliases + FROM "public"."env_aliases" + WHERE env_id = s.base_env_id +) ea ON TRUE +WHERE s.sandbox_id = $1 AND eb.status = 'success' AND e.team_id = $2 +ORDER BY eb.finished_at DESC +LIMIT 1; diff --git a/packages/db/queries/get_last_snapshot.sql.go b/packages/db/queries/get_last_snapshot.sql.go new file mode 100644 index 0000000..6232273 --- /dev/null +++ b/packages/db/queries/get_last_snapshot.sql.go @@ -0,0 +1,72 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: get_last_snapshot.sql + +package queries + +import ( + "context" + + "github.com/google/uuid" +) + +const getLastSnapshot = `-- name: GetLastSnapshot :one +SELECT COALESCE(ea.aliases, ARRAY[]::text[])::text[] AS aliases, s.created_at, s.env_id, s.sandbox_id, s.id, s.metadata, s.base_env_id, s.sandbox_started_at, s.env_secure, eb.id, eb.created_at, eb.updated_at, eb.finished_at, eb.status, eb.dockerfile, eb.start_cmd, eb.vcpu, eb.ram_mb, eb.free_disk_size_mb, eb.total_disk_size_mb, eb.kernel_version, eb.firecracker_version, eb.env_id, eb.envd_version, eb.ready_cmd, eb.cluster_node_id +FROM "public"."snapshots" s +JOIN "public"."envs" e ON s.env_id = e.id +JOIN "public"."env_builds" eb ON e.id = eb.env_id +LEFT JOIN LATERAL ( + SELECT ARRAY_AGG(alias ORDER BY alias) AS aliases + FROM "public"."env_aliases" + WHERE env_id = s.base_env_id +) ea ON TRUE +WHERE s.sandbox_id = $1 AND eb.status = 'success' AND e.team_id = $2 +ORDER BY eb.finished_at DESC +LIMIT 1 +` + +type GetLastSnapshotParams struct { + SandboxID string + TeamID uuid.UUID +} + +type GetLastSnapshotRow struct { + Aliases []string + Snapshot Snapshot + EnvBuild EnvBuild +} + +func (q *Queries) GetLastSnapshot(ctx context.Context, arg GetLastSnapshotParams) (GetLastSnapshotRow, error) { + row := q.db.QueryRow(ctx, getLastSnapshot, arg.SandboxID, arg.TeamID) + var i GetLastSnapshotRow + err := row.Scan( + &i.Aliases, + &i.Snapshot.CreatedAt, + &i.Snapshot.EnvID, + &i.Snapshot.SandboxID, + &i.Snapshot.ID, + &i.Snapshot.Metadata, + &i.Snapshot.BaseEnvID, + &i.Snapshot.SandboxStartedAt, + &i.Snapshot.EnvSecure, + &i.EnvBuild.ID, + &i.EnvBuild.CreatedAt, + &i.EnvBuild.UpdatedAt, + &i.EnvBuild.FinishedAt, + &i.EnvBuild.Status, + &i.EnvBuild.Dockerfile, + &i.EnvBuild.StartCmd, + &i.EnvBuild.Vcpu, + &i.EnvBuild.RamMb, + &i.EnvBuild.FreeDiskSizeMb, + &i.EnvBuild.TotalDiskSizeMb, + &i.EnvBuild.KernelVersion, + &i.EnvBuild.FirecrackerVersion, + &i.EnvBuild.EnvID, + &i.EnvBuild.EnvdVersion, + &i.EnvBuild.ReadyCmd, + &i.EnvBuild.ClusterNodeID, + ) + return i, err +} diff --git a/packages/db/queries/get_snapshots_with_cursor.sql b/packages/db/queries/get_snapshots_with_cursor.sql new file mode 100644 index 0000000..8e2fabe --- /dev/null +++ b/packages/db/queries/get_snapshots_with_cursor.sql @@ -0,0 +1,29 @@ +-- name: GetSnapshotsWithCursor :many +SELECT COALESCE(ea.aliases, ARRAY[]::text[])::text[] AS aliases, sqlc.embed(s), sqlc.embed(eb) +FROM "public"."snapshots" s +JOIN "public"."envs" e ON e.id = s.env_id +LEFT JOIN LATERAL ( + SELECT ARRAY_AGG(alias ORDER BY alias) AS aliases + FROM "public"."env_aliases" + WHERE env_id = s.base_env_id +) ea ON TRUE +JOIN LATERAL ( + SELECT eb.* + FROM "public"."env_builds" eb + WHERE + eb.env_id = s.env_id + AND eb.status = 'success' + ORDER BY eb.created_at DESC + LIMIT 1 +) eb ON TRUE +WHERE + e.team_id = @team_id + AND s.metadata @> @metadata + AND ( + s.created_at < @cursor_time + OR + (s.created_at = @cursor_time AND s.sandbox_id > @cursor_id) + ) + AND NOT (s.sandbox_id = ANY (@snapshot_exclude_sbx_ids::text[])) +ORDER BY s.created_at DESC, s.sandbox_id +LIMIT $1; diff --git a/packages/db/queries/get_snapshots_with_cursor.sql.go b/packages/db/queries/get_snapshots_with_cursor.sql.go new file mode 100644 index 0000000..356d0d9 --- /dev/null +++ b/packages/db/queries/get_snapshots_with_cursor.sql.go @@ -0,0 +1,114 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: get_snapshots_with_cursor.sql + +package queries + +import ( + "context" + + "github.com/e2b-dev/infra/packages/db/types" + "github.com/google/uuid" + "github.com/jackc/pgx/v5/pgtype" +) + +const getSnapshotsWithCursor = `-- name: GetSnapshotsWithCursor :many +SELECT COALESCE(ea.aliases, ARRAY[]::text[])::text[] AS aliases, s.created_at, s.env_id, s.sandbox_id, s.id, s.metadata, s.base_env_id, s.sandbox_started_at, s.env_secure, eb.id, eb.created_at, eb.updated_at, eb.finished_at, eb.status, eb.dockerfile, eb.start_cmd, eb.vcpu, eb.ram_mb, eb.free_disk_size_mb, eb.total_disk_size_mb, eb.kernel_version, eb.firecracker_version, eb.env_id, eb.envd_version, eb.ready_cmd, eb.cluster_node_id +FROM "public"."snapshots" s +JOIN "public"."envs" e ON e.id = s.env_id +LEFT JOIN LATERAL ( + SELECT ARRAY_AGG(alias ORDER BY alias) AS aliases + FROM "public"."env_aliases" + WHERE env_id = s.base_env_id +) ea ON TRUE +JOIN LATERAL ( + SELECT eb.id, eb.created_at, eb.updated_at, eb.finished_at, eb.status, eb.dockerfile, eb.start_cmd, eb.vcpu, eb.ram_mb, eb.free_disk_size_mb, eb.total_disk_size_mb, eb.kernel_version, eb.firecracker_version, eb.env_id, eb.envd_version, eb.ready_cmd, eb.cluster_node_id + FROM "public"."env_builds" eb + WHERE + eb.env_id = s.env_id + AND eb.status = 'success' + ORDER BY eb.created_at DESC + LIMIT 1 +) eb ON TRUE +WHERE + e.team_id = $2 + AND s.metadata @> $3 + AND ( + s.created_at < $4 + OR + (s.created_at = $4 AND s.sandbox_id > $5) + ) + AND NOT (s.sandbox_id = ANY ($6::text[])) +ORDER BY s.created_at DESC, s.sandbox_id +LIMIT $1 +` + +type GetSnapshotsWithCursorParams struct { + Limit int32 + TeamID uuid.UUID + Metadata types.JSONBStringMap + CursorTime pgtype.Timestamptz + CursorID string + SnapshotExcludeSbxIds []string +} + +type GetSnapshotsWithCursorRow struct { + Aliases []string + Snapshot Snapshot + EnvBuild EnvBuild +} + +func (q *Queries) GetSnapshotsWithCursor(ctx context.Context, arg GetSnapshotsWithCursorParams) ([]GetSnapshotsWithCursorRow, error) { + rows, err := q.db.Query(ctx, getSnapshotsWithCursor, + arg.Limit, + arg.TeamID, + arg.Metadata, + arg.CursorTime, + arg.CursorID, + arg.SnapshotExcludeSbxIds, + ) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetSnapshotsWithCursorRow + for rows.Next() { + var i GetSnapshotsWithCursorRow + if err := rows.Scan( + &i.Aliases, + &i.Snapshot.CreatedAt, + &i.Snapshot.EnvID, + &i.Snapshot.SandboxID, + &i.Snapshot.ID, + &i.Snapshot.Metadata, + &i.Snapshot.BaseEnvID, + &i.Snapshot.SandboxStartedAt, + &i.Snapshot.EnvSecure, + &i.EnvBuild.ID, + &i.EnvBuild.CreatedAt, + &i.EnvBuild.UpdatedAt, + &i.EnvBuild.FinishedAt, + &i.EnvBuild.Status, + &i.EnvBuild.Dockerfile, + &i.EnvBuild.StartCmd, + &i.EnvBuild.Vcpu, + &i.EnvBuild.RamMb, + &i.EnvBuild.FreeDiskSizeMb, + &i.EnvBuild.TotalDiskSizeMb, + &i.EnvBuild.KernelVersion, + &i.EnvBuild.FirecrackerVersion, + &i.EnvBuild.EnvID, + &i.EnvBuild.EnvdVersion, + &i.EnvBuild.ReadyCmd, + &i.EnvBuild.ClusterNodeID, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/packages/db/queries/models.go b/packages/db/queries/models.go new file mode 100644 index 0000000..92a15d9 --- /dev/null +++ b/packages/db/queries/models.go @@ -0,0 +1,137 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 + +package queries + +import ( + "time" + + "github.com/e2b-dev/infra/packages/db/types" + "github.com/google/uuid" + "github.com/jackc/pgx/v5/pgtype" +) + +type AccessToken struct { + AccessToken string + UserID uuid.UUID + CreatedAt time.Time + ID *uuid.UUID + // sensitive + AccessTokenHash *string + AccessTokenMask *string + Name string + AccessTokenPrefix *string + AccessTokenLength *int32 + AccessTokenMaskPrefix *string + AccessTokenMaskSuffix *string +} + +type Cluster struct { + ID uuid.UUID + Endpoint string + EndpointTls bool + Token string +} + +type Env struct { + ID string + CreatedAt time.Time + UpdatedAt time.Time + Public bool + BuildCount int32 + // Number of times the env was spawned + SpawnCount int64 + // Timestamp of the last time the env was spawned + LastSpawnedAt *time.Time + TeamID uuid.UUID + CreatedBy *uuid.UUID + ClusterID *uuid.UUID +} + +type EnvAlias struct { + Alias string + IsRenamable bool + EnvID string +} + +type EnvBuild struct { + ID uuid.UUID + CreatedAt time.Time + UpdatedAt time.Time + FinishedAt *time.Time + Status string + Dockerfile *string + StartCmd *string + Vcpu int64 + RamMb int64 + FreeDiskSizeMb int64 + TotalDiskSizeMb *int64 + KernelVersion string + FirecrackerVersion string + EnvID *string + EnvdVersion *string + ReadyCmd *string + ClusterNodeID *string +} + +type Snapshot struct { + CreatedAt pgtype.Timestamptz + EnvID string + SandboxID string + ID uuid.UUID + Metadata types.JSONBStringMap + BaseEnvID string + SandboxStartedAt pgtype.Timestamptz + EnvSecure bool +} + +type Team struct { + ID uuid.UUID + CreatedAt time.Time + IsBlocked bool + Name string + Tier string + Email string + IsBanned bool + BlockedReason *string + ClusterID *uuid.UUID +} + +type TeamApiKey struct { + ApiKey string + CreatedAt time.Time + TeamID uuid.UUID + UpdatedAt *time.Time + Name string + LastUsed *time.Time + CreatedBy *uuid.UUID + ID uuid.UUID + // sensitive + ApiKeyHash *string + ApiKeyMask *string + ApiKeyPrefix *string + ApiKeyLength *int32 + ApiKeyMaskPrefix *string + ApiKeyMaskSuffix *string +} + +type Tier struct { + ID string + Name string + DiskMb int64 + // The number of instances the team can run concurrently + ConcurrentInstances int64 + MaxLengthHours int64 + MaxVcpu int64 + MaxRamMb int64 +} + +type UsersTeam struct { + ID int64 + UserID uuid.UUID + TeamID uuid.UUID + IsDefault bool + AddedBy *uuid.UUID + CreatedAt pgtype.Timestamp +} diff --git a/packages/db/queries/teams___tiers__usersteams.sql b/packages/db/queries/teams___tiers__usersteams.sql new file mode 100644 index 0000000..1ec6749 --- /dev/null +++ b/packages/db/queries/teams___tiers__usersteams.sql @@ -0,0 +1,6 @@ +-- name: GetTeamsWithUsersTeamsWithTier :many +SELECT sqlc.embed(t), sqlc.embed(ut), sqlc.embed(tier) +FROM "public"."teams" t +JOIN "public"."tiers" tier ON t.tier = tier.id +JOIN "public"."users_teams" ut ON ut.team_id = t.id +WHERE ut.user_id = $1; diff --git a/packages/db/queries/teams___tiers__usersteams.sql.go b/packages/db/queries/teams___tiers__usersteams.sql.go new file mode 100644 index 0000000..4060b61 --- /dev/null +++ b/packages/db/queries/teams___tiers__usersteams.sql.go @@ -0,0 +1,69 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: teams___tiers__usersteams.sql + +package queries + +import ( + "context" + + "github.com/google/uuid" +) + +const getTeamsWithUsersTeamsWithTier = `-- name: GetTeamsWithUsersTeamsWithTier :many +SELECT t.id, t.created_at, t.is_blocked, t.name, t.tier, t.email, t.is_banned, t.blocked_reason, t.cluster_id, ut.id, ut.user_id, ut.team_id, ut.is_default, ut.added_by, ut.created_at, tier.id, tier.name, tier.disk_mb, tier.concurrent_instances, tier.max_length_hours, tier.max_vcpu, tier.max_ram_mb +FROM "public"."teams" t +JOIN "public"."tiers" tier ON t.tier = tier.id +JOIN "public"."users_teams" ut ON ut.team_id = t.id +WHERE ut.user_id = $1 +` + +type GetTeamsWithUsersTeamsWithTierRow struct { + Team Team + UsersTeam UsersTeam + Tier Tier +} + +func (q *Queries) GetTeamsWithUsersTeamsWithTier(ctx context.Context, userID uuid.UUID) ([]GetTeamsWithUsersTeamsWithTierRow, error) { + rows, err := q.db.Query(ctx, getTeamsWithUsersTeamsWithTier, userID) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetTeamsWithUsersTeamsWithTierRow + for rows.Next() { + var i GetTeamsWithUsersTeamsWithTierRow + if err := rows.Scan( + &i.Team.ID, + &i.Team.CreatedAt, + &i.Team.IsBlocked, + &i.Team.Name, + &i.Team.Tier, + &i.Team.Email, + &i.Team.IsBanned, + &i.Team.BlockedReason, + &i.Team.ClusterID, + &i.UsersTeam.ID, + &i.UsersTeam.UserID, + &i.UsersTeam.TeamID, + &i.UsersTeam.IsDefault, + &i.UsersTeam.AddedBy, + &i.UsersTeam.CreatedAt, + &i.Tier.ID, + &i.Tier.Name, + &i.Tier.DiskMb, + &i.Tier.ConcurrentInstances, + &i.Tier.MaxLengthHours, + &i.Tier.MaxVcpu, + &i.Tier.MaxRamMb, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/packages/db/queries/teams_usersteams_join.sql b/packages/db/queries/teams_usersteams_join.sql new file mode 100644 index 0000000..e6654dc --- /dev/null +++ b/packages/db/queries/teams_usersteams_join.sql @@ -0,0 +1,5 @@ +-- name: GetTeamsWithUsersTeams :many +SELECT sqlc.embed(t), sqlc.embed(ut) +FROM "public"."teams" t +JOIN "public"."users_teams" ut ON ut.team_id = t.id +WHERE ut.user_id = $1; diff --git a/packages/db/queries/teams_usersteams_join.sql.go b/packages/db/queries/teams_usersteams_join.sql.go new file mode 100644 index 0000000..31d5561 --- /dev/null +++ b/packages/db/queries/teams_usersteams_join.sql.go @@ -0,0 +1,60 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: teams_usersteams_join.sql + +package queries + +import ( + "context" + + "github.com/google/uuid" +) + +const getTeamsWithUsersTeams = `-- name: GetTeamsWithUsersTeams :many +SELECT t.id, t.created_at, t.is_blocked, t.name, t.tier, t.email, t.is_banned, t.blocked_reason, t.cluster_id, ut.id, ut.user_id, ut.team_id, ut.is_default, ut.added_by, ut.created_at +FROM "public"."teams" t +JOIN "public"."users_teams" ut ON ut.team_id = t.id +WHERE ut.user_id = $1 +` + +type GetTeamsWithUsersTeamsRow struct { + Team Team + UsersTeam UsersTeam +} + +func (q *Queries) GetTeamsWithUsersTeams(ctx context.Context, userID uuid.UUID) ([]GetTeamsWithUsersTeamsRow, error) { + rows, err := q.db.Query(ctx, getTeamsWithUsersTeams, userID) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetTeamsWithUsersTeamsRow + for rows.Next() { + var i GetTeamsWithUsersTeamsRow + if err := rows.Scan( + &i.Team.ID, + &i.Team.CreatedAt, + &i.Team.IsBlocked, + &i.Team.Name, + &i.Team.Tier, + &i.Team.Email, + &i.Team.IsBanned, + &i.Team.BlockedReason, + &i.Team.ClusterID, + &i.UsersTeam.ID, + &i.UsersTeam.UserID, + &i.UsersTeam.TeamID, + &i.UsersTeam.IsDefault, + &i.UsersTeam.AddedBy, + &i.UsersTeam.CreatedAt, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/packages/db/scripts/migrator.go b/packages/db/scripts/migrator.go new file mode 100644 index 0000000..1ae09c5 --- /dev/null +++ b/packages/db/scripts/migrator.go @@ -0,0 +1,75 @@ +package main + +import ( + "context" + "database/sql" + "fmt" + "log" + "os" + + _ "github.com/lib/pq" + "github.com/pressly/goose/v3" + "github.com/pressly/goose/v3/database" + "github.com/pressly/goose/v3/lock" +) + +const ( + trackingTable = "_migrations" + migrationsDir = "./migrations" +) + +func main() { + fmt.Printf("Starting migrations...\n") + ctx := context.Background() + + dbString := os.Getenv("POSTGRES_CONNECTION_STRING") + if dbString == "" { + log.Fatal("Database connection string is required. Set POSTGRES_CONNECTION_STRING env var.") + } + + db, err := sql.Open("postgres", dbString) + if err != nil { + log.Fatalf("failed to open DB: %v", err) + } + defer func() { + err := db.Close() + if err != nil { + log.Printf("failed to close DB: %v\n", err) + } + }() + + // Create a session locking + sessionLocker, err := lock.NewPostgresSessionLocker() + if err != nil { + log.Fatalf("failed to create session locker: %v", err) + } + + // We have to use custom store to use a custom tracking table + store, err := database.NewStore(goose.DialectPostgres, trackingTable) + if err != nil { + log.Fatalf("failed to create database store: %v", err) + } + + migrationsFS := os.DirFS(migrationsDir) + provider, err := goose.NewProvider( + "", // Has to empty when using a custom store + db, + migrationsFS, + goose.WithStore(store), + goose.WithSessionLocker(sessionLocker), + ) + if err != nil { + log.Fatalf("failed to create goose provider: %v", err) + } + + results, err := provider.Up(ctx) + if err != nil { + log.Fatalf("failed to apply migrations: %v", err) + } + + for _, res := range results { + fmt.Printf("Applied migration %s %s (%s)\n", res.Direction, res.Source.Path, res.Duration) + } + + fmt.Println("Migrations applied successfully.") +} diff --git a/packages/db/sqlc.yaml b/packages/db/sqlc.yaml new file mode 100644 index 0000000..95f64e0 --- /dev/null +++ b/packages/db/sqlc.yaml @@ -0,0 +1,41 @@ +version: "2" +sql: + - engine: "postgresql" + queries: "queries" + schema: "migrations" + gen: + go: + emit_pointers_for_null_types: true + package: "queries" + out: "queries/" + sql_package: "pgx/v5" + overrides: + - db_type: "uuid" + go_type: + import: "github.com/google/uuid" + type: "UUID" + - db_type: "uuid" + nullable: true + go_type: + import: "github.com/google/uuid" + type: "UUID" + pointer: true + + - db_type: "pg_catalog.numeric" + go_type: "github.com/shopspring/decimal.Decimal" + - db_type: "pg_catalog.numeric" + nullable: true + go_type: "*github.com/shopspring/decimal.Decimal" + + - db_type: "timestamptz" + go_type: "time.Time" + - db_type: "timestamptz" + go_type: + import: "time" + type: "Time" + pointer: true + nullable: true + + - db_type: "jsonb" + go_type: "github.com/e2b-dev/infra/packages/db/types.JSONBStringMap" + nullable: true diff --git a/packages/db/types/types.go b/packages/db/types/types.go new file mode 100644 index 0000000..3b6c73a --- /dev/null +++ b/packages/db/types/types.go @@ -0,0 +1,3 @@ +package types + +type JSONBStringMap map[string]string diff --git a/packages/docker-reverse-proxy/.gitignore b/packages/docker-reverse-proxy/.gitignore new file mode 100644 index 0000000..5e56e04 --- /dev/null +++ b/packages/docker-reverse-proxy/.gitignore @@ -0,0 +1 @@ +/bin diff --git a/packages/docker-reverse-proxy/Dockerfile b/packages/docker-reverse-proxy/Dockerfile new file mode 100644 index 0000000..2763c69 --- /dev/null +++ b/packages/docker-reverse-proxy/Dockerfile @@ -0,0 +1,29 @@ +FROM golang:1.24-alpine3.20 AS builder + +RUN apk add --no-cache make + +WORKDIR /build/shared + +COPY .shared/go.mod .shared/go.sum ./ +RUN go mod download + +COPY .shared/pkg pkg + +WORKDIR /build/docker-reverse-proxy + +COPY go.mod go.sum Makefile ./ +RUN go mod download + +COPY main.go main.go +COPY internal internal + +ARG COMMIT_SHA +RUN --mount=type=cache,target=/root/.cache/go-build make build COMMIT_SHA=${COMMIT_SHA} + +RUN chmod +x /build/docker-reverse-proxy/bin/docker-reverse-proxy + +FROM alpine:3.17 + +COPY --from=builder /build/docker-reverse-proxy/bin/docker-reverse-proxy . + +ENTRYPOINT [ "./docker-reverse-proxy" ] diff --git a/packages/docker-reverse-proxy/Makefile b/packages/docker-reverse-proxy/Makefile new file mode 100644 index 0000000..1b9281c --- /dev/null +++ b/packages/docker-reverse-proxy/Makefile @@ -0,0 +1,46 @@ +ENV := $(shell cat ../../.last_used_env || echo "not-set") +-include ../../.env.${ENV} + +IMAGE := docker-reverse-proxy + +.PHONY: build +build: + # Allow for passing commit sha directly for docker builds + $(eval COMMIT_SHA ?= $(shell git rev-parse --short HEAD)) + CGO_ENABLED=0 go build -o bin/docker-reverse-proxy -ldflags "-X=main.commitSHA=$(COMMIT_SHA)" . + +.PHONY: build-debug +build-debug: + CGO_ENABLED=1 go build -race -gcflags=all="-N -l" -o bin/docker-reverse-proxy . + +.PHONY: build-and-upload +build-and-upload: + $(eval COMMIT_SHA := $(shell git rev-parse --short HEAD)) + @cp -r ../shared .shared/ + @docker buildx install # sets up the buildx as default docker builder (otherwise the command below won't work) + @docker build --platform linux/amd64 --tag "$(GCP_REGION)-docker.pkg.dev/$(GCP_PROJECT_ID)/$(IMAGE)" --push --build-arg COMMIT_SHA="$(COMMIT_SHA)" . + @rm -rf .shared/ + +.PHONY: test +test: + go test -v ./... + + +.PHONY: build-and-upload-aws +build-and-upload-aws: + $(eval AWS_ACCOUNT_ID := $(shell grep "^account_id=" /opt/config.properties | cut -d= -f2)) + $(eval AWS_REGION := $(shell grep "^AWSREGION=" /opt/config.properties | cut -d= -f2)) + $(eval ARCHITECTURE := $(shell grep "^CFNARCHITECTURE=" /opt/config.properties | cut -d= -f2 || echo "amd64")) + $(eval COMMIT_SHA := $(shell git rev-parse --short HEAD)) + # Create ECR repository if it doesn't exist + @aws ecr describe-repositories --repository-names $(IMAGE) || aws ecr create-repository --repository-name $(IMAGE) + # Login to ECR + @aws ecr get-login-password --region $(AWS_REGION) | docker login --username AWS --password-stdin $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com + @cp -r ../shared .shared/ + @docker buildx install # sets up the buildx as default docker builder (otherwise the command below won't work) + @docker build --platform linux/amd64 --tag "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" --push --build-arg COMMIT_SHA="$(COMMIT_SHA)" . + # Build and push the image + @echo "Building for architecture: $(ARCHITECTURE)" + @docker build --platform linux/amd64 --tag "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" . + @docker push "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" + @rm -rf .shared/ \ No newline at end of file diff --git a/packages/docker-reverse-proxy/go.mod b/packages/docker-reverse-proxy/go.mod new file mode 100644 index 0000000..c2cfc24 --- /dev/null +++ b/packages/docker-reverse-proxy/go.mod @@ -0,0 +1,33 @@ +module github.com/e2b-dev/infra/packages/docker-reverse-proxy + +go 1.24.3 + +replace github.com/e2b-dev/infra/packages/shared v0.0.0 => ../shared + +require ( + github.com/aws/aws-sdk-go v1.51.6 + github.com/e2b-dev/infra/packages/shared v0.0.0 + github.com/jellydator/ttlcache/v3 v3.3.1-0.20250207140243-aefc35918359 +) + +require ( + ariga.io/atlas v0.15.0 // indirect + entgo.io/ent v0.12.5 // indirect + github.com/agext/levenshtein v1.2.3 // indirect + github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect + github.com/dchest/uniuri v1.2.0 // indirect + github.com/go-openapi/inflect v0.19.0 // indirect + github.com/go-test/deep v1.0.8 // indirect + github.com/google/go-cmp v0.7.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/hcl/v2 v2.19.1 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/lib/pq v1.10.9 // indirect + github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/rogpeppe/go-internal v1.13.1 // indirect + github.com/zclconf/go-cty v1.14.1 // indirect + golang.org/x/mod v0.25.0 // indirect + golang.org/x/sync v0.15.0 // indirect + golang.org/x/text v0.26.0 // indirect +) diff --git a/packages/docker-reverse-proxy/go.sum b/packages/docker-reverse-proxy/go.sum new file mode 100644 index 0000000..f1d6de4 --- /dev/null +++ b/packages/docker-reverse-proxy/go.sum @@ -0,0 +1,73 @@ +ariga.io/atlas v0.15.0 h1:9lwSVcO/D3WgaCzstSGqR1hEDtsGibu6JqUofEI/0sY= +ariga.io/atlas v0.15.0/go.mod h1:isZrlzJ5cpoCoKFoY9knZug7Lq4pP1cm8g3XciLZ0Pw= +entgo.io/ent v0.12.5 h1:KREM5E4CSoej4zeGa88Ou/gfturAnpUv0mzAjch1sj4= +entgo.io/ent v0.12.5/go.mod h1:Y3JVAjtlIk8xVZYSn3t3mf8xlZIn5SAOXZQxD6kKI+Q= +github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= +github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= +github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= +github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= +github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= +github.com/aws/aws-sdk-go v1.51.6 h1:Ld36dn9r7P9IjU8WZSaswQ8Y/XUCRpewim5980DwYiU= +github.com/aws/aws-sdk-go v1.51.6/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g= +github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY= +github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4= +github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4= +github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= +github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI= +github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= +github.com/jellydator/ttlcache/v3 v3.3.1-0.20250207140243-aefc35918359 h1:uzTOUCYbGERlXB3wX2/u9AsMeXnZCd8yLl2DMAY1Wxs= +github.com/jellydator/ttlcache/v3 v3.3.1-0.20250207140243-aefc35918359/go.mod h1:aqa3CYl8S7MwpMXtFH3uNIEEfOjcn1MUNO+bQIGbFAQ= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= +github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= +github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w= +golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= +golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= +golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= +golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/packages/docker-reverse-proxy/internal/auth/aws.go b/packages/docker-reverse-proxy/internal/auth/aws.go new file mode 100644 index 0000000..8ee8fa3 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/auth/aws.go @@ -0,0 +1,234 @@ +package auth + +import ( + "encoding/base64" + "encoding/json" + "fmt" + "io" + "log" + "net/http" + "strings" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/aws/session" + "github.com/aws/aws-sdk-go/service/ecr" + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/constants" +) + +// AWSAuthResponse represents the authentication response from AWS ECR +type AWSAuthResponse struct { + Token string + ExpiresAt time.Time + ProxyEndpoint string +} + +// EnsureECRRepositoryExists checks if the ECR repository exists and creates it if it doesn't +func EnsureECRRepositoryExists(templateID string) error { + // Get AWS session + sess, err := constants.GetAWSSession() + if err != nil { + return fmt.Errorf("failed to get AWS session: %v", err) + } + + // Create ECR client + ecrClient := ecr.New(sess) + + // Format repository name for the template using base_repo_name/template_id format + templateRepo := fmt.Sprintf("%s/%s", constants.AWSECRRepository, templateID) + + log.Printf("[DEBUG] ECR - Checking if repository %s exists", templateRepo) + + // Check if repository exists + _, err = ecrClient.DescribeRepositories(&ecr.DescribeRepositoriesInput{ + RepositoryNames: []*string{aws.String(templateRepo)}, + }) + + if err != nil { + if aerr, ok := err.(awserr.Error); ok && aerr.Code() == ecr.ErrCodeRepositoryNotFoundException { + // Repository doesn't exist, create it + log.Printf("[DEBUG] ECR - Creating repository %s for template %s", templateRepo, templateID) + _, err = ecrClient.CreateRepository(&ecr.CreateRepositoryInput{ + RepositoryName: aws.String(templateRepo), + ImageTagMutability: aws.String(ecr.ImageTagMutabilityMutable), + }) + if err != nil { + return fmt.Errorf("failed to create ECR repository: %v", err) + } + log.Printf("[DEBUG] ECR - Repository %s created successfully", templateRepo) + return nil + } + return fmt.Errorf("failed to check ECR repository: %v", err) + } + + // Repository exists + log.Printf("[DEBUG] ECR - Repository %s already exists", templateRepo) + return nil +} + +// GetAWSECRAuthToken retrieves an authentication token for AWS ECR +func GetAWSECRAuthToken() (*AWSAuthResponse, error) { + // Get AWS session + sess, err := constants.GetAWSSession() + if err != nil { + return nil, fmt.Errorf("failed to get AWS session: %v", err) + } + + // 确保会话有区域信息 + if sess.Config.Region == nil || *sess.Config.Region == "" { + region, err := constants.GetAWSRegion() + if err != nil { + return nil, fmt.Errorf("failed to get AWS region: %v", err) + } + + // 使用获取到的区域创建新的会话 + newConfig := aws.Config{ + Region: aws.String(region), + } + if sess.Config.Credentials != nil { + newConfig.Credentials = sess.Config.Credentials + } + + newSess, err := session.NewSession(&newConfig) + if err != nil { + return nil, fmt.Errorf("failed to create AWS session with region: %v", err) + } + sess = newSess + } + + // Create ECR client + ecrClient := ecr.New(sess) + + // Get authorization token + input := &ecr.GetAuthorizationTokenInput{} + result, err := ecrClient.GetAuthorizationToken(input) + if err != nil { + log.Printf("[ERROR] ECR Auth - Failed to get token: %v", err) + return nil, fmt.Errorf("failed to get ECR authorization token: %v", err) + } + + if len(result.AuthorizationData) == 0 { + log.Printf("[ERROR] ECR Auth - No authorization data returned") + return nil, fmt.Errorf("no authorization data returned from ECR") + } + + authData := result.AuthorizationData[0] + log.Printf("[DEBUG] ECR Auth - Got token expiring at: %s", authData.ExpiresAt.Format(time.RFC3339)) + log.Printf("[DEBUG] ECR Auth - Proxy endpoint: %s", *authData.ProxyEndpoint) + + // 测试令牌有效性 + testClient := &http.Client{ + Timeout: 5 * time.Second, + } + testReq, _ := http.NewRequest("GET", fmt.Sprintf("%s/v2/", *authData.ProxyEndpoint), nil) + testReq.Header.Set("Authorization", fmt.Sprintf("Basic %s", *authData.AuthorizationToken)) + testResp, testErr := testClient.Do(testReq) + if testErr != nil { + log.Printf("[ERROR] ECR Auth - Token test failed: %v", testErr) + } else { + defer testResp.Body.Close() + log.Printf("[INFO] ECR Auth - Token test status: %d", testResp.StatusCode) + if testResp.StatusCode == http.StatusOK { + log.Printf("[INFO] ECR Auth - Token is valid") + } else { + respBody, _ := io.ReadAll(testResp.Body) + log.Printf("[ERROR] ECR Auth - Token test failed: %s", string(respBody)) + } + } + + // 验证令牌格式 + decodedToken, err := base64.StdEncoding.DecodeString(*authData.AuthorizationToken) + if err != nil { + log.Printf("[ERROR] ECR Auth - Failed to decode token: %v", err) + return nil, fmt.Errorf("failed to decode ECR authorization token: %v", err) + } + + tokenStr := string(decodedToken) + if !strings.Contains(tokenStr, ":") { + log.Printf("[ERROR] ECR Auth - Invalid token format") + return nil, fmt.Errorf("invalid ECR token format") + } + + // Important: For AWS ECR, we return the raw base64 encoded token + // This will be used directly in the Basic auth header + return &AWSAuthResponse{ + Token: *authData.AuthorizationToken, + ExpiresAt: *authData.ExpiresAt, + ProxyEndpoint: *authData.ProxyEndpoint, + }, nil +} + +// HandleAWSECRToken handles the token request for AWS ECR +func HandleAWSECRToken(w http.ResponseWriter, req *http.Request) (string, error) { + log.Printf("[DEBUG] ECR Token - Handling token request") + + // Extract template ID from the request + scope := req.URL.Query().Get("scope") + templateID := "" + if scope != "" { + // Extract template ID from scope + // Format: repository:e2b/custom-envs/{templateID}:push,pull + parts := strings.Split(scope, ":") + if len(parts) >= 2 { + repoPath := parts[1] + pathParts := strings.Split(repoPath, "/") + if len(pathParts) >= 3 { + templateID = pathParts[2] + log.Printf("[DEBUG] ECR Token - Extracted template ID: %s", templateID) + + // Ensure repository exists for this template + err := EnsureECRRepositoryExists(templateID) + if err != nil { + log.Printf("Error ensuring ECR repository exists: %v", err) + http.Error(w, "Failed to ensure ECR repository exists", http.StatusInternalServerError) + return "", err + } + } + } + } + + authResponse, err := GetAWSECRAuthToken() + if err != nil { + log.Printf("Error getting AWS ECR auth token: %v", err) + http.Error(w, "Failed to get ECR authorization token", http.StatusInternalServerError) + return "", err + } + + // For Docker client compatibility, we need to decode the token + // to extract the password part for the client response + log.Printf("[DEBUG] ECR Token - Using token (length: %d)", len(authResponse.Token)) + + // Create a response similar to Docker Registry v2 token response + // 直接返回完整的 base64 编码令牌 + tokenResponse := map[string]interface{}{ + "token": authResponse.Token, // 返回完整的 base64 编码令牌 + "expires_in": int(time.Until(authResponse.ExpiresAt).Seconds()), + "issued_at": time.Now().Format(time.RFC3339), + } + + responseJSON, err := json.Marshal(tokenResponse) + if err != nil { + log.Printf("Error marshaling token response: %v", err) + http.Error(w, "Failed to create token response", http.StatusInternalServerError) + return "", err + } + + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(http.StatusOK) + w.Write(responseJSON) + + log.Printf("[DEBUG] ECR Token - Successfully returned token response") + + // 返回完整的base64编码令牌，用于Basic认证 + // 这将在代理请求时使用 + return authResponse.Token, nil +} + +// Helper function to get the minimum of two integers +func min(a, b int) int { + if a < b { + return a + } + return b +} diff --git a/packages/docker-reverse-proxy/internal/auth/validate.go b/packages/docker-reverse-proxy/internal/auth/validate.go new file mode 100644 index 0000000..c7c8735 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/auth/validate.go @@ -0,0 +1,74 @@ +package auth + +import ( + "context" + "encoding/base64" + "fmt" + "log" + "strings" + + "github.com/e2b-dev/infra/packages/shared/pkg/models" + "github.com/e2b-dev/infra/packages/shared/pkg/models/accesstoken" + "github.com/e2b-dev/infra/packages/shared/pkg/models/env" + "github.com/e2b-dev/infra/packages/shared/pkg/models/envbuild" + "github.com/e2b-dev/infra/packages/shared/pkg/models/user" +) + +func Validate(ctx context.Context, db *models.Client, token, envID string) (bool, error) { + u, err := db.User.Query().Where(user.HasAccessTokensWith(accesstoken.AccessToken(token))).WithTeams().Only(ctx) + if err != nil { + return false, err + } + + e, err := db.Env.Query().Where( + env.ID(envID), + env.HasBuildsWith(envbuild.StatusEQ(envbuild.StatusWaiting)), + ).Only(ctx) + if err != nil { + return false, err + } + + for _, team := range u.Edges.Teams { + if team.ID == e.TeamID { + return true, nil + } + } + + return false, nil +} + +func ValidateAccessToken(ctx context.Context, db *models.Client, accessToken string) bool { + exists, err := db.AccessToken.Query().Where(accesstoken.AccessToken(accessToken)).Exist(ctx) + if err != nil { + log.Printf("Error while checking access token: %s\n", err.Error()) + return false + } + + return exists +} + +func ExtractAccessToken(authHeader, authType string) (string, error) { + encodedLoginInfo := strings.TrimSpace(strings.TrimPrefix(authHeader, authType)) + + loginInfo, err := base64.StdEncoding.DecodeString(encodedLoginInfo) + if err != nil { + return "", fmt.Errorf("error while decoding login info for %s: %s", encodedLoginInfo, err) + } + + loginInfoParts := strings.Split(string(loginInfo), ":") + if len(loginInfoParts) != 2 { + return "", fmt.Errorf("invalid login info format %s", string(loginInfo)) + } + + username := loginInfoParts[0] + if username != "_e2b_access_token" { + return "", fmt.Errorf("invalid username %s", username) + } + + accessToken := strings.TrimSpace(loginInfoParts[1]) + if strings.HasPrefix(accessToken, "\"") && strings.HasSuffix(accessToken, "\"") { + return strings.Trim(accessToken, "\""), nil + } + // There can be extra whitespace in the token when the user uses Windows + return accessToken, nil +} diff --git a/packages/docker-reverse-proxy/internal/cache/auth.go b/packages/docker-reverse-proxy/internal/cache/auth.go new file mode 100644 index 0000000..ef95fe5 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/cache/auth.go @@ -0,0 +1,65 @@ +package cache + +import ( + "fmt" + "log" + "time" + + "github.com/jellydator/ttlcache/v3" + + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/utils" +) + +const ( + authInfoExpiration = time.Hour * 2 +) + +type AccessTokenData struct { + DockerToken string + TemplateID string +} + +type AuthCache struct { + cache *ttlcache.Cache[string, *AccessTokenData] +} + +func New() *AuthCache { + cache := ttlcache.New(ttlcache.WithTTL[string, *AccessTokenData](authInfoExpiration)) + + go cache.Start() + + return &AuthCache{cache: cache} +} + +// Get returns the auth token for the given teamID and e2bToken. +func (c *AuthCache) Get(e2bToken string) (*AccessTokenData, error) { + if e2bToken == "" { + return nil, fmt.Errorf("e2bToken is empty") + } + + item := c.cache.Get(e2bToken) + + if item == nil { + return nil, fmt.Errorf("creds for '%s' not found in cache", e2bToken) + } + + return item.Value(), nil +} + +// Create creates a new auth token for the given templateID and accessToken and returns e2bToken +func (c *AuthCache) Create(templateID, token string, expiresIn int) string { + // Get docker token from the actual registry for the scope, + // Create a new e2b token for the user and store it in the cache + userToken := utils.GenerateRandomString(128) + jsonResponse := fmt.Sprintf(`{"token": "%s", "expires_in": %d}`, userToken, expiresIn) + + data := &AccessTokenData{ + DockerToken: token, + TemplateID: templateID, + } + + c.cache.Set(userToken, data, authInfoExpiration) + + log.Printf("Created new auth token for '%s' expiring in '%d'\n", templateID, expiresIn) + return jsonResponse +} diff --git a/packages/docker-reverse-proxy/internal/constants/aws.go b/packages/docker-reverse-proxy/internal/constants/aws.go new file mode 100644 index 0000000..d835432 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/constants/aws.go @@ -0,0 +1,183 @@ +package constants + +import ( + "fmt" + "io" + "log" + "net/http" + "os" + "sync" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/aws/session" + "github.com/aws/aws-sdk-go/service/sts" +) + +var ( + // AWS environment variables + AWSRegion = os.Getenv("AWS_REGION") + AWSECRRepository = os.Getenv("AWS_ECR_REPOSITORY_NAME") + AWSAccessKeyID = os.Getenv("AWS_ACCESS_KEY_ID") + AWSSecretAccessKey = os.Getenv("AWS_SECRET_ACCESS_KEY") + AWSAccountID = os.Getenv("AWS_ACCOUNT_ID") + + // AWS dynamic configuration + awsAccountID string + awsRegion string + awsRegistryHost string + awsUploadPrefix string + + awsConfigOnce sync.Once + awsConfigErr error + awsSession *session.Session +) + +// 尝试从 EC2 实例元数据服务获取区域信息 +func getRegionFromEC2Metadata() (string, error) { + client := &http.Client{ + Timeout: 2 * time.Second, // 设置较短的超时时间 + } + + resp, err := client.Get("http://169.254.169.254/latest/meta-data/placement/region") + if err != nil { + return "", fmt.Errorf("failed to get region from EC2 metadata: %v", err) + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + return "", fmt.Errorf("EC2 metadata service returned non-OK status: %d", resp.StatusCode) + } + + regionBytes, err := io.ReadAll(resp.Body) + if err != nil { + return "", fmt.Errorf("failed to read region from EC2 metadata: %v", err) + } + + region := string(regionBytes) + if region == "" { + return "", fmt.Errorf("empty region from EC2 metadata") + } + + return region, nil +} + +// InitAWSConfig 初始化 AWS 配置信息 +func InitAWSConfig() error { + awsConfigOnce.Do(func() { + // 创建 AWS 会话 + config := &aws.Config{} + + // 处理区域配置 + if AWSRegion != "" { + // 如果环境变量中提供了区域，直接使用 + config.Region = aws.String(AWSRegion) + log.Printf("Using region from environment variable: %s", AWSRegion) + } else { + // 尝试从 EC2 元数据获取区域 + metadataRegion, err := getRegionFromEC2Metadata() + if err == nil && metadataRegion != "" { + config.Region = aws.String(metadataRegion) + log.Printf("Using region from EC2 metadata: %s", metadataRegion) + } else { + log.Printf("Could not get region from EC2 metadata: %v", err) + } + } + + // 处理凭证配置 + if AWSAccessKeyID != "" && AWSSecretAccessKey != "" { + config.Credentials = credentials.NewStaticCredentials( + AWSAccessKeyID, + AWSSecretAccessKey, + "", + ) + log.Printf("Using AWS credentials from environment variables") + } + + // 创建 AWS 会话 + var err error + awsSession, err = session.NewSession(config) + if err != nil { + awsConfigErr = fmt.Errorf("failed to create AWS session: %v", err) + return + } + + // 获取 AWS 账户 ID + if AWSAccountID != "" { + awsAccountID = AWSAccountID + } else { + // 通过 STS 获取账户 ID + stsClient := sts.New(awsSession) + result, err := stsClient.GetCallerIdentity(&sts.GetCallerIdentityInput{}) + if err != nil { + awsConfigErr = fmt.Errorf("failed to get AWS account ID: %v", err) + return + } + awsAccountID = *result.Account + } + + // 确定最终使用的区域 + if AWSRegion != "" { + awsRegion = AWSRegion + } else if awsSession.Config.Region != nil && *awsSession.Config.Region != "" { + awsRegion = *awsSession.Config.Region + log.Printf("Using region from AWS session: %s", awsRegion) + } else { + // 如果仍然无法获取区域，使用默认区域 + awsRegion = "us-east-1" // 默认区域 + log.Printf("No region found, using default: %s", awsRegion) + } + + // 设置注册表主机 + awsRegistryHost = fmt.Sprintf("%s.dkr.ecr.%s.amazonaws.com", awsAccountID, awsRegion) + }) + + return awsConfigErr +} + +// GetAWSSession 返回 AWS 会话 +func GetAWSSession() (*session.Session, error) { + if err := InitAWSConfig(); err != nil { + return nil, err + } + return awsSession, nil +} + +// GetAWSAccountID 返回 AWS 账户 ID +func GetAWSAccountID() (string, error) { + if err := InitAWSConfig(); err != nil { + return "", err + } + return awsAccountID, nil +} + +// GetAWSRegion 返回 AWS 区域 +func GetAWSRegion() (string, error) { + if err := InitAWSConfig(); err != nil { + return "", err + } + return awsRegion, nil +} + +// GetAWSRegistryHost 返回 AWS ECR 注册表主机 +func GetAWSRegistryHost() (string, error) { + if err := InitAWSConfig(); err != nil { + return "", err + } + return awsRegistryHost, nil +} + +// GetAWSUploadPrefix 返回 AWS ECR 上传前缀 +// 使用 base_repo_name/template_id 格式的仓库名称 +func GetAWSUploadPrefix(templateID string) (string, error) { + if err := InitAWSConfig(); err != nil { + return "", err + } + + // 使用 base_repo_name/template_id 格式的仓库名称 + templateRepo := fmt.Sprintf("%s/%s", AWSECRRepository, templateID) + + // 返回上传前缀 + return fmt.Sprintf("/v2/%s/blobs/uploads/", templateRepo), nil +} diff --git a/packages/docker-reverse-proxy/internal/constants/main.go b/packages/docker-reverse-proxy/internal/constants/main.go new file mode 100644 index 0000000..08da737 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/constants/main.go @@ -0,0 +1,76 @@ +package constants + +import ( + "fmt" + "os" + "strings" + + "github.com/e2b-dev/infra/packages/shared/pkg/consts" +) + +// CloudProvider represents the cloud provider type +type CloudProvider string + +const ( + GCP CloudProvider = "gcp" + AWS CloudProvider = "aws" +) + +// Current cloud provider based on environment variable +var CurrentCloudProvider = getCloudProvider() + +func getCloudProvider() CloudProvider { + provider := os.Getenv("CLOUD_PROVIDER") + if provider == "aws" { + return AWS + } + return GCP // Default to GCP if not specified +} + +func CheckRequired() error { + var missing []string + + // Common required variables + if consts.Domain == "" { + missing = append(missing, "DOMAIN_NAME") + } + + // Check GCP specific variables if GCP is the provider + if CurrentCloudProvider == GCP { + if consts.GCPProject == "" { + missing = append(missing, "GCP_PROJECT_ID") + } + + if consts.DockerRegistry == "" { + missing = append(missing, "GCP_DOCKER_REPOSITORY_NAME") + } + + if consts.GoogleServiceAccountSecret == "" { + missing = append(missing, "GOOGLE_SERVICE_ACCOUNT_BASE64") + } + + if consts.GCPRegion == "" { + missing = append(missing, "GCP_REGION") + } + } + + // Check AWS specific variables if AWS is the provider + if CurrentCloudProvider == AWS { + if AWSECRRepository == "" { + missing = append(missing, "AWS_ECR_REPOSITORY_NAME") + } + + // Initialize AWS config to check if we can get the required information + if err := InitAWSConfig(); err != nil { + return fmt.Errorf("failed to initialize AWS config: %v", err) + } + } + + if len(missing) > 0 { + return fmt.Errorf("missing environment variables: %s", strings.Join(missing, ", ")) + } + + return nil +} + +var GCPArtifactUploadPrefix = fmt.Sprintf("/artifacts-uploads/namespaces/%s/repositories/%s/uploads/", consts.GCPProject, consts.DockerRegistry) diff --git a/packages/docker-reverse-proxy/internal/handlers/health.go b/packages/docker-reverse-proxy/internal/handlers/health.go new file mode 100644 index 0000000..d243155 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/handlers/health.go @@ -0,0 +1,7 @@ +package handlers + +import "net/http" + +func (a *APIStore) HealthCheck(w http.ResponseWriter, _ *http.Request) { + w.WriteHeader(http.StatusOK) +} diff --git a/packages/docker-reverse-proxy/internal/handlers/login.go b/packages/docker-reverse-proxy/internal/handlers/login.go new file mode 100644 index 0000000..6bd3457 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/handlers/login.go @@ -0,0 +1,24 @@ +package handlers + +import ( + "log" + "net/http" + "strings" + + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/utils" +) + +// LoginWithToken Validates the token by checking if the generated token is in the cache. +func (a *APIStore) LoginWithToken(w http.ResponseWriter, r *http.Request) error { + authHeader := r.Header.Get("Authorization") + e2bToken := strings.TrimPrefix(authHeader, "Bearer ") + _, err := a.AuthCache.Get(e2bToken) + if err != nil { + log.Printf("Error while logging with access token: %s, header: %s\n", err, authHeader) + utils.SetDockerUnauthorizedHeaders(w) + + return err + } + + return nil +} diff --git a/packages/docker-reverse-proxy/internal/handlers/proxy.go b/packages/docker-reverse-proxy/internal/handlers/proxy.go new file mode 100644 index 0000000..769b301 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/handlers/proxy.go @@ -0,0 +1,191 @@ +package handlers + +import ( + "fmt" + "io" + "log" + "net/http" + "strings" + "time" + + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/auth" + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/cache" + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/constants" + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/utils" + "github.com/e2b-dev/infra/packages/shared/pkg/consts" +) + +func (a *APIStore) Proxy(w http.ResponseWriter, req *http.Request) { + // Check if the request is for the correct repository + path := req.URL.String() + log.Printf("[DEBUG] Proxy - Handling request: %s %s", req.Method, path) + + // Validate the token by checking if the generated token is in the cache + authHeader := req.Header.Get("Authorization") + log.Printf("[DEBUG] Proxy - Auth header: %s", authHeader) + e2bToken := strings.TrimPrefix(authHeader, "Bearer ") + token, err := a.AuthCache.Get(e2bToken) + if err != nil { + log.Printf("Error while getting token for %s: %s, header: %s\n", path, err, authHeader) + utils.SetDockerUnauthorizedHeaders(w) + return + } + + log.Printf("[DEBUG] Proxy - Found token in cache for template ID: %s, docker token (first 10 chars): %s...", + token.TemplateID, token.DockerToken[:10]) + + // Handle based on cloud provider + if constants.CurrentCloudProvider == constants.GCP { + // Set the Authorization header for the request to the real docker registry + req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token.DockerToken)) + log.Printf("[DEBUG] Proxy - Set Bearer Authorization header for GCP") + handleGCPProxy(a, w, req, path, token) + } else if constants.CurrentCloudProvider == constants.AWS { + // For AWS ECR, we'll handle authentication in handleAWSProxy + log.Printf("[DEBUG] Proxy - Delegating to AWS ECR proxy handler") + handleAWSProxy(a, w, req, path, token) + } else { + log.Printf("Unsupported cloud provider for path: %s\n", path) + w.WriteHeader(http.StatusInternalServerError) + } +} + +func handleGCPProxy(a *APIStore, w http.ResponseWriter, req *http.Request, path string, token *cache.AccessTokenData) { + // Allow access to the GCP artifact uploads. + // The url is generated by repository and sent as a Location header from the /blobs/upload request + // https://distribution.github.io/distribution/spec/api/#starting-an-upload + // Other methods than PATCH require the Authorization header + if strings.HasPrefix(path, constants.GCPArtifactUploadPrefix) { + a.ServeHTTP(w, req) + return + } + + repoPrefix := "/v2/e2b/custom-envs/" + realRepoPrefix := fmt.Sprintf("/v2/%s/%s/", consts.GCPProject, consts.DockerRegistry) + if !strings.HasPrefix(path, repoPrefix) && !strings.HasPrefix(path, realRepoPrefix) { + // The request shouldn't need any other endpoints, we deny access + log.Printf("No matching route found for path: %s\n", path) + + w.WriteHeader(http.StatusForbidden) + return + } + + templateID := token.TemplateID + + // Uploading blobs doesn't have the template ID in the path + if strings.HasPrefix(path, fmt.Sprintf("%spkg/blobs/uploads/", realRepoPrefix)) { + a.ServeHTTP(w, req) + + return + } + + pathInRepo := strings.TrimPrefix(path, repoPrefix) + templateWithBuildID := strings.Split(strings.Split(pathInRepo, "/")[0], ":") + + // If the template ID in the path is different from the token template ID, deny access + if templateWithBuildID[0] != templateID { + w.WriteHeader(http.StatusForbidden) + log.Printf("Access denied for template: %s\n", templateID) + + return + } + + // Set the host and access token for the real docker registry + req.URL.Path = strings.Replace(req.URL.Path, repoPrefix, realRepoPrefix, 1) + + a.ServeHTTP(w, req) +} + +func handleAWSProxy(a *APIStore, w http.ResponseWriter, req *http.Request, path string, token *cache.AccessTokenData) { + templateID := token.TemplateID + + // 确保 ECR 仓库存在 + err := auth.EnsureECRRepositoryExists(templateID) + if err != nil { + log.Printf("[ERROR] Error ensuring ECR repository exists: %v", err) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(fmt.Sprintf("Failed to ensure ECR repository exists: %v", err))) + return + } + + log.Printf("[INFO] AWS Proxy - Request: %s %s", req.Method, req.URL.Path) + + // 使用缓存中的令牌，而不是每次都获取新的令牌 + req.Header.Set("Authorization", fmt.Sprintf("Basic %s", token.DockerToken)) + log.Printf("[DEBUG] AWS Proxy - Set Basic auth header for AWS ECR using cached token") + + // 测试认证是否有效 + testClient := &http.Client{ + Timeout: 5 * time.Second, + } + + // 获取 AWS 注册表主机 + registryHost, err := constants.GetAWSRegistryHost() + if err != nil { + log.Printf("[ERROR] Failed to get AWS registry host: %v", err) + } else { + testReq, _ := http.NewRequest("GET", fmt.Sprintf("https://%s/v2/", registryHost), nil) + testReq.Header.Set("Authorization", fmt.Sprintf("Basic %s", token.DockerToken)) + testResp, testErr := testClient.Do(testReq) + if testErr != nil { + log.Printf("[ERROR] AWS ECR Auth Test - Failed to connect: %v", testErr) + } else { + defer testResp.Body.Close() + log.Printf("[INFO] AWS ECR Auth Test - Status: %d", testResp.StatusCode) + if testResp.StatusCode == http.StatusOK { + log.Printf("[INFO] AWS ECR Auth Test - Basic auth successful") + } else if testResp.StatusCode == http.StatusUnauthorized { + log.Printf("[ERROR] AWS ECR Auth Test - Basic auth failed (Unauthorized)") + respBody, _ := io.ReadAll(testResp.Body) + log.Printf("[ERROR] AWS ECR Auth Test - Response: %s", string(respBody)) + } else { + log.Printf("[WARN] AWS ECR Auth Test - Unexpected status code") + respBody, _ := io.ReadAll(testResp.Body) + log.Printf("[WARN] AWS ECR Auth Test - Response: %s", string(respBody)) + } + } + } + + // 客户端请求路径前缀 + repoPrefix := "/v2/e2b/custom-envs/" + + // 对于 AWS ECR，使用 base_repo_name 作为基础仓库名 + baseRepo := strings.Trim(constants.AWSECRRepository, "/") + + // 设置真实的仓库前缀，包含 templateID + realRepoPrefix := fmt.Sprintf("/v2/%s/%s/", baseRepo, templateID) + + // 如果路径不是以客户端仓库前缀开头，拒绝访问 + if !strings.HasPrefix(path, repoPrefix) { + log.Printf("[ERROR] No matching route found for path: %s", path) + w.WriteHeader(http.StatusForbidden) + return + } + + // 提取路径中的模板 ID + pathInRepo := strings.TrimPrefix(path, repoPrefix) + templateWithBuildID := strings.Split(strings.Split(pathInRepo, "/")[0], ":") + + // 如果路径中的模板 ID 与令牌中的不同，拒绝访问 + if templateWithBuildID[0] != templateID { + log.Printf("[ERROR] Access denied: path template ID %s doesn't match token template ID %s", + templateWithBuildID[0], templateID) + w.WriteHeader(http.StatusForbidden) + return + } + + // 替换路径前缀，确保不会重复 templateID + newPath := strings.Replace(req.URL.Path, + fmt.Sprintf("%s%s", repoPrefix, templateID), + realRepoPrefix, + 1) + + // 移除任何双斜杠 + newPath = strings.ReplaceAll(newPath, "//", "/") + req.URL.Path = newPath + + log.Printf("[DEBUG] AWS Proxy - Converted path: %s", req.URL.Path) + + // 代理请求 + a.ServeHTTP(w, req) +} diff --git a/packages/docker-reverse-proxy/internal/handlers/store.go b/packages/docker-reverse-proxy/internal/handlers/store.go new file mode 100644 index 0000000..86e84c7 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/handlers/store.go @@ -0,0 +1,169 @@ +package handlers + +import ( + "fmt" + "io" + "log" + "net/http" + "net/http/httputil" + "net/url" + "strings" + + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/cache" + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/constants" + "github.com/e2b-dev/infra/packages/shared/pkg/consts" + "github.com/e2b-dev/infra/packages/shared/pkg/db" +) + +type APIStore struct { + db *db.DB + AuthCache *cache.AuthCache + proxy *httputil.ReverseProxy +} + +func NewStore() *APIStore { + authCache := cache.New() + database, err := db.NewClient(3, 2) + if err != nil { + log.Fatal(err) + } + + var targetUrl *url.URL + + // Set the target URL based on the cloud provider + if constants.CurrentCloudProvider == constants.GCP { + targetUrl = &url.URL{ + Scheme: "https", + Host: fmt.Sprintf("%s-docker.pkg.dev", consts.GCPRegion), + } + log.Printf("[DEBUG] Store - Using GCP target URL: %s", targetUrl) + } else if constants.CurrentCloudProvider == constants.AWS { + // Get AWS registry host + registryHost, err := constants.GetAWSRegistryHost() + if err != nil { + log.Fatalf("Failed to get AWS registry host: %v", err) + } + + targetUrl = &url.URL{ + Scheme: "https", + Host: registryHost, + } + log.Printf("[DEBUG] Store - Using AWS target URL: %s", targetUrl) + + // Get additional AWS info for debugging + accountID, _ := constants.GetAWSAccountID() + region, _ := constants.GetAWSRegion() + log.Printf("[DEBUG] Store - AWS Account ID: %s, Region: %s, Repository: %s", + accountID, region, constants.AWSECRRepository) + } else { + log.Fatal("Unsupported cloud provider") + } + + proxy := httputil.NewSingleHostReverseProxy(targetUrl) + + // Custom ModifyResponse function + proxy.ModifyResponse = func(resp *http.Response) error { + // 记录所有响应，特别关注错误响应 + if resp.StatusCode >= 400 { + log.Printf("[ERROR] Proxy Response - Status: %d, URL: %s, Method: %s", + resp.StatusCode, resp.Request.URL, resp.Request.Method) + + // 读取响应体 + respBody, err := io.ReadAll(resp.Body) + if err != nil { + log.Printf("[ERROR] Failed to read response body: %v", err) + return nil + } + + bodyStr := string(respBody) + + // 记录详细的错误信息 + log.Printf("[ERROR] Detailed error response [%d] for %s %s:", + resp.StatusCode, resp.Request.Method, resp.Request.URL) + log.Printf("[ERROR] Response body: %s", bodyStr) + + // 特别检查认证错误 + if resp.StatusCode == http.StatusUnauthorized { + log.Printf("[ERROR] Authentication error detected!") + + // 检查是否包含 "Not Authorized" 错误 + if strings.Contains(bodyStr, "Not Authorized") { + log.Printf("[ERROR] ECR Not Authorized error detected!") + + // 记录请求头信息 + log.Printf("[ERROR] Request headers:") + for name, values := range resp.Request.Header { + if name == "Authorization" { + authParts := strings.Split(values[0], " ") + if len(authParts) >= 2 { + log.Printf("[ERROR] %s: %s ***", name, authParts[0]) + } else { + log.Printf("[ERROR] %s: ***", name) + } + } else { + log.Printf("[ERROR] %s: %v", name, values) + } + } + } + } + log.Printf("[ERROR] Detailed error response [%d] for %s %s:", + resp.StatusCode, resp.Request.Method, resp.Request.URL) + log.Printf("[ERROR] Response body: %s", bodyStr) + + // 记录请求头信息（不包括完整的授权令牌） + log.Printf("[ERROR] Request headers:") + for name, values := range resp.Request.Header { + if name == "Authorization" { + authParts := strings.Split(values[0], " ") + if len(authParts) >= 2 { + log.Printf("[ERROR] %s: %s ***", name, authParts[0]) + } else { + log.Printf("[ERROR] %s: ***", name) + } + } else { + log.Printf("[ERROR] %s: %v", name, values) + } + } + + // 记录响应头信息 + log.Printf("[ERROR] Response headers:") + for name, values := range resp.Header { + log.Printf("[ERROR] %s: %v", name, values) + } + + // 创建一个新的读取器，包含相同的内容供下一个处理程序使用 + resp.Body = io.NopCloser(strings.NewReader(bodyStr)) + } + + return nil + } + + // Add custom director function for more control + originalDirector := proxy.Director + proxy.Director = func(req *http.Request) { + originalDirector(req) + + // 只记录基本请求信息 + log.Printf("[INFO] Proxy Director - Forwarding request to: %s %s", + req.Method, req.URL.String()) + + // 对于PUT请求和digest参数，记录特殊调试信息 + if req.Method == http.MethodPut && req.URL.Query().Get("digest") != "" { + log.Printf("[INFO] Proxy Director - PUT request with digest: %s", req.URL.Query().Get("digest")) + } + } + + return &APIStore{ + db: database, + AuthCache: authCache, + proxy: proxy, + } +} + +func (a *APIStore) ServeHTTP(rw http.ResponseWriter, req *http.Request) { + // Set the host to the URL host + req.Host = req.URL.Host + log.Printf("[INFO] ServeHTTP - Proxying request to: %s %s", req.Method, req.URL.String()) + + a.proxy.ServeHTTP(rw, req) +} diff --git a/packages/docker-reverse-proxy/internal/handlers/token.go b/packages/docker-reverse-proxy/internal/handlers/token.go new file mode 100644 index 0000000..0f5bdd8 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/handlers/token.go @@ -0,0 +1,192 @@ +package handlers + +import ( + "encoding/json" + "fmt" + "io" + "log" + "net/http" + "regexp" + "strings" + "time" + + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/auth" + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/constants" + "github.com/e2b-dev/infra/packages/shared/pkg/consts" +) + +type DockerToken struct { + Token string `json:"token"` + ExpiresIn int `json:"expires_in"` +} + +// The scope is in format "repository://:" +var scopeRegex = regexp.MustCompile(`^repository:e2b/custom-envs/(?P[^:]+):(?P[^:]+)$`) + +// GetToken validates if user has access to template and then returns a new token for the required scope +func (a *APIStore) GetToken(w http.ResponseWriter, r *http.Request) error { + ctx := r.Context() + + // To get the token, the docker CLI uses Basic Auth in format "username:password", + // where username should be "_e2b_access_token" and password is the actual access token + authHeader := r.Header.Get("Authorization") + + accessToken, err := auth.ExtractAccessToken(authHeader, "Basic ") + if err != nil { + w.WriteHeader(http.StatusBadRequest) + return fmt.Errorf("error while extracting access token: %s", err) + } + + if !auth.ValidateAccessToken(ctx, a.db.Client, accessToken) { + log.Printf("Invalid access token: '%s'\n", accessToken) + + w.WriteHeader(http.StatusForbidden) + w.Write([]byte("invalid access token")) + + return fmt.Errorf("invalid access token") + } + + scope := r.URL.Query().Get("scope") + hasScope := scope != "" + + if !hasScope { + // If the scope is not provided, create a new token for the user, + // but don't grant any access to the underlying repository. + jsonResponse := a.AuthCache.Create("not-yet-known", "undefined-docker-token", int(time.Hour.Seconds())) + + w.Header().Set("Content-Type", "application/json") + w.Write([]byte(jsonResponse)) + + return nil + } + + scopeRegexMatches := scopeRegex.FindStringSubmatch(scope) + if len(scopeRegexMatches) == 0 { + w.WriteHeader(http.StatusBadRequest) + + return fmt.Errorf("invalid scope %s", scope) + } + + templateID := scopeRegexMatches[1] + action := scopeRegexMatches[2] + + // Don't allow a delete actions + if strings.Contains(action, "delete") { + w.WriteHeader(http.StatusForbidden) + + return fmt.Errorf("access denied for scope %s", scope) + } + + // Validate if the user has access to the template + hasAccess, err := auth.Validate(ctx, a.db.Client, accessToken, templateID) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + + return fmt.Errorf("error while validating access: %s", err) + } + + if !hasAccess { + w.WriteHeader(http.StatusForbidden) + + return fmt.Errorf("access denied for env: %s", templateID) + } + + // Get docker token from the actual registry based on cloud provider + var dockerToken *DockerToken + if constants.CurrentCloudProvider == constants.GCP { + dockerToken, err = getGCPToken(templateID) + } else if constants.CurrentCloudProvider == constants.AWS { + dockerToken, err = getAWSToken(templateID) + } else { + err = fmt.Errorf("unsupported cloud provider") + } + + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + return fmt.Errorf("error while getting docker token: %s", err) + } + + jsonResponse := a.AuthCache.Create(templateID, dockerToken.Token, dockerToken.ExpiresIn) + + w.Header().Set("Content-Type", "application/json") + w.Write([]byte(jsonResponse)) + + return nil +} + +// getGCPToken gets a new token from the GCP Artifact Registry for the required scope +func getGCPToken(templateID string) (*DockerToken, error) { + scope := fmt.Sprintf( + "?service=%s-docker.pkg.dev&scope=repository:%s/%s/%s:push,pull", + consts.GCPRegion, + consts.GCPProject, + consts.DockerRegistry, + templateID, + ) + url := fmt.Sprintf( + "https://%s-docker.pkg.dev/v2/token%s", + consts.GCPRegion, + scope, + ) + + r, err := http.NewRequest(http.MethodGet, url, nil) + if err != nil { + return nil, fmt.Errorf("failed to create request for scope - %s: %w", templateID, err) + } + + // Use the service account credentials for the request + r.Header.Set("Authorization", fmt.Sprintf("Basic %s", consts.EncodedDockerCredentials)) + + resp, err := http.DefaultClient.Do(r) + if err != nil { + return nil, fmt.Errorf("failed to get token for scope - %s: %w", templateID, err) + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + body := make([]byte, resp.ContentLength) + _, err := resp.Body.Read(body) + if err != nil { + return nil, fmt.Errorf("failed to read body for failed token acquisition (%d) for scope - %s: %w", resp.StatusCode, templateID, err) + } + defer resp.Body.Close() + + return nil, fmt.Errorf("failed to get token (%d) for scope - %s: %s", resp.StatusCode, templateID, string(body)) + } + + body, err := io.ReadAll(resp.Body) + if err != nil { + return nil, fmt.Errorf("failed to read body for successful token acquisition for scope - %s: %w", templateID, err) + } + + parsedBody := &DockerToken{} + err = json.Unmarshal(body, parsedBody) + if err != nil { + return nil, fmt.Errorf("failed to parse body for successful token acquisition for scope - %s: %w", templateID, err) + } + + return parsedBody, nil +} + +// getAWSToken gets a new token from AWS ECR for the required scope +func getAWSToken(templateID string) (*DockerToken, error) { + // First, ensure the ECR repository exists for this template + err := auth.EnsureECRRepositoryExists(templateID) + if err != nil { + return nil, fmt.Errorf("failed to ensure ECR repository exists: %w", err) + } + + // For AWS ECR, we use the AWS SDK to get the authorization token + authResponse, err := auth.GetAWSECRAuthToken() + if err != nil { + return nil, fmt.Errorf("failed to get AWS ECR auth token: %w", err) + } + + // 直接返回完整的 base64 编码令牌 + log.Printf("[DEBUG] ECR Token - Got token expiring at: %s", authResponse.ExpiresAt.Format(time.RFC3339)) + + return &DockerToken{ + Token: authResponse.Token, // 返回完整的 base64 编码令牌 + ExpiresIn: int(time.Until(authResponse.ExpiresAt).Seconds()), + }, nil +} diff --git a/packages/docker-reverse-proxy/internal/utils/authorization.go b/packages/docker-reverse-proxy/internal/utils/authorization.go new file mode 100644 index 0000000..06d4b37 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/utils/authorization.go @@ -0,0 +1,17 @@ +package utils + +import ( + "fmt" + "net/http" + + "github.com/e2b-dev/infra/packages/shared/pkg/consts" +) + +// SetDockerUnauthorizedHeaders https://distribution.github.io/distribution/spec/api/#api-version-check +func SetDockerUnauthorizedHeaders(w http.ResponseWriter) { + // Set the WWW-Authenticate header to indicate the next action + w.Header().Set("Www-Authenticate", fmt.Sprintf("Bearer realm=\"https://docker.%s/v2/token\"", consts.Domain)) + // Required for docker registry v2 + w.Header().Set("Docker-Distribution-API-Version", "registry/2.0") + w.WriteHeader(http.StatusUnauthorized) +} diff --git a/packages/docker-reverse-proxy/internal/utils/random.go b/packages/docker-reverse-proxy/internal/utils/random.go new file mode 100644 index 0000000..5f64b89 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/utils/random.go @@ -0,0 +1,15 @@ +package utils + +import ( + "crypto/rand" + "encoding/base64" +) + +func GenerateRandomString(length int) string { + b := make([]byte, length) + _, err := rand.Read(b) + if err != nil { + panic(err) + } + return base64.StdEncoding.EncodeToString(b) +} diff --git a/packages/docker-reverse-proxy/internal/utils/string.go b/packages/docker-reverse-proxy/internal/utils/string.go new file mode 100644 index 0000000..1e317b6 --- /dev/null +++ b/packages/docker-reverse-proxy/internal/utils/string.go @@ -0,0 +1,8 @@ +package utils + +func SubstringMax(s string, max int) string { + if len(s) <= max { + return s + } + return s[:max] + "..." +} diff --git a/packages/docker-reverse-proxy/main.go b/packages/docker-reverse-proxy/main.go new file mode 100644 index 0000000..f2e580b --- /dev/null +++ b/packages/docker-reverse-proxy/main.go @@ -0,0 +1,108 @@ +package main + +import ( + "flag" + "fmt" + "log" + "net/http" + "strconv" + "strings" + + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/constants" + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/handlers" + "github.com/e2b-dev/infra/packages/docker-reverse-proxy/internal/utils" +) + +var commitSHA string + +func main() { + err := constants.CheckRequired() + if err != nil { + log.Fatal(err) + } + + port := flag.Int("port", 5000, "Port for test HTTP server") + flag.Parse() + + log.Println("Starting docker reverse proxy", "commit", commitSHA, "cloud provider", constants.CurrentCloudProvider) + + store := handlers.NewStore() + + // https://distribution.github.io/distribution/spec/api/ + http.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) { + path := req.URL.String() + log.Printf("Request: %s %s\n", req.Method, utils.SubstringMax(path, 100)) + + // Health check for nomad + if req.URL.Path == "/health" { + store.HealthCheck(w, req) + return + } + + // Handle PATCH requests for artifact uploads based on cloud provider + if req.Method == http.MethodPatch { + if constants.CurrentCloudProvider == constants.GCP && strings.HasPrefix(path, constants.GCPArtifactUploadPrefix) { + store.ServeHTTP(w, req) + return + } else if constants.CurrentCloudProvider == constants.AWS { + // For AWS, we need to extract the template ID from the path to get the correct upload prefix + // Path format: /v2/e2b/custom-envs/{templateID}/blobs/uploads/... + repoPrefix := "/v2/e2b/custom-envs/" + if strings.HasPrefix(path, repoPrefix) { + pathParts := strings.Split(strings.TrimPrefix(path, repoPrefix), "/") + if len(pathParts) >= 3 && pathParts[1] == "blobs" && pathParts[2] == "uploads" { + templateID := pathParts[0] + log.Printf("[DEBUG] Main - Extracted template ID from path: %s", templateID) + + if strings.HasPrefix(path, fmt.Sprintf("%s%s/blobs/uploads/", repoPrefix, templateID)) { + log.Printf("[DEBUG] Main - Path matches template upload prefix, proxying directly") + store.ServeHTTP(w, req) + return + } + } + } + } + } + + // https://docker-docs.uclv.cu/registry/spec/auth/oauth/ + // We are using Token validation, and not OAuth2, so we need to return 404 for the POST /v2/token endpoint + if req.URL.Path == "/v2/token" && req.Method == http.MethodPost { + w.WriteHeader(http.StatusNotFound) + return + } + + // If the request doesn't have the Authorization header, we return 401 with the url for getting a token + if req.Header.Get("Authorization") == "" { + log.Printf("Authorization header is missing: %s\n", utils.SubstringMax(path, 100)) + utils.SetDockerUnauthorizedHeaders(w) + + return + } + + // Get token to access the Docker repository + if req.URL.Path == "/v2/token" { + err = store.GetToken(w, req) + if err != nil { + log.Printf("Error while getting token: %s\n", err) + } + return + } + + // Verify if the user is logged in with the token + // https://distribution.github.io/distribution/spec/api/#api-version-check + if req.URL.Path == "/v2/" { + err = store.LoginWithToken(w, req) + if err != nil { + log.Printf("Error while logging in with token: %s\n", err) + } + + return + } + + // Proxy all other requests + store.Proxy(w, req) + }) + + log.Printf("Starting server on port: %d\n", *port) + log.Fatal(http.ListenAndServe(fmt.Sprintf(":%s", strconv.Itoa(*port)), nil)) +} diff --git a/packages/docker-reverse-proxy/main.tf b/packages/docker-reverse-proxy/main.tf new file mode 100644 index 0000000..49bb01c --- /dev/null +++ b/packages/docker-reverse-proxy/main.tf @@ -0,0 +1,14 @@ +resource "google_service_account" "docker_registry_service_account" { + account_id = "${var.prefix}docker-reverse-proxy-sa" + display_name = "Docker Reverse Proxy Service Account" +} + +resource "google_artifact_registry_repository_iam_member" "orchestration_repository_member" { + repository = var.custom_envs_repository_name + role = "roles/artifactregistry.writer" + member = "serviceAccount:${google_service_account.docker_registry_service_account.email}" +} + +resource "google_service_account_key" "google_service_key" { + service_account_id = google_service_account.docker_registry_service_account.id +} diff --git a/packages/docker-reverse-proxy/outputs.tf b/packages/docker-reverse-proxy/outputs.tf new file mode 100644 index 0000000..19fbc21 --- /dev/null +++ b/packages/docker-reverse-proxy/outputs.tf @@ -0,0 +1,3 @@ +output "docker_reverse_proxy_service_account_key" { + value = google_service_account_key.google_service_key.private_key +} diff --git a/packages/docker-reverse-proxy/variables.tf b/packages/docker-reverse-proxy/variables.tf new file mode 100644 index 0000000..d28350b --- /dev/null +++ b/packages/docker-reverse-proxy/variables.tf @@ -0,0 +1,9 @@ +variable "custom_envs_repository_name" { + type = string +} + +variable "prefix" { + type = string + description = "The prefix to use for all resources in this module" + default = "e2b-" +} diff --git a/packages/envd/Dockerfile b/packages/envd/Dockerfile deleted file mode 100644 index 9c5a229..0000000 --- a/packages/envd/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM golang:1.23 AS builder - -WORKDIR /build/shared -COPY .shared/go.mod .shared/go.sum ./ -RUN go mod download - -COPY .shared/pkg pkg - -WORKDIR /build/envd -COPY go.mod go.sum ./ -RUN go mod download - -COPY . . - -ARG COMMIT_SHA="" -# Fix any module issues first -RUN go mod tidy -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o bin/envd -ldflags "-X=main.commit=${COMMIT_SHA}" - -FROM alpine:3.17 - -COPY --from=builder /build/envd/bin/envd . -CMD ["/envd"] \ No newline at end of file diff --git a/packages/envd/Makefile b/packages/envd/Makefile index 9e0730d..f6f4c11 100644 --- a/packages/envd/Makefile +++ b/packages/envd/Makefile @@ -1,49 +1,32 @@ -ENV := $(shell cat ../../.last_used_env || echo "not-set") --include ../../.env.${ENV} - BUILD := $(shell git rev-parse --short HEAD) -LDFLAGS=-ldflags "-X=main.commit=$(BUILD)" +LDFLAGS=-ldflags "-X=main.commitSHA=$(BUILD)" .PHONY: init init: brew install protobuf - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 -upload-gcp: +upload: ./upload.sh $(GCP_PROJECT_ID) -upload-aws: - # Create repository if it doesn't exist - $(eval IMAGE := e2b-orchestration/envd) - aws ecr describe-repositories --repository-names $(IMAGE) --region $(AWS_REGION) || \ - aws ecr create-repository --repository-name $(IMAGE) --region $(AWS_REGION) - # Login to ECR - aws ecr get-login-password --region $(AWS_REGION) | sudo docker login --username AWS --password-stdin $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com - # Build and push Docker image - $(eval COMMIT_SHA := $(shell git rev-parse --short HEAD)) - sudo docker buildx install || true # sets up the buildx as default docker builder - sudo docker build --platform linux/amd64 --tag "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" --build-arg COMMIT_SHA="$(COMMIT_SHA)" . - sudo docker push "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" - -upload: - @if [ -n "$(GCP_PROJECT_ID)" ] && [ -n "$(GCP_REGION)" ]; then \ - $(MAKE) upload-gcp; \ - elif [ -n "$(AWS_ACCOUNT_ID)" ] && [ -n "$(AWS_REGION)" ]; then \ - $(MAKE) upload-aws; \ +build: + $(eval ARCHITECTURE := $(shell grep "^CFNARCHITECTURE=" /opt/config.properties | cut -d= -f2 || echo "amd64")) + @if [ "$(ARCHITECTURE)" = "arm64" ]; then \ + echo "Building for arm64 architecture"; \ + CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -a -o bin/envd ${LDFLAGS}; \ else \ - echo "Either GCP_PROJECT_ID and GCP_REGION or AWS_ACCOUNT_ID and AWS_REGION must be set"; \ - exit 1; \ + echo "Building for x86_64 architecture"; \ + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o bin/envd ${LDFLAGS}; \ fi -build: - # Use Docker for building to ensure we have the Go environment - @mkdir -p bin - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o bin/envd ${LDFLAGS} - # sudo docker run --rm -v $(PWD):/app -w /app golang:1.23 bash -c "CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o bin/envd ${LDFLAGS}" - build-debug: - CGO_ENABLED=1 go build -race -gcflags=all="-N -l" -o bin/debug/envd ${LDFLAGS} + $(eval ARCHITECTURE := $(shell grep "^CFNARCHITECTURE=" /opt/config.properties | cut -d= -f2 || echo "amd64")) + @if [ "$(ARCHITECTURE)" = "arm64" ]; then \ + echo "Building for arm64 architecture"; \ + CGO_ENABLED=1 GOARCH=arm64 go build -race -gcflags=all="-N -l" -o bin/debug/envd ${LDFLAGS}; \ + else \ + echo "Building for x86_64 architecture"; \ + CGO_ENABLED=1 GOARCH=amd64 go build -race -gcflags=all="-N -l" -o bin/debug/envd ${LDFLAGS}; \ + fi start-docker: DOCKER_BUILDKIT=1 docker build -t envd-debug . -f debug.Dockerfile @@ -59,49 +42,17 @@ start-docker: /usr/bin/envd -debug build-and-upload: - @rm -rf .shared/ - @cp -r ../shared .shared/ || true - # We'll use docker to build and push directly - $(eval COMMIT_SHA := $(shell git rev-parse --short HEAD)) - @if [ -n "$(GCP_PROJECT_ID)" ] && [ -n "$(GCP_REGION)" ]; then \ - sudo docker build --platform linux/amd64 --tag "$(GCP_REGION)-docker.pkg.dev/$(GCP_PROJECT_ID)/e2b-orchestration/envd:latest" --build-arg COMMIT_SHA="$(COMMIT_SHA)" . && \ - sudo docker push "$(GCP_REGION)-docker.pkg.dev/$(GCP_PROJECT_ID)/e2b-orchestration/envd:latest"; \ - elif [ -n "$(AWS_ACCOUNT_ID)" ]; then \ - aws ecr describe-repositories --repository-names e2b-orchestration/envd --region us-east-1 || \ - aws ecr create-repository --repository-name e2b-orchestration/envd --region us-east-1; \ - aws ecr get-login-password --region us-east-1 | sudo docker login --username AWS --password-stdin $(AWS_ACCOUNT_ID).dkr.ecr.us-east-1.amazonaws.com; \ - sudo docker buildx install || true; \ - sudo docker build --platform linux/amd64 --tag "$(AWS_ACCOUNT_ID).dkr.ecr.us-east-1.amazonaws.com/e2b-orchestration/envd:latest" --build-arg COMMIT_SHA="$(COMMIT_SHA)" . && \ - sudo docker push "$(AWS_ACCOUNT_ID).dkr.ecr.us-east-1.amazonaws.com/e2b-orchestration/envd:latest"; \ - else \ - echo "Either GCP_PROJECT_ID and GCP_REGION or AWS_ACCOUNT_ID must be set"; \ - exit 1; \ - fi - @rm -rf .shared/ + make build + $(eval BUCKET_FC_ENV_PIPELINE := $(shell grep BUCKET_FC_ENV_PIPELINE /opt/config.properties | cut -d'=' -f2)) + @echo "Using bucket: $(BUCKET_FC_ENV_PIPELINE)" + aws s3 cp bin/envd s3://$(BUCKET_FC_ENV_PIPELINE)/envd .PHONY: generate generate: go generate ./... - @if ! command -v buf >/dev/null 2>&1; then \ - echo "buf is not installed. Do you want to install it? (Y/n): "; \ - read choice; \ - if [ "$$choice" = "Y" ]; then \ - go install github.com/bufbuild/buf/cmd/buf@latest && \ - go install google.golang.org/protobuf/cmd/protoc-gen-go@latest && \ - go install connectrpc.com/connect/cmd/protoc-gen-connect-go@latest; \ - else \ - exit 1; \ - fi; \ - fi - cd spec && buf generate - -.PHONY: init-generate -init-generate: - go install github.com/bufbuild/buf/cmd/buf@latest - go install github.com/fullstorydev/grpcurl/cmd/grpcurl@latest - go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - go install connectrpc.com/connect/cmd/protoc-gen-connect-go@latest + cd spec && go tool buf generate --template buf.gen.yaml + cd spec && go tool buf generate --template buf.gen.shared.yaml .PHONY: test test: - go test -v ./... + go test -v ./... \ No newline at end of file diff --git a/packages/envd/debug.Dockerfile b/packages/envd/debug.Dockerfile index 54386c1..d1fb52a 100644 --- a/packages/envd/debug.Dockerfile +++ b/packages/envd/debug.Dockerfile @@ -1,13 +1,24 @@ -FROM golang:1.23 +FROM golang:1.24 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update -RUN apt-get install systemd ca-certificates make python-is-python3 python3 nodejs chrony sudo -y +RUN apt-get install systemd ca-certificates make python-is-python3 python3 nodejs npm chrony sudo -y RUN update-ca-certificates +# Remove password for root. +RUN passwd -d root + +# Create default user. RUN useradd -ms /bin/bash user +RUN usermod -aG sudo user +RUN passwd -d user +RUN echo "user ALL=(ALL:ALL) NOPASSWD: ALL" >>/etc/sudoers + +RUN mkdir -p /home/user +RUN chmod 777 -R /home/user +RUN chmod 777 -R /usr/local RUN go install github.com/go-delve/delve/cmd/dlv@latest diff --git a/packages/envd/go.mod b/packages/envd/go.mod index 7a779e9..869633e 100644 --- a/packages/envd/go.mod +++ b/packages/envd/go.mod @@ -1,47 +1,163 @@ module github.com/e2b-dev/infra/packages/envd -go 1.24.0 - -toolchain go1.24.3 +go 1.24.3 require ( connectrpc.com/authn v0.1.0 - connectrpc.com/connect v1.16.2 + connectrpc.com/connect v1.18.1 connectrpc.com/cors v0.1.0 - github.com/creack/pty v1.1.18 + github.com/creack/pty v1.1.23 github.com/e2b-dev/fsnotify v0.0.0-20241216145137-2fe5d32bcb51 github.com/e2b-dev/infra/packages/shared v0.0.0 - github.com/go-chi/chi/v5 v5.0.12 - github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 + github.com/go-chi/chi/v5 v5.2.2 github.com/oapi-codegen/runtime v1.1.1 - github.com/rs/cors v1.11.0 - github.com/rs/zerolog v1.33.0 - google.golang.org/protobuf v1.35.1 + github.com/rs/cors v1.11.1 + github.com/rs/zerolog v1.34.0 + github.com/shirou/gopsutil/v4 v4.24.10 + github.com/stretchr/testify v1.10.0 + google.golang.org/protobuf v1.36.6 ) require ( + buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.6-20250121211742-6d880cc6cc8d.1 // indirect + buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250425153114-8976f5be98c1.1 // indirect + buf.build/gen/go/bufbuild/registry/connectrpc/go v1.18.1-20250424215339-a457693b5db4.1 // indirect + buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.6-20250424215339-a457693b5db4.1 // indirect + buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.6-20241007202033-cf42259fcbfc.1 // indirect + buf.build/go/app v0.1.0 // indirect + buf.build/go/bufplugin v0.9.0 // indirect + buf.build/go/interrupt v1.1.0 // indirect + buf.build/go/protovalidate v0.12.0 // indirect + buf.build/go/protoyaml v0.6.0 // indirect + buf.build/go/spdx v0.2.0 // indirect + buf.build/go/standard v0.1.0 // indirect + cel.dev/expr v0.24.0 // indirect + connectrpc.com/otelconnect v0.7.2 // indirect + github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect + github.com/antlr4-go/antlr/v4 v4.13.1 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect + github.com/bufbuild/buf v1.54.0 // indirect + github.com/bufbuild/protocompile v0.14.1 // indirect + github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1 // indirect + github.com/cenkalti/backoff/v5 v5.0.2 // indirect + github.com/containerd/log v0.1.0 // indirect + github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dchest/uniuri v1.2.0 // indirect + github.com/distribution/reference v0.6.0 // indirect + github.com/docker/cli v28.1.1+incompatible // indirect + github.com/docker/distribution v2.8.3+incompatible // indirect + github.com/docker/docker v28.1.1+incompatible // indirect + github.com/docker/docker-credential-helpers v0.9.3 // indirect + github.com/docker/go-connections v0.5.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect + github.com/ebitengine/purego v0.8.1 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/getkin/kin-openapi v0.132.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect + github.com/gofrs/flock v0.12.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/cel-go v0.25.0 // indirect + github.com/google/go-containerregistry v0.20.5 // indirect + github.com/google/pprof v0.0.0-20250501235452-c0086092b71a // indirect github.com/google/uuid v1.6.0 // indirect - github.com/invopop/yaml v0.3.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jdx/go-netrc v1.0.0 // indirect github.com/josharian/intern v1.0.0 // indirect + github.com/klauspost/compress v1.18.0 // indirect + github.com/klauspost/pgzip v1.2.6 // indirect + github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/moby/docker-image-spec v1.3.1 // indirect + github.com/moby/go-archive v0.1.0 // indirect + github.com/moby/locker v1.0.1 // indirect + github.com/moby/patternmatcher v0.6.0 // indirect + github.com/moby/sys/atomicwriter v0.1.0 // indirect + github.com/moby/sys/mount v0.3.4 // indirect + github.com/moby/sys/mountinfo v0.7.2 // indirect + github.com/moby/sys/reexec v0.1.0 // indirect + github.com/moby/sys/sequential v0.6.0 // indirect + github.com/moby/sys/user v0.4.0 // indirect + github.com/moby/sys/userns v0.1.0 // indirect + github.com/moby/term v0.5.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/morikuni/aec v1.0.0 // indirect + github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 // indirect + github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect + github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect + github.com/onsi/ginkgo v1.16.5 // indirect + github.com/onsi/ginkgo/v2 v2.23.4 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.1 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.51.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/segmentio/asm v1.2.0 // indirect + github.com/segmentio/encoding v0.4.1 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect + github.com/spf13/cobra v1.9.1 // indirect + github.com/spf13/pflag v1.0.6 // indirect + github.com/stoewer/go-strcase v1.3.0 // indirect + github.com/tetratelabs/wazero v1.9.0 // indirect + github.com/tklauser/go-sysconf v0.3.14 // indirect + github.com/tklauser/numcpus v0.9.0 // indirect + github.com/vbatts/tar-split v0.12.1 // indirect github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect - golang.org/x/mod v0.17.0 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.lsp.dev/jsonrpc2 v0.10.0 // indirect + go.lsp.dev/pkg v0.0.0-20210717090340-384b27a52fb2 // indirect + go.lsp.dev/protocol v0.12.0 // indirect + go.lsp.dev/uri v0.3.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect + go.opentelemetry.io/otel v1.36.0 // indirect + go.opentelemetry.io/otel/metric v1.36.0 // indirect + go.opentelemetry.io/otel/trace v1.36.0 // indirect + go.uber.org/automaxprocs v1.6.0 // indirect + go.uber.org/mock v0.5.2 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect + go.uber.org/zap/exp v0.3.0 // indirect + golang.org/x/crypto v0.38.0 // indirect + golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect + golang.org/x/mod v0.24.0 // indirect + golang.org/x/net v0.40.0 // indirect + golang.org/x/sync v0.14.0 // indirect golang.org/x/sys v0.33.0 // indirect + golang.org/x/term v0.32.0 // indirect golang.org/x/text v0.25.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect + golang.org/x/tools v0.33.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + pluginrpc.com/pluginrpc v0.5.0 // indirect ) replace github.com/e2b-dev/infra/packages/shared v0.0.0 => ../shared + +tool ( + buf.build/go/protovalidate + connectrpc.com/connect/cmd/protoc-gen-connect-go + github.com/bufbuild/buf/cmd/buf + github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen + google.golang.org/protobuf/cmd/protoc-gen-go +) diff --git a/packages/envd/go.sum b/packages/envd/go.sum index e86de56..6a18f0b 100644 --- a/packages/envd/go.sum +++ b/packages/envd/go.sum @@ -1,46 +1,131 @@ +buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.6-20250121211742-6d880cc6cc8d.1 h1:f6miF8tK6H+Ktad24WpnNfpHO75GRGk0rhJ1mxPXqgA= +buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.6-20250121211742-6d880cc6cc8d.1/go.mod h1:rvbyamNtvJ4o3ExeCmaG5/6iHnu0vy0E+UQ+Ph0om8s= +buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250425153114-8976f5be98c1.1 h1:YhMSc48s25kr7kv31Z8vf7sPUIq5YJva9z1mn/hAt0M= +buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250425153114-8976f5be98c1.1/go.mod h1:avRlCjnFzl98VPaeCtJ24RrV/wwHFzB8sWXhj26+n/U= +buf.build/gen/go/bufbuild/registry/connectrpc/go v1.18.1-20250424215339-a457693b5db4.1 h1:/xe4ZIu8EIUaWoGeqTVQYzJ/bNMgkWUi706Puwo8A5Q= +buf.build/gen/go/bufbuild/registry/connectrpc/go v1.18.1-20250424215339-a457693b5db4.1/go.mod h1:9bOYLdeGZQKUUP21CviSP1G3U5qpgZ0k5Kn7i9Q9GfY= +buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.6-20250424215339-a457693b5db4.1 h1:/CrSdYpZi1tRhnkUNTY00LE8ro++bHwSBjLcW+dywM8= +buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.6-20250424215339-a457693b5db4.1/go.mod h1:bUPpZtzAkcnTA7OLfKCvkvkxEAC6dG/ZIlbnbUJicL4= +buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.6-20241007202033-cf42259fcbfc.1 h1:trcsXBDm8exui7mvndZnvworCyBq1xuMnod2N0j79K8= +buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.6-20241007202033-cf42259fcbfc.1/go.mod h1:OUbhXurY+VHFGn9FBxcRy8UB7HXk9NvJ2qCgifOMypQ= +buf.build/go/app v0.1.0 h1:nlqD/h0rhIN73ZoiDElprrPiO2N6JV+RmNK34K29Ihg= +buf.build/go/app v0.1.0/go.mod h1:0XVOYemubVbxNXVY0DnsVgWeGkcbbAvjDa1fmhBC+Wo= +buf.build/go/bufplugin v0.9.0 h1:ktZJNP3If7ldcWVqh46XKeiYJVPxHQxCfjzVQDzZ/lo= +buf.build/go/bufplugin v0.9.0/go.mod h1:Z0CxA3sKQ6EPz/Os4kJJneeRO6CjPeidtP1ABh5jPPY= +buf.build/go/interrupt v1.1.0 h1:olBuhgv9Sav4/9pkSLoxgiOsZDgM5VhRhvRpn3DL0lE= +buf.build/go/interrupt v1.1.0/go.mod h1:ql56nXPG1oHlvZa6efNC7SKAQ/tUjS6z0mhJl0gyeRM= +buf.build/go/protovalidate v0.12.0 h1:4GKJotbspQjRCcqZMGVSuC8SjwZ/FmgtSuKDpKUTZew= +buf.build/go/protovalidate v0.12.0/go.mod h1:q3PFfbzI05LeqxSwq+begW2syjy2Z6hLxZSkP1OH/D0= +buf.build/go/protoyaml v0.6.0 h1:Nzz1lvcXF8YgNZXk+voPPwdU8FjDPTUV4ndNTXN0n2w= +buf.build/go/protoyaml v0.6.0/go.mod h1:RgUOsBu/GYKLDSIRgQXniXbNgFlGEZnQpRAUdLAFV2Q= +buf.build/go/spdx v0.2.0 h1:IItqM0/cMxvFJJumcBuP8NrsIzMs/UYjp/6WSpq8LTw= +buf.build/go/spdx v0.2.0/go.mod h1:bXdwQFem9Si3nsbNy8aJKGPoaPi5DKwdeEp5/ArZ6w8= +buf.build/go/standard v0.1.0 h1:g98T9IyvAl0vS3Pq8iVk6Cvj2ZiFvoUJRtfyGa0120U= +buf.build/go/standard v0.1.0/go.mod h1:PiqpHz/7ZFq+kqvYhc/SK3lxFIB9N/aiH2CFC2JHIQg= +cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY= +cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw= connectrpc.com/authn v0.1.0 h1:m5weACjLWwgwcjttvUDyTPICJKw74+p2obBVrf8hT9E= connectrpc.com/authn v0.1.0/go.mod h1:AwNZK/KYbqaJzRYadTuAaoz6sYQSPdORPqh1TOPIkgY= -connectrpc.com/connect v1.16.2 h1:ybd6y+ls7GOlb7Bh5C8+ghA6SvCBajHwxssO2CGFjqE= -connectrpc.com/connect v1.16.2/go.mod h1:n2kgwskMHXC+lVqb18wngEpF95ldBHXjZYJussz5FRc= +connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw= +connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8= connectrpc.com/cors v0.1.0 h1:f3gTXJyDZPrDIZCQ567jxfD9PAIpopHiRDnJRt3QuOQ= connectrpc.com/cors v0.1.0/go.mod h1:v8SJZCPfHtGH1zsm+Ttajpozd4cYIUryl4dFB6QEpfg= +connectrpc.com/otelconnect v0.7.2 h1:WlnwFzaW64dN06JXU+hREPUGeEzpz3Acz2ACOmN8cMI= +connectrpc.com/otelconnect v0.7.2/go.mod h1:JS7XUKfuJs2adhCnXhNHPHLz6oAaZniCJdSF00OZSew= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= +github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg= +github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= +github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= +github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= +github.com/bufbuild/buf v1.54.0 h1:0kjSRNNkrDZ1wSKXjcCn05IMeRq9aCUcwrORwH24x1c= +github.com/bufbuild/buf v1.54.0/go.mod h1:UbGzdlFMzfg1GUmGL+AZUB/4bzGn+XPeqL3ru14iwd4= +github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw= +github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c= +github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1 h1:V1xulAoqLqVg44rY97xOR+mQpD2N+GzhMHVwJ030WEU= +github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1/go.mod h1:c5D8gWRIZ2HLWO3gXYTtUfw/hbJyD8xikv2ooPxnklQ= +github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8= +github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= +github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= +github.com/containerd/stargz-snapshotter/estargz v0.16.3 h1:7evrXtoh1mSbGj/pfRccTampEyKpjpOnS3CyiV1Ebr8= +github.com/containerd/stargz-snapshotter/estargz v0.16.3/go.mod h1:uyr4BfYfOj3G9WBVE8cOlQmXAbPN9VEQpBBeJIuOipU= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= -github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo= +github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0= +github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g= github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/cli v28.1.1+incompatible h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5MdSpiItp8k= +github.com/docker/cli v28.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= +github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I= +github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8= +github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960/go.mod h1:9HQzr9D/0PGwMEbC3d5AB7oi67+h4TsQqItC1GVYG58= github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 h1:PRxIJD8XjimM5aTknUK9w6DHLDox2r2M3DI4i2pnd3w= github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936/go.mod h1:ttYvX5qlB+mlV1okblJqcSMtR4c52UKxDiX9GRBS8+Q= +github.com/e2b-dev/fsnotify v0.0.0-20241216145137-2fe5d32bcb51 h1:eo4W23CTT43LdwJ5i+CCYZrsu/c4BkK7JGG5ozrwNuA= github.com/e2b-dev/fsnotify v0.0.0-20241216145137-2fe5d32bcb51/go.mod h1:49MToyZ6q0q2rwa5A77Gdh9p3gqmoID22vEJeAYyNDs= +github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE= +github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/getkin/kin-openapi v0.127.0 h1:Mghqi3Dhryf3F8vR370nN67pAERW+3a95vomb3MAREY= -github.com/getkin/kin-openapi v0.127.0/go.mod h1:OZrfXzUfGrNbsKj+xmFBx6E5c6yH3At/tAKSc2UszXM= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= +github.com/getkin/kin-openapi v0.132.0 h1:3ISeLMsQzcb5v26yeJrBcdTCEQTag36ZjaGk7MIRUwk= github.com/getkin/kin-openapi v0.132.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58= -github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s= -github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618= +github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E= +github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= @@ -50,22 +135,41 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/cel-go v0.25.0 h1:jsFw9Fhn+3y2kBbltZR4VEz5xKkcIFRPDnuEzAGv5GY= +github.com/google/cel-go v0.25.0/go.mod h1:hjEb6r5SuOSlhCHmFoLzu8HGCERvIsDAbxDAyNU/MmI= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/go-containerregistry v0.20.5 h1:4RnlYcDs5hoA++CeFjlbZ/U9Yp1EuWr+UhhTyYQjOP0= +github.com/google/go-containerregistry v0.20.5/go.mod h1:Q14vdOOzug02bwnhMkZKD4e30pDaD9W65qzXpyzF49E= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20250501235452-c0086092b71a h1:rDA3FfmxwXR+BVKKdz55WwMJ1pD2hJQNW31d+l3mPk4= +github.com/google/pprof v0.0.0-20250501235452-c0086092b71a/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/invopop/yaml v0.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso= -github.com/invopop/yaml v0.3.1/go.mod h1:PMOp3nn4/12yEZUFfmOuNHJsZToEEOwoWsT+D81KkeA= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jdx/go-netrc v1.0.0 h1:QbLMLyCZGj0NA8glAhxUpf1zDg6cxnWgMBbjq40W0gQ= +github.com/jdx/go-netrc v1.0.0/go.mod h1:Gh9eFQJnoTNIRHXl2j5bJXA1u84hQWJWgGh569zF3v8= +github.com/jhump/protoreflect/v2 v2.0.0-beta.2 h1:qZU+rEZUOYTz1Bnhi3xbwn+VxdXkLVeEpAeZzVXLY88= +github.com/jhump/protoreflect/v2 v2.0.0-beta.2/go.mod h1:4tnOYkB/mq7QTyS3YKtVtNrJv4Psqout8HA1U+hZtgM= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= +github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= +github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -73,16 +177,47 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0= +github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= +github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= +github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ= +github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo= +github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= +github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= +github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= +github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= +github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw= +github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs= +github.com/moby/sys/mount v0.3.4 h1:yn5jq4STPztkkzSKpZkLcmjue+bZJ0u2AuQY1iNI1Ww= +github.com/moby/sys/mount v0.3.4/go.mod h1:KcQJMbQdJHPlq5lcYT+/CjatWM4PuxKe+XLSVS4J6Os= +github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg= +github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4= +github.com/moby/sys/reexec v0.1.0 h1:RrBi8e0EBTLEgfruBOFcxtElzRGTEUkeIFaVXgU7wok= +github.com/moby/sys/reexec v0.1.0/go.mod h1:EqjBg8F3X7iZe5pU6nRZnYCMUTXoxsjiIfHup5wYIN8= +github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU= +github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko= +github.com/moby/sys/user v0.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs= +github.com/moby/sys/user v0.4.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs= +github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g= +github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= +github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ= +github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -90,106 +225,225 @@ github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 h1:ykgG34472DWey7TSjd8vIfNykXgjOg github.com/oapi-codegen/oapi-codegen/v2 v2.4.1/go.mod h1:N5+lY1tiTDV3V1BeHtOxeWXHoPVeApvsvjJqegfoaz8= github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro= github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= +github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//JalHPu/3yz+De2J+4aLtSRlHiY= +github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw= +github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c= +github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus= +github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= -github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= +github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU= +github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= +github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= +github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplUkdTrmPb8= +github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= -github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= -github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= +github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= +github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= +github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= +github.com/quic-go/quic-go v0.51.0 h1:K8exxe9zXxeRKxaXxi/GpUqYiTrtdiWP8bo1KFya6Wc= +github.com/quic-go/quic-go v0.51.0/go.mod h1:MFlGGpcpJqRAfmYi6NC2cptDPSxRWTOGNuP4wqrWmzQ= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA= +github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= +github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY= +github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= +github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= +github.com/segmentio/encoding v0.4.1 h1:KLGaLSW0jrmhB58Nn4+98spfvPvmo4Ci1P/WIQ9wn7w= +github.com/segmentio/encoding v0.4.1/go.mod h1:/d03Cd8PoaDeceuhUUUQWjU0KhWjrmYrWPgtJHYZSnI= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shirou/gopsutil/v4 v4.24.10 h1:7VOzPtfw/5YDU+jLEoBwXwxJbQetULywoSV4RYY7HkM= +github.com/shirou/gopsutil/v4 v4.24.10/go.mod h1:s4D/wg+ag4rG0WO7AiTj2BeYCRhym0vM7DHbZRxnIT8= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/speakeasy-api/openapi-overlay v0.9.0 h1:Wrz6NO02cNlLzx1fB093lBlYxSI54VRhy1aSutx0PQg= github.com/speakeasy-api/openapi-overlay v0.9.0/go.mod h1:f5FloQrHA7MsxYg9djzMD5h6dxrHjVVByWKh7an8TRc= +github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= +github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= +github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= +github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= +github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I= +github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM= +github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU= +github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY= +github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPDo= +github.com/tklauser/numcpus v0.9.0/go.mod h1:SN6Nq1O3VychhC1npsWostA+oW+VOQTxZrS604NSRyI= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/vbatts/tar-split v0.12.1 h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnnbo= +github.com/vbatts/tar-split v0.12.1/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA= github.com/vmware-labs/yaml-jsonpath v0.3.2 h1:/5QKeCBGdsInyDCyVNLbXyilb61MXGi9NP674f9Hobk= github.com/vmware-labs/yaml-jsonpath v0.3.2/go.mod h1:U6whw1z03QyqgWdgXxvVnQ90zN1BWz5V+51Ewf8k+rQ= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.lsp.dev/jsonrpc2 v0.10.0 h1:Pr/YcXJoEOTMc/b6OTmcR1DPJ3mSWl/SWiU1Cct6VmI= +go.lsp.dev/jsonrpc2 v0.10.0/go.mod h1:fmEzIdXPi/rf6d4uFcayi8HpFP1nBF99ERP1htC72Ac= +go.lsp.dev/pkg v0.0.0-20210717090340-384b27a52fb2 h1:hCzQgh6UcwbKgNSRurYWSqh8MufqRRPODRBblutn4TE= +go.lsp.dev/pkg v0.0.0-20210717090340-384b27a52fb2/go.mod h1:gtSHRuYfbCT0qnbLnovpie/WEmqyJ7T4n6VXiFMBtcw= +go.lsp.dev/protocol v0.12.0 h1:tNprUI9klQW5FAFVM4Sa+AbPFuVQByWhP1ttNUAjIWg= +go.lsp.dev/protocol v0.12.0/go.mod h1:Qb11/HgZQ72qQbeyPfJbu3hZBH23s1sr4st8czGeDMQ= +go.lsp.dev/uri v0.3.0 h1:KcZJmh6nFIBeJzTugn5JTU6OOyG0lDOo3R9KwTxTYbo= +go.lsp.dev/uri v0.3.0/go.mod h1:P5sbO1IQR+qySTWOCnhnK7phBx+W3zbLqSMDJNTw88I= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= +go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= +go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 h1:dNzwXjZKpMpE2JhmO+9HsPl42NIXFIFSUSSs0fiqra0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0/go.mod h1:90PoxvaEB5n6AOdZvi+yWJQoE95U8Dhhw2bSyRqnTD0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 h1:nRVXXvf78e00EwY6Wp0YII8ww2JVWshZ20HfTlE11AM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0/go.mod h1:r49hO7CgrxY9Voaj3Xe8pANWtr0Oq916d0XAmOoCZAQ= +go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= +go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= +go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs= +go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY= +go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o= +go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w= +go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= +go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= +go.opentelemetry.io/proto/otlp v1.6.0 h1:jQjP+AQyTf+Fe7OKj/MfkDrmK4MNVtw2NpXsf9fefDI= +go.opentelemetry.io/proto/otlp v1.6.0/go.mod h1:cicgGehlFuNdgZkcALOCh3VE6K/u2tAjzlRhDwmVpZc= +go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs= +go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko= +go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U= +go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= +golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b h1:QoALfVG9rhQ/M7vYDScfPdWjGL9dlsVVM5VGh7aKoAA= +golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= +golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= +golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= -golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= +golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= -golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= +golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= -golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= +golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= +golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 h1:Kog3KlB4xevJlAcbbbzPfRG0+X9fdoGM+UBRKVz6Wr0= +google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237/go.mod h1:ezi0AVyMKDWy5xAncvjLWH7UcLBB5n7y2fQ8MzjJcto= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 h1:cJfm9zPbe1e873mHJzmQ1nwVEeRDU/T1wXDK2kUSU34= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA= +google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -198,8 +452,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= +google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= @@ -217,3 +471,8 @@ gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q= +gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA= +pluginrpc.com/pluginrpc v0.5.0 h1:tOQj2D35hOmvHyPu8e7ohW2/QvAnEtKscy2IJYWQ2yo= +pluginrpc.com/pluginrpc v0.5.0/go.mod h1:UNWZ941hcVAoOZUn8YZsMmOZBzbUjQa3XMns8RQLp9o= diff --git a/packages/envd/internal/api/api.gen.go b/packages/envd/internal/api/api.gen.go index bbc0aea..1d4964b 100644 --- a/packages/envd/internal/api/api.gen.go +++ b/packages/envd/internal/api/api.gen.go @@ -4,6 +4,7 @@ package api import ( + "context" "fmt" "net/http" @@ -12,6 +13,10 @@ import ( openapi_types "github.com/oapi-codegen/runtime/types" ) +const ( + AccessTokenAuthScopes = "AccessTokenAuth.Scopes" +) + // Defines values for EntryInfoType. const ( File EntryInfoType = "file" @@ -44,9 +49,24 @@ type Error struct { Message string `json:"message"` } +// Metrics Resource usage metrics +type Metrics struct { + // CpuUsedPct CPU usage percentage + CpuUsedPct *float32 `json:"cpu_used_pct,omitempty"` + + // MemBytes Total virtual memory usage in bytes + MemBytes *int `json:"mem_bytes,omitempty"` +} + // FilePath defines model for FilePath. type FilePath = string +// Signature defines model for Signature. +type Signature = string + +// SignatureExpiration defines model for SignatureExpiration. +type SignatureExpiration = int + // User defines model for User. type User = string @@ -75,6 +95,12 @@ type GetFilesParams struct { // Username User used for setting the owner, or resolving relative paths. Username User `form:"username" json:"username"` + + // Signature Signature used for file access permission verification. + Signature *Signature `form:"signature,omitempty" json:"signature,omitempty"` + + // SignatureExpiration Signature expiration used for defining the expiration time of the signature. + SignatureExpiration *SignatureExpiration `form:"signature_expiration,omitempty" json:"signature_expiration,omitempty"` } // PostFilesMultipartBody defines parameters for PostFiles. @@ -89,10 +115,19 @@ type PostFilesParams struct { // Username User used for setting the owner, or resolving relative paths. Username User `form:"username" json:"username"` + + // Signature Signature used for file access permission verification. + Signature *Signature `form:"signature,omitempty" json:"signature,omitempty"` + + // SignatureExpiration Signature expiration used for defining the expiration time of the signature. + SignatureExpiration *SignatureExpiration `form:"signature_expiration,omitempty" json:"signature_expiration,omitempty"` } // PostInitJSONBody defines parameters for PostInit. type PostInitJSONBody struct { + // AccessToken Access token for secure access to envd service + AccessToken *string `json:"accessToken,omitempty"` + // EnvVars Environment variables to set EnvVars *EnvVars `json:"envVars,omitempty"` } @@ -117,7 +152,7 @@ type ServerInterface interface { // Check the health of the service // (GET /health) GetHealth(w http.ResponseWriter, r *http.Request) - // Set env vars, ensure the time and metadata is synced with the host + // Set initial vars, ensure the time and metadata is synced with the host // (POST /init) PostInit(w http.ResponseWriter, r *http.Request) // Get the stats of the service @@ -153,7 +188,7 @@ func (_ Unimplemented) GetHealth(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusNotImplemented) } -// Set env vars, ensure the time and metadata is synced with the host +// Set initial vars, ensure the time and metadata is synced with the host // (POST /init) func (_ Unimplemented) PostInit(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusNotImplemented) @@ -177,6 +212,12 @@ type MiddlewareFunc func(http.Handler) http.Handler // GetEnvs operation middleware func (siw *ServerInterfaceWrapper) GetEnvs(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + + ctx = context.WithValue(ctx, AccessTokenAuthScopes, []string{}) + + r = r.WithContext(ctx) + handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { siw.Handler.GetEnvs(w, r) })) @@ -193,6 +234,12 @@ func (siw *ServerInterfaceWrapper) GetFiles(w http.ResponseWriter, r *http.Reque var err error + ctx := r.Context() + + ctx = context.WithValue(ctx, AccessTokenAuthScopes, []string{}) + + r = r.WithContext(ctx) + // Parameter object where we will unmarshal all parameters from the context var params GetFilesParams @@ -219,6 +266,22 @@ func (siw *ServerInterfaceWrapper) GetFiles(w http.ResponseWriter, r *http.Reque return } + // ------------- Optional query parameter "signature" ------------- + + err = runtime.BindQueryParameter("form", true, false, "signature", r.URL.Query(), ¶ms.Signature) + if err != nil { + siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "signature", Err: err}) + return + } + + // ------------- Optional query parameter "signature_expiration" ------------- + + err = runtime.BindQueryParameter("form", true, false, "signature_expiration", r.URL.Query(), ¶ms.SignatureExpiration) + if err != nil { + siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "signature_expiration", Err: err}) + return + } + handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { siw.Handler.GetFiles(w, r, params) })) @@ -235,6 +298,12 @@ func (siw *ServerInterfaceWrapper) PostFiles(w http.ResponseWriter, r *http.Requ var err error + ctx := r.Context() + + ctx = context.WithValue(ctx, AccessTokenAuthScopes, []string{}) + + r = r.WithContext(ctx) + // Parameter object where we will unmarshal all parameters from the context var params PostFilesParams @@ -261,6 +330,22 @@ func (siw *ServerInterfaceWrapper) PostFiles(w http.ResponseWriter, r *http.Requ return } + // ------------- Optional query parameter "signature" ------------- + + err = runtime.BindQueryParameter("form", true, false, "signature", r.URL.Query(), ¶ms.Signature) + if err != nil { + siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "signature", Err: err}) + return + } + + // ------------- Optional query parameter "signature_expiration" ------------- + + err = runtime.BindQueryParameter("form", true, false, "signature_expiration", r.URL.Query(), ¶ms.SignatureExpiration) + if err != nil { + siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "signature_expiration", Err: err}) + return + } + handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { siw.Handler.PostFiles(w, r, params) })) @@ -289,6 +374,12 @@ func (siw *ServerInterfaceWrapper) GetHealth(w http.ResponseWriter, r *http.Requ // PostInit operation middleware func (siw *ServerInterfaceWrapper) PostInit(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + + ctx = context.WithValue(ctx, AccessTokenAuthScopes, []string{}) + + r = r.WithContext(ctx) + handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { siw.Handler.PostInit(w, r) })) @@ -303,6 +394,12 @@ func (siw *ServerInterfaceWrapper) PostInit(w http.ResponseWriter, r *http.Reque // GetMetrics operation middleware func (siw *ServerInterfaceWrapper) GetMetrics(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + + ctx = context.WithValue(ctx, AccessTokenAuthScopes, []string{}) + + r = r.WithContext(ctx) + handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { siw.Handler.GetMetrics(w, r) })) diff --git a/packages/envd/internal/api/auth.go b/packages/envd/internal/api/auth.go new file mode 100644 index 0000000..7ec2670 --- /dev/null +++ b/packages/envd/internal/api/auth.go @@ -0,0 +1,114 @@ +package api + +import ( + "errors" + "fmt" + "net/http" + "slices" + "strconv" + "time" + + "github.com/e2b-dev/infra/packages/shared/pkg/keys" +) + +const ( + SigningReadOperation = "read" + SigningWriteOperation = "write" + + accessTokenHeader = "X-Access-Token" +) + +// paths that are always allowed without general authentication +var allowedPaths = []string{ + "GET/health", + "GET/files", + "POST/files", +} + +func (a *API) WithAuthorization(handler http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { + if a.accessToken != nil { + authHeader := req.Header.Get(accessTokenHeader) + + // check if this path is allowed without authentication (e.g., health check, endpoints supporting signing) + allowedPath := slices.Contains(allowedPaths, req.Method+req.URL.Path) + + if authHeader != *a.accessToken && !allowedPath { + a.logger.Error().Msg("Trying to access secured envd without correct access token") + + err := fmt.Errorf("unauthorized access, please provide a valid access token or method signing if supported") + jsonError(w, http.StatusUnauthorized, err) + return + } + } + + handler.ServeHTTP(w, req) + }) +} + +func (a *API) generateSignature(path string, username string, operation string, signatureExpiration *int64) (string, error) { + if a.accessToken == nil { + return "", fmt.Errorf("access token is not set") + } + + var signature string + hasher := keys.NewSHA256Hashing() + + if signatureExpiration == nil { + signature = fmt.Sprintf("%s:%s:%s:%s", path, operation, username, *a.accessToken) + } else { + signature = fmt.Sprintf("%s:%s:%s:%s:%s", path, operation, username, *a.accessToken, strconv.FormatInt(*signatureExpiration, 10)) + } + + return fmt.Sprintf("v1_%s", hasher.HashWithoutPrefix([]byte(signature))), nil +} + +func (a *API) validateSigning(r *http.Request, signature *string, signatureExpiration *int, username string, path string, operation string) (err error) { + var expectedSignature string + + // no need to validate signing key if access token is not set + if a.accessToken == nil { + return nil + } + + // check if access token is sent in the header + tokenFromHeader := r.Header.Get(accessTokenHeader) + if tokenFromHeader != "" { + if tokenFromHeader != *a.accessToken { + return fmt.Errorf("access token present in header but does not match") + } + + return nil + } + + if signature == nil { + return fmt.Errorf("missing signature query parameter") + } + + if signatureExpiration == nil { + expectedSignature, err = a.generateSignature(path, username, operation, nil) + } else { + exp := int64(*signatureExpiration) + expectedSignature, err = a.generateSignature(path, username, operation, &exp) + } + + if err != nil { + a.logger.Error().Err(err).Msg("error generating signing key") + return errors.New("invalid signature") + } + + // signature validation + if expectedSignature != *signature { + return fmt.Errorf("invalid signature") + } + + // signature expiration + if signatureExpiration != nil { + exp := int64(*signatureExpiration) + if exp < time.Now().Unix() { + return fmt.Errorf("signature is already expired") + } + } + + return nil +} diff --git a/packages/envd/internal/api/auth_test.go b/packages/envd/internal/api/auth_test.go new file mode 100644 index 0000000..d9e0d91 --- /dev/null +++ b/packages/envd/internal/api/auth_test.go @@ -0,0 +1,53 @@ +package api + +import ( + "fmt" + "strconv" + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "github.com/e2b-dev/infra/packages/shared/pkg/keys" +) + +func TestKeyGenerationAlgorithmIsStable(t *testing.T) { + apiToken := "secret-access-token" + api := &API{accessToken: &apiToken} + + path := "/path/to/demo.txt" + username := "root" + operation := "write" + timestamp := time.Now().Unix() + + signature, err := api.generateSignature(path, username, operation, ×tamp) + assert.NoError(t, err) + assert.NotEmpty(t, signature) + + // locally generated signature + hasher := keys.NewSHA256Hashing() + localSignatureTmp := fmt.Sprintf("%s:%s:%s:%s:%s", path, operation, username, apiToken, strconv.FormatInt(timestamp, 10)) + localSignature := fmt.Sprintf("v1_%s", hasher.HashWithoutPrefix([]byte(localSignatureTmp))) + + assert.Equal(t, localSignature, signature) +} + +func TestKeyGenerationAlgorithmWithoutExpirationIsStable(t *testing.T) { + apiToken := "secret-access-token" + api := &API{accessToken: &apiToken} + + path := "/path/to/resource.txt" + username := "user" + operation := "read" + + signature, err := api.generateSignature(path, username, operation, nil) + assert.NoError(t, err) + assert.NotEmpty(t, signature) + + // locally generated signature + hasher := keys.NewSHA256Hashing() + localSignatureTmp := fmt.Sprintf("%s:%s:%s:%s", path, operation, username, apiToken) + localSignature := fmt.Sprintf("v1_%s", hasher.HashWithoutPrefix([]byte(localSignatureTmp))) + + assert.Equal(t, localSignature, signature) +} diff --git a/packages/envd/internal/api/download.go b/packages/envd/internal/api/download.go index d7ccb66..cc3d9e1 100644 --- a/packages/envd/internal/api/download.go +++ b/packages/envd/internal/api/download.go @@ -16,7 +16,6 @@ func (a *API) GetFiles(w http.ResponseWriter, r *http.Request, params GetFilesPa defer r.Body.Close() var errorCode int - var errMsg error var path string @@ -24,11 +23,21 @@ func (a *API) GetFiles(w http.ResponseWriter, r *http.Request, params GetFilesPa path = *params.Path } + operationID := logs.AssignOperationID() + + // signing authorization if needed + err := a.validateSigning(r, params.Signature, params.SignatureExpiration, params.Username, path, SigningReadOperation) + if err != nil { + a.logger.Error().Err(err).Str(string(logs.OperationIDKey), operationID).Msg("error during auth validation") + jsonError(w, http.StatusUnauthorized, err) + return + } + defer func() { l := a.logger. Err(errMsg). Str("method", r.Method+" "+r.URL.Path). - Str(string(logs.OperationIDKey), logs.AssignOperationID()). + Str(string(logs.OperationIDKey), operationID). Str("path", path). Str("username", params.Username) diff --git a/packages/envd/internal/api/envs.go b/packages/envd/internal/api/envs.go index 98bfb3c..4a571b0 100644 --- a/packages/envd/internal/api/envs.go +++ b/packages/envd/internal/api/envs.go @@ -2,8 +2,9 @@ package api import ( "encoding/json" - "github.com/e2b-dev/infra/packages/envd/internal/logs" "net/http" + + "github.com/e2b-dev/infra/packages/envd/internal/logs" ) func (a *API) GetEnvs(w http.ResponseWriter, _ *http.Request) { diff --git a/packages/envd/internal/api/init.go b/packages/envd/internal/api/init.go index 9a82e94..406b24e 100644 --- a/packages/envd/internal/api/init.go +++ b/packages/envd/internal/api/init.go @@ -14,37 +14,48 @@ func (a *API) PostInit(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() operationID := logs.AssignOperationID() + logger := a.logger.With().Str(string(logs.OperationIDKey), operationID).Logger() if r.Body != nil { var initRequest PostInitJSONBody err := json.NewDecoder(r.Body).Decode(&initRequest) if err != nil && err != io.EOF { - a.logger.Error().Str(string(logs.OperationIDKey), operationID).Msgf("Failed to decode request: %v", err) + logger.Error().Msgf("Failed to decode request: %v", err) w.WriteHeader(http.StatusBadRequest) return } if initRequest.EnvVars != nil { - a.logger.Debug().Str(string(logs.OperationIDKey), operationID).Msg(fmt.Sprintf("Setting %d env vars", len(*initRequest.EnvVars))) + logger.Debug().Msg(fmt.Sprintf("Setting %d env vars", len(*initRequest.EnvVars))) for key, value := range *initRequest.EnvVars { - a.logger.Debug().Str(string(logs.OperationIDKey), operationID).Msgf("Setting env var for %s", key) - + logger.Debug().Msgf("Setting env var for %s", key) a.envVars.Store(key, value) } } + + if initRequest.AccessToken != nil { + if a.accessToken != nil && *initRequest.AccessToken != *a.accessToken { + logger.Error().Msg("Access token is already set and cannot be changed") + w.WriteHeader(http.StatusConflict) + return + } + + logger.Debug().Msg("Setting access token") + a.accessToken = initRequest.AccessToken + } } - a.logger.Debug().Str(string(logs.OperationIDKey), operationID).Msg("Syncing host") + logger.Debug().Msg("Syncing host") go func() { err := host.Sync() if err != nil { - a.logger.Error().Str(string(logs.OperationIDKey), operationID).Msgf("Failed to sync clock: %v", err) + logger.Error().Msgf("Failed to sync clock: %v", err) } else { - a.logger.Trace().Str(string(logs.OperationIDKey), operationID).Msg("Clock synced") + logger.Trace().Msg("Clock synced") } }() diff --git a/packages/envd/internal/api/store.go b/packages/envd/internal/api/store.go index 689ad29..1af8f99 100644 --- a/packages/envd/internal/api/store.go +++ b/packages/envd/internal/api/store.go @@ -11,8 +11,9 @@ import ( ) type API struct { - logger *zerolog.Logger - envVars *utils.Map[string, string] + logger *zerolog.Logger + accessToken *string + envVars *utils.Map[string, string] } func New(l *zerolog.Logger, envVars *utils.Map[string, string]) *API { diff --git a/packages/envd/internal/api/upload.go b/packages/envd/internal/api/upload.go index c3dbca2..e40a301 100644 --- a/packages/envd/internal/api/upload.go +++ b/packages/envd/internal/api/upload.go @@ -153,7 +153,6 @@ func (a *API) PostFiles(w http.ResponseWriter, r *http.Request, params PostFiles defer r.Body.Close() var errorCode int - var errMsg error var path string @@ -163,6 +162,14 @@ func (a *API) PostFiles(w http.ResponseWriter, r *http.Request, params PostFiles operationID := logs.AssignOperationID() + // signing authorization if needed + err := a.validateSigning(r, params.Signature, params.SignatureExpiration, params.Username, path, SigningWriteOperation) + if err != nil { + a.logger.Error().Err(err).Str(string(logs.OperationIDKey), operationID).Msg("error during auth validation") + jsonError(w, http.StatusUnauthorized, err) + return + } + defer func() { l := a.logger. Err(errMsg). diff --git a/packages/envd/internal/host/sync.go b/packages/envd/internal/host/sync.go index e7b24bf..30a47e6 100644 --- a/packages/envd/internal/host/sync.go +++ b/packages/envd/internal/host/sync.go @@ -16,10 +16,12 @@ func updateClock() error { ctx, cancel := context.WithTimeout(context.Background(), syncTimeout) defer cancel() - // The chronyc -a makestep is not immediately stepping the clock - err := exec.CommandContext(ctx, "/bin/bash", "-l", "-c", "date -s @$(/usr/sbin/phc_ctl /dev/ptp0 get | cut -d' ' -f5)").Run() + cmd := exec.CommandContext(ctx, "/bin/bash", "-l", "-c", "date -s @$(/usr/sbin/phc_ctl /dev/ptp0 get | cut -d' ' -f5)") + + // Capture both stdout and stderr + output, err := cmd.CombinedOutput() if err != nil { - return fmt.Errorf("failed to update clock: %w", err) + return fmt.Errorf("failed to update clock: %w\nCommand output: %s", err, string(output)) } return nil @@ -39,5 +41,5 @@ func Sync() error { func WaitForSync() { syncingLock.RLock() - syncingLock.RUnlock() + defer syncingLock.RUnlock() } diff --git a/packages/envd/internal/logs/exporter/exporter.go b/packages/envd/internal/logs/exporter/exporter.go index 0086ad8..712b2d5 100644 --- a/packages/envd/internal/logs/exporter/exporter.go +++ b/packages/envd/internal/logs/exporter/exporter.go @@ -11,6 +11,8 @@ import ( "time" ) +const ExporterTimeout = 10 * time.Second + type HTTPExporter struct { ctx context.Context client http.Client @@ -23,7 +25,7 @@ type HTTPExporter struct { func NewHTTPLogsExporter(ctx context.Context, debug bool) *HTTPExporter { exporter := &HTTPExporter{ client: http.Client{ - Timeout: 2 * time.Second, + Timeout: ExporterTimeout, }, triggers: make(chan struct{}, 1), debug: debug, @@ -108,7 +110,7 @@ func (w *HTTPExporter) start() { err = w.sendInstanceLogs(logsWithOpts, mmdsOpts.Address) if err != nil { - log.Printf(fmt.Sprintf("error sending instance logs: %+v", err)) + log.Printf("error sending instance logs: %+v", err) printLog(logLine) diff --git a/packages/envd/internal/logs/logger.go b/packages/envd/internal/logs/logger.go index 390e6f2..e88cee3 100644 --- a/packages/envd/internal/logs/logger.go +++ b/packages/envd/internal/logs/logger.go @@ -6,9 +6,9 @@ import ( "os" "time" - "github.com/e2b-dev/infra/packages/envd/internal/logs/exporter" - "github.com/rs/zerolog" + + "github.com/e2b-dev/infra/packages/envd/internal/logs/exporter" ) func NewLogger(ctx context.Context, debug bool) *zerolog.Logger { diff --git a/packages/envd/internal/services/filesystem/dir.go b/packages/envd/internal/services/filesystem/dir.go index fd040eb..0a9b342 100644 --- a/packages/envd/internal/services/filesystem/dir.go +++ b/packages/envd/internal/services/filesystem/dir.go @@ -5,14 +5,21 @@ import ( "fmt" "os" "path" + "path/filepath" + "strings" + + "connectrpc.com/connect" "github.com/e2b-dev/infra/packages/envd/internal/permissions" rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/filesystem" - - "connectrpc.com/connect" ) func (Service) ListDir(ctx context.Context, req *connect.Request[rpc.ListDirRequest]) (*connect.Response[rpc.ListDirResponse], error) { + depth := req.Msg.GetDepth() + if depth == 0 { + depth = 1 // default depth to current directory + } + u, err := permissions.GetAuthUser(ctx) if err != nil { return nil, err @@ -36,30 +43,42 @@ func (Service) ListDir(ctx context.Context, req *connect.Request[rpc.ListDirRequ return nil, connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("path is not a directory: %s", dirPath)) } - entries, err := os.ReadDir(dirPath) - if err != nil { - return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("error reading directory: %w", err)) - } + var entries []*rpc.EntryInfo + err = filepath.WalkDir(dirPath, func(path string, entry os.DirEntry, err error) error { + if err != nil { + return err + } - e := make([]*rpc.EntryInfo, len(entries)) + // Skip the root directory itself + if path == dirPath { + return nil + } - for i, entry := range entries { - var t rpc.FileType - if entry.IsDir() { - t = rpc.FileType_FILE_TYPE_DIRECTORY - } else { - t = rpc.FileType_FILE_TYPE_FILE + // Calculate current depth + relPath, err := filepath.Rel(dirPath, path) + if err != nil { + return err } + currentDepth := len(strings.Split(relPath, string(os.PathSeparator))) - e[i] = &rpc.EntryInfo{ - Name: entry.Name(), - Type: t, - Path: path.Join(dirPath, entry.Name()), + if currentDepth > int(depth) { + return filepath.SkipDir } + + entries = append(entries, &rpc.EntryInfo{ + Name: entry.Name(), + Type: getEntryType(entry), + Path: path, + }) + + return nil + }) + if err != nil { + return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("error reading directory: %w", err)) } return connect.NewResponse(&rpc.ListDirResponse{ - Entries: e, + Entries: entries, }), nil } diff --git a/packages/envd/internal/services/filesystem/move.go b/packages/envd/internal/services/filesystem/move.go index 357e7f3..0a1cc44 100644 --- a/packages/envd/internal/services/filesystem/move.go +++ b/packages/envd/internal/services/filesystem/move.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" + "connectrpc.com/connect" + "github.com/e2b-dev/infra/packages/envd/internal/permissions" rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/filesystem" - - "connectrpc.com/connect" ) func (Service) Move(ctx context.Context, req *connect.Request[rpc.MoveRequest]) (*connect.Response[rpc.MoveResponse], error) { @@ -52,17 +52,10 @@ func (Service) Move(ctx context.Context, req *connect.Request[rpc.MoveRequest]) return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("error renaming: %w", err)) } - var t rpc.FileType - if entry.IsDir() { - t = rpc.FileType_FILE_TYPE_DIRECTORY - } else { - t = rpc.FileType_FILE_TYPE_FILE - } - return connect.NewResponse(&rpc.MoveResponse{ Entry: &rpc.EntryInfo{ Name: filepath.Base(destination), - Type: t, + Type: getEntryType(entry), Path: destination, }, }), nil diff --git a/packages/envd/internal/services/filesystem/remove.go b/packages/envd/internal/services/filesystem/remove.go index a1586d8..32f1cfa 100644 --- a/packages/envd/internal/services/filesystem/remove.go +++ b/packages/envd/internal/services/filesystem/remove.go @@ -5,10 +5,10 @@ import ( "fmt" "os" + "connectrpc.com/connect" + "github.com/e2b-dev/infra/packages/envd/internal/permissions" rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/filesystem" - - "connectrpc.com/connect" ) func (Service) Remove(ctx context.Context, req *connect.Request[rpc.RemoveRequest]) (*connect.Response[rpc.RemoveResponse], error) { diff --git a/packages/envd/internal/services/filesystem/stat.go b/packages/envd/internal/services/filesystem/stat.go index fb20aba..27fdf47 100644 --- a/packages/envd/internal/services/filesystem/stat.go +++ b/packages/envd/internal/services/filesystem/stat.go @@ -5,10 +5,10 @@ import ( "fmt" "os" + "connectrpc.com/connect" + "github.com/e2b-dev/infra/packages/envd/internal/permissions" rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/filesystem" - - "connectrpc.com/connect" ) func (Service) Stat(ctx context.Context, req *connect.Request[rpc.StatRequest]) (*connect.Response[rpc.StatResponse], error) { @@ -31,18 +31,12 @@ func (Service) Stat(ctx context.Context, req *connect.Request[rpc.StatRequest]) return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("error statting file: %w", err)) } - var t rpc.FileType - if fileInfo.IsDir() { - t = rpc.FileType_FILE_TYPE_DIRECTORY - } else { - t = rpc.FileType_FILE_TYPE_FILE - } - return connect.NewResponse( &rpc.StatResponse{ Entry: &rpc.EntryInfo{ Name: fileInfo.Name(), - Type: t, + Type: getEntryType(fileInfo), + Path: path, }, }, ), nil diff --git a/packages/envd/internal/services/filesystem/utils.go b/packages/envd/internal/services/filesystem/utils.go new file mode 100644 index 0000000..1cd473b --- /dev/null +++ b/packages/envd/internal/services/filesystem/utils.go @@ -0,0 +1,17 @@ +package filesystem + +import ( + rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/filesystem" +) + +type osEntry interface { + IsDir() bool +} + +func getEntryType(entry osEntry) rpc.FileType { + if entry.IsDir() { + return rpc.FileType_FILE_TYPE_DIRECTORY + } else { + return rpc.FileType_FILE_TYPE_FILE + } +} diff --git a/packages/envd/internal/services/filesystem/watch.go b/packages/envd/internal/services/filesystem/watch.go index 3a7c427..a578706 100644 --- a/packages/envd/internal/services/filesystem/watch.go +++ b/packages/envd/internal/services/filesystem/watch.go @@ -6,13 +6,13 @@ import ( "os" "path/filepath" + "connectrpc.com/connect" + "github.com/e2b-dev/fsnotify" + "github.com/e2b-dev/infra/packages/envd/internal/logs" "github.com/e2b-dev/infra/packages/envd/internal/permissions" rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/filesystem" "github.com/e2b-dev/infra/packages/envd/internal/utils" - - "connectrpc.com/connect" - "github.com/e2b-dev/fsnotify" ) func (s Service) WatchDir(ctx context.Context, req *connect.Request[rpc.WatchDirRequest], stream *connect.ServerStream[rpc.WatchDirResponse]) error { @@ -75,7 +75,7 @@ func (s Service) watchHandler(ctx context.Context, req *connect.Request[rpc.Watc }, }) if streamErr != nil { - return connect.NewError(connect.CodeUnknown, streamErr) + return connect.NewError(connect.CodeUnknown, fmt.Errorf("error sending keepalive: %w", streamErr)) } case <-ctx.Done(): return ctx.Err() @@ -140,7 +140,7 @@ func (s Service) watchHandler(ctx context.Context, req *connect.Request[rpc.Watc Msg("Streaming filesystem event") if streamErr != nil { - return connect.NewError(connect.CodeUnknown, streamErr) + return connect.NewError(connect.CodeUnknown, fmt.Errorf("error sending filesystem event: %w", streamErr)) } resetKeepalive() diff --git a/packages/envd/internal/services/filesystem/watch_sync.go b/packages/envd/internal/services/filesystem/watch_sync.go index 0e773ba..e73e813 100644 --- a/packages/envd/internal/services/filesystem/watch_sync.go +++ b/packages/envd/internal/services/filesystem/watch_sync.go @@ -158,6 +158,10 @@ func (s Service) CreateWatcher(ctx context.Context, req *connect.Request[rpc.Cre watcherId := "w" + id.Generate() w, err := CreateFileWatcher(watchPath, req.Msg.Recursive, watcherId, s.logger) + if err != nil { + return nil, err + } + s.watchers.Store(watcherId, w) return connect.NewResponse(&rpc.CreateWatcherResponse{ diff --git a/packages/envd/internal/services/process/connect.go b/packages/envd/internal/services/process/connect.go index 75e7f3a..6f90c21 100644 --- a/packages/envd/internal/services/process/connect.go +++ b/packages/envd/internal/services/process/connect.go @@ -3,12 +3,13 @@ package process import ( "context" "errors" + "fmt" + + "connectrpc.com/connect" "github.com/e2b-dev/infra/packages/envd/internal/logs" "github.com/e2b-dev/infra/packages/envd/internal/permissions" rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process" - - "connectrpc.com/connect" ) func (s *Service) Connect(ctx context.Context, req *connect.Request[rpc.ConnectRequest], stream *connect.ServerStream[rpc.ConnectResponse]) error { @@ -42,7 +43,7 @@ func (s *Service) handleConnect(ctx context.Context, req *connect.Request[rpc.Co }, }) if streamErr != nil { - return connect.NewError(connect.CodeUnknown, streamErr) + return connect.NewError(connect.CodeUnknown, fmt.Errorf("error sending start event: %w", streamErr)) } go func() { @@ -63,7 +64,7 @@ func (s *Service) handleConnect(ctx context.Context, req *connect.Request[rpc.Co }, }) if streamErr != nil { - cancel(connect.NewError(connect.CodeUnknown, streamErr)) + cancel(connect.NewError(connect.CodeUnknown, fmt.Errorf("error sending keepalive: %w", streamErr))) return } @@ -82,7 +83,7 @@ func (s *Service) handleConnect(ctx context.Context, req *connect.Request[rpc.Co }, }) if streamErr != nil { - cancel(connect.NewError(connect.CodeUnknown, streamErr)) + cancel(connect.NewError(connect.CodeUnknown, fmt.Errorf("error sending data event: %w", streamErr))) return } @@ -109,7 +110,7 @@ func (s *Service) handleConnect(ctx context.Context, req *connect.Request[rpc.Co }, }) if streamErr != nil { - cancel(connect.NewError(connect.CodeUnknown, streamErr)) + cancel(connect.NewError(connect.CodeUnknown, fmt.Errorf("error sending end event: %w", streamErr))) return } diff --git a/packages/envd/internal/services/process/handler/handler.go b/packages/envd/internal/services/process/handler/handler.go index 4327e1f..9683438 100644 --- a/packages/envd/internal/services/process/handler/handler.go +++ b/packages/envd/internal/services/process/handler/handler.go @@ -1,6 +1,7 @@ package handler import ( + "context" "errors" "fmt" "io" @@ -10,14 +11,14 @@ import ( "sync" "syscall" + "connectrpc.com/connect" + "github.com/creack/pty" + "github.com/rs/zerolog" + "github.com/e2b-dev/infra/packages/envd/internal/logs" "github.com/e2b-dev/infra/packages/envd/internal/permissions" rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process" "github.com/e2b-dev/infra/packages/envd/internal/utils" - - "connectrpc.com/connect" - "github.com/creack/pty" - "github.com/rs/zerolog" ) const ( @@ -43,7 +44,11 @@ type Handler struct { cmd *exec.Cmd tty *os.File - outWg *sync.WaitGroup + cancel context.CancelFunc + + outCtx context.Context + outCancel context.CancelFunc + stdin io.WriteCloser DataEvent *MultiplexedChannel[rpc.ProcessEvent_Data] @@ -55,9 +60,15 @@ func (p *Handler) Pid() uint32 { return uint32(p.cmd.Process.Pid) } -func New(user *user.User, req *rpc.StartRequest, logger *zerolog.Logger, envVars *utils.Map[string, string]) (*Handler, error) { - // nosemgrep dangerous-exec-command - cmd := exec.Command(req.GetProcess().GetCmd(), req.GetProcess().GetArgs()...) +func New( + ctx context.Context, + user *user.User, + req *rpc.StartRequest, + logger *zerolog.Logger, + envVars *utils.Map[string, string], + cancel context.CancelFunc, +) (*Handler, error) { + cmd := exec.CommandContext(ctx, req.GetProcess().GetCmd(), req.GetProcess().GetArgs()...) uid, gid, err := permissions.GetUserIds(user) if err != nil { @@ -104,8 +115,25 @@ func New(user *user.User, req *rpc.StartRequest, logger *zerolog.Logger, envVars cmd.Env = formattedVars outMultiplex := NewMultiplexedChannel[rpc.ProcessEvent_Data](outputBufferSize) + var outWg sync.WaitGroup + // Create a context for waiting for and cancelling output pipes. + // Cancellation of the process via timeout will propagate and cancel this context too. + outCtx, outCancel := context.WithCancel(ctx) + + h := &Handler{ + Config: req.GetProcess(), + cmd: cmd, + Tag: req.Tag, + DataEvent: outMultiplex, + cancel: cancel, + outCtx: outCtx, + outCancel: outCancel, + EndEvent: NewMultiplexedChannel[rpc.ProcessEvent_End](0), + logger: logger, + } + if req.GetPty() != nil { // The pty should ideally start only in the Start method, but the package does not support that and we would have to code it manually. // The output of the pty should correctly be passed though. @@ -118,7 +146,6 @@ func New(user *user.User, req *rpc.StartRequest, logger *zerolog.Logger, envVars } outWg.Add(1) - go func() { defer outWg.Done() @@ -149,123 +176,113 @@ func New(user *user.User, req *rpc.StartRequest, logger *zerolog.Logger, envVars } }() - return &Handler{ - Config: req.GetProcess(), - cmd: cmd, - tty: tty, - Tag: req.Tag, - DataEvent: outMultiplex, - outWg: &outWg, - EndEvent: NewMultiplexedChannel[rpc.ProcessEvent_End](0), - logger: logger, - }, nil - } - - stdin, err := cmd.StdinPipe() - if err != nil { - return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("error creating stdin pipe for command '%s': %w", cmd, err)) - } + h.tty = tty + } else { + stdout, err := cmd.StdoutPipe() + if err != nil { + return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("error creating stdout pipe for command '%s': %w", cmd, err)) + } - stdout, err := cmd.StdoutPipe() - if err != nil { - return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("error creating stdout pipe for command '%s': %w", cmd, err)) - } + outWg.Add(1) + go func() { + defer outWg.Done() + stdoutLogs := make(chan []byte, outputBufferSize) + defer close(stdoutLogs) - outWg.Add(1) - go func() { - defer outWg.Done() + stdoutLogger := logger.With().Str("event_type", "stdout").Logger() - stdoutLogs := make(chan []byte, outputBufferSize) - defer close(stdoutLogs) + go logs.LogBufferedDataEvents(stdoutLogs, &stdoutLogger, "data") - stdoutLogger := logger.With().Str("event_type", "stdout").Logger() + for { + buf := make([]byte, stdChunkSize) - go logs.LogBufferedDataEvents(stdoutLogs, &stdoutLogger, "data") + n, readErr := stdout.Read(buf) - for { - buf := make([]byte, stdChunkSize) + if n > 0 { + outMultiplex.Source <- rpc.ProcessEvent_Data{ + Data: &rpc.ProcessEvent_DataEvent{ + Output: &rpc.ProcessEvent_DataEvent_Stdout{ + Stdout: buf[:n], + }, + }, + } - n, readErr := stdout.Read(buf) + stdoutLogs <- buf[:n] + } - if n > 0 { - outMultiplex.Source <- rpc.ProcessEvent_Data{ - Data: &rpc.ProcessEvent_DataEvent{ - Output: &rpc.ProcessEvent_DataEvent_Stdout{ - Stdout: buf[:n], - }, - }, + if errors.Is(readErr, io.EOF) { + break } - stdoutLogs <- buf[:n] - } + if readErr != nil { + fmt.Fprintf(os.Stderr, "error reading from stdout: %s\n", readErr) - if errors.Is(readErr, io.EOF) { - break + break + } } + }() - if readErr != nil { - fmt.Fprintf(os.Stderr, "error reading from stdout: %s\n", readErr) - - break - } + stderr, err := cmd.StderrPipe() + if err != nil { + return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("error creating stderr pipe for command '%s': %w", cmd, err)) } - }() - stderr, err := cmd.StderrPipe() - if err != nil { - return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("error creating stderr pipe for command '%s': %w", cmd, err)) - } + outWg.Add(1) + go func() { + defer outWg.Done() + stderrLogs := make(chan []byte, outputBufferSize) + defer close(stderrLogs) - outWg.Add(1) - go func() { - defer outWg.Done() + stderrLogger := logger.With().Str("event_type", "stderr").Logger() - stderrLogs := make(chan []byte, outputBufferSize) - defer close(stderrLogs) + go logs.LogBufferedDataEvents(stderrLogs, &stderrLogger, "data") - stderrLogger := logger.With().Str("event_type", "stderr").Logger() + for { + buf := make([]byte, stdChunkSize) - go logs.LogBufferedDataEvents(stderrLogs, &stderrLogger, "data") + n, readErr := stderr.Read(buf) - for { - buf := make([]byte, stdChunkSize) + if n > 0 { + outMultiplex.Source <- rpc.ProcessEvent_Data{ + Data: &rpc.ProcessEvent_DataEvent{ + Output: &rpc.ProcessEvent_DataEvent_Stderr{ + Stderr: buf[:n], + }, + }, + } - n, readErr := stderr.Read(buf) + stderrLogs <- buf[:n] + } - if n > 0 { - outMultiplex.Source <- rpc.ProcessEvent_Data{ - Data: &rpc.ProcessEvent_DataEvent{ - Output: &rpc.ProcessEvent_DataEvent_Stderr{ - Stderr: buf[:n], - }, - }, + if errors.Is(readErr, io.EOF) { + break } - stderrLogs <- buf[:n] - } + if readErr != nil { + fmt.Fprintf(os.Stderr, "error reading from stderr: %s\n", readErr) - if errors.Is(readErr, io.EOF) { - break + break + } } + }() - if readErr != nil { - fmt.Fprintf(os.Stderr, "error reading from stderr: %s\n", readErr) - - break - } + stdin, err := cmd.StdinPipe() + if err != nil { + return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("error creating stdin pipe for command '%s': %w", cmd, err)) } + + h.stdin = stdin + } + + go func() { + outWg.Wait() + + close(outMultiplex.Source) + + outCancel() }() - return &Handler{ - Config: req.GetProcess(), - cmd: cmd, - stdin: stdin, - Tag: req.Tag, - DataEvent: outMultiplex, - outWg: &outWg, - EndEvent: NewMultiplexedChannel[rpc.ProcessEvent_End](0), - logger: logger, - }, nil + return h, nil } func (p *Handler) SendSignal(signal syscall.Signal) error { @@ -273,6 +290,10 @@ func (p *Handler) SendSignal(signal syscall.Signal) error { return fmt.Errorf("process not started") } + if signal == syscall.SIGKILL || signal == syscall.SIGTERM { + p.outCancel() + } + return p.cmd.Process.Signal(signal) } @@ -335,14 +356,13 @@ func (p *Handler) Start() (uint32, error) { } func (p *Handler) Wait() { - p.outWg.Wait() + // Wait for the output pipes to be closed or cancelled. + <-p.outCtx.Done() - close(p.DataEvent.Source) + err := p.cmd.Wait() p.tty.Close() - err := p.cmd.Wait() - var errMsg *string if err != nil { @@ -368,4 +388,8 @@ func (p *Handler) Wait() { Str("event_type", "process_end"). Interface("process_result", endEvent). Send() + + // Ensure the process cancel is called to cleanup resources. + // As it is called after end event and Wait, it should not affect command execution or returned events. + p.cancel() } diff --git a/packages/envd/internal/services/process/input.go b/packages/envd/internal/services/process/input.go index df2d349..8a6f122 100644 --- a/packages/envd/internal/services/process/input.go +++ b/packages/envd/internal/services/process/input.go @@ -4,12 +4,12 @@ import ( "context" "fmt" + "connectrpc.com/connect" + "github.com/rs/zerolog" + "github.com/e2b-dev/infra/packages/envd/internal/logs" "github.com/e2b-dev/infra/packages/envd/internal/services/process/handler" rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process" - - "connectrpc.com/connect" - "github.com/rs/zerolog" ) func handleInput(ctx context.Context, process *handler.Handler, in *rpc.ProcessInput, logger *zerolog.Logger) error { @@ -85,7 +85,7 @@ func (s *Service) streamInputHandler(ctx context.Context, stream *connect.Client err := stream.Err() if err != nil { - return nil, connect.NewError(connect.CodeUnknown, err) + return nil, connect.NewError(connect.CodeUnknown, fmt.Errorf("error streaming input: %w", err)) } return connect.NewResponse(&rpc.StreamInputResponse{}), nil diff --git a/packages/envd/internal/services/process/list.go b/packages/envd/internal/services/process/list.go index f8ff819..df5df1c 100644 --- a/packages/envd/internal/services/process/list.go +++ b/packages/envd/internal/services/process/list.go @@ -3,10 +3,10 @@ package process import ( "context" + "connectrpc.com/connect" + "github.com/e2b-dev/infra/packages/envd/internal/services/process/handler" rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process" - - "connectrpc.com/connect" ) func (s *Service) List(ctx context.Context, req *connect.Request[rpc.ListRequest]) (*connect.Response[rpc.ListResponse], error) { diff --git a/packages/envd/internal/services/process/service.go b/packages/envd/internal/services/process/service.go index d85462a..4a0453d 100644 --- a/packages/envd/internal/services/process/service.go +++ b/packages/envd/internal/services/process/service.go @@ -3,15 +3,15 @@ package process import ( "fmt" + "connectrpc.com/connect" + "github.com/go-chi/chi/v5" + "github.com/rs/zerolog" + "github.com/e2b-dev/infra/packages/envd/internal/logs" "github.com/e2b-dev/infra/packages/envd/internal/services/process/handler" rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process" spec "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process/processconnect" "github.com/e2b-dev/infra/packages/envd/internal/utils" - - "connectrpc.com/connect" - "github.com/go-chi/chi/v5" - "github.com/rs/zerolog" ) type Service struct { diff --git a/packages/envd/internal/services/process/signal.go b/packages/envd/internal/services/process/signal.go index 9a89733..7b1583a 100644 --- a/packages/envd/internal/services/process/signal.go +++ b/packages/envd/internal/services/process/signal.go @@ -5,13 +5,13 @@ import ( "fmt" "syscall" - rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process" - "connectrpc.com/connect" + + rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process" ) func (s *Service) SendSignal(ctx context.Context, req *connect.Request[rpc.SendSignalRequest]) (*connect.Response[rpc.SendSignalResponse], error) { - proc, err := s.getProcess(req.Msg.Process) + handler, err := s.getProcess(req.Msg.Process) if err != nil { return nil, err } @@ -26,7 +26,7 @@ func (s *Service) SendSignal(ctx context.Context, req *connect.Request[rpc.SendS return nil, connect.NewError(connect.CodeUnimplemented, fmt.Errorf("invalid signal: %s", req.Msg.GetSignal())) } - err = proc.SendSignal(signal) + err = handler.SendSignal(signal) if err != nil { return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("error sending signal: %w", err)) } diff --git a/packages/envd/internal/services/process/start.go b/packages/envd/internal/services/process/start.go index c1e478f..e036d06 100644 --- a/packages/envd/internal/services/process/start.go +++ b/packages/envd/internal/services/process/start.go @@ -3,15 +3,19 @@ package process import ( "context" "errors" + "fmt" + "net/http" "os/user" + "strconv" + "time" + + "connectrpc.com/connect" "github.com/e2b-dev/infra/packages/envd/internal/host" "github.com/e2b-dev/infra/packages/envd/internal/logs" "github.com/e2b-dev/infra/packages/envd/internal/permissions" "github.com/e2b-dev/infra/packages/envd/internal/services/process/handler" rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process" - - "connectrpc.com/connect" ) func (s *Service) InitializeStartProcess(ctx context.Context, user *user.User, req *rpc.StartRequest) error { @@ -27,7 +31,8 @@ func (s *Service) InitializeStartProcess(ctx context.Context, user *user.User, r handlerL := s.logger.With().Str(string(logs.OperationIDKey), ctx.Value(logs.OperationIDKey).(string)).Logger() - proc, err := handler.New(user, req, &handlerL, nil) + startProcCtx, startProcCancel := context.WithCancel(ctx) + proc, err := handler.New(startProcCtx, user, req, &handlerL, nil, startProcCancel) if err != nil { return err } @@ -67,8 +72,23 @@ func (s *Service) handleStart(ctx context.Context, req *connect.Request[rpc.Star return err } - proc, err := handler.New(u, req.Msg, &handlerL, s.envs) + timeout, err := determineTimeoutFromHeader(stream.Conn().RequestHeader()) + if err != nil { + return connect.NewError(connect.CodeInvalidArgument, err) + } + + // Create a new context with a timeout if provided. + // We do not want the command to be killed if the request context is cancelled + procCtx, cancelProc := context.Background(), func() {} + if timeout > 0 { // zero timeout means no timeout + procCtx, cancelProc = context.WithTimeout(procCtx, timeout) + } + + proc, err := handler.New(procCtx, u, req.Msg, &handlerL, s.envs, cancelProc) if err != nil { + // Ensure the process cancel is called to cleanup resources. + cancelProc() + return err } @@ -107,7 +127,7 @@ func (s *Service) handleStart(ctx context.Context, req *connect.Request[rpc.Star }, }) if streamErr != nil { - cancel(connect.NewError(connect.CodeUnknown, streamErr)) + cancel(connect.NewError(connect.CodeUnknown, fmt.Errorf("error sending start event: %w", streamErr))) return } @@ -128,7 +148,7 @@ func (s *Service) handleStart(ctx context.Context, req *connect.Request[rpc.Star }, }) if streamErr != nil { - cancel(connect.NewError(connect.CodeUnknown, streamErr)) + cancel(connect.NewError(connect.CodeUnknown, fmt.Errorf("error sending keepalive: %w", streamErr))) return } case <-ctx.Done(): @@ -145,7 +165,7 @@ func (s *Service) handleStart(ctx context.Context, req *connect.Request[rpc.Star }, }) if streamErr != nil { - cancel(connect.NewError(connect.CodeUnknown, streamErr)) + cancel(connect.NewError(connect.CodeUnknown, fmt.Errorf("error sending data event: %w", streamErr))) return } @@ -171,7 +191,7 @@ func (s *Service) handleStart(ctx context.Context, req *connect.Request[rpc.Star }, }) if streamErr != nil { - cancel(connect.NewError(connect.CodeUnknown, streamErr)) + cancel(connect.NewError(connect.CodeUnknown, fmt.Errorf("error sending end event: %w", streamErr))) return } @@ -204,3 +224,18 @@ func (s *Service) handleStart(ctx context.Context, req *connect.Request[rpc.Star return nil } } + +func determineTimeoutFromHeader(header http.Header) (time.Duration, error) { + timeoutHeader := header.Get("Connect-Timeout-Ms") + + if timeoutHeader == "" { + return 0, nil + } + + timeout, err := strconv.Atoi(timeoutHeader) + if err != nil { + return 0, err + } + + return time.Duration(timeout) * time.Millisecond, nil +} diff --git a/packages/envd/internal/services/process/update.go b/packages/envd/internal/services/process/update.go index 9c442e8..5337375 100644 --- a/packages/envd/internal/services/process/update.go +++ b/packages/envd/internal/services/process/update.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process" - "connectrpc.com/connect" "github.com/creack/pty" + + rpc "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process" ) func (s *Service) Update(ctx context.Context, req *connect.Request[rpc.UpdateRequest]) (*connect.Response[rpc.UpdateResponse], error) { diff --git a/packages/envd/internal/services/spec/filesystem/filesystem.pb.go b/packages/envd/internal/services/spec/filesystem/filesystem.pb.go index b8d2978..b7f3d9f 100644 --- a/packages/envd/internal/services/spec/filesystem/filesystem.pb.go +++ b/packages/envd/internal/services/spec/filesystem/filesystem.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.28.1 // protoc (unknown) // source: filesystem/filesystem.proto @@ -570,7 +570,8 @@ type ListDirRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` + Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` + Depth uint32 `protobuf:"varint,2,opt,name=depth,proto3" json:"depth,omitempty"` } func (x *ListDirRequest) Reset() { @@ -612,6 +613,13 @@ func (x *ListDirRequest) GetPath() string { return "" } +func (x *ListDirRequest) GetDepth() uint32 { + if x != nil { + return x.Depth + } + return 0 +} + type ListDirResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1256,130 +1264,131 @@ var file_filesystem_filesystem_proto_rawDesc = []byte{ 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0x24, 0x0a, 0x0e, 0x4c, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0x3a, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, - 0x68, 0x22, 0x42, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x72, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x2e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x65, 0x6e, - 0x74, 0x72, 0x69, 0x65, 0x73, 0x22, 0x43, 0x0a, 0x0f, 0x57, 0x61, 0x74, 0x63, 0x68, 0x44, 0x69, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1c, 0x0a, 0x09, - 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x22, 0x50, 0x0a, 0x0f, 0x46, 0x69, - 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x12, 0x0a, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x12, 0x29, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x15, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0xfe, 0x01, 0x0a, - 0x10, 0x57, 0x61, 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x3f, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x27, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x57, 0x61, - 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, - 0x74, 0x61, 0x72, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x05, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x12, 0x3d, 0x0a, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x45, 0x76, - 0x65, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, - 0x6d, 0x12, 0x46, 0x0a, 0x09, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, - 0x6d, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x2e, 0x4b, 0x65, 0x65, 0x70, 0x41, 0x6c, 0x69, 0x76, 0x65, 0x48, 0x00, 0x52, 0x09, - 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x1a, 0x0c, 0x0a, 0x0a, 0x53, 0x74, 0x61, - 0x72, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x1a, 0x0b, 0x0a, 0x09, 0x4b, 0x65, 0x65, 0x70, 0x41, - 0x6c, 0x69, 0x76, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x48, 0x0a, - 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x63, - 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x72, 0x65, - 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x22, 0x36, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x68, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x70, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x05, 0x64, 0x65, 0x70, 0x74, 0x68, 0x22, 0x42, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x44, + 0x69, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x07, 0x65, 0x6e, + 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x66, 0x69, + 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x22, 0x43, 0x0a, 0x0f, 0x57, + 0x61, 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, + 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, + 0x74, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, + 0x22, 0x50, 0x0a, 0x0f, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x45, 0x76, + 0x65, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, + 0x70, 0x65, 0x22, 0xfe, 0x01, 0x0a, 0x10, 0x57, 0x61, 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x48, + 0x00, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x3d, 0x0a, 0x0a, 0x66, 0x69, 0x6c, 0x65, + 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x66, + 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x66, 0x69, 0x6c, + 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x46, 0x0a, 0x09, 0x6b, 0x65, 0x65, 0x70, 0x61, + 0x6c, 0x69, 0x76, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x66, 0x69, 0x6c, + 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4b, 0x65, 0x65, 0x70, 0x41, 0x6c, 0x69, + 0x76, 0x65, 0x48, 0x00, 0x52, 0x09, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x1a, + 0x0c, 0x0a, 0x0a, 0x53, 0x74, 0x61, 0x72, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x1a, 0x0b, 0x0a, + 0x09, 0x4b, 0x65, 0x65, 0x70, 0x41, 0x6c, 0x69, 0x76, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x65, 0x76, + 0x65, 0x6e, 0x74, 0x22, 0x48, 0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x74, + 0x63, 0x68, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, + 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, + 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x22, 0x36, 0x0a, + 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, + 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x77, 0x61, 0x74, 0x63, + 0x68, 0x65, 0x72, 0x49, 0x64, 0x22, 0x38, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x57, 0x61, 0x74, 0x63, + 0x68, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x49, 0x64, 0x22, - 0x38, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x77, 0x61, - 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x49, 0x64, 0x22, 0x4f, 0x0a, 0x18, 0x47, 0x65, 0x74, - 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x35, 0x0a, 0x14, 0x52, 0x65, - 0x6d, 0x6f, 0x76, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x49, - 0x64, 0x22, 0x17, 0x0a, 0x15, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, - 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x52, 0x0a, 0x08, 0x46, 0x69, - 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x15, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x54, - 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, - 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, - 0x49, 0x4c, 0x45, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x54, 0x59, - 0x50, 0x45, 0x5f, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x59, 0x10, 0x02, 0x2a, 0x98, - 0x01, 0x0a, 0x09, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x16, - 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, - 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x45, 0x56, 0x45, 0x4e, - 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x52, 0x45, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, - 0x14, 0x0a, 0x10, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x52, - 0x49, 0x54, 0x45, 0x10, 0x02, 0x12, 0x15, 0x0a, 0x11, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x54, - 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, 0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, - 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x4e, 0x41, 0x4d, - 0x45, 0x10, 0x04, 0x12, 0x14, 0x0a, 0x10, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x59, 0x50, - 0x45, 0x5f, 0x43, 0x48, 0x4d, 0x4f, 0x44, 0x10, 0x05, 0x32, 0x9f, 0x05, 0x0a, 0x0a, 0x46, 0x69, - 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x39, 0x0a, 0x04, 0x53, 0x74, 0x61, 0x74, - 0x12, 0x17, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x53, 0x74, - 0x61, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x66, 0x69, 0x6c, 0x65, - 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a, 0x07, 0x4d, 0x61, 0x6b, 0x65, 0x44, 0x69, 0x72, 0x12, 0x1a, - 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x4d, 0x61, 0x6b, 0x65, - 0x44, 0x69, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, - 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x4d, 0x61, 0x6b, 0x65, 0x44, 0x69, 0x72, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x39, 0x0a, 0x04, 0x4d, 0x6f, 0x76, 0x65, 0x12, - 0x17, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x4d, 0x6f, 0x76, - 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x42, 0x0a, 0x07, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x72, 0x12, 0x1a, 0x2e, - 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, - 0x69, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, - 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x72, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, - 0x12, 0x19, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x52, 0x65, - 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x66, 0x69, - 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a, 0x08, 0x57, 0x61, 0x74, 0x63, 0x68, - 0x44, 0x69, 0x72, 0x12, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1c, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x57, 0x61, - 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, - 0x12, 0x54, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, - 0x72, 0x12, 0x20, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x57, 0x61, 0x74, - 0x63, 0x68, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x23, 0x2e, 0x66, 0x69, 0x6c, - 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x47, 0x65, 0x74, 0x57, 0x61, 0x74, 0x63, 0x68, - 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x24, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x47, 0x65, 0x74, - 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x54, 0x0a, 0x0d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x57, - 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x57, 0x61, 0x74, 0x63, - 0x68, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xb3, 0x01, 0x0a, 0x0e, - 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x42, 0x0f, - 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, - 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x32, - 0x62, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x69, 0x6e, 0x66, 0x72, 0x61, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x61, 0x67, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x76, 0x64, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, 0x70, 0x65, 0x63, - 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0xa2, 0x02, 0x03, 0x46, 0x58, - 0x58, 0xaa, 0x02, 0x0a, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0xca, 0x02, - 0x0a, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0xe2, 0x02, 0x16, 0x46, 0x69, - 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0a, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, - 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x4f, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x65, + 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x66, 0x69, + 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, + 0x22, 0x35, 0x0a, 0x14, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, + 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x77, 0x61, 0x74, 0x63, + 0x68, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x77, 0x61, + 0x74, 0x63, 0x68, 0x65, 0x72, 0x49, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x52, 0x65, 0x6d, 0x6f, 0x76, + 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x2a, 0x52, 0x0a, 0x08, 0x46, 0x69, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x15, + 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, + 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x46, 0x49, 0x4c, 0x45, 0x5f, + 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x46, + 0x49, 0x4c, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x4f, + 0x52, 0x59, 0x10, 0x02, 0x2a, 0x98, 0x01, 0x0a, 0x09, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x16, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, + 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x15, + 0x0a, 0x11, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x52, 0x45, + 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x54, + 0x59, 0x50, 0x45, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x02, 0x12, 0x15, 0x0a, 0x11, 0x45, + 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, + 0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, + 0x5f, 0x52, 0x45, 0x4e, 0x41, 0x4d, 0x45, 0x10, 0x04, 0x12, 0x14, 0x0a, 0x10, 0x45, 0x56, 0x45, + 0x4e, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x48, 0x4d, 0x4f, 0x44, 0x10, 0x05, 0x32, + 0x9f, 0x05, 0x0a, 0x0a, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x39, + 0x0a, 0x04, 0x53, 0x74, 0x61, 0x74, 0x12, 0x17, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x18, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x53, 0x74, 0x61, + 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a, 0x07, 0x4d, 0x61, 0x6b, + 0x65, 0x44, 0x69, 0x72, 0x12, 0x1a, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0x2e, 0x4d, 0x61, 0x6b, 0x65, 0x44, 0x69, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x4d, 0x61, + 0x6b, 0x65, 0x44, 0x69, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x39, 0x0a, + 0x04, 0x4d, 0x6f, 0x76, 0x65, 0x12, 0x17, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, + 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x4d, 0x6f, 0x76, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a, 0x07, 0x4c, 0x69, 0x73, 0x74, + 0x44, 0x69, 0x72, 0x12, 0x1a, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x44, 0x69, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x06, + 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x19, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x1a, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x52, + 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a, + 0x08, 0x57, 0x61, 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, 0x12, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, + 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x44, 0x69, 0x72, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, 0x12, 0x54, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, + 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x66, 0x69, 0x6c, 0x65, + 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x57, 0x61, 0x74, + 0x63, 0x68, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a, 0x10, + 0x47, 0x65, 0x74, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, + 0x12, 0x23, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x47, 0x65, + 0x74, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x2e, 0x47, 0x65, 0x74, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x54, 0x0a, 0x0d, 0x52, + 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x66, + 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, + 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x52, 0x65, 0x6d, 0x6f, + 0x76, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x42, 0xb3, 0x01, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x42, 0x0f, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x32, 0x62, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x69, 0x6e, 0x66, 0x72, + 0x61, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x76, 0x64, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x73, 0x2f, 0x73, 0x70, 0x65, 0x63, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0xa2, 0x02, 0x03, 0x46, 0x58, 0x58, 0xaa, 0x02, 0x0a, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0xca, 0x02, 0x0a, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0xe2, 0x02, 0x16, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5c, 0x47, + 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0a, 0x46, 0x69, 0x6c, + 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1396,7 +1405,7 @@ func file_filesystem_filesystem_proto_rawDescGZIP() []byte { var file_filesystem_filesystem_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_filesystem_filesystem_proto_msgTypes = make([]protoimpl.MessageInfo, 22) -var file_filesystem_filesystem_proto_goTypes = []any{ +var file_filesystem_filesystem_proto_goTypes = []interface{}{ (FileType)(0), // 0: filesystem.FileType (EventType)(0), // 1: filesystem.EventType (*MoveRequest)(nil), // 2: filesystem.MoveRequest @@ -1464,7 +1473,7 @@ func file_filesystem_filesystem_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_filesystem_filesystem_proto_msgTypes[0].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoveRequest); i { case 0: return &v.state @@ -1476,7 +1485,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[1].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoveResponse); i { case 0: return &v.state @@ -1488,7 +1497,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[2].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MakeDirRequest); i { case 0: return &v.state @@ -1500,7 +1509,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[3].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MakeDirResponse); i { case 0: return &v.state @@ -1512,7 +1521,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[4].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RemoveRequest); i { case 0: return &v.state @@ -1524,7 +1533,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[5].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RemoveResponse); i { case 0: return &v.state @@ -1536,7 +1545,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[6].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StatRequest); i { case 0: return &v.state @@ -1548,7 +1557,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[7].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StatResponse); i { case 0: return &v.state @@ -1560,7 +1569,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[8].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*EntryInfo); i { case 0: return &v.state @@ -1572,7 +1581,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[9].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListDirRequest); i { case 0: return &v.state @@ -1584,7 +1593,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[10].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListDirResponse); i { case 0: return &v.state @@ -1596,7 +1605,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[11].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WatchDirRequest); i { case 0: return &v.state @@ -1608,7 +1617,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[12].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FilesystemEvent); i { case 0: return &v.state @@ -1620,7 +1629,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[13].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WatchDirResponse); i { case 0: return &v.state @@ -1632,7 +1641,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[14].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CreateWatcherRequest); i { case 0: return &v.state @@ -1644,7 +1653,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[15].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CreateWatcherResponse); i { case 0: return &v.state @@ -1656,7 +1665,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[16].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetWatcherEventsRequest); i { case 0: return &v.state @@ -1668,7 +1677,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[17].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetWatcherEventsResponse); i { case 0: return &v.state @@ -1680,7 +1689,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[18].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RemoveWatcherRequest); i { case 0: return &v.state @@ -1692,7 +1701,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[19].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RemoveWatcherResponse); i { case 0: return &v.state @@ -1704,7 +1713,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[20].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WatchDirResponse_StartEvent); i { case 0: return &v.state @@ -1716,7 +1725,7 @@ func file_filesystem_filesystem_proto_init() { return nil } } - file_filesystem_filesystem_proto_msgTypes[21].Exporter = func(v any, i int) any { + file_filesystem_filesystem_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WatchDirResponse_KeepAlive); i { case 0: return &v.state @@ -1729,7 +1738,7 @@ func file_filesystem_filesystem_proto_init() { } } } - file_filesystem_filesystem_proto_msgTypes[13].OneofWrappers = []any{ + file_filesystem_filesystem_proto_msgTypes[13].OneofWrappers = []interface{}{ (*WatchDirResponse_Start)(nil), (*WatchDirResponse_Filesystem)(nil), (*WatchDirResponse_Keepalive)(nil), diff --git a/packages/envd/internal/services/spec/filesystem/filesystemconnect/filesystem.connect.go b/packages/envd/internal/services/spec/filesystem/filesystemconnect/filesystem.connect.go index 7fff065..c8f67e4 100644 --- a/packages/envd/internal/services/spec/filesystem/filesystemconnect/filesystem.connect.go +++ b/packages/envd/internal/services/spec/filesystem/filesystemconnect/filesystem.connect.go @@ -56,20 +56,6 @@ const ( FilesystemRemoveWatcherProcedure = "/filesystem.Filesystem/RemoveWatcher" ) -// These variables are the protoreflect.Descriptor objects for the RPCs defined in this package. -var ( - filesystemServiceDescriptor = filesystem.File_filesystem_filesystem_proto.Services().ByName("Filesystem") - filesystemStatMethodDescriptor = filesystemServiceDescriptor.Methods().ByName("Stat") - filesystemMakeDirMethodDescriptor = filesystemServiceDescriptor.Methods().ByName("MakeDir") - filesystemMoveMethodDescriptor = filesystemServiceDescriptor.Methods().ByName("Move") - filesystemListDirMethodDescriptor = filesystemServiceDescriptor.Methods().ByName("ListDir") - filesystemRemoveMethodDescriptor = filesystemServiceDescriptor.Methods().ByName("Remove") - filesystemWatchDirMethodDescriptor = filesystemServiceDescriptor.Methods().ByName("WatchDir") - filesystemCreateWatcherMethodDescriptor = filesystemServiceDescriptor.Methods().ByName("CreateWatcher") - filesystemGetWatcherEventsMethodDescriptor = filesystemServiceDescriptor.Methods().ByName("GetWatcherEvents") - filesystemRemoveWatcherMethodDescriptor = filesystemServiceDescriptor.Methods().ByName("RemoveWatcher") -) - // FilesystemClient is a client for the filesystem.Filesystem service. type FilesystemClient interface { Stat(context.Context, *connect.Request[filesystem.StatRequest]) (*connect.Response[filesystem.StatResponse], error) @@ -93,59 +79,60 @@ type FilesystemClient interface { // http://api.acme.com or https://acme.com/grpc). func NewFilesystemClient(httpClient connect.HTTPClient, baseURL string, opts ...connect.ClientOption) FilesystemClient { baseURL = strings.TrimRight(baseURL, "/") + filesystemMethods := filesystem.File_filesystem_filesystem_proto.Services().ByName("Filesystem").Methods() return &filesystemClient{ stat: connect.NewClient[filesystem.StatRequest, filesystem.StatResponse]( httpClient, baseURL+FilesystemStatProcedure, - connect.WithSchema(filesystemStatMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("Stat")), connect.WithClientOptions(opts...), ), makeDir: connect.NewClient[filesystem.MakeDirRequest, filesystem.MakeDirResponse]( httpClient, baseURL+FilesystemMakeDirProcedure, - connect.WithSchema(filesystemMakeDirMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("MakeDir")), connect.WithClientOptions(opts...), ), move: connect.NewClient[filesystem.MoveRequest, filesystem.MoveResponse]( httpClient, baseURL+FilesystemMoveProcedure, - connect.WithSchema(filesystemMoveMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("Move")), connect.WithClientOptions(opts...), ), listDir: connect.NewClient[filesystem.ListDirRequest, filesystem.ListDirResponse]( httpClient, baseURL+FilesystemListDirProcedure, - connect.WithSchema(filesystemListDirMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("ListDir")), connect.WithClientOptions(opts...), ), remove: connect.NewClient[filesystem.RemoveRequest, filesystem.RemoveResponse]( httpClient, baseURL+FilesystemRemoveProcedure, - connect.WithSchema(filesystemRemoveMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("Remove")), connect.WithClientOptions(opts...), ), watchDir: connect.NewClient[filesystem.WatchDirRequest, filesystem.WatchDirResponse]( httpClient, baseURL+FilesystemWatchDirProcedure, - connect.WithSchema(filesystemWatchDirMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("WatchDir")), connect.WithClientOptions(opts...), ), createWatcher: connect.NewClient[filesystem.CreateWatcherRequest, filesystem.CreateWatcherResponse]( httpClient, baseURL+FilesystemCreateWatcherProcedure, - connect.WithSchema(filesystemCreateWatcherMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("CreateWatcher")), connect.WithClientOptions(opts...), ), getWatcherEvents: connect.NewClient[filesystem.GetWatcherEventsRequest, filesystem.GetWatcherEventsResponse]( httpClient, baseURL+FilesystemGetWatcherEventsProcedure, - connect.WithSchema(filesystemGetWatcherEventsMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("GetWatcherEvents")), connect.WithClientOptions(opts...), ), removeWatcher: connect.NewClient[filesystem.RemoveWatcherRequest, filesystem.RemoveWatcherResponse]( httpClient, baseURL+FilesystemRemoveWatcherProcedure, - connect.WithSchema(filesystemRemoveWatcherMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("RemoveWatcher")), connect.WithClientOptions(opts...), ), } @@ -229,58 +216,59 @@ type FilesystemHandler interface { // By default, handlers support the Connect, gRPC, and gRPC-Web protocols with the binary Protobuf // and JSON codecs. They also support gzip compression. func NewFilesystemHandler(svc FilesystemHandler, opts ...connect.HandlerOption) (string, http.Handler) { + filesystemMethods := filesystem.File_filesystem_filesystem_proto.Services().ByName("Filesystem").Methods() filesystemStatHandler := connect.NewUnaryHandler( FilesystemStatProcedure, svc.Stat, - connect.WithSchema(filesystemStatMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("Stat")), connect.WithHandlerOptions(opts...), ) filesystemMakeDirHandler := connect.NewUnaryHandler( FilesystemMakeDirProcedure, svc.MakeDir, - connect.WithSchema(filesystemMakeDirMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("MakeDir")), connect.WithHandlerOptions(opts...), ) filesystemMoveHandler := connect.NewUnaryHandler( FilesystemMoveProcedure, svc.Move, - connect.WithSchema(filesystemMoveMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("Move")), connect.WithHandlerOptions(opts...), ) filesystemListDirHandler := connect.NewUnaryHandler( FilesystemListDirProcedure, svc.ListDir, - connect.WithSchema(filesystemListDirMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("ListDir")), connect.WithHandlerOptions(opts...), ) filesystemRemoveHandler := connect.NewUnaryHandler( FilesystemRemoveProcedure, svc.Remove, - connect.WithSchema(filesystemRemoveMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("Remove")), connect.WithHandlerOptions(opts...), ) filesystemWatchDirHandler := connect.NewServerStreamHandler( FilesystemWatchDirProcedure, svc.WatchDir, - connect.WithSchema(filesystemWatchDirMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("WatchDir")), connect.WithHandlerOptions(opts...), ) filesystemCreateWatcherHandler := connect.NewUnaryHandler( FilesystemCreateWatcherProcedure, svc.CreateWatcher, - connect.WithSchema(filesystemCreateWatcherMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("CreateWatcher")), connect.WithHandlerOptions(opts...), ) filesystemGetWatcherEventsHandler := connect.NewUnaryHandler( FilesystemGetWatcherEventsProcedure, svc.GetWatcherEvents, - connect.WithSchema(filesystemGetWatcherEventsMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("GetWatcherEvents")), connect.WithHandlerOptions(opts...), ) filesystemRemoveWatcherHandler := connect.NewUnaryHandler( FilesystemRemoveWatcherProcedure, svc.RemoveWatcher, - connect.WithSchema(filesystemRemoveWatcherMethodDescriptor), + connect.WithSchema(filesystemMethods.ByName("RemoveWatcher")), connect.WithHandlerOptions(opts...), ) return "/filesystem.Filesystem/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/packages/envd/internal/services/spec/process/process.pb.go b/packages/envd/internal/services/spec/process/process.pb.go index 52cb30c..9093add 100644 --- a/packages/envd/internal/services/spec/process/process.pb.go +++ b/packages/envd/internal/services/spec/process/process.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.28.1 // protoc (unknown) // source: process/process.proto @@ -1868,7 +1868,7 @@ func file_process_process_proto_rawDescGZIP() []byte { var file_process_process_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_process_process_proto_msgTypes = make([]protoimpl.MessageInfo, 29) -var file_process_process_proto_goTypes = []any{ +var file_process_process_proto_goTypes = []interface{}{ (Signal)(0), // 0: process.Signal (*PTY)(nil), // 1: process.PTY (*ProcessConfig)(nil), // 2: process.ProcessConfig @@ -1952,7 +1952,7 @@ func file_process_process_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_process_process_proto_msgTypes[0].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*PTY); i { case 0: return &v.state @@ -1964,7 +1964,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[1].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessConfig); i { case 0: return &v.state @@ -1976,7 +1976,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[2].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListRequest); i { case 0: return &v.state @@ -1988,7 +1988,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[3].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessInfo); i { case 0: return &v.state @@ -2000,7 +2000,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[4].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListResponse); i { case 0: return &v.state @@ -2012,7 +2012,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[5].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StartRequest); i { case 0: return &v.state @@ -2024,7 +2024,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[6].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UpdateRequest); i { case 0: return &v.state @@ -2036,7 +2036,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[7].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UpdateResponse); i { case 0: return &v.state @@ -2048,7 +2048,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[8].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessEvent); i { case 0: return &v.state @@ -2060,7 +2060,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[9].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StartResponse); i { case 0: return &v.state @@ -2072,7 +2072,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[10].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ConnectResponse); i { case 0: return &v.state @@ -2084,7 +2084,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[11].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SendInputRequest); i { case 0: return &v.state @@ -2096,7 +2096,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[12].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SendInputResponse); i { case 0: return &v.state @@ -2108,7 +2108,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[13].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessInput); i { case 0: return &v.state @@ -2120,7 +2120,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[14].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StreamInputRequest); i { case 0: return &v.state @@ -2132,7 +2132,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[15].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StreamInputResponse); i { case 0: return &v.state @@ -2144,7 +2144,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[16].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SendSignalRequest); i { case 0: return &v.state @@ -2156,7 +2156,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[17].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SendSignalResponse); i { case 0: return &v.state @@ -2168,7 +2168,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[18].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ConnectRequest); i { case 0: return &v.state @@ -2180,7 +2180,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[19].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessSelector); i { case 0: return &v.state @@ -2192,7 +2192,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[20].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*PTY_Size); i { case 0: return &v.state @@ -2204,7 +2204,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[22].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessEvent_StartEvent); i { case 0: return &v.state @@ -2216,7 +2216,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[23].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessEvent_DataEvent); i { case 0: return &v.state @@ -2228,7 +2228,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[24].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessEvent_EndEvent); i { case 0: return &v.state @@ -2240,7 +2240,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[25].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessEvent_KeepAlive); i { case 0: return &v.state @@ -2252,7 +2252,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[26].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StreamInputRequest_StartEvent); i { case 0: return &v.state @@ -2264,7 +2264,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[27].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StreamInputRequest_DataEvent); i { case 0: return &v.state @@ -2276,7 +2276,7 @@ func file_process_process_proto_init() { return nil } } - file_process_process_proto_msgTypes[28].Exporter = func(v any, i int) any { + file_process_process_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StreamInputRequest_KeepAlive); i { case 0: return &v.state @@ -2289,35 +2289,35 @@ func file_process_process_proto_init() { } } } - file_process_process_proto_msgTypes[1].OneofWrappers = []any{} - file_process_process_proto_msgTypes[3].OneofWrappers = []any{} - file_process_process_proto_msgTypes[5].OneofWrappers = []any{} - file_process_process_proto_msgTypes[6].OneofWrappers = []any{} - file_process_process_proto_msgTypes[8].OneofWrappers = []any{ + file_process_process_proto_msgTypes[1].OneofWrappers = []interface{}{} + file_process_process_proto_msgTypes[3].OneofWrappers = []interface{}{} + file_process_process_proto_msgTypes[5].OneofWrappers = []interface{}{} + file_process_process_proto_msgTypes[6].OneofWrappers = []interface{}{} + file_process_process_proto_msgTypes[8].OneofWrappers = []interface{}{ (*ProcessEvent_Start)(nil), (*ProcessEvent_Data)(nil), (*ProcessEvent_End)(nil), (*ProcessEvent_Keepalive)(nil), } - file_process_process_proto_msgTypes[13].OneofWrappers = []any{ + file_process_process_proto_msgTypes[13].OneofWrappers = []interface{}{ (*ProcessInput_Stdin)(nil), (*ProcessInput_Pty)(nil), } - file_process_process_proto_msgTypes[14].OneofWrappers = []any{ + file_process_process_proto_msgTypes[14].OneofWrappers = []interface{}{ (*StreamInputRequest_Start)(nil), (*StreamInputRequest_Data)(nil), (*StreamInputRequest_Keepalive)(nil), } - file_process_process_proto_msgTypes[19].OneofWrappers = []any{ + file_process_process_proto_msgTypes[19].OneofWrappers = []interface{}{ (*ProcessSelector_Pid)(nil), (*ProcessSelector_Tag)(nil), } - file_process_process_proto_msgTypes[23].OneofWrappers = []any{ + file_process_process_proto_msgTypes[23].OneofWrappers = []interface{}{ (*ProcessEvent_DataEvent_Stdout)(nil), (*ProcessEvent_DataEvent_Stderr)(nil), (*ProcessEvent_DataEvent_Pty)(nil), } - file_process_process_proto_msgTypes[24].OneofWrappers = []any{} + file_process_process_proto_msgTypes[24].OneofWrappers = []interface{}{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/packages/envd/internal/services/spec/process/processconnect/process.connect.go b/packages/envd/internal/services/spec/process/processconnect/process.connect.go index e90d8fc..e5fb739 100644 --- a/packages/envd/internal/services/spec/process/processconnect/process.connect.go +++ b/packages/envd/internal/services/spec/process/processconnect/process.connect.go @@ -49,18 +49,6 @@ const ( ProcessSendSignalProcedure = "/process.Process/SendSignal" ) -// These variables are the protoreflect.Descriptor objects for the RPCs defined in this package. -var ( - processServiceDescriptor = process.File_process_process_proto.Services().ByName("Process") - processListMethodDescriptor = processServiceDescriptor.Methods().ByName("List") - processConnectMethodDescriptor = processServiceDescriptor.Methods().ByName("Connect") - processStartMethodDescriptor = processServiceDescriptor.Methods().ByName("Start") - processUpdateMethodDescriptor = processServiceDescriptor.Methods().ByName("Update") - processStreamInputMethodDescriptor = processServiceDescriptor.Methods().ByName("StreamInput") - processSendInputMethodDescriptor = processServiceDescriptor.Methods().ByName("SendInput") - processSendSignalMethodDescriptor = processServiceDescriptor.Methods().ByName("SendSignal") -) - // ProcessClient is a client for the process.Process service. type ProcessClient interface { List(context.Context, *connect.Request[process.ListRequest]) (*connect.Response[process.ListResponse], error) @@ -82,47 +70,48 @@ type ProcessClient interface { // http://api.acme.com or https://acme.com/grpc). func NewProcessClient(httpClient connect.HTTPClient, baseURL string, opts ...connect.ClientOption) ProcessClient { baseURL = strings.TrimRight(baseURL, "/") + processMethods := process.File_process_process_proto.Services().ByName("Process").Methods() return &processClient{ list: connect.NewClient[process.ListRequest, process.ListResponse]( httpClient, baseURL+ProcessListProcedure, - connect.WithSchema(processListMethodDescriptor), + connect.WithSchema(processMethods.ByName("List")), connect.WithClientOptions(opts...), ), connect: connect.NewClient[process.ConnectRequest, process.ConnectResponse]( httpClient, baseURL+ProcessConnectProcedure, - connect.WithSchema(processConnectMethodDescriptor), + connect.WithSchema(processMethods.ByName("Connect")), connect.WithClientOptions(opts...), ), start: connect.NewClient[process.StartRequest, process.StartResponse]( httpClient, baseURL+ProcessStartProcedure, - connect.WithSchema(processStartMethodDescriptor), + connect.WithSchema(processMethods.ByName("Start")), connect.WithClientOptions(opts...), ), update: connect.NewClient[process.UpdateRequest, process.UpdateResponse]( httpClient, baseURL+ProcessUpdateProcedure, - connect.WithSchema(processUpdateMethodDescriptor), + connect.WithSchema(processMethods.ByName("Update")), connect.WithClientOptions(opts...), ), streamInput: connect.NewClient[process.StreamInputRequest, process.StreamInputResponse]( httpClient, baseURL+ProcessStreamInputProcedure, - connect.WithSchema(processStreamInputMethodDescriptor), + connect.WithSchema(processMethods.ByName("StreamInput")), connect.WithClientOptions(opts...), ), sendInput: connect.NewClient[process.SendInputRequest, process.SendInputResponse]( httpClient, baseURL+ProcessSendInputProcedure, - connect.WithSchema(processSendInputMethodDescriptor), + connect.WithSchema(processMethods.ByName("SendInput")), connect.WithClientOptions(opts...), ), sendSignal: connect.NewClient[process.SendSignalRequest, process.SendSignalResponse]( httpClient, baseURL+ProcessSendSignalProcedure, - connect.WithSchema(processSendSignalMethodDescriptor), + connect.WithSchema(processMethods.ByName("SendSignal")), connect.WithClientOptions(opts...), ), } @@ -192,46 +181,47 @@ type ProcessHandler interface { // By default, handlers support the Connect, gRPC, and gRPC-Web protocols with the binary Protobuf // and JSON codecs. They also support gzip compression. func NewProcessHandler(svc ProcessHandler, opts ...connect.HandlerOption) (string, http.Handler) { + processMethods := process.File_process_process_proto.Services().ByName("Process").Methods() processListHandler := connect.NewUnaryHandler( ProcessListProcedure, svc.List, - connect.WithSchema(processListMethodDescriptor), + connect.WithSchema(processMethods.ByName("List")), connect.WithHandlerOptions(opts...), ) processConnectHandler := connect.NewServerStreamHandler( ProcessConnectProcedure, svc.Connect, - connect.WithSchema(processConnectMethodDescriptor), + connect.WithSchema(processMethods.ByName("Connect")), connect.WithHandlerOptions(opts...), ) processStartHandler := connect.NewServerStreamHandler( ProcessStartProcedure, svc.Start, - connect.WithSchema(processStartMethodDescriptor), + connect.WithSchema(processMethods.ByName("Start")), connect.WithHandlerOptions(opts...), ) processUpdateHandler := connect.NewUnaryHandler( ProcessUpdateProcedure, svc.Update, - connect.WithSchema(processUpdateMethodDescriptor), + connect.WithSchema(processMethods.ByName("Update")), connect.WithHandlerOptions(opts...), ) processStreamInputHandler := connect.NewClientStreamHandler( ProcessStreamInputProcedure, svc.StreamInput, - connect.WithSchema(processStreamInputMethodDescriptor), + connect.WithSchema(processMethods.ByName("StreamInput")), connect.WithHandlerOptions(opts...), ) processSendInputHandler := connect.NewUnaryHandler( ProcessSendInputProcedure, svc.SendInput, - connect.WithSchema(processSendInputMethodDescriptor), + connect.WithSchema(processMethods.ByName("SendInput")), connect.WithHandlerOptions(opts...), ) processSendSignalHandler := connect.NewUnaryHandler( ProcessSendSignalProcedure, svc.SendSignal, - connect.WithSchema(processSendSignalMethodDescriptor), + connect.WithSchema(processMethods.ByName("SendSignal")), connect.WithHandlerOptions(opts...), ) return "/process.Process/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/packages/envd/main.go b/packages/envd/main.go index f3903df..8768726 100644 --- a/packages/envd/main.go +++ b/packages/envd/main.go @@ -8,6 +8,11 @@ import ( "net/http" "time" + "connectrpc.com/authn" + connectcors "connectrpc.com/cors" + "github.com/go-chi/chi/v5" + "github.com/rs/cors" + "github.com/e2b-dev/infra/packages/envd/internal/api" "github.com/e2b-dev/infra/packages/envd/internal/logs" "github.com/e2b-dev/infra/packages/envd/internal/permissions" @@ -15,29 +20,26 @@ import ( processRpc "github.com/e2b-dev/infra/packages/envd/internal/services/process" processSpec "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process" "github.com/e2b-dev/infra/packages/envd/internal/utils" - - "connectrpc.com/authn" - connectcors "connectrpc.com/cors" - "github.com/go-chi/chi/v5" - "github.com/rs/cors" ) const ( - // We limit the timeout more in proxies. - maxTimeout = 24 * time.Hour - maxAge = 2 * time.Hour + // Downstream timeout should be greater than upstream (in orchestrator proxy). + idleTimeout = 640 * time.Second + maxAge = 2 * time.Hour defaultPort = 49983 ) var ( - // These vars are automatically set by goreleaser. - Version = "0.1.5" + Version = "0.2.0" + + commitSHA string debug bool port int64 versionFlag bool + commitFlag bool startCmdFlag string ) @@ -56,6 +58,13 @@ func parseFlags() { "print envd version", ) + flag.BoolVar( + &commitFlag, + "commit", + false, + "print envd source commit", + ) + flag.Int64Var( &port, "port", @@ -94,6 +103,18 @@ func withCORS(h http.Handler) http.Handler { "Access-Control-Request-Private-Network", "Access-Control-Expose-Headers", "Keepalive-Ping-Interval", // for gRPC + // Custom headers sent from SDK + "browser", + "lang", + "lang_version", + "machine", + "os", + "package_version", + "processor", + "publisher", + "release", + "sdk_runtime", + "system", ), ExposedHeaders: append( connectcors.ExposedHeaders(), @@ -111,7 +132,11 @@ func main() { if versionFlag { fmt.Printf("%s\n", Version) + return + } + if commitFlag { + fmt.Printf("%s\n", commitSHA) return } @@ -127,25 +152,29 @@ func main() { filesystemRpc.Handle(m, &fsLogger) envVars := utils.NewMap[string, string]() - envVars.Store("E2B_SANDBOX", "true") processLogger := l.With().Str("logger", "process").Logger() processService := processRpc.Handle(m, &processLogger, envVars) - handler := api.HandlerFromMux(api.New(&envLogger, envVars), m) - + service := api.New(&envLogger, envVars) + handler := api.HandlerFromMux(service, m) middleware := authn.NewMiddleware(permissions.AuthenticateUsername) s := &http.Server{ - Handler: withCORS(middleware.Wrap(handler)), - Addr: fmt.Sprintf("0.0.0.0:%d", port), - ReadHeaderTimeout: 5 * time.Second, - ReadTimeout: maxTimeout, - WriteTimeout: maxTimeout, - IdleTimeout: maxTimeout, + Handler: withCORS( + service.WithAuthorization( + middleware.Wrap(handler), + ), + ), + Addr: fmt.Sprintf("0.0.0.0:%d", port), + // We remove the timeouts as the connection is terminated by closing of the sandbox and keepalive close. + ReadTimeout: 0, + WriteTimeout: 0, + IdleTimeout: idleTimeout, } + // TODO: Not used anymore in template build, replaced by direct envd command call. if startCmdFlag != "" { tag := "startCmd" cwd := "/home/user" diff --git a/packages/envd/spec/buf.gen.shared.yaml b/packages/envd/spec/buf.gen.shared.yaml new file mode 100644 index 0000000..9061b0c --- /dev/null +++ b/packages/envd/spec/buf.gen.shared.yaml @@ -0,0 +1,14 @@ +version: v1 +plugins: + - plugin: go + out: ../../shared/pkg/grpc/envd + opt: paths=source_relative + - plugin: connect-go + out: ../../shared/pkg/grpc/envd + opt: paths=source_relative + +managed: + enabled: true + optimize_for: SPEED + go_package_prefix: + default: github.com/e2b-dev/infra/packages/shared/pkg/grpc/envd diff --git a/packages/envd/spec/envd.yaml b/packages/envd/spec/envd.yaml index ee94d85..e4bcc10 100644 --- a/packages/envd/spec/envd.yaml +++ b/packages/envd/spec/envd.yaml @@ -18,6 +18,9 @@ paths: /metrics: get: summary: Get the stats of the service + security: + - AccessTokenAuth: [] + - {} responses: "200": description: The resource usage metrics of the service @@ -28,7 +31,10 @@ paths: /init: post: - summary: Set env vars, ensure the time and metadata is synced with the host + summary: Set initial vars, ensure the time and metadata is synced with the host + security: + - AccessTokenAuth: [] + - {} requestBody: content: application/json: @@ -37,6 +43,9 @@ paths: properties: envVars: $ref: "#/components/schemas/EnvVars" + accessToken: + type: string + description: Access token for secure access to envd service responses: "204": description: Env vars set, the time and metadata is synced with the host @@ -44,6 +53,9 @@ paths: /envs: get: summary: Get the environment variables + security: + - AccessTokenAuth: [] + - {} responses: "200": description: Environment variables @@ -56,9 +68,14 @@ paths: get: summary: Download a file tags: [files] + security: + - AccessTokenAuth: [] + - {} parameters: - $ref: "#/components/parameters/FilePath" - $ref: "#/components/parameters/User" + - $ref: "#/components/parameters/Signature" + - $ref: "#/components/parameters/SignatureExpiration" responses: "200": $ref: "#/components/responses/DownloadSuccess" @@ -73,9 +90,14 @@ paths: post: summary: Upload a file and ensure the parent directories exist. If the file exists, it will be overwritten. tags: [files] + security: + - AccessTokenAuth: [] + - {} parameters: - $ref: "#/components/parameters/FilePath" - $ref: "#/components/parameters/User" + - $ref: "#/components/parameters/Signature" + - $ref: "#/components/parameters/SignatureExpiration" requestBody: $ref: "#/components/requestBodies/File" responses: @@ -91,6 +113,12 @@ paths: $ref: "#/components/responses/NotEnoughDiskSpace" components: + securitySchemes: + AccessTokenAuth: + type: apiKey + scheme: header + name: X-Access-Token + parameters: FilePath: name: path @@ -107,6 +135,20 @@ components: schema: type: string pattern: "^(root|user)$" + Signature: + name: signature + in: query + required: false + description: Signature used for file access permission verification. + schema: + type: string + SignatureExpiration: + name: signature_expiration + in: query + required: false + description: Signature expiration used for defining the expiration time of the signature. + schema: + type: integer requestBodies: File: diff --git a/packages/envd/spec/filesystem/filesystem.proto b/packages/envd/spec/filesystem/filesystem.proto index b1320fc..f80c37c 100644 --- a/packages/envd/spec/filesystem/filesystem.proto +++ b/packages/envd/spec/filesystem/filesystem.proto @@ -62,6 +62,7 @@ enum FileType { message ListDirRequest { string path = 1; + uint32 depth = 2; } message ListDirResponse { diff --git a/packages/envd/tools/tools.go b/packages/envd/tools/tools.go deleted file mode 100644 index 35e0f39..0000000 --- a/packages/envd/tools/tools.go +++ /dev/null @@ -1,8 +0,0 @@ -//go:build tools -// +build tools - -package main - -import ( - _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" -) diff --git a/packages/template-manager/.gitignore b/packages/template-manager/.gitignore deleted file mode 100644 index 42e6d19..0000000 --- a/packages/template-manager/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.out -.plan -alloc -plugin -bin diff --git a/packages/template-manager/Makefile b/packages/template-manager/Makefile deleted file mode 100644 index b3d9465..0000000 --- a/packages/template-manager/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -#client := gcloud compute instances list --format='csv(name)' --project $(GCP_PROJECT_ID) | grep "client" - -.PHONY: init -init: - brew install protobuf - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 - -.PHONY: generate -generate: - # You need to install protobuf (brew install protobuf) and following go packages: protoc-gen-go, protoc-gen-go-grpc - # https://grpc.io/docs/languages/go/quickstart/ - @echo "Generating..." - @protoc --go_out=../shared/pkg/grpc/template-manager/ --go_opt=paths=source_relative --go-grpc_out=../shared/pkg/grpc/template-manager/ --go-grpc_opt=paths=source_relative template-manager.proto - @echo "Done" - -.PHONY: build -build: - # Allow for passing commit sha directly for docker builds - $(eval COMMIT_SHA ?= $(shell git rev-parse --short HEAD)) - go mod tidy - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/template-manager -ldflags "-X=main.commitSHA=$(COMMIT_SHA)" . - -.PHONY: build-debug -build-debug: - CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -race -gcflags=all="-N -l" -o bin/template-manager . - -.PHONY: upload-gcp -upload-gcp: - echo "GCP upload has been deprecated. Please use upload-aws or upload target instead." - -.PHONY: upload-aws -upload-aws: - # Create repository if it doesn't exist - $(eval IMAGE := e2b-orchestration/template-manager) - aws ecr describe-repositories --repository-names $(IMAGE) --region $(AWS_REGION) || \ - aws ecr create-repository --repository-name $(IMAGE) --region $(AWS_REGION) - # Login to ECR - aws ecr get-login-password --region $(AWS_REGION) | sudo docker login --username AWS --password-stdin $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com - # Build and push Docker image - $(eval COMMIT_SHA := $(shell git rev-parse --short HEAD)) - @cp -r ../shared .shared/ - sudo docker buildx install || true # sets up the buildx as default docker builder - sudo docker build --platform linux/amd64 --tag "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" --build-arg COMMIT_SHA="$(COMMIT_SHA)" . - sudo docker push "$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(IMAGE):latest" - @rm -rf .shared/ - -.PHONY: upload -upload: - @if [ -n "$(AWS_ACCOUNT_ID)" ] && [ -n "$(AWS_REGION)" ]; then \ - $(MAKE) upload-aws; \ - else \ - echo "AWS_ACCOUNT_ID and AWS_REGION must be set"; \ - exit 1; \ - fi - -.PHONY: build-and-upload -build-and-upload: - @rm -rf .shared/ - @cp -r ../shared .shared/ - $(MAKE) build - @rm -rf .shared/ - $(eval E2B_EXECUTE_FILE_BUCKET := $(shell grep CFNSOFTWAREBUCKET /opt/config.properties | cut -d'=' -f2)) - @echo "Using bucket: $(E2B_EXECUTE_FILE_BUCKET)" - aws s3 cp bin/template-manager s3://$(E2B_EXECUTE_FILE_BUCKET)/template-manager - - -.PHONY: test -test: - go test -v ./... - -.PHONY: test-build -test-build: - sudo TEMPLATE_BUCKET_NAME=$(TEMPLATE_BUCKET_NAME) AWS_ACCOUNT_ID=$(AWS_ACCOUNT_ID) AWS_ECR_REPOSITORY=$(AWS_ECR_REPOSITORY) AWS_REGION=$(AWS_REGION) go run -race -gcflags=all="-N -l" main.go -test build -template d6a5c9wp4ccm7uqi4jzi -build 8e00bbdf-7f55-4025-9964-eede203c6ee5 - -.PHONY: test-delete -test-delete: - sudo TEMPLATE_BUCKET_NAME=$(TEMPLATE_BUCKET_NAME) AWS_ACCOUNT_ID=$(AWS_ACCOUNT_ID) AWS_ECR_REPOSITORY=$(AWS_ECR_REPOSITORY) AWS_REGION=$(AWS_REGION) go run -race -gcflags=all="-N -l" main.go -test delete -env 0v0c9frk1etrhpxr5ljw - -.PHONY: migrate -migrate: - ./upload-envs.sh /mnt/disks/fc-envs/v1 $(TEMPLATE_BUCKET_NAME) diff --git a/packages/template-manager/go.mod b/packages/template-manager/go.mod deleted file mode 100644 index 1d5d78f..0000000 --- a/packages/template-manager/go.mod +++ /dev/null @@ -1,140 +0,0 @@ -module github.com/e2b-dev/infra/packages/template-manager - -go 1.24.0 - -toolchain go1.24.2 - -require ( - github.com/Microsoft/hcsshim v0.12.9 - github.com/aws/aws-sdk-go v1.51.7 - github.com/docker/docker v27.3.1+incompatible - github.com/e2b-dev/infra/packages/shared v0.0.0 - github.com/firecracker-microvm/firecracker-go-sdk v1.0.0 - github.com/fsouza/go-dockerclient v1.12.0 - github.com/go-openapi/strfmt v0.23.0 - github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 - github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 - github.com/opencontainers/image-spec v1.1.0 - github.com/rs/zerolog v1.33.0 - github.com/vishvananda/netlink v1.3.0 - github.com/vishvananda/netns v0.0.5 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0 - go.opentelemetry.io/otel v1.32.0 - go.opentelemetry.io/otel/trace v1.32.0 - go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.68.0 - google.golang.org/protobuf v1.35.2 -) - -require ( - github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect - github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect - github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect - github.com/aws/aws-sdk-go-v2/config v1.29.9 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.62 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.66 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 // indirect - github.com/aws/smithy-go v1.22.2 // indirect - github.com/bits-and-blooms/bitset v1.17.0 // indirect - github.com/cenkalti/backoff/v4 v4.3.0 // indirect - github.com/containerd/cgroups/v3 v3.0.4 // indirect - github.com/containerd/fifo v1.1.0 // indirect - github.com/containerd/log v0.1.0 // indirect - github.com/containernetworking/cni v1.2.3 // indirect - github.com/containernetworking/plugins v1.6.0 // indirect - github.com/dchest/uniuri v1.2.0 // indirect - github.com/distribution/reference v0.6.0 // indirect - github.com/docker/go-connections v0.5.0 // indirect - github.com/docker/go-units v0.5.0 // indirect - github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/go-logr/logr v1.4.2 // indirect - github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-openapi/analysis v0.23.0 // indirect - github.com/go-openapi/errors v0.22.0 // indirect - github.com/go-openapi/jsonpointer v0.21.0 // indirect - github.com/go-openapi/jsonreference v0.21.0 // indirect - github.com/go-openapi/loads v0.22.0 // indirect - github.com/go-openapi/runtime v0.28.0 // indirect - github.com/go-openapi/spec v0.21.0 // indirect - github.com/go-openapi/swag v0.23.0 // indirect - github.com/go-openapi/validate v0.24.0 // indirect - github.com/gofrs/uuid v3.3.0+incompatible // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.4 // indirect - github.com/google/uuid v1.6.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect - github.com/hashicorp/errwrap v1.1.0 // indirect - github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/jmespath/go-jmespath v0.4.0 // indirect - github.com/josharian/intern v1.0.0 // indirect - github.com/klauspost/compress v1.17.11 // indirect - github.com/mailru/easyjson v0.7.7 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect - github.com/moby/docker-image-spec v1.3.1 // indirect - github.com/moby/patternmatcher v0.6.0 // indirect - github.com/moby/sys/sequential v0.6.0 // indirect - github.com/moby/sys/user v0.3.0 // indirect - github.com/moby/sys/userns v0.1.0 // indirect - github.com/moby/term v0.5.0 // indirect - github.com/morikuni/aec v1.0.0 // indirect - github.com/oklog/ulid v1.3.1 // indirect - github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opentracing/opentracing-go v1.2.0 // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/sirupsen/logrus v1.9.3 // indirect - go.mongodb.org/mongo-driver v1.17.1 // indirect - go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect - go.opentelemetry.io/otel/metric v1.32.0 // indirect - go.opentelemetry.io/otel/sdk v1.32.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect - go.opentelemetry.io/proto/otlp v1.3.1 // indirect - go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.33.0 // indirect - golang.org/x/sync v0.14.0 // indirect - golang.org/x/sys v0.33.0 // indirect - golang.org/x/term v0.32.0 // indirect - golang.org/x/text v0.25.0 // indirect - golang.org/x/time v0.8.0 // indirect - golang.org/x/tools v0.27.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) - -replace github.com/e2b-dev/infra/packages/shared v0.0.0 => ../shared - -// Fix for deprecated and unavailable dependencies -replace github.com/mitchellh/osext => golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 - -replace github.com/gin-contrib/cors => github.com/gin-contrib/cors v1.3.1 - -replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.7 - -replace github.com/firecracker-microvm/firecracker-go-sdk => github.com/firecracker-microvm/firecracker-go-sdk v0.22.0 - -replace github.com/containernetworking/cni => github.com/containernetworking/cni v0.8.1 - -replace github.com/chenzhuoyu/iasm => github.com/chenzhuoyu/iasm v0.0.0-20241031125313-4cba78b3538b diff --git a/packages/template-manager/go.sum b/packages/template-manager/go.sum deleted file mode 100644 index 19772c2..0000000 --- a/packages/template-manager/go.sum +++ /dev/null @@ -1,623 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= -github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= -github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= -github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -github.com/Microsoft/hcsshim v0.12.9 h1:2zJy5KA+l0loz1HzEGqyNnjd3fyZA31ZBCGKacp6lLg= -github.com/Microsoft/hcsshim v0.12.9/go.mod h1:fJ0gkFAna6ukt0bLdKB8djt4XIJhF/vEPuoIWYVvZ8Y= -github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= -github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= -github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/aws/aws-sdk-go v1.51.7 h1:RRjxHhx9RCjw5AhgpmmShq3F4JDlleSkyhYMQ2xUAe8= -github.com/aws/aws-sdk-go v1.51.7/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM= -github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 h1:zAybnyUQXIZ5mok5Jqwlf58/TFE7uvd3IAsa1aF9cXs= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10/go.mod h1:qqvMj6gHLR/EXWZw4ZbqlPbQUyenf4h82UQUlKc+l14= -github.com/aws/aws-sdk-go-v2/config v1.29.9 h1:Kg+fAYNaJeGXp1vmjtidss8O2uXIsXwaRqsQJKXVr+0= -github.com/aws/aws-sdk-go-v2/config v1.29.9/go.mod h1:oU3jj2O53kgOU4TXq/yipt6ryiooYjlkqqVaZk7gY/U= -github.com/aws/aws-sdk-go-v2/credentials v1.17.62 h1:fvtQY3zFzYJ9CfixuAQ96IxDrBajbBWGqjNTCa79ocU= -github.com/aws/aws-sdk-go-v2/credentials v1.17.62/go.mod h1:ElETBxIQqcxej++Cs8GyPBbgMys5DgQPTwo7cUPDKt8= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.66 h1:MTLivtC3s89de7Fe3P8rzML/8XPNRfuyJhlRTsCEt0k= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.66/go.mod h1:NAuQ2s6gaFEsuTIb2+P5t6amB1w5MhvJFxppoezGWH0= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q= -github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= -github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 h1:ZNTqv4nIdE/DiBfUUfXcLZ/Spcuz+RjeziUtNJackkM= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34/go.mod h1:zf7Vcd1ViW7cPqYWEHLHJkS50X0JS2IKz9Cgaj6ugrs= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 h1:lguz0bmOoGzozP9XfRJR1QIayEYo+2vP/No3OfLF0pU= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2 h1:jIiopHEV22b4yQP2q36Y0OmwLbsxNWdWwfZRR5QRRO4= -github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2/go.mod h1:U5SNqwhXB3Xe6F47kXvWihPl/ilGaEDe8HD/50Z9wxc= -github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 h1:8JdC7Gr9NROg1Rusk25IcZeTO59zLxsKgE0gkh5O6h0= -github.com/aws/aws-sdk-go-v2/service/sso v1.25.1/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 h1:KwuLovgQPcdjNMfFt9OhUd9a2OwcOKhxfvF4glTzLuA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs= -github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 h1:PZV5W8yk4OtH1JAuhV2PXwwO9v5G5Aoj+eMCn4T+1Kc= -github.com/aws/aws-sdk-go-v2/service/sts v1.33.17/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4= -github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ= -github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/bits-and-blooms/bitset v1.17.0 h1:1X2TS7aHz1ELcC0yU1y2stUs/0ig5oMU6STFZGrhvHI= -github.com/bits-and-blooms/bitset v1.17.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= -github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/containerd/cgroups/v3 v3.0.4 h1:2fs7l3P0Qxb1nKWuJNFiwhp2CqiKzho71DQkDrHJIo4= -github.com/containerd/cgroups/v3 v3.0.4/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins= -github.com/containerd/fifo v0.0.0-20191213151349-ff969a566b00/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= -github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= -github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= -github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= -github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= -github.com/containernetworking/cni v0.8.1 h1:7zpDnQ3T3s4ucOuJ/ZCLrYBxzkg0AELFfII3Epo9TmI= -github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/plugins v0.8.7/go.mod h1:R7lXeZaBzpfqapcAbHRW8/CYwm0dHzbz0XEjofx0uB0= -github.com/containernetworking/plugins v1.6.0 h1:lrsUrLF7QODLx6gncHOqk/pnCiC7c6bvDAskV4KUifQ= -github.com/containernetworking/plugins v1.6.0/go.mod h1:rYLQWMJz/dYuW1XhHdc9xuzdkgbkWEEjwOhUm84+288= -github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= -github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= -github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= -github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= -github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= -github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g= -github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY= -github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= -github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= -github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= -github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= -github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= -github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= -github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/firecracker-microvm/firecracker-go-sdk v0.22.0 h1:hk28AO5ArAX9iHomi6axNLK+6+8gz1wi3ooNsUTlSFQ= -github.com/firecracker-microvm/firecracker-go-sdk v0.22.0/go.mod h1:lr7w/zmzIi72h+dDMQsRmmKS63EKvnFPEpg2KrjX2X0= -github.com/fsouza/go-dockerclient v1.12.0 h1:S2f2crEUbBNCFiF06kR/GvioEB8EMsb3Td/bpawD+aU= -github.com/fsouza/go-dockerclient v1.12.0/go.mod h1:YWUtjg8japrqD/80L98nTtCoxQFp5B5wrSsnyeB5lFo= -github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= -github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= -github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= -github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ= -github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU= -github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo= -github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.19.7/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.22.0 h1:c4xY/OLxUBSTiepAg3j/MHuAv5mJhnf53LLMWFB+u/w= -github.com/go-openapi/errors v0.22.0/go.mod h1:J3DmZScxCDufmIMsdOuDHxJbdOGC0xtUynjIx092vXE= -github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= -github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= -github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= -github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= -github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= -github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= -github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI= -github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2es0x5/IbjY= -github.com/go-openapi/loads v0.22.0 h1:ECPGd4jX1U6NApCGG1We+uEozOAvXvJSF4nnwHZ8Aco= -github.com/go-openapi/loads v0.22.0/go.mod h1:yLsaTCS92mnSAZX5WWoxszLj0u+Ojl+Zs5Stn1oF+rs= -github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= -github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= -github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= -github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo= -github.com/go-openapi/runtime v0.19.16/go.mod h1:5P9104EJgYcizotuXhEuUrzVc+j1RiSjahULvYmlv98= -github.com/go-openapi/runtime v0.19.22/go.mod h1:Lm9YGCeecBnUUkFTxPC4s1+lwrkJ0pthx8YvyjCfkgk= -github.com/go-openapi/runtime v0.28.0 h1:gpPPmWSNGo214l6n8hzdXYhPuJcGtziTOgUpvsFWGIQ= -github.com/go-openapi/runtime v0.28.0/go.mod h1:QN7OzcS+XuYmkQLw05akXk0jRH/eZ3kb18+1KwW9gyc= -github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= -github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= -github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= -github.com/go-openapi/spec v0.19.8/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= -github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY= -github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk= -github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= -github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= -github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= -github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= -github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= -github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c= -github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4= -github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= -github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= -github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= -github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= -github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= -github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= -github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= -github.com/go-openapi/validate v0.19.10/go.mod h1:RKEZTUWDkxKQxN2jDT7ZnZi2bhZlbNMAuKvKB+IaGx8= -github.com/go-openapi/validate v0.19.11/go.mod h1:Rzou8hA/CBw8donlS6WNEUQupNvUZ0waH08tGe6kAQ4= -github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58= -github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= -github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= -github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= -github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= -github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= -github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= -github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= -github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= -github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= -github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= -github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= -github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= -github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= -github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= -github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= -github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= -github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= -github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= -github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84= -github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA= -github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= -github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= -github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= -github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= -github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= -github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= -github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= -github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= -github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= -github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 h1:BpfhmLKZf+SjVanKKhCgf3bg+511DmU9eDQTen7LLbY= -github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= -github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= -github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= -github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= -github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU= -github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko= -github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo= -github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs= -github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g= -github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= -github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= -github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b h1:Ey6yH0acn50T/v6CB75bGP4EMJqnv9WvnjN7oZaj+xE= -github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= -github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= -github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= -github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= -github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= -github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= -github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= -github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= -github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= -github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= -github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= -github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= -github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c h1:gqEdF4VwBu3lTKGHS9rXE9x1/pEaSwCXRLOZRF6qtlw= -github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c/go.mod h1:eMyUVp6f/5jnzM+3zahzl7q6UXLbgSc3MKg/+ow9QW0= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= -github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk= -github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= -github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY= -github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= -github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE= -go.mongodb.org/mongo-driver v1.3.4/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE= -go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM= -go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4= -go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0 h1:qtFISDHKolvIxzSs0gIaiPUPR0Cucb0F2coHC7ZLdps= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0/go.mod h1:Y+Pop1Q6hCOnETWTW4NROK/q1hv50hM7yDaUTjG8lp8= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 h1:DheMAlT6POBP+gh8RUH19EOTnQIor5QE0uSRPtzCpSw= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0/go.mod h1:wZcGmeVO9nzP67aYSLDqXNWK87EZWhi7JWj1v7ZXf94= -go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= -go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 h1:j7ZSD+5yn+lo3sGV69nW04rRR0jhYnBwjuX3r0HvnK0= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0/go.mod h1:WXbYJTUaZXAbYd8lbgGuvih0yuCfOFC5RJoYnoLcGz8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 h1:IJFEoHiytixx8cMiVAO+GmHR6Frwu+u5Ur8njpFO6Ac= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0/go.mod h1:3rHrKNtLIoS0oZwkY2vxi+oJcwFRWdtUyRII+so45p8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 h1:9kV11HXBHZAvuPUZxmMWrH8hZn/6UnHX4K0mu36vNsU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0/go.mod h1:JyA0FHXe22E1NeNiHmVp7kFHglnexDQ7uRWDiiJ1hKQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU= -go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= -go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= -go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= -go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= -go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= -go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= -go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= -go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= -go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= -go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= -go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= -go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= -go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= -golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= -golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= -golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= -golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= -golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o= -golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 h1:pgr/4QbFyktUv9CtQ/Fq4gzEE6/Xs7iCXbktaGzLHbQ= -google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697/go.mod h1:+D9ySVjN8nY8YCVjc5O7PZDIdZporIDY3KaGfJunh88= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 h1:LWZqQOEjDyONlF1H6afSWpAL/znlREo2tHfLoe+8LMA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= -google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= -google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= -gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= -gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/packages/template-manager/internal/build/network_linux.go b/packages/template-manager/internal/build/network_linux.go deleted file mode 100644 index a212549..0000000 --- a/packages/template-manager/internal/build/network_linux.go +++ /dev/null @@ -1,186 +0,0 @@ -//go:build linux -// +build linux - -package build - -import ( - "context" - "fmt" - "net" - "runtime" - - "github.com/vishvananda/netlink" - "github.com/vishvananda/netns" - "go.opentelemetry.io/otel/trace" - - "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" -) - - -const ( - fcTapAddress = "169.254.0.22" - fcTapMask = "30" - fcTapName = "tap0" - namespaceNamePrefix = "fc-env-" -) - -var fcTapCIDR = fmt.Sprintf("%s/%s", fcTapAddress, fcTapMask) - -type FCNetwork struct { - namespaceID string -} - -func NewFCNetwork(ctx context.Context, tracer trace.Tracer, env *Env) (*FCNetwork, error) { - childCtx, childSpan := tracer.Start(ctx, "new-fc-network") - defer childSpan.End() - - network := &FCNetwork{ - namespaceID: namespaceNamePrefix + env.BuildId, - } - - err := network.setup(childCtx, tracer) - if err != nil { - errMsg := fmt.Errorf("error setting up network: %w", err) - - network.Cleanup(childCtx, tracer) - - return nil, errMsg - } - - return network, err -} - -func (n *FCNetwork) setup(ctx context.Context, tracer trace.Tracer) error { - childCtx, childSpan := tracer.Start(ctx, "setup") - defer childSpan.End() - - // Prevent thread changes so the we can safely manipulate with namespaces - telemetry.ReportEvent(childCtx, "waiting for OS thread lock") - - runtime.LockOSThread() - defer runtime.UnlockOSThread() - - telemetry.ReportEvent(childCtx, "OS thread lock passed") - - // Save the original (host) namespace and restore it upon function exit - hostNS, err := netns.Get() - if err != nil { - errMsg := fmt.Errorf("cannot get current (host) namespace: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "saved original ns") - - defer func() { - netErr := netns.Set(hostNS) - if netErr != nil { - errMsg := fmt.Errorf("error resetting network namespace back to the host namespace: %w", netErr) - telemetry.ReportError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "reset network namespace back to the host namespace") - } - - netErr = hostNS.Close() - if netErr != nil { - errMsg := fmt.Errorf("error closing host network namespace: %w", netErr) - telemetry.ReportError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "closed host network namespace") - } - }() - - // Create namespace - ns, err := netns.NewNamed(n.namespaceID) - if err != nil { - errMsg := fmt.Errorf("cannot create new namespace: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "created ns") - - defer func() { - nsErr := ns.Close() - if nsErr != nil { - errMsg := fmt.Errorf("error closing namespace: %w", nsErr) - telemetry.ReportError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "closed namespace") - } - }() - - // Create tap device - tapAttrs := netlink.NewLinkAttrs() - tapAttrs.Name = fcTapName - tapAttrs.Namespace = ns - - tap := &netlink.Tuntap{ - Mode: netlink.TUNTAP_MODE_TAP, - LinkAttrs: tapAttrs, - } - - err = netlink.LinkAdd(tap) - if err != nil { - errMsg := fmt.Errorf("error creating tap device: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "created tap device") - - // Active tap device - err = netlink.LinkSetUp(tap) - if err != nil { - errMsg := fmt.Errorf("error setting tap device up: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "set tap device up") - - // Add ip address to tap device - ip, ipNet, err := net.ParseCIDR(fcTapCIDR) - if err != nil { - errMsg := fmt.Errorf("error parsing tap CIDR: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "parsed CIDR") - - err = netlink.AddrAdd(tap, &netlink.Addr{ - IPNet: &net.IPNet{ - IP: ip, - Mask: ipNet.Mask, - }, - }) - if err != nil { - errMsg := fmt.Errorf("error setting address of the tap device: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "set tap device address") - - return nil -} - -func (n *FCNetwork) Cleanup(ctx context.Context, tracer trace.Tracer) { - childCtx, childSpan := tracer.Start(ctx, "cleanup") - defer childSpan.End() - - err := netns.DeleteNamed(n.namespaceID) - if err != nil { - errMsg := fmt.Errorf("error deleting namespace: %w", err) - telemetry.ReportError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "deleted namespace") - } -} diff --git a/packages/template-manager/internal/build/network_other.go b/packages/template-manager/internal/build/network_other.go deleted file mode 100644 index fd13872..0000000 --- a/packages/template-manager/internal/build/network_other.go +++ /dev/null @@ -1,24 +0,0 @@ -//go:build !linux -// +build !linux - -package build - -import ( - "context" - "fmt" - - "go.opentelemetry.io/otel/trace" -) - -type FCNetwork struct { - namespaceID string -} - -// Cleanup is a no-op for non-Linux systems -func (n *FCNetwork) Cleanup(ctx context.Context, tracer trace.Tracer) { -} - -// NewFCNetwork returns an error -func NewFCNetwork(ctx context.Context, tracer trace.Tracer, env *Env) (*FCNetwork, error) { - return nil, fmt.Errorf("network functionality is only supported on Linux") -} diff --git a/packages/template-manager/internal/build/provision.sh b/packages/template-manager/internal/build/provision.sh deleted file mode 100644 index 76b1114..0000000 --- a/packages/template-manager/internal/build/provision.sh +++ /dev/null @@ -1,141 +0,0 @@ -export BASH_XTRACEFD=1 -set -euxo pipefail - -echo "Starting provisioning script." - -echo "ENV_ID={{ .EnvID }}" >/.e2b -echo "BUILD_ID={{ .BuildID }}" >>/.e2b - -# We are downloading the packages manually -apt-get update --download-only -DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes apt-get install -y openssh-server sudo systemd socat chrony linuxptp iptables - -# Set up autologin. -mkdir -p /etc/systemd/system/serial-getty@ttyS0.service.d -cat </etc/systemd/system/serial-getty@ttyS0.service.d/autologin.conf -[Service] -ExecStart= -ExecStart=-/sbin/agetty --noissue --autologin root %I 115200,38400,9600 vt102 -EOF - -# Add swapfile — we enable it in the preexec for envd -mkdir /swap -fallocate -l 128M /swap/swapfile -chmod 600 /swap/swapfile -mkswap /swap/swapfile - -# Set up envd service. -mkdir -p /etc/systemd/system - -# Set up e2bd service. -cat </etc/systemd/system/envd.service -[Unit] -Description=Env Daemon Service - -[Service] -Type=simple -Restart=always -User=root -Group=root -Environment=GOTRACEBACK=all -LimitCORE=infinity -ExecStart=/bin/bash -l -c "/usr/bin/envd -cmd '{{ .StartCmd }}'" -OOMPolicy=continue -OOMScoreAdjust=-1000 -Environment="GOMEMLIMIT={{ .MemoryLimit }}MiB" - -ExecStartPre=/bin/bash -c 'echo 0 > /proc/sys/vm/swappiness && swapon /swap/swapfile' - -[Install] -WantedBy=multi-user.target -EOF - -# Set up chrony. -mkdir -p /etc/chrony -cat </etc/chrony/chrony.conf -refclock PHC /dev/ptp0 poll -1 dpoll -1 offset 0 trust prefer -makestep 1 -1 -EOF - -# Add a proxy config, as some environments expects it there (e.g. timemaster in Node Dockerimage) -echo "include /etc/chrony/chrony.conf" >/etc/chrony.conf - -mkdir -p /etc/systemd/system/chrony.service.d -# The ExecStart= should be emptying the ExecStart= line in config. -cat </etc/systemd/system/chrony.service.d/override.conf -[Service] -ExecStart= -ExecStart=/usr/sbin/chronyd -User=root -Group=root -EOF - -# Enable systemd services -# Because this script runs in a container we can't use `systemctl`. -# Containers don't run init daemons. We have to enable the runner service manually. -mkdir -p /etc/systemd/system/multi-user.target.wants -ln -s /etc/systemd/system/envd.service /etc/systemd/system/multi-user.target.wants/envd.service - -# Set up shell. -echo "export SHELL='/bin/bash'" >/etc/profile.d/shell.sh -echo "export PS1='\w \$ '" >/etc/profile.d/prompt.sh -echo "export PS1='\w \$ '" >>"/etc/profile" -echo "export PS1='\w \$ '" >>"/root/.bashrc" - -# Use .bashrc and .profile -echo "if [ -f ~/.bashrc ]; then source ~/.bashrc; fi; if [ -f ~/.profile ]; then source ~/.profile; fi" >>/etc/profile - -# Set up SSH. -mkdir -p /etc/ssh -cat <>/etc/ssh/sshd_config -PermitRootLogin yes -PermitEmptyPasswords yes -PasswordAuthentication yes -EOF - -# Remove password for root. -passwd -d root - -# Create default user. -adduser --disabled-password --gecos "" user -usermod -aG sudo user -passwd -d user -echo "user ALL=(ALL:ALL) NOPASSWD: ALL" >>/etc/sudoers - -mkdir -p /code -mkdir -p /home/user - -chmod 777 -R /home/user -chmod 777 -R /usr/local -chmod 777 -R /code - -# TODO: Right now the chown line has no effect in the FC, even though it correctly changes the owner here. -# It may be because of the way we are starting the FC VM? - -# Add DNS. -echo "nameserver 8.8.8.8" >/etc/resolv.conf - -# Start systemd services -systemctl enable envd -systemctl enable chrony 2>&1 - -cat </etc/systemd/system/forward_ports.service -[Unit] -Description=Forward Ports Service - -[Service] -Type=simple -Restart=no -User=root -Group=root -ExecStart=/bin/bash -l -c "(echo 1 | tee /proc/sys/net/ipv4/ip_forward) && iptables-legacy -t nat -A POSTROUTING -s 127.0.0.1 -j SNAT --to-source {{ .FcAddress }} && iptables-legacy -t nat -A PREROUTING -d {{ .FcAddress }} -j DNAT --to-destination 127.0.0.1" - -[Install] -WantedBy=multi-user.target -EOF - - - -# systemctl enable forward_ports - -echo "Finished provisioning script" diff --git a/packages/template-manager/internal/build/rootfs.go b/packages/template-manager/internal/build/rootfs.go deleted file mode 100644 index 31ccff2..0000000 --- a/packages/template-manager/internal/build/rootfs.go +++ /dev/null @@ -1,679 +0,0 @@ -package build - -import ( - "archive/tar" - "bytes" - "context" - "encoding/base64" - "encoding/json" - "fmt" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/aws-sdk-go/service/ecr" - "io" - "math" - "os" - "os/exec" - "strings" - "time" - - "github.com/Microsoft/hcsshim/ext4/tar2ext4" - "github.com/docker/docker/api/types" - "github.com/docker/docker/api/types/container" - "github.com/docker/docker/api/types/filters" - "github.com/docker/docker/api/types/image" - "github.com/docker/docker/api/types/registry" - "github.com/docker/docker/client" - docker "github.com/fsouza/go-dockerclient" - v1 "github.com/opencontainers/image-spec/specs-go/v1" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/trace" - - "github.com/e2b-dev/infra/packages/shared/pkg/consts" - "github.com/e2b-dev/infra/packages/shared/pkg/storage" - "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" -) - -const ( - ToMBShift = 20 - // Max size of the rootfs file in MB. - maxRootfsSize = 15000 << ToMBShift - cacheTimeout = "48h" -) - -// authConfig will be populated at runtime with ECR credentials -var authConfig registry.AuthConfig - -type Rootfs struct { - client *client.Client - legacyClient *docker.Client - - env *Env -} - -type MultiWriter struct { - writers []io.Writer -} - -func (mw *MultiWriter) Write(p []byte) (int, error) { - for _, writer := range mw.writers { - _, err := writer.Write(p) - if err != nil { - return 0, err - } - } - - return len(p), nil -} - -func NewRootfs(ctx context.Context, tracer trace.Tracer, env *Env, docker *client.Client, legacyDocker *docker.Client) (*Rootfs, error) { - childCtx, childSpan := tracer.Start(ctx, "new-rootfs") - defer childSpan.End() - - rootfs := &Rootfs{ - client: docker, - legacyClient: legacyDocker, - env: env, - } - - _, _ = env.BuildLogsWriter.Write([]byte("Pulling Docker image...\n")) - err := rootfs.pullDockerImage(childCtx, tracer) - if err != nil { - errMsg := fmt.Errorf("error building docker image: %w", err) - - rootfs.cleanupDockerImage(childCtx, tracer) - - return nil, errMsg - } - _, _ = env.BuildLogsWriter.Write([]byte("Pulled Docker image.\n\n")) - - err = rootfs.createRootfsFile(childCtx, tracer) - if err != nil { - errMsg := fmt.Errorf("error creating rootfs file: %w", err) - - rootfs.cleanupDockerImage(childCtx, tracer) - - return nil, errMsg - } - - return rootfs, nil -} - -func (r *Rootfs) pullDockerImage(ctx context.Context, tracer trace.Tracer) error { - childCtx, childSpan := tracer.Start(ctx, "pull-docker-image") - defer childSpan.End() - sess, err := session.NewSession(&aws.Config{ - Region: aws.String(consts.AWSRegion), - }) - if err != nil { - return fmt.Errorf("error creating AWS session: %w", err) - } - - // 创建 ECR 客户端 - ecrClient := ecr.New(sess) - - // 获取授权令牌 - input := &ecr.GetAuthorizationTokenInput{} - result, err := ecrClient.GetAuthorizationToken(input) - if err != nil { - return fmt.Errorf("error getting ECR auth token: %w", err) - } - - // 处理授权数据 - if len(result.AuthorizationData) == 0 { - return fmt.Errorf("no authorization data returned") - } - - authData := result.AuthorizationData[0] - token := *authData.AuthorizationToken - - // 解码 Base64 令牌 - decodedToken, err := base64.StdEncoding.DecodeString(token) - if err != nil { - return fmt.Errorf("error decoding auth token: %w", err) - } - - // 分割用户名和密码 - parts := strings.SplitN(string(decodedToken), ":", 2) - if len(parts) != 2 { - return fmt.Errorf("invalid auth token format") - } - // 设置认证配置 - authConfig = registry.AuthConfig{ - Username: parts[0], - Password: parts[1], - } - // Get AWS ECR authorization token - //cmd := exec.CommandContext(childCtx, "aws", "ecr", "get-login-password", "--region", consts.AWSRegion) - //password, err := cmd.Output() - //if err != nil { - // errMsg := fmt.Errorf("error getting ECR auth token: %w", err) - // telemetry.ReportCriticalError(childCtx, errMsg) - // return errMsg - //} - - // Set up auth config with ECR credentials - //authConfig = registry.AuthConfig{ - // Username: "AWS", - // Password: strings.TrimSpace(string(password)), - //} - authConfigBytes, err := json.Marshal(authConfig) - if err != nil { - errMsg := fmt.Errorf("error marshaling auth config: %w", err) - return errMsg - } - - authConfigBase64 := base64.URLEncoding.EncodeToString(authConfigBytes) - - logs, err := r.client.ImagePull(childCtx, r.dockerTag(), image.PullOptions{ - RegistryAuth: authConfigBase64, - Platform: "linux/amd64", - }) - if err != nil { - errMsg := fmt.Errorf("error pulling image: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - return errMsg - } - - _, err = io.Copy(os.Stdout, logs) - if err != nil { - errMsg := fmt.Errorf("error copying logs: %w", err) - telemetry.ReportError(childCtx, errMsg) - return errMsg - } - - err = logs.Close() - if err != nil { - errMsg := fmt.Errorf("error closing logs: %w", err) - telemetry.ReportError(childCtx, errMsg) - return errMsg - } - - telemetry.ReportEvent(childCtx, "pulled image") - return nil -} - -func (r *Rootfs) cleanupDockerImage(ctx context.Context, tracer trace.Tracer) { - childCtx, childSpan := tracer.Start(ctx, "cleanup-docker-image") - defer childSpan.End() - - _, err := r.client.ImageRemove(childCtx, r.dockerTag(), image.RemoveOptions{ - Force: false, - PruneChildren: false, - }) - if err != nil { - errMsg := fmt.Errorf("error removing image: %w", err) - telemetry.ReportError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "removed image") - } -} - -func (r *Rootfs) dockerTag() string { - return fmt.Sprintf("%s.dkr.ecr.%s.amazonaws.com/%s/%s:%s", consts.AWSAccountID, consts.AWSRegion, consts.ECRRepository, r.env.TemplateId, r.env.BuildId) -} - -type PostProcessor struct { - errChan chan error - ctx context.Context - writer io.Writer -} - -// Start starts the post-processing. -func (p *PostProcessor) Start() { - - now := time.Now() - for { - msg := []byte(fmt.Sprintf("Postprocessing (%s) \r", time.Since(now).Round(time.Second))) - - select { - case postprocessingErr := <-p.errChan: - if postprocessingErr != nil { - p.writer.Write([]byte(fmt.Sprintf("Postprocessing failed: %s\n", postprocessingErr))) - - return - } - - p.writer.Write(msg) - p.writer.Write([]byte("Postprocessing finished. \n")) - - return - case <-p.ctx.Done(): - return - case <-time.After(100 * time.Millisecond): - p.writer.Write(msg) - } - } - -} - -func (p *PostProcessor) stop(err error) { - p.errChan <- err -} - -func NewPostProcessor(ctx context.Context, writer io.Writer) *PostProcessor { - return &PostProcessor{ - ctx: ctx, - writer: writer, - errChan: make(chan error), - } -} - -func (r *Rootfs) createRootfsFile(ctx context.Context, tracer trace.Tracer) error { - childCtx, childSpan := tracer.Start(ctx, "create-rootfs-file") - defer childSpan.End() - - var err error - PostProcessor := NewPostProcessor(childCtx, r.env.BuildLogsWriter) - go PostProcessor.Start() - defer PostProcessor.stop(err) - - var scriptDef bytes.Buffer - - err = EnvInstanceTemplate.Execute(&scriptDef, struct { - EnvID string - BuildID string - StartCmd string - FcAddress string - MemoryLimit int - }{ - FcAddress: fcAddr, - EnvID: r.env.TemplateId, - BuildID: r.env.BuildId, - StartCmd: strings.ReplaceAll(r.env.StartCmd, "'", "\\'"), - MemoryLimit: int(math.Min(float64(r.env.MemoryMB)/2, 512)), - }) - if err != nil { - errMsg := fmt.Errorf("error executing provision script: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "executed provision script env") - - if err != nil { - errMsg := fmt.Errorf("error generating network name: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "created network") - - pidsLimit := int64(200) - - cont, err := r.client.ContainerCreate(childCtx, &container.Config{ - Image: r.dockerTag(), - Entrypoint: []string{"/bin/bash", "-c"}, - User: "root", - Cmd: []string{scriptDef.String()}, - Tty: false, - AttachStdout: true, - AttachStderr: true, - }, &container.HostConfig{ - SecurityOpt: []string{"no-new-privileges"}, - CapAdd: []string{"CHOWN", "DAC_OVERRIDE", "FSETID", "FOWNER", "SETGID", "SETUID", "NET_RAW", "SYS_CHROOT"}, - CapDrop: []string{"ALL"}, - // TODO: Network mode is causing problems with /etc/hosts - we want to find a way to fix this and enable network mode again - // NetworkMode: container.NetworkMode(network.ID), - Resources: container.Resources{ - Memory: r.env.MemoryMB << ToMBShift, - CPUPeriod: 100000, - CPUQuota: r.env.VCpuCount * 100000, - MemorySwap: r.env.MemoryMB << ToMBShift, - PidsLimit: &pidsLimit, - }, - }, nil, &v1.Platform{}, "") - if err != nil { - errMsg := fmt.Errorf("error creating container: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "created container") - - defer func() { - go func() { - cleanupContext, cleanupSpan := tracer.Start( - trace.ContextWithSpanContext(context.Background(), childSpan.SpanContext()), - "cleanup-container", - ) - defer cleanupSpan.End() - - removeErr := r.legacyClient.RemoveContainer(docker.RemoveContainerOptions{ - ID: cont.ID, - RemoveVolumes: true, - Force: true, - Context: cleanupContext, - }) - if removeErr != nil { - errMsg := fmt.Errorf("error removing container: %w", removeErr) - telemetry.ReportError(cleanupContext, errMsg) - } else { - telemetry.ReportEvent(cleanupContext, "removed container") - } - - // Move pruning to separate goroutine - cacheTimeoutArg := filters.Arg("until", cacheTimeout) - - _, pruneErr := r.client.BuildCachePrune(cleanupContext, types.BuildCachePruneOptions{ - Filters: filters.NewArgs(cacheTimeoutArg), - All: true, - }) - if pruneErr != nil { - errMsg := fmt.Errorf("error pruning build cache: %w", pruneErr) - telemetry.ReportError(cleanupContext, errMsg) - } else { - telemetry.ReportEvent(cleanupContext, "pruned build cache") - } - - _, pruneErr = r.client.ImagesPrune(cleanupContext, filters.NewArgs(cacheTimeoutArg)) - if pruneErr != nil { - errMsg := fmt.Errorf("error pruning images: %w", pruneErr) - telemetry.ReportError(cleanupContext, errMsg) - } else { - telemetry.ReportEvent(cleanupContext, "pruned images") - } - - _, pruneErr = r.client.ContainersPrune(cleanupContext, filters.NewArgs(cacheTimeoutArg)) - if pruneErr != nil { - errMsg := fmt.Errorf("error pruning containers: %w", pruneErr) - telemetry.ReportError(cleanupContext, errMsg) - } else { - telemetry.ReportEvent(cleanupContext, "pruned containers") - } - }() - }() - - filesToTar := []fileToTar{ - { - localPath: storage.HostOldEnvdPath, - tarPath: storage.GuestOldEnvdPath, - }, - { - localPath: storage.HostEnvdPath, - tarPath: storage.GuestEnvdPath, - }, - } - - pr, pw := io.Pipe() - - go func() { - defer func() { - closeErr := pw.Close() - if closeErr != nil { - errMsg := fmt.Errorf("error closing pipe: %w", closeErr) - telemetry.ReportCriticalError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "closed pipe") - } - }() - - tw := tar.NewWriter(pw) - defer func() { - err = tw.Close() - if err != nil { - errMsg := fmt.Errorf("error closing tar writer: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "closed tar writer") - } - }() - - for _, file := range filesToTar { - addErr := addFileToTarWriter(tw, file) - if addErr != nil { - errMsg := fmt.Errorf("error adding envd to tar writer: %w", addErr) - telemetry.ReportCriticalError(childCtx, errMsg) - - return - } else { - telemetry.ReportEvent(childCtx, "added envd to tar writer") - } - } - }() - - // Copy tar to the container - err = r.legacyClient.UploadToContainer(cont.ID, docker.UploadToContainerOptions{ - InputStream: pr, - Path: "/", - Context: childCtx, - NoOverwriteDirNonDir: false, - }) - if err != nil { - errMsg := fmt.Errorf("error copying envd to container: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "copied envd to container") - - err = r.client.ContainerStart(childCtx, cont.ID, container.StartOptions{}) - if err != nil { - errMsg := fmt.Errorf("error starting container: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "started container") - - go func() { - anonymousChildCtx, anonymousChildSpan := tracer.Start(childCtx, "handle-container-logs", trace.WithSpanKind(trace.SpanKindConsumer)) - defer anonymousChildSpan.End() - - containerStdoutWriter := telemetry.NewEventWriter(anonymousChildCtx, "stdout") - containerStderrWriter := telemetry.NewEventWriter(anonymousChildCtx, "stderr") - - writer := &MultiWriter{ - writers: []io.Writer{containerStderrWriter, r.env.BuildLogsWriter}, - } - - logsErr := r.legacyClient.Logs(docker.LogsOptions{ - Stdout: true, - Stderr: true, - RawTerminal: false, - OutputStream: containerStdoutWriter, - ErrorStream: writer, - Context: childCtx, - Container: cont.ID, - Follow: true, - Timestamps: false, - }) - if logsErr != nil { - errMsg := fmt.Errorf("error getting container logs: %w", logsErr) - telemetry.ReportError(anonymousChildCtx, errMsg) - } else { - telemetry.ReportEvent(anonymousChildCtx, "setup container logs") - } - }() - - wait, errWait := r.client.ContainerWait(childCtx, cont.ID, container.WaitConditionNotRunning) - select { - case <-childCtx.Done(): - errMsg := fmt.Errorf("error waiting for container: %w", childCtx.Err()) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - case waitErr := <-errWait: - if waitErr != nil { - errMsg := fmt.Errorf("error waiting for container: %w", waitErr) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - case response := <-wait: - if response.Error != nil { - errMsg := fmt.Errorf("error waiting for container - code %d: %s", response.StatusCode, response.Error.Message) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - } - - telemetry.ReportEvent(childCtx, "waited for container exit") - - inspection, err := r.client.ContainerInspect(ctx, cont.ID) - if err != nil { - errMsg := fmt.Errorf("error inspecting container: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "inspected container") - - if inspection.State.Running { - errMsg := fmt.Errorf("container is still running") - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - if inspection.State.ExitCode != 0 { - errMsg := fmt.Errorf("container exited with status %d: %s", inspection.State.ExitCode, inspection.State.Error) - telemetry.ReportCriticalError( - childCtx, - errMsg, - attribute.Int("exit_code", inspection.State.ExitCode), - attribute.String("error", inspection.State.Error), - attribute.Bool("oom", inspection.State.OOMKilled), - ) - - return errMsg - } - - rootfsFile, err := os.Create(r.env.BuildRootfsPath()) - if err != nil { - errMsg := fmt.Errorf("error creating rootfs file: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "created rootfs file") - - defer func() { - rootfsErr := rootfsFile.Close() - if rootfsErr != nil { - errMsg := fmt.Errorf("error closing rootfs file: %w", rootfsErr) - telemetry.ReportError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "closed rootfs file") - } - }() - - pr, pw = io.Pipe() - - go func() { - downloadErr := r.legacyClient.DownloadFromContainer(cont.ID, docker.DownloadFromContainerOptions{ - Context: childCtx, - Path: "/", - OutputStream: pw, - }) - if downloadErr != nil { - errMsg := fmt.Errorf("error downloading from container: %w", downloadErr) - telemetry.ReportCriticalError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "downloaded from container") - } - - closeErr := pw.Close() - if closeErr != nil { - errMsg := fmt.Errorf("error closing pipe: %w", closeErr) - telemetry.ReportCriticalError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "closed pipe") - } - }() - - telemetry.ReportEvent(childCtx, "coverting tar to ext4") - - // This package creates a read-only ext4 filesystem from a tar archive. - // We need to use another program to make the filesystem writable. - err = tar2ext4.ConvertTarToExt4(pr, rootfsFile, tar2ext4.MaximumDiskSize(maxRootfsSize)) - if err != nil { - if strings.Contains(err.Error(), "disk exceeded maximum size") { - r.env.BuildLogsWriter.Write([]byte(fmt.Sprintf("Build failed - exceeded maximum size %v MB.\n", maxRootfsSize>>ToMBShift))) - } - - errMsg := fmt.Errorf("error converting tar to ext4: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "converted container tar to ext4") - - tuneContext, tuneSpan := tracer.Start(childCtx, "tune-rootfs-file-cmd") - defer tuneSpan.End() - - cmd := exec.CommandContext(tuneContext, "tune2fs", "-O", "^read-only", r.env.BuildRootfsPath()) - - tuneStdoutWriter := telemetry.NewEventWriter(tuneContext, "stdout") - cmd.Stdout = tuneStdoutWriter - - tuneStderrWriter := telemetry.NewEventWriter(childCtx, "stderr") - cmd.Stderr = tuneStderrWriter - - err = cmd.Run() - if err != nil { - errMsg := fmt.Errorf("error making rootfs file writable: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "made rootfs file writable") - - rootfsStats, err := rootfsFile.Stat() - if err != nil { - errMsg := fmt.Errorf("error statting rootfs file: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "statted rootfs file") - - // In bytes - rootfsSize := rootfsStats.Size() + r.env.DiskSizeMB<= timeout { - return fmt.Errorf("timeout reached while waiting for socket file") - } - - // Wait for a short duration before checking again - time.Sleep(socketReadyCheckInterval) - } else { - // Error occurred while checking for socket file - return err - } - } -} - -func newFirecrackerClient(socketPath string) *client.Firecracker { - httpClient := client.NewHTTPClient(strfmt.NewFormats()) - - transport := firecracker.NewUnixSocketTransport(socketPath, nil, false) - httpClient.SetTransport(transport) - - return httpClient -} - -func NewSnapshot(ctx context.Context, tracer trace.Tracer, env *Env, network *FCNetwork, rootfs *Rootfs) (*Snapshot, error) { - childCtx, childSpan := tracer.Start(ctx, "new-snapshot") - defer childSpan.End() - - socketFileName := fmt.Sprintf("fc-sock-%s.sock", env.BuildId) - socketPath := filepath.Join(tmpDirPath, socketFileName) - - client := newFirecrackerClient(socketPath) - - telemetry.ReportEvent(childCtx, "created fc client") - - snapshot := &Snapshot{ - socketPath: socketPath, - client: client, - env: env, - fc: nil, - } - - defer snapshot.cleanupFC(childCtx, tracer) - - err := snapshot.startFCProcess( - childCtx, - tracer, - env.FirecrackerPath(), - network.namespaceID, - storage.KernelMountDir, - env.CacheKernelDir(), - ) - if err != nil { - errMsg := fmt.Errorf("error starting fc process: %w", err) - - return nil, errMsg - } - - telemetry.ReportEvent(childCtx, "started fc process") - - err = snapshot.configureFC(childCtx, tracer) - if err != nil { - errMsg := fmt.Errorf("error configuring fc: %w", err) - - return nil, errMsg - } - - telemetry.ReportEvent(childCtx, "configured fc") - - // Wait for all necessary things in FC to start - // TODO: Maybe init should signalize when it's ready? - time.Sleep(waitTimeForFCStart) - telemetry.ReportEvent(childCtx, "waited for fc to start", attribute.Float64("seconds", float64(waitTimeForFCStart/time.Second))) - - if env.StartCmd != "" { - // HACK: This is a temporary fix for a customer that needs a bigger time to start the command. - // TODO: Remove this after we can add customizable wait time for building templates. - if env.TemplateId == "zegbt9dl3l2ixqem82mm" || env.TemplateId == "ot5bidkk3j2so2j02uuz" { - time.Sleep(120 * time.Second) - } else { - time.Sleep(waitTimeForStartCmd) - } - telemetry.ReportEvent(childCtx, "waited for start command", attribute.Float64("seconds", float64(waitTimeForStartCmd/time.Second))) - } - - err = snapshot.pauseFC(childCtx, tracer) - if err != nil { - errMsg := fmt.Errorf("error pausing fc: %w", err) - - return nil, errMsg - } - - err = snapshot.snapshotFC(childCtx, tracer) - if err != nil { - errMsg := fmt.Errorf("error snapshotting fc: %w", err) - - return nil, errMsg - } - - return snapshot, nil -} - -func (s *Snapshot) startFCProcess( - ctx context.Context, - tracer trace.Tracer, - fcBinaryPath, - networkNamespaceID, - kernelMountDir, - kernelDirPath string, -) error { - childCtx, childSpan := tracer.Start(ctx, "start-fc-process") - defer childSpan.End() - kernelMountCmd := fmt.Sprintf( - "mount --bind %s %s && ", - kernelDirPath, - kernelMountDir, - ) - inNetNSCmd := fmt.Sprintf("ip netns exec %s ", networkNamespaceID) - fcCmd := fmt.Sprintf("%s --api-sock %s", fcBinaryPath, s.socketPath) - - s.fc = exec.CommandContext(childCtx, "unshare", "-pm", "--kill-child", "--", "bash", "-c", kernelMountCmd+inNetNSCmd+fcCmd) - - fcVMStdoutWriter := telemetry.NewEventWriter(childCtx, "stdout") - fcVMStderrWriter := telemetry.NewEventWriter(childCtx, "stderr") - - stdoutPipe, err := s.fc.StdoutPipe() - if err != nil { - errMsg := fmt.Errorf("error creating fc stdout pipe: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - stderrPipe, err := s.fc.StderrPipe() - if err != nil { - errMsg := fmt.Errorf("error creating fc stderr pipe: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - closeErr := stdoutPipe.Close() - if closeErr != nil { - closeErrMsg := fmt.Errorf("error closing fc stdout pipe: %w", closeErr) - telemetry.ReportError(childCtx, closeErrMsg) - } - - return errMsg - } - - var outputWaitGroup sync.WaitGroup - - outputWaitGroup.Add(1) - go func() { - scanner := bufio.NewScanner(stdoutPipe) - - for scanner.Scan() { - line := scanner.Text() - fcVMStdoutWriter.Write([]byte(line)) - } - - outputWaitGroup.Done() - }() - - outputWaitGroup.Add(1) - go func() { - scanner := bufio.NewScanner(stderrPipe) - - for scanner.Scan() { - line := scanner.Text() - fcVMStderrWriter.Write([]byte(line)) - } - - outputWaitGroup.Done() - }() - - err = s.fc.Start() - if err != nil { - errMsg := fmt.Errorf("error starting fc process: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "started fc process") - - go func() { - anonymousChildCtx, anonymousChildSpan := tracer.Start(ctx, "handle-fc-process-wait") - defer anonymousChildSpan.End() - - outputWaitGroup.Wait() - - waitErr := s.fc.Wait() - if err != nil { - errMsg := fmt.Errorf("error waiting for fc process: %w", waitErr) - telemetry.ReportError(anonymousChildCtx, errMsg) - } else { - telemetry.ReportEvent(anonymousChildCtx, "fc process exited") - } - }() - - // Wait for the FC process to start so we can use FC API - err = waitForSocket(s.socketPath, socketWaitTimeout) - if err != nil { - errMsg := fmt.Errorf("error waiting for fc socket: %w", err) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "fc process created socket") - - return nil -} - -func (s *Snapshot) configureFC(ctx context.Context, tracer trace.Tracer) error { - childCtx, childSpan := tracer.Start(ctx, "configure-fc") - defer childSpan.End() - - ip := fmt.Sprintf("%s::%s:%s:instance:eth0:off:8.8.8.8", fcAddr, fcTapAddress, fcMaskLong) - kernelArgs := fmt.Sprintf("quiet loglevel=1 ip=%s reboot=k panic=1 pci=off nomodules i8042.nokbd i8042.noaux ipv6.disable=1 random.trust_cpu=on", ip) - kernelImagePath := storage.KernelMountedPath - bootSourceConfig := operations.PutGuestBootSourceParams{ - Context: childCtx, - Body: &models.BootSource{ - BootArgs: kernelArgs, - KernelImagePath: &kernelImagePath, - }, - } - - _, err := s.client.Operations.PutGuestBootSource(&bootSourceConfig) - if err != nil { - errMsg := fmt.Errorf("error setting fc boot source config: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "set fc boot source config") - - rootfs := "rootfs" - ioEngine := "Async" - isRootDevice := true - isReadOnly := false - pathOnHost := s.env.BuildRootfsPath() - driversConfig := operations.PutGuestDriveByIDParams{ - Context: childCtx, - DriveID: rootfs, - Body: &models.Drive{ - DriveID: &rootfs, - PathOnHost: pathOnHost, - IsRootDevice: &isRootDevice, - IsReadOnly: isReadOnly, - IoEngine: &ioEngine, - }, - } - - _, err = s.client.Operations.PutGuestDriveByID(&driversConfig) - if err != nil { - errMsg := fmt.Errorf("error setting fc drivers config: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "set fc drivers config") - - ifaceID := fcIfaceID - hostDevName := fcTapName - networkConfig := operations.PutGuestNetworkInterfaceByIDParams{ - Context: childCtx, - IfaceID: ifaceID, - Body: &models.NetworkInterface{ - IfaceID: &ifaceID, - GuestMac: fcMacAddress, - HostDevName: &hostDevName, - }, - } - - _, err = s.client.Operations.PutGuestNetworkInterfaceByID(&networkConfig) - if err != nil { - errMsg := fmt.Errorf("error setting fc network config: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "set fc network config") - - smt := true - trackDirtyPages := false - - machineConfig := &models.MachineConfiguration{ - VcpuCount: &s.env.VCpuCount, - MemSizeMib: &s.env.MemoryMB, - Smt: &smt, - TrackDirtyPages: &trackDirtyPages, - } - - if s.env.Hugepages() { - machineConfig.HugePages = models.MachineConfigurationHugePagesNr2M - } - - machineConfigParams := operations.PutMachineConfigurationParams{ - Context: childCtx, - Body: machineConfig, - } - - _, err = s.client.Operations.PutMachineConfiguration(&machineConfigParams) - if err != nil { - errMsg := fmt.Errorf("error setting fc machine config: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "set fc machine config") - - mmdsVersion := "V2" - mmdsConfig := operations.PutMmdsConfigParams{ - Context: childCtx, - Body: &models.MmdsConfig{ - Version: &mmdsVersion, - NetworkInterfaces: []string{fcIfaceID}, - }, - } - - _, err = s.client.Operations.PutMmdsConfig(&mmdsConfig) - if err != nil { - errMsg := fmt.Errorf("error setting fc mmds config: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "set fc mmds config") - - // We may need to sleep before start - previous configuration is processes asynchronously. How to do this sync or in one go? - time.Sleep(waitTimeForFCConfig) - - start := models.InstanceActionInfoActionTypeInstanceStart - startActionParams := operations.CreateSyncActionParams{ - Context: childCtx, - Info: &models.InstanceActionInfo{ - ActionType: &start, - }, - } - - _, err = s.client.Operations.CreateSyncAction(&startActionParams) - if err != nil { - errMsg := fmt.Errorf("error starting fc: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "started fc") - - return nil -} - -func (s *Snapshot) pauseFC(ctx context.Context, tracer trace.Tracer) error { - childCtx, childSpan := tracer.Start(ctx, "pause-fc") - defer childSpan.End() - - state := models.VMStatePaused - pauseConfig := operations.PatchVMParams{ - Context: childCtx, - Body: &models.VM{ - State: &state, - }, - } - - _, err := s.client.Operations.PatchVM(&pauseConfig) - if err != nil { - errMsg := fmt.Errorf("error pausing vm: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "paused fc") - - return nil -} - -func (s *Snapshot) snapshotFC(ctx context.Context, tracer trace.Tracer) error { - childCtx, childSpan := tracer.Start(ctx, "snapshot-fc") - defer childSpan.End() - - memfilePath := s.env.BuildMemfilePath() - snapfilePath := s.env.BuildSnapfilePath() - snapshotConfig := operations.CreateSnapshotParams{ - Context: childCtx, - Body: &models.SnapshotCreateParams{ - SnapshotType: models.SnapshotCreateParamsSnapshotTypeFull, - MemFilePath: &memfilePath, - SnapshotPath: &snapfilePath, - }, - } - - _, err := s.client.Operations.CreateSnapshot(&snapshotConfig) - if err != nil { - errMsg := fmt.Errorf("error creating vm snapshot: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "created vm snapshot") - - return nil -} - -func (s *Snapshot) cleanupFC(ctx context.Context, tracer trace.Tracer) { - childCtx, childSpan := tracer.Start(ctx, "cleanup-fc") - defer childSpan.End() - - if s.fc != nil { - err := s.fc.Cancel() - if err != nil { - errMsg := fmt.Errorf("error killing fc process: %w", err) - telemetry.ReportError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "killed fc process") - } - } - - err := os.RemoveAll(s.socketPath) - if err != nil { - errMsg := fmt.Errorf("error removing fc socket %w", err) - telemetry.ReportError(childCtx, errMsg) - } else { - telemetry.ReportEvent(childCtx, "removed fc socket") - } -} diff --git a/packages/template-manager/internal/build/snapshot_other.go b/packages/template-manager/internal/build/snapshot_other.go deleted file mode 100644 index 9f03cff..0000000 --- a/packages/template-manager/internal/build/snapshot_other.go +++ /dev/null @@ -1,20 +0,0 @@ -//go:build !linux -// +build !linux - -package build - -import ( - "context" - "errors" - - "go.opentelemetry.io/otel/trace" -) - -var fcAddr = "127.0.0.1:5150" - -type Snapshot struct { -} - -func NewSnapshot(ctx context.Context, tracer trace.Tracer, env *Env, network *FCNetwork, rootfs *Rootfs) (*Snapshot, error) { - return nil, errors.New("snapshot is not supported on this platform") -} diff --git a/packages/template-manager/internal/build/tar.go b/packages/template-manager/internal/build/tar.go deleted file mode 100644 index b135243..0000000 --- a/packages/template-manager/internal/build/tar.go +++ /dev/null @@ -1,59 +0,0 @@ -package build - -import ( - "archive/tar" - "fmt" - "io" - "os" -) - -func addFileToTarWriter(writer *tar.Writer, file fileToTar) error { - f, err := os.Open(file.localPath) - if err != nil { - errMsg := fmt.Errorf("error opening file: %w", err) - - return errMsg - } - - defer func() { - closeErr := f.Close() - if closeErr != nil { - errMsg := fmt.Errorf("error closing file: %w", closeErr) - fmt.Print(errMsg) - } - }() - - stat, err := f.Stat() - if err != nil { - errMsg := fmt.Errorf("error statting file: %w", err) - - return errMsg - } - - hdr := &tar.Header{ - Name: file.tarPath, // The name of the file in the tar archive - Mode: 0o777, - Size: stat.Size(), - } - - err = writer.WriteHeader(hdr) - if err != nil { - errMsg := fmt.Errorf("error writing tar header: %w", err) - - return errMsg - } - - _, err = io.Copy(writer, f) - if err != nil { - errMsg := fmt.Errorf("error copying file to tar: %w", err) - - return errMsg - } - - return nil -} - -type fileToTar struct { - localPath string - tarPath string -} diff --git a/packages/template-manager/internal/build/template.go b/packages/template-manager/internal/build/template.go deleted file mode 100644 index bf391e5..0000000 --- a/packages/template-manager/internal/build/template.go +++ /dev/null @@ -1,106 +0,0 @@ -package build - -import ( - "context" - _ "embed" - "fmt" - "io" - "os" - "text/template" - - "github.com/docker/docker/client" - docker "github.com/fsouza/go-dockerclient" - "go.opentelemetry.io/otel/trace" - - "github.com/e2b-dev/infra/packages/shared/pkg/storage" - "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" -) - -type Env struct { - *storage.TemplateFiles - - // Command to run when building the env. - StartCmd string - - // The number of vCPUs to allocate to the VM. - VCpuCount int64 - - // The amount of RAM memory to allocate to the VM, in MiB. - MemoryMB int64 - - // The amount of free disk to allocate to the VM, in MiB. - DiskSizeMB int64 - - // Path to the directory where the temporary files for the build are stored. - BuildLogsWriter io.Writer - - // Real size of the rootfs after building the env. - rootfsSize int64 -} - -//go:embed provision.sh -var provisionEnvScriptFile string -var EnvInstanceTemplate = template.Must(template.New("provisioning-script").Parse(provisionEnvScriptFile)) - -// Real size in MB of rootfs after building the env -func (e *Env) RootfsSizeMB() int64 { - return e.rootfsSize >> 20 -} - -func (e *Env) Build(ctx context.Context, tracer trace.Tracer, docker *client.Client, legacyDocker *docker.Client) error { - childCtx, childSpan := tracer.Start(ctx, "build") - defer childSpan.End() - - err := os.MkdirAll(e.BuildDir(), 0o777) - if err != nil { - errMsg := fmt.Errorf("error initializing directories for building env '%s' during build '%s': %w", e.TemplateId, e.BuildId, err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - rootfs, err := NewRootfs(childCtx, tracer, e, docker, legacyDocker) - if err != nil { - errMsg := fmt.Errorf("error creating rootfs for env '%s' during build '%s': %w", e.TemplateId, e.BuildId, err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - network, err := NewFCNetwork(childCtx, tracer, e) - if err != nil { - errMsg := fmt.Errorf("error network setup for FC while building env '%s' during build '%s': %w", e.TemplateId, e.BuildId, err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - defer network.Cleanup(childCtx, tracer) - - _, err = NewSnapshot(childCtx, tracer, e, network, rootfs) - if err != nil { - errMsg := fmt.Errorf("error snapshot for env '%s' during build '%s': %w", e.TemplateId, e.BuildId, err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - return nil -} - -func (e *Env) Remove(ctx context.Context, tracer trace.Tracer) error { - childCtx, childSpan := tracer.Start(ctx, "move-to-env-dir") - defer childSpan.End() - - err := os.RemoveAll(e.BuildDir()) - if err != nil { - errMsg := fmt.Errorf("error removing build dir: %w", err) - telemetry.ReportCriticalError(childCtx, errMsg) - - return errMsg - } - - telemetry.ReportEvent(childCtx, "removed build dir") - - return nil -} diff --git a/packages/template-manager/internal/build/writer/writer.go b/packages/template-manager/internal/build/writer/writer.go deleted file mode 100644 index b2f5c38..0000000 --- a/packages/template-manager/internal/build/writer/writer.go +++ /dev/null @@ -1,26 +0,0 @@ -package writer - -import ( - "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" -) - -type BuildLogsWriter struct { - stream template_manager.TemplateService_TemplateCreateServer -} - -func (w BuildLogsWriter) Write(p []byte) (n int, err error) { - err = w.stream.Send(&template_manager.TemplateBuildLog{Log: string(p)}) - if err != nil { - return 0, err - } - - return len(p), nil -} - -func New(stream template_manager.TemplateService_TemplateCreateServer) BuildLogsWriter { - writer := BuildLogsWriter{ - stream: stream, - } - - return writer -} diff --git a/packages/template-manager/internal/constants/main.go b/packages/template-manager/internal/constants/main.go deleted file mode 100644 index 95c2116..0000000 --- a/packages/template-manager/internal/constants/main.go +++ /dev/null @@ -1,29 +0,0 @@ -package constants - -import ( - "fmt" - "github.com/e2b-dev/infra/packages/shared/pkg/consts" - "strings" -) - -func CheckRequired() error { - var missing []string - - if consts.AWSAccountID == "" { - missing = append(missing, "AWS_ACCOUNT_ID") - } - - if consts.ECRRepository == "" { - missing = append(missing, "AWS_ECR_REPOSITORY") - } - - if consts.AWSRegion == "" { - missing = append(missing, "AWS_REGION") - } - - if len(missing) > 0 { - return fmt.Errorf("missing environment variables: %s", strings.Join(missing, ", ")) - } - - return nil -} diff --git a/packages/template-manager/internal/constants/service.go b/packages/template-manager/internal/constants/service.go deleted file mode 100644 index c97fdc0..0000000 --- a/packages/template-manager/internal/constants/service.go +++ /dev/null @@ -1,3 +0,0 @@ -package constants - -const ServiceName = "template-manager" diff --git a/packages/template-manager/internal/server/create_template.go b/packages/template-manager/internal/server/create_template.go deleted file mode 100644 index 7346b97..0000000 --- a/packages/template-manager/internal/server/create_template.go +++ /dev/null @@ -1,134 +0,0 @@ -package server - -import ( - "context" - "fmt" - "os/exec" - "strconv" - "strings" - "time" - - "go.opentelemetry.io/otel/attribute" - "google.golang.org/grpc/metadata" - - template_manager "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" - "github.com/e2b-dev/infra/packages/shared/pkg/storage" - "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" - "github.com/e2b-dev/infra/packages/template-manager/internal/build" - "github.com/e2b-dev/infra/packages/template-manager/internal/build/writer" -) - -const cleanupTimeout = time.Second * 10 - -func (s *serverStore) TemplateCreate(templateRequest *template_manager.TemplateCreateRequest, stream template_manager.TemplateService_TemplateCreateServer) error { - ctx := stream.Context() - - childCtx, childSpan := s.tracer.Start(ctx, "template-create") - defer childSpan.End() - - config := templateRequest.Template - - childSpan.SetAttributes( - attribute.String("env.id", config.TemplateID), - attribute.String("env.build.id", config.BuildID), - attribute.String("env.kernel.version", config.KernelVersion), - attribute.String("env.firecracker.version", config.FirecrackerVersion), - attribute.String("env.start_cmd", config.StartCommand), - attribute.Int64("env.memory_mb", int64(config.MemoryMB)), - attribute.Int64("env.vcpu_count", int64(config.VCpuCount)), - attribute.Bool("env.huge_pages", config.HugePages), - ) - - logsWriter := writer.New(stream) - template := &build.Env{ - TemplateFiles: storage.NewTemplateFiles( - config.TemplateID, - config.BuildID, - config.KernelVersion, - config.FirecrackerVersion, - config.HugePages, - ), - VCpuCount: int64(config.VCpuCount), - MemoryMB: int64(config.MemoryMB), - StartCmd: config.StartCommand, - DiskSizeMB: int64(config.DiskSizeMB), - BuildLogsWriter: logsWriter, - } - - buildStorage := s.templateStorage.NewBuild(template.TemplateFiles) - - var err error - - // Remove local template files if build fails - defer func() { - removeCtx, cancel := context.WithTimeout(context.Background(), cleanupTimeout) - defer cancel() - - removeErr := template.Remove(removeCtx, s.tracer) - if removeErr != nil { - telemetry.ReportError(childCtx, removeErr) - } - }() - - err = template.Build(childCtx, s.tracer, s.dockerClient, s.legacyDockerClient) - if err != nil { - _, _ = logsWriter.Write([]byte(fmt.Sprintf("Error building environment: %v", err))) - - telemetry.ReportCriticalError(childCtx, err) - - return err - } - - // Remove build files if build fails or times out - defer func() { - if err != nil { - removeCtx, cancel := context.WithTimeout(context.Background(), cleanupTimeout) - defer cancel() - - removeErr := buildStorage.Remove(removeCtx) - if removeErr != nil { - telemetry.ReportError(childCtx, removeErr) - } - } - }() - - memfilePath := template.BuildMemfilePath() - rootfsPath := template.BuildRootfsPath() - - upload := buildStorage.Upload( - childCtx, - template.BuildSnapfilePath(), - &memfilePath, - &rootfsPath, - ) - - // nosemgrep dangerous-exec-command - cmd := exec.Command(storage.HostEnvdPath, "-version") - - out, err := cmd.Output() - if err != nil { - _, _ = logsWriter.Write([]byte(fmt.Sprintf("Error while getting envd version: %v", err))) - - return err - } - - uploadErr := <-upload - if uploadErr != nil { - errMsg := fmt.Sprintf("Error while uploading build files: %v", uploadErr) - _, _ = logsWriter.Write([]byte(errMsg)) - - return uploadErr - } - - version := strings.TrimSpace(string(out)) - trailerMetadata := metadata.Pairs( - storage.RootfsSizeKey, strconv.FormatInt(template.RootfsSizeMB(), 10), - storage.EnvdVersionKey, version, - ) - - stream.SetTrailer(trailerMetadata) - - telemetry.ReportEvent(childCtx, "Environment built") - - return nil -} diff --git a/packages/template-manager/internal/server/delete_template.go b/packages/template-manager/internal/server/delete_template.go deleted file mode 100644 index 627f145..0000000 --- a/packages/template-manager/internal/server/delete_template.go +++ /dev/null @@ -1,22 +0,0 @@ -package server - -import ( - "context" - - "google.golang.org/protobuf/types/known/emptypb" - - template_manager "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" - "github.com/e2b-dev/infra/packages/template-manager/internal/template" -) - -func (s *serverStore) TemplateBuildDelete(ctx context.Context, in *template_manager.TemplateBuildDeleteRequest) (*emptypb.Empty, error) { - childCtx, childSpan := s.tracer.Start(ctx, "template-delete-request") - defer childSpan.End() - - err := template.Delete(childCtx, s.tracer, s.ecrClient, s.templateStorage, in.BuildID, in.TemplateID) - if err != nil { - return nil, err - } - - return &emptypb.Empty{}, nil -} diff --git a/packages/template-manager/internal/server/main.go b/packages/template-manager/internal/server/main.go deleted file mode 100644 index e73b7b1..0000000 --- a/packages/template-manager/internal/server/main.go +++ /dev/null @@ -1,94 +0,0 @@ -package server - -import ( - "context" - "log" - "time" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/aws-sdk-go/service/ecr" - "github.com/docker/docker/client" - docker "github.com/fsouza/go-dockerclient" - grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery" - "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" - "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/trace" - "go.uber.org/zap" - "google.golang.org/grpc" - "google.golang.org/grpc/health" - "google.golang.org/grpc/health/grpc_health_v1" - "google.golang.org/grpc/keepalive" - - e2bgrpc "github.com/e2b-dev/infra/packages/shared/pkg/grpc" - templatemanager "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager" - "github.com/e2b-dev/infra/packages/shared/pkg/logging" - "github.com/e2b-dev/infra/packages/shared/pkg/consts" - "github.com/e2b-dev/infra/packages/template-manager/internal/constants" - "github.com/e2b-dev/infra/packages/template-manager/internal/template" -) - -type serverStore struct { - templatemanager.UnimplementedTemplateServiceServer - server *grpc.Server - tracer trace.Tracer - dockerClient *client.Client - legacyDockerClient *docker.Client - ecrClient *ecr.ECR - templateStorage *template.Storage -} - -func New(logger *zap.Logger) *grpc.Server { - ctx := context.Background() - log.Println("Initializing template manager") - - opts := []grpc_zap.Option{logging.WithoutHealthCheck()} - - s := grpc.NewServer( - grpc.KeepaliveEnforcementPolicy(keepalive.EnforcementPolicy{ - MinTime: 5 * time.Second, // Minimum time between pings from client - PermitWithoutStream: true, // Allow pings even when no active streams - }), - grpc.KeepaliveParams(keepalive.ServerParameters{ - Time: 15 * time.Second, // Server sends keepalive pings every 15s - Timeout: 5 * time.Second, // Wait 5s for response before considering dead - }), - grpc.StatsHandler(e2bgrpc.NewStatsWrapper(otelgrpc.NewServerHandler())), - grpc.ChainUnaryInterceptor( - grpc_zap.UnaryServerInterceptor(logger, opts...), - recovery.UnaryServerInterceptor(), - ), - ) - dockerClient, err := client.NewClientWithOpts(client.FromEnv) - if err != nil { - panic(err) - } - - legacyClient, err := docker.NewClientFromEnv() - if err != nil { - panic(err) - } - - // Create AWS session and ECR client - awsSession, err := session.NewSession(&aws.Config{ - Region: aws.String(consts.AWSRegion), - }) - if err != nil { - panic(err) - } - ecrClient := ecr.New(awsSession) - - templateStorage := template.NewStorage(ctx) - - templatemanager.RegisterTemplateServiceServer(s, &serverStore{ - tracer: otel.Tracer(constants.ServiceName), - dockerClient: dockerClient, - legacyDockerClient: legacyClient, - ecrClient: ecrClient, - templateStorage: templateStorage, - }) - - grpc_health_v1.RegisterHealthServer(s, health.NewServer()) - return s -} \ No newline at end of file diff --git a/packages/template-manager/internal/template/main.go b/packages/template-manager/internal/template/main.go deleted file mode 100644 index 46acbbb..0000000 --- a/packages/template-manager/internal/template/main.go +++ /dev/null @@ -1,74 +0,0 @@ -package template - -import ( - "context" - "fmt" - "log" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/ecr" - "go.opentelemetry.io/otel/trace" - - "github.com/e2b-dev/infra/packages/shared/pkg/consts" - "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" -) - -func GetDockerImageTag(templateID string) string { - // Return the ECR image tag - return templateID -} - -func GetDockerImageRepository(templateID string) string { - // Return the ECR repository URI - return fmt.Sprintf("%s.dkr.ecr.%s.amazonaws.com/%s/%s", consts.AWSAccountID, consts.AWSRegion, consts.ECRRepository, templateID) - //return fmt.Sprintf("%s.dkr.ecr.%s.amazonaws.com/%s:", consts.AWSAccountID, consts.AWSRegion, consts.ECRRepository) -} - -// GetDockerRepositoryName 返回完整的 ECR 仓库名称 -func GetDockerRepositoryName(templateID string) string { - // 根据截图和您提供的信息，正确的格式是 "e2b-custom-environments/templateID" - return fmt.Sprintf("%s/%s", consts.ECRRepository, templateID) -} - -func Delete( - ctx context.Context, - tracer trace.Tracer, - ecrClient *ecr.ECR, - templateStorage *Storage, - buildId string, - templateID string, -) error { - childCtx, childSpan := tracer.Start(ctx, "delete-template") - defer childSpan.End() - - err := templateStorage.Remove(ctx, buildId) - if err != nil { - return fmt.Errorf("error when deleting template objects: %w", err) - } - - // 获取完整的仓库名称 - repositoryName := GetDockerRepositoryName(templateID) - - // 打印调试信息 - log.Printf("Attempting to delete image with tag '%s' from repository '%s'", buildId, repositoryName) - - _, ecrDeleteErr := ecrClient.BatchDeleteImage(&ecr.BatchDeleteImageInput{ - RepositoryName: aws.String(repositoryName), - ImageIds: []*ecr.ImageIdentifier{ - { - ImageTag: aws.String(buildId), - }, - }, - }) - - if ecrDeleteErr != nil { - errMsg := fmt.Errorf("error when deleting template image from registry: %w", ecrDeleteErr) - telemetry.ReportCriticalError(childCtx, errMsg) - log.Printf("error deleting template image from ECR: %v", ecrDeleteErr) - } else { - telemetry.ReportEvent(childCtx, "deleted template image from registry") - log.Printf("successfully deleted template image %s from ECR", buildId) - } - - return nil -} diff --git a/packages/template-manager/internal/template/storage.go b/packages/template-manager/internal/template/storage.go deleted file mode 100644 index a2c038b..0000000 --- a/packages/template-manager/internal/template/storage.go +++ /dev/null @@ -1,32 +0,0 @@ -package template - -import ( - "context" - "fmt" - - "github.com/e2b-dev/infra/packages/shared/pkg/storage" - "github.com/e2b-dev/infra/packages/shared/pkg/storage/s3" -) - -type Storage struct { - bucket *s3.BucketHandle -} - -func NewStorage(ctx context.Context) *Storage { - return &Storage{ - bucket: s3.GetTemplateBucket(), - } -} - -func (t *Storage) Remove(ctx context.Context, buildId string) error { - err := s3.RemoveDir(ctx, t.bucket, buildId) - if err != nil { - return fmt.Errorf("error when removing template '%s': %w", buildId, err) - } - - return nil -} - -func (t *Storage) NewBuild(files *storage.TemplateFiles) *storage.TemplateBuild { - return storage.NewTemplateBuild(nil, nil, files) -} diff --git a/packages/template-manager/internal/test/build.go b/packages/template-manager/internal/test/build.go deleted file mode 100644 index 1b130e6..0000000 --- a/packages/template-manager/internal/test/build.go +++ /dev/null @@ -1,79 +0,0 @@ -package test - -import ( - "bytes" - "context" - "fmt" - "os" - "time" - - "github.com/docker/docker/client" - docker "github.com/fsouza/go-dockerclient" - "github.com/rs/zerolog/log" - "go.opentelemetry.io/otel" - - "github.com/e2b-dev/infra/packages/shared/pkg/storage" - "github.com/e2b-dev/infra/packages/template-manager/internal/build" - "github.com/e2b-dev/infra/packages/template-manager/internal/template" -) - -func Build(templateID, buildID string) { - ctx, cancel := context.WithTimeout(context.Background(), time.Minute*3) - defer cancel() - - tracer := otel.Tracer("test") - - dockerClient, err := client.NewClientWithOpts(client.FromEnv) - if err != nil { - panic(err) - } - - legacyClient, err := docker.NewClientFromEnv() - if err != nil { - panic(err) - } - - var buf bytes.Buffer - t := build.Env{ - TemplateFiles: storage.NewTemplateFiles( - templateID, - buildID, - "vmlinux-5.10.186", - "v1.7.0-dev_8bb88311", - true, - ), - VCpuCount: 2, - MemoryMB: 256, - StartCmd: "", - DiskSizeMB: 512, - BuildLogsWriter: &buf, - } - - err = t.Build(ctx, tracer, dockerClient, legacyClient) - if err != nil { - errMsg := fmt.Errorf("error building template: %w", err) - - fmt.Fprintln(os.Stderr, errMsg) - - return - } - - tempStorage := template.NewStorage(ctx) - - buildStorage := tempStorage.NewBuild(t.TemplateFiles) - - memfilePath := t.BuildMemfilePath() - rootfsPath := t.BuildRootfsPath() - - upload := buildStorage.Upload( - ctx, - t.BuildSnapfilePath(), - &memfilePath, - &rootfsPath, - ) - - err = <-upload - if err != nil { - log.Fatal().Err(err).Msg("error uploading build files") - } -} diff --git a/packages/template-manager/main.go b/packages/template-manager/main.go deleted file mode 100644 index b045454..0000000 --- a/packages/template-manager/main.go +++ /dev/null @@ -1,71 +0,0 @@ -package main - -import ( - "context" - "flag" - "fmt" - "log" - "net" - - "github.com/e2b-dev/infra/packages/shared/pkg/env" - "github.com/e2b-dev/infra/packages/shared/pkg/logging" - "github.com/e2b-dev/infra/packages/shared/pkg/telemetry" - "github.com/e2b-dev/infra/packages/template-manager/internal/constants" - "github.com/e2b-dev/infra/packages/template-manager/internal/server" - "github.com/e2b-dev/infra/packages/template-manager/internal/test" -) - -const defaultPort = 5009 - -var commitSHA string - -func main() { - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - - testFlag := flag.String("test", "", "run tests") - templateID := flag.String("template", "", "template id") - buildID := flag.String("build", "", "build id") - - port := flag.Int("port", defaultPort, "Port for test HTTP server") - - log.Println("Starting template manager", "commit", commitSHA) - - flag.Parse() - - if err := constants.CheckRequired(); err != nil { - log.Fatalf("Validation for environment variables failed: %v", err) - } - - // If we're running a test, we don't need to start the server - if *testFlag != "" { - switch *testFlag { - case "build": - test.Build(*templateID, *buildID) - return - } - } - - if !env.IsLocal() { - shutdown := telemetry.InitOTLPExporter(ctx, constants.ServiceName, "no") - defer shutdown(context.TODO()) - } - - lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port)) - if err != nil { - log.Fatalf("failed to listen: %v", err) - } - - logger, err := logging.New(env.IsLocal()) - if err != nil { - log.Fatalf("Error initializing logging\n: %v\n", err) - } - - // Create an instance of our handler which satisfies the generated interface - s := server.New(logger.Desugar()) - - log.Printf("Starting server on port %d", *port) - if err := s.Serve(lis); err != nil { - log.Fatalf("failed to serve: %v", err) - } -} diff --git a/packages/template-manager/template-manager.proto b/packages/template-manager/template-manager.proto deleted file mode 100644 index fb1c85b..0000000 --- a/packages/template-manager/template-manager.proto +++ /dev/null @@ -1,43 +0,0 @@ -syntax = "proto3"; - -import "google/protobuf/empty.proto"; - -option go_package = "https://github.com/e2b-dev/infra/template-manager"; - - -message TemplateConfig { - string templateID = 1; - string buildID = 2; - - int32 memoryMB = 3; - int32 vCpuCount = 4; - int32 diskSizeMB = 5; - - string kernelVersion = 6; - string firecrackerVersion = 7; - string startCommand = 8; - bool hugePages = 9; -} - -message TemplateCreateRequest { - TemplateConfig template = 1; -} - -// Data required for deleting a template. -message TemplateBuildDeleteRequest { - string buildID = 1; - string templateID = 2; -} - -// Logs from template build -message TemplateBuildLog { - string log = 1; -} - -// Interface exported by the server. -service TemplateService { - // TemplateCreate is a gRPC service that creates a new template - rpc TemplateCreate (TemplateCreateRequest) returns (stream TemplateBuildLog); - // TemplateBuildDelete is a gRPC service that deletes files associated with a template build - rpc TemplateBuildDelete (TemplateBuildDeleteRequest) returns (google.protobuf.Empty); -} diff --git a/packages/template-manager/upload-envs.sh b/packages/template-manager/upload-envs.sh deleted file mode 100644 index 6ecece7..0000000 --- a/packages/template-manager/upload-envs.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -# ------------------------------------------------------------------------------------------------- -# Upload envs from disk to AWS S3 -# ------------------------------------------------------------------------------------------------- -# First argument is target dir name -TARGET_DIR_NAME=$1 - -# Second argument is template bucket name -TEMPLATE_BUCKET_NAME=$2 - -# Third argument is template id that you can specify to upload a specific env -TEMPLATE_ID=$3 -# ------------------------------------------------------------------------------------------------- - -echo "Uploading envs from ${TARGET_DIR_NAME} to S3 bucket ${TEMPLATE_BUCKET_NAME}" - -COMMAND="aws s3 cp --quiet --cache-control no-cache,max-age=0" - -# Initialize counter for uploaded envs -uploaded_env_count=0 -total_envs=$(ls ${TARGET_DIR_NAME} | wc -l) - -# Record the start time -start_time=$(date +%s) - -# iterate over all directories in the target dir -for template_id in $(ls ${TARGET_DIR_NAME}); do - if [ -n "${TEMPLATE_ID}" ] && [ "${template_id}" != "${TEMPLATE_ID}" ]; then - continue - fi - - # Increment the counter for uploaded envs - uploaded_env_count=$((uploaded_env_count + 1)) - - echo -e "\n------------------${uploaded_env_count}/${total_envs}-----------------" - echo "Uploading env ${template_id}" - # Get the build id by printing the content of build_id text file, skip dir if not build_id file exists - if [ ! -f "${TARGET_DIR_NAME}/${template_id}/build_id" ]; then - echo "Skip ${template_id} because build_id file does not exist" - continue - fi - - BUILD_ID=$(cat ${TARGET_DIR_NAME}/${template_id}/build_id) - echo "Build ID: ${BUILD_ID}" - - # Upload env to S3 with aws s3 cp, copy only "memfile", "rootfs.ext4" and "snapfile" from the dir - # First get and print the paths to the files - MEMFILE_PATH=$(ls ${TARGET_DIR_NAME}/${template_id}/memfile) - ROOTFS_EXT4_PATH=$(ls ${TARGET_DIR_NAME}/${template_id}/rootfs.ext4) - SNAPFILE_PATH=$(ls ${TARGET_DIR_NAME}/${template_id}/snapfile) - - # Check if files exist - if [ ! -f "${MEMFILE_PATH}" ]; then - echo "Skip ${template_id} because memfile does not exist" - continue - fi - - if [ ! -f "${ROOTFS_EXT4_PATH}" ]; then - echo "Skip ${template_id} because rootfs.ext4 does not exist" - continue - fi - - if [ ! -f "${SNAPFILE_PATH}" ]; then - echo "Skip ${template_id} because snapfile does not exist" - continue - fi - - BUCKET_MEMFILE_PATH="s3://${TEMPLATE_BUCKET_NAME}/${BUILD_ID}/memfile" - BUCKET_ROOTFS_EXT4_PATH="s3://${TEMPLATE_BUCKET_NAME}/${BUILD_ID}/rootfs.ext4" - BUCKET_SNAPFILE_PATH="s3://${TEMPLATE_BUCKET_NAME}/${BUILD_ID}/snapfile" - - # Upload the files - echo "Uploading memfile" - ${COMMAND} ${MEMFILE_PATH} ${BUCKET_MEMFILE_PATH} & - - echo "Uploading rootfs.ext4" - ${COMMAND} ${ROOTFS_EXT4_PATH} ${BUCKET_ROOTFS_EXT4_PATH} & - - echo "Uploading snapfile" - ${COMMAND} ${SNAPFILE_PATH} ${BUCKET_SNAPFILE_PATH} & - - # Wait for all background jobs to finish - wait -done - -# Print the number of uploaded envs -echo "Total number of uploaded envs: ${uploaded_env_count}" - -# Record the end time -end_time=$(date +%s) - -# Calculate and print the elapsed time -elapsed_time=$((end_time - start_time)) -echo "Total elapsed time: ${elapsed_time} seconds" diff --git a/packages/template-manager/upload.sh b/packages/template-manager/upload.sh deleted file mode 100644 index 5a2d57b..0000000 --- a/packages/template-manager/upload.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -AWS_S3_BUCKET=$1 -AWS_REGION=${2:-us-east-1} - -chmod +x bin/template-manager - -aws s3 cp \ - --region ${AWS_REGION} \ - --cache-control "no-cache, max-age=0" \ - bin/template-manager "s3://${AWS_S3_BUCKET}/template-manager" diff --git a/packages/upload.sh b/packages/upload.sh index 1d531d4..da11350 100755 --- a/packages/upload.sh +++ b/packages/upload.sh @@ -32,31 +32,6 @@ echo "BUCKET_FC_ENV_PIPELINE: $BUCKET_FC_ENV_PIPELINE" echo "BUCKET_FC_KERNELS: $BUCKET_FC_KERNELS" echo "BUCKET_FC_VERSIONS: $BUCKET_FC_VERSIONS" -# Check if gsutil is installed -if ! command -v gsutil &> /dev/null; then - echo "Installing gsutil..." - - # Create keyring directory if it doesn't exist - sudo mkdir -p /usr/share/keyrings - - # Add Google Cloud SDK distribution URI as a package source - echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list - - # Import Google Cloud public key - curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - - - # Update package list - export DEBIAN_FRONTEND=noninteractive - sudo apt-get update -y - - # Install Google Cloud SDK (automatically accept all prompts) - sudo apt-get install -y google-cloud-sdk - - echo "gsutil installation completed" -else - echo "gsutil is already installed" -fi - # Check if AWS CLI is installed if ! command -v aws &> /dev/null; then echo "Installing AWS CLI..." @@ -66,24 +41,41 @@ else echo "AWS CLI is already installed" fi -# Create subdirectories -mkdir -p "${TEMP_DIR}/kernels" -mkdir -p "${TEMP_DIR}/firecrackers" +CI_VERSION="v1.10" +KERNEL_VERSION="6.1.102" +KERNEL_FOLDER="vmlinux-${KERNEL_VERSION}" +FC_VERSION="v1.10.1" +FC_FOLDER="v1.10.1_1fcdaec" -# Download files from Google Cloud Storage -echo "Downloading files from Google Cloud Storage..." -gsutil cp -r gs://e2b-prod-public-builds/envd-v0.0.1 "${TEMP_DIR}/envd-v0.0.1" -gsutil cp -r gs://e2b-prod-public-builds/envd "${TEMP_DIR}/envd" -gsutil cp -r gs://e2b-prod-public-builds/kernels/* "${TEMP_DIR}/kernels/" -gsutil cp -r gs://e2b-prod-public-builds/firecrackers/* "${TEMP_DIR}/firecrackers/" -echo "File download completed" +# Create subdirectories +mkdir -p "${TEMP_DIR}/kernels/${KERNEL_FOLDER}" +mkdir -p "${TEMP_DIR}/firecrackers/${FC_FOLDER}" + +fc_url="https://github.com/firecracker-microvm/firecracker/releases" + +ARCHITECTURE=$(grep "^CFNARCHITECTURE=" "$CONFIG_FILE" | cut -d'=' -f2) + +# Download kernel and fc +if [ "$ARCHITECTURE" = "arm64" ]; then + # Download kernel + curl -L https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/$CI_VERSION/aarch64/vmlinux-$KERNEL_VERSION -o ${TEMP_DIR}/kernels/${KERNEL_FOLDER}/vmlinux.bin + # Download firecracker + curl -L ${fc_url}/download/${FC_VERSION}/firecracker-${FC_VERSION}-aarch64.tgz | tar -xz + mv release-${FC_VERSION}-aarch64/firecracker-${FC_VERSION}-aarch64 \ + ${TEMP_DIR}/firecrackers/${FC_FOLDER}/firecracker + rm -rf release-${latest_version}-aarch64 +else + # Download kernel + curl -L https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/$CI_VERSION/x86_64/vmlinux-$KERNEL_VERSION -o ${TEMP_DIR}/kernels/${KERNEL_FOLDER}/vmlinux.bin + # Download firecracker + curl -L ${fc_url}/download/${FC_VERSION}/firecracker-${FC_VERSION}-x86_64.tgz | tar -xz + mv release-${FC_VERSION}-x86_64/firecracker-${FC_VERSION}-x86_64 \ + ${TEMP_DIR}/firecrackers/${FC_FOLDER}/firecracker + rm -rf release-${latest_version}-x86_64 +fi # Upload to S3 echo "Starting file upload to S3..." -# Copy envd binary to S3 bucket -aws s3 cp "${TEMP_DIR}/envd-v0.0.1" "s3://${BUCKET_FC_ENV_PIPELINE}/envd-v0.0.1" -# aws s3 cp ./envd/bin/envd "s3://${BUCKET_FC_ENV_PIPELINE}/envd" -aws s3 cp "${TEMP_DIR}/envd" "s3://${BUCKET_FC_ENV_PIPELINE}/envd" aws s3 cp --recursive "${TEMP_DIR}/kernels/" "s3://${BUCKET_FC_KERNELS}/" aws s3 cp --recursive "${TEMP_DIR}/firecrackers/" "s3://${BUCKET_FC_VERSIONS}/" echo "File upload to S3 completed" @@ -92,5 +84,4 @@ echo "File upload to S3 completed" echo "Cleaning up temporary files..." rm -rf "${TEMP_DIR}" echo "Temporary files cleaned up" - echo "Migration completed!" \ No newline at end of file diff --git a/test_use_case/Dockerfile/e2b.Dockerfile.BrowserUse b/test_use_case/Dockerfile/e2b.Dockerfile.BrowserUse new file mode 100644 index 0000000..a1f6e8c --- /dev/null +++ b/test_use_case/Dockerfile/e2b.Dockerfile.BrowserUse @@ -0,0 +1,54 @@ +# E2B Desktop Sandbox Template +# +# This Dockerfile contains the commands to create a computer use sandbox on E2B. +# If you want to make your own template based on this one, make your changes + +FROM ubuntu:22.04 + +# Environment variables: + +ENV \ + # Avoid system prompts: \ + DEBIAN_FRONTEND=noninteractive \ + DEBIAN_PRIORITY=high \ + # Pip settings: \ + PIP_DEFAULT_TIMEOUT=100 \ + PIP_DISABLE_PIP_VERSION_CHECK=1 \ + PIP_NO_CACHE_DIR=1 + +# Desktop environment: + +RUN yes | unminimize && \ + apt-get update && \ + # X window server: + apt-get install -y xserver-xorg xorg x11-xserver-utils xvfb x11-utils xauth && \ + # XFCE desktop environment: + apt-get install -y xfce4 xfce4-goodies && \ + # Basic system utilities: + apt-get install -y util-linux sudo curl git wget && \ + # Pip will be used to install Python packages: + apt-get install -y python3-pip && \ + # Tools used by the desktop SDK: + apt-get install -y xdotool scrot ffmpeg + +# Streaming server: + +RUN \ + # VNC: \ + apt-get install -y x11vnc && \ + # NoVNC: \ + git clone --branch e2b-desktop https://github.com/e2b-dev/noVNC.git /opt/noVNC && \ + ln -s /opt/noVNC/vnc.html /opt/noVNC/index.html && \ + # Websockify: \ + apt-get install -y net-tools netcat && \ + pip install numpy && \ + git clone --branch v0.12.0 https://github.com/novnc/websockify /opt/noVNC/utils/websockify + +# User applications: + +# ~ Make your changes to this template BELOW this line ~ + +#For BrowserUse +RUN apt-get install -y python3.11 python3.11-dev && \ + python3.11 -m pip install --no-cache-dir boto3 langchain-aws pydantic browser_use[memory]==0.3.2 playwright dotenv && \ + playwright install chromium --with-deps --no-shell \ No newline at end of file