Merge branch '302-envoy-ui' into 'master'

feat: open port to provide access to a local UI container (database-lab#302)

See merge request postgres-ai/terraform-postgres-ai-database-lab!42

Author: agneum

dle-logical-init.sh.tpl

@@ -137,11 +137,11 @@ case "${source_type}" in
   extra_mount="--volume /var/lib/dblab/dblab_pool_00/dump:/var/lib/dblab/dblab_pool/dump"
 
   yq e -i '
-    .retrieval.spec.logicalDump.options.source.connection.host = ${source_postgres_host}" |
-    .retrieval.spec.logicalDump.options.source.connection.port = ${source_postgres_port}" |
-    .retrieval.spec.logicalDump.options.source.connection.username = ${source_postgres_username}" |
-    .retrieval.spec.logicalDump.options.source.connection.password = ${source_postgres_password}" |
-    .retrieval.spec.logicalDump.options.parallelJobs = 1"
+    .retrieval.spec.logicalDump.options.source.connection.host = "${source_postgres_host}" |
+    .retrieval.spec.logicalDump.options.source.connection.port = ${source_postgres_port} |
+    .retrieval.spec.logicalDump.options.source.connection.username = "${source_postgres_username}" |
+    .retrieval.spec.logicalDump.options.source.connection.password = "${source_postgres_password}" |
+    .retrieval.spec.logicalDump.options.parallelJobs = 1
   ' $dle_config_path/server.yml
 
   # restore pg_dump via pipe -  without saving it on the disk
@@ -151,7 +151,7 @@ case "${source_type}" in
     .retrieval.spec.logicalDump.options.immediateRestore.forceInit=true |
     .retrieval.spec.logicalDump.options.immediateRestore.configs alias = .databaseConfig |
     del(.retrieval.jobs[] | select(. == "logicalRestore")) |
-    .databaseConfig.configs.shared_preload_libraries = ${postgres_config_shared_preload_libraries}
+    .databaseConfigs.configs.shared_preload_libraries = "${postgres_config_shared_preload_libraries}"
   ' $dle_config_path/server.yml
   ;;
 

outputs.tf

@@ -25,3 +25,6 @@ output "vcs_db_migration_checker_verification_token" {
 output "vcs_db_migration_checker_registration_url" {
   value = "${format("%s://%s:%s", "https",join("", aws_route53_record.dblab_subdomain.*.fqdn),"445")}"
 }
+output "local_ui_url" {
+  value = "${format("%s://%s:%s", "https",join("", aws_route53_record.dblab_subdomain.*.fqdn),"446")}"
+}

security.tf

@@ -12,20 +12,16 @@ resource "aws_security_group_rule" "dle_instance_ssh" {
   cidr_blocks       = "${var.aws_deploy_allow_ssh_from_cidrs}"
 }
 
-resource "aws_security_group_rule" "dle_instance_api" {
+resource "aws_security_group_rule" "dle_products" {
+  # Ports:
+  # 443 - dle_instance_api
+  # 444 - joe_bot_api
+  # 445 - ci_observer_api
+  # 446 - dle_local_ui
   security_group_id         = aws_security_group.dle_instance_sg.id
   type                      = "ingress"
   from_port                 = 443
-  to_port                   = 443
-  protocol                  = "tcp"
-  cidr_blocks               = "${var.aws_deploy_allow_api_from_cidrs}"
-}
-
-resource "aws_security_group_rule" "joe_bot_api" {
-  security_group_id         = aws_security_group.dle_instance_sg.id
-  type                      = "ingress"
-  from_port                 = 444
-  to_port                   = 444
+  to_port                   = 446
   protocol                  = "tcp"
   cidr_blocks               = "${var.aws_deploy_allow_api_from_cidrs}"
 }
@@ -39,15 +35,6 @@ resource "aws_security_group_rule" "dle_instance_http_cert_auth" {
   cidr_blocks               = ["0.0.0.0/0"]
 }
 
-resource "aws_security_group_rule" "ci_observer_api" {
-  security_group_id         = aws_security_group.dle_instance_sg.id
-  type                      = "ingress"
-  from_port                 = 445
-  to_port                   = 445
-  protocol                  = "tcp"
-  cidr_blocks               = "${var.aws_deploy_allow_api_from_cidrs}"
-}
-
 resource "aws_security_group_rule" "dle_instance_clones" {
   security_group_id = aws_security_group.dle_instance_sg.id
   type              = "ingress"