Merge branch 'improve_output' into 'master'

improve TF module output

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

Author: NikolayS

README.md

@@ -103,14 +103,25 @@ The following steps were tested on Ubuntu 20.04 but supposed to be valid for oth
     ```
 1. If everything goes well, you should get an output like this:
     ```config
-    vcs_db_migration_checker_verification_token = "gsio7KmgaxECfJ80kUx2tUeIf4kEXZex"
-    dle_verification_token = "zXPodd13LyQaKgVXGmSCeB8TUtnGNnIa"
-    ec2_public_dns = "ec2-18-118-126-25.us-east-2.compute.amazonaws.com"
-    ec2instance = "i-0b07738148950af25"
-    ip = "18.118.126.25"
-    platform_joe_signing_secret = "lG23qZbUh2kq0ULIBfW6TRwKzqGZu1aP"
-    public_dns_name = "demo-api-engine.aws.postgres.ai"  # todo: this should be URL, not hostname – further we'll need URL, with protocol – `https://`
-    ```
+
+    #####################################################################
+
+    Congratulations! Database Lab Engine installed.
+    Data initialization may take time, depending on the database size.
+
+    You should be able to work with all DLE interfaces already:
+    - [RECOMMENDED] UI: https://tf-test.aws.postgres.ai:446
+    - CLI: dblab init --url=https://tf-test.aws.postgres.ai --token=sDTPu17pzXhW9DkhcSGpAMj72KgiIJxG --environment="i-0687b060f45314be5" --insecure
+    - API: https://tf-test.aws.postgres.ai
+    - SSH connection for troubleshooting: ssh ubuntu@3.92.133.178 -i dmitry-DBLABserver-ec2instance.pem
+
+    (Use verification token: sDTPu17pzXhW9DkhcSGpAMj72KgiIJxG
+
+    For support, go to https://postgres.ai/contact.
+
+    #####################################################################
+
+   ```
 
 1. To verify result and check the progress, you might want to connect to the just-created EC2 machine using IP address or hostname from the Terraform output and ssh key from ssh_public_keys_files_list and/or ssh_public_keys_list variables. In our example, it can be done using this one-liner (you can find more about DLE logs and configuration on this page: https://postgres.ai/docs/how-to-guides/administration/engine-manage):
     ```shell

dle-logical-init.sh.tpl

@@ -190,6 +190,9 @@ case "${source_type}" in
 
 esac
 
+# Fix ownership of the dblab directory
+chown -R ubuntu.ubuntu /home/ubuntu/.dblab/
+
 sudo docker run \
   --name dblab_server \
   --label dblab_control \
@@ -214,11 +217,14 @@ done
 
 curl https://gitlab.com/postgres-ai/database-lab/-/raw/${dle_version}/scripts/cli_install.sh | bash
 sudo mv ~/.dblab/dblab /usr/local/bin/dblab
-dblab init \
- --environment-id=tutorial \
- --url=http://localhost:2345 \
- --token=${dle_verification_token} \
- --insecure
+
+# Init dblab environment
+su - ubuntu -c \
+ 'dblab init \
+  --environment-id=tutorial \
+  --url=http://localhost:2345 \
+  --token=${dle_verification_token} \
+  --insecure'
 
 # Configure and run Joe Bot container.
 joe_config_path="/home/ubuntu/.dblab/joe/configs"
@@ -276,3 +282,4 @@ sudo docker run \
   --volume /tmp/ci_checker:/tmp/ci_checker \
   --volume $ci_checker_config_path:/home/dblab/configs:ro \
 registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker:${dle_version}
+

outputs.tf

@@ -28,3 +28,30 @@ output "vcs_db_migration_checker_registration_url" {
 output "local_ui_url" {
   value = "${format("%s://%s:%s", "https",join("", aws_route53_record.dblab_subdomain.*.fqdn),"446")}"
 }
+
+locals {
+  welcome_message = <<EOT
+
+
+    #####################################################################
+
+    Congratulations! Database Lab Engine installed.
+    Data initialization may take time, depending on the database size.
+
+    You should be able to work with all DLE interfaces already:
+    - [RECOMMENDED] UI: ${format("%s://%s:%s", "https",join("", aws_route53_record.dblab_subdomain.*.fqdn),"446")}
+    - CLI: dblab init --url=${format("%s://%s", "https",join("", aws_route53_record.dblab_subdomain.*.fqdn))} --token=${random_string.dle_verification_token.result} --environment="${aws_instance.aws_ec2.id}" --insecure
+    - API: ${format("%s://%s", "https",join("", aws_route53_record.dblab_subdomain.*.fqdn))}
+    - SSH connection for troubleshooting: ssh ubuntu@${aws_instance.aws_ec2.public_ip} -i ${var.aws_deploy_ec2_instance_tag_name}.pem
+
+    (Use verification token: ${random_string.dle_verification_token.result}
+
+    For support, go to https://postgres.ai/contact.
+
+    #####################################################################
+
+EOT
+}
+output "zzz_next_steps" {
+  value = local.welcome_message
+}