Page MenuHomePhabricator
Differential D11089

[lib] Make api-request-handler keyserver-specific
ClosedPublic
Actions

Authored by tomek on Feb 15 2024, 4:13 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 19, 12:42 AM
Unknown Object (File)
Sun, Mar 16, 7:07 AM
Unknown Object (File)
Tue, Feb 25, 3:45 AM
Unknown Object (File)
Mon, Feb 24, 9:39 AM
Unknown Object (File)
Feb 16 2025, 12:45 AM
Unknown Object (File)
Feb 16 2025, 12:45 AM
Unknown Object (File)
Feb 16 2025, 12:45 AM
Unknown Object (File)
Feb 16 2025, 12:45 AM
View All 86 Files
Subscribers
ashoat

Details

Reviewers
inka
kamil
michal
atul
Commits
rCOMMf5e11bdfcd79: [lib] Make api-request-handler keyserver-specific
Summary

Select a connection status from the given keyserver.
Modify socketAPIHandlers to be a map from keyserver to SocketAPIHandler.

https://linear.app/comm/issue/ENG-5778/update-apirequesthandler

Test Plan

Added console.logs in fetchResponse to check if it is called and if a request is matched with response. Focused a thread and checked if proper request and response were generated.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

tomek created this revision.Feb 15 2024, 4:13 AM
Herald added a subscriber: ashoat. · View Herald TranscriptFeb 15 2024, 4:13 AM
tomek edited the summary of this revision. (Show Details)Feb 15 2024, 4:14 AM
Harbormaster completed remote builds in B26915: Diff 37237.Feb 15 2024, 4:27 AM
tomek requested review of this revision.Feb 15 2024, 4:27 AM
ashoat added inline comments.Feb 15 2024, 5:58 AM
lib/keyserver-conn/call-keyserver-endpoint-provider.react.js
446–452 ↗(On Diff #37237)

I guess this works, but I wonder if it would be more idiomatic to move this to the provider... socketAPIHandlers could be a ref, and registerActiveSocket could be a utility exposed via the context

tomek added a child revision: D11092: [lib] Make activity-handler keyserver-specific.Feb 15 2024, 6:15 AM
tomek updated this revision to Diff 37363.Feb 20 2024, 7:06 AM
tomek marked an inline comment as done.

Move map to a context

Harbormaster completed remote builds in B27002: Diff 37363.Feb 20 2024, 7:21 AM
atul accepted this revision.Feb 21 2024, 10:34 PM
This revision is now accepted and ready to land.Feb 21 2024, 10:34 PM
Closed by commit rCOMMf5e11bdfcd79: [lib] Make api-request-handler keyserver-specific (authored by tomek). · Explain WhyFeb 22 2024, 3:08 AM
This revision was automatically updated to reflect the committed changes.
tomek added a commit: rCOMMf5e11bdfcd79: [lib] Make api-request-handler keyserver-specific.

Revision Contents
Changeset List

PathSize
lib/
keyserver-conn/
29 lines
socket/
35 lines
1 line

Diff 37426

View Options

lib/keyserver-conn/call-keyserver-endpoint-provider.react.js

locals {
mariadb_database_name = local.local_with_default_environment_vars.COMM_DATABASE_DATABASE
mariadb_username = local.local_with_default_environment_vars.COMM_DATABASE_USER
mariadb_password = local.local_with_default_environment_vars.COMM_DATABASE_PASSWORD
mariadb_port = jsondecode(local.local_with_default_environment_vars.COMM_DATABASE_PORT)
}
# MariaDB Security Group # MariaDB Security Group
resource "aws_security_group" "keyserver_mariadb_security_group" { resource "aws_security_group" "keyserver_mariadb_security_group" {
name = "keyserver-mariadb-sg" name = "keyserver-mariadb-sg"
description = "Allow inbound traffic on port 3307 and all outbound traffic" description = "Allow inbound traffic on port 3307 and all outbound traffic"
vpc_id = local.vpc_id vpc_id = local.vpc_id
# Inbound rules # Inbound rules
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
security_groups = [aws_security_group.keyserver_service.id] security_groups = [aws_security_group.keyserver_service.id]
} }
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
cidr_blocks = ["${var.allowed_ip}/32"] cidr_blocks = ["${var.allowed_ip}/32"]
} }
# Outbound rules # Outbound rules
egress { egress {
from_port = 0 from_port = 0
to_port = 0 to_port = 0
Show All 9 Linesresource "aws_db_instance" "mariadb" {
storage_type = "gp3" storage_type = "gp3"
db_name = "mariadb" db_name = "mariadb"
identifier = "mariadb-instance" identifier = "mariadb-instance"
engine = "mariadb" engine = "mariadb"
engine_version = "10.11" engine_version = "10.11"
instance_class = "db.m6g.large" instance_class = "db.m6g.large"
db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name
vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id] vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id]
username = var.mariadb_username username = local.mariadb_username
password = var.mariadb_password password = local.mariadb_password
parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name
storage_encrypted = true storage_encrypted = true
publicly_accessible = true publicly_accessible = true
port = 3307 port = local.mariadb_port
skip_final_snapshot = true skip_final_snapshot = true
} }
# MariaDB Parameter Group # MariaDB Parameter Group
resource "aws_db_parameter_group" "mariadb_parameter_group" { resource "aws_db_parameter_group" "mariadb_parameter_group" {
name = "mariadb-parameter-group" name = "mariadb-parameter-group"
family = "mariadb10.11" family = "mariadb10.11"
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Linesresource "aws_db_parameter_group" "mariadb_parameter_group" {
} }
} }
resource "null_resource" "create_comm_database" { resource "null_resource" "create_comm_database" {
depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group] depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group]
provisioner "local-exec" { provisioner "local-exec" {
command = <<EOT command = <<EOT
mysql --user=${var.mariadb_username} \ mysql --user=${local.mariadb_username} \
--port=3307 \ --port=${local.mariadb_port} \
--host=${aws_db_instance.mariadb.address} \ --host=${aws_db_instance.mariadb.address} \
--execute="CREATE DATABASE IF NOT EXISTS comm;" \ --execute="CREATE DATABASE IF NOT EXISTS ${local.mariadb_database_name};" \
--password=${var.mariadb_password} --password=${local.mariadb_password}
EOT EOT
} }
} }
View Options

lib/socket/api-request-handler.react.js

locals {
mariadb_database_name = local.local_with_default_environment_vars.COMM_DATABASE_DATABASE
mariadb_username = local.local_with_default_environment_vars.COMM_DATABASE_USER
mariadb_password = local.local_with_default_environment_vars.COMM_DATABASE_PASSWORD
mariadb_port = jsondecode(local.local_with_default_environment_vars.COMM_DATABASE_PORT)
}
# MariaDB Security Group # MariaDB Security Group
resource "aws_security_group" "keyserver_mariadb_security_group" { resource "aws_security_group" "keyserver_mariadb_security_group" {
name = "keyserver-mariadb-sg" name = "keyserver-mariadb-sg"
description = "Allow inbound traffic on port 3307 and all outbound traffic" description = "Allow inbound traffic on port 3307 and all outbound traffic"
vpc_id = local.vpc_id vpc_id = local.vpc_id
# Inbound rules # Inbound rules
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
security_groups = [aws_security_group.keyserver_service.id] security_groups = [aws_security_group.keyserver_service.id]
} }
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
cidr_blocks = ["${var.allowed_ip}/32"] cidr_blocks = ["${var.allowed_ip}/32"]
} }
# Outbound rules # Outbound rules
egress { egress {
from_port = 0 from_port = 0
to_port = 0 to_port = 0
Show All 9 Linesresource "aws_db_instance" "mariadb" {
storage_type = "gp3" storage_type = "gp3"
db_name = "mariadb" db_name = "mariadb"
identifier = "mariadb-instance" identifier = "mariadb-instance"
engine = "mariadb" engine = "mariadb"
engine_version = "10.11" engine_version = "10.11"
instance_class = "db.m6g.large" instance_class = "db.m6g.large"
db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name
vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id] vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id]
username = var.mariadb_username username = local.mariadb_username
password = var.mariadb_password password = local.mariadb_password
parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name
storage_encrypted = true storage_encrypted = true
publicly_accessible = true publicly_accessible = true
port = 3307 port = local.mariadb_port
skip_final_snapshot = true skip_final_snapshot = true
} }
# MariaDB Parameter Group # MariaDB Parameter Group
resource "aws_db_parameter_group" "mariadb_parameter_group" { resource "aws_db_parameter_group" "mariadb_parameter_group" {
name = "mariadb-parameter-group" name = "mariadb-parameter-group"
family = "mariadb10.11" family = "mariadb10.11"
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Linesresource "aws_db_parameter_group" "mariadb_parameter_group" {
} }
} }
resource "null_resource" "create_comm_database" { resource "null_resource" "create_comm_database" {
depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group] depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group]
provisioner "local-exec" { provisioner "local-exec" {
command = <<EOT command = <<EOT
mysql --user=${var.mariadb_username} \ mysql --user=${local.mariadb_username} \
--port=3307 \ --port=${local.mariadb_port} \
--host=${aws_db_instance.mariadb.address} \ --host=${aws_db_instance.mariadb.address} \
--execute="CREATE DATABASE IF NOT EXISTS comm;" \ --execute="CREATE DATABASE IF NOT EXISTS ${local.mariadb_database_name};" \
--password=${var.mariadb_password} --password=${local.mariadb_password}
EOT EOT
} }
} }
View Options

lib/socket/socket.react.js

locals {
mariadb_database_name = local.local_with_default_environment_vars.COMM_DATABASE_DATABASE
mariadb_username = local.local_with_default_environment_vars.COMM_DATABASE_USER
mariadb_password = local.local_with_default_environment_vars.COMM_DATABASE_PASSWORD
mariadb_port = jsondecode(local.local_with_default_environment_vars.COMM_DATABASE_PORT)
}
# MariaDB Security Group # MariaDB Security Group
resource "aws_security_group" "keyserver_mariadb_security_group" { resource "aws_security_group" "keyserver_mariadb_security_group" {
name = "keyserver-mariadb-sg" name = "keyserver-mariadb-sg"
description = "Allow inbound traffic on port 3307 and all outbound traffic" description = "Allow inbound traffic on port 3307 and all outbound traffic"
vpc_id = local.vpc_id vpc_id = local.vpc_id
# Inbound rules # Inbound rules
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
security_groups = [aws_security_group.keyserver_service.id] security_groups = [aws_security_group.keyserver_service.id]
} }
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
cidr_blocks = ["${var.allowed_ip}/32"] cidr_blocks = ["${var.allowed_ip}/32"]
} }
# Outbound rules # Outbound rules
egress { egress {
from_port = 0 from_port = 0
to_port = 0 to_port = 0
Show All 9 Linesresource "aws_db_instance" "mariadb" {
storage_type = "gp3" storage_type = "gp3"
db_name = "mariadb" db_name = "mariadb"
identifier = "mariadb-instance" identifier = "mariadb-instance"
engine = "mariadb" engine = "mariadb"
engine_version = "10.11" engine_version = "10.11"
instance_class = "db.m6g.large" instance_class = "db.m6g.large"
db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name
vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id] vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id]
username = var.mariadb_username username = local.mariadb_username
password = var.mariadb_password password = local.mariadb_password
parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name
storage_encrypted = true storage_encrypted = true
publicly_accessible = true publicly_accessible = true
port = 3307 port = local.mariadb_port
skip_final_snapshot = true skip_final_snapshot = true
} }
# MariaDB Parameter Group # MariaDB Parameter Group
resource "aws_db_parameter_group" "mariadb_parameter_group" { resource "aws_db_parameter_group" "mariadb_parameter_group" {
name = "mariadb-parameter-group" name = "mariadb-parameter-group"
family = "mariadb10.11" family = "mariadb10.11"
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Linesresource "aws_db_parameter_group" "mariadb_parameter_group" {
} }
} }
resource "null_resource" "create_comm_database" { resource "null_resource" "create_comm_database" {
depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group] depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group]
provisioner "local-exec" { provisioner "local-exec" {
command = <<EOT command = <<EOT
mysql --user=${var.mariadb_username} \ mysql --user=${local.mariadb_username} \
--port=3307 \ --port=${local.mariadb_port} \
--host=${aws_db_instance.mariadb.address} \ --host=${aws_db_instance.mariadb.address} \
--execute="CREATE DATABASE IF NOT EXISTS comm;" \ --execute="CREATE DATABASE IF NOT EXISTS ${local.mariadb_database_name};" \
--password=${var.mariadb_password} --password=${local.mariadb_password}
EOT EOT
} }
} }