Merge branch 'switch_to_s3_source_in_example' into 'master'

switch to S3 as a source for DLE in example, change welcome message output and some cleanup

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

Author: DmitryFomin1

Diff for: README.md

@@ -99,7 +99,7 @@ The following steps were tested on Ubuntu 20.04 but supposed to be valid for oth
     ```
 1. Deploy:
     ```
-    terraform  apply -var-file="secret.tfvars" -auto-approve
+    terraform apply -var-file="secret.tfvars" -auto-approve && terraform output -raw next_steps
     ```
 1. If everything goes well, you should get an output like this:
     ```config
@@ -186,7 +186,7 @@ The following steps were tested on Ubuntu 20.04 but supposed to be valid for oth
 
 This is it!
 
-If you need to remove everything created by this Terraform module, you can simply run `terraform destroy`. Do not forget to do it if you're just experimenting. Otherwise, if you leave infrastructure blocks running, they might significantly affect your AWS bill (depending on the EC2 instance family you've chosen, the disk type, and size).
+If you need to remove everything created by this Terraform module, you can run `terraform destroy -var-file="secret.tfvars" -auto-approve`. Do not forget to do it if you're just experimenting. Otherwise, if you leave infrastructure blocks running, they might significantly affect your AWS bill (depending on the EC2 instance family you've chosen, the disk type, and size).
 
 ## Important Note
 When the DLE creates new database clones, it makes them available on incremental ports in the 6000 range (e.g. 6000, 6001, ...). The DLE CLI will also report that the clone is available on a port in the 6000 range.  However, please note that these are the ports when accessing the DLE from `localhost`.  This Terraform module deploys [Envoy](https://www.envoyproxy.io/) to handle SSL termination and port forwarding to connect to DLE generated clones.

Diff for: instance.tf

@@ -1,7 +1,3 @@
-locals {
-    public_key = file("~/.ssh/id_rsa.pub")
-  }
-
 resource "tls_private_key" "ssh_key" {
   algorithm = "RSA"
   rsa_bits  = 4096

Diff for: outputs.tf

@@ -52,6 +52,7 @@ locals {
 
 EOT
 }
-output "zzz_next_steps" {
+output "next_steps" {
   value = local.welcome_message
+  sensitive   = true
 }

Diff for: terraform.tfvars

@@ -14,17 +14,17 @@ aws_deploy_allow_ssh_from_cidrs = ["0.0.0.0/0"]
 aws_deploy_dns_api_subdomain = "tf-test" # subdomain in aws.postgres.ai, fqdn will be ${dns_api_subdomain}.aws.postgres.ai
 
 source_postgres_version = "13"
-source_postgres_host = "ec2-3-215-57-87.compute-1.amazonaws.com"
-source_postgres_port = "5432"
-source_postgres_dbname = "d3dljqkrnopdvg" # this is an existing DB (Heroku example DB)
-source_postgres_username = "bfxuriuhcfpftt" # in secret.tfvars, use:   source_postgres_password = "dfe01cbd809a71efbaecafec5311a36b439460ace161627e5973e278dfe960b7" 
 
 dle_debug_mode = "true"
 dle_retrieval_refresh_timetable = "0 0 * * 0"
 postgres_config_shared_preload_libraries = "pg_stat_statements,logerrors" # DB Migration Checker requires logerrors extension
 
 platform_project_name = "aws_test_tf"
 
+source_type = "s3" # source is dump stored on demo s3 bucket
+source_pgdump_s3_bucket = "tf-demo-dump" # This is an example public bucket
+source_pgdump_path_on_s3_bucket = "heroku_sql.sql" # This is an example dump from demo database
+
 # Edit this list to have all public keys that will be placed to 
 # have them placed to authorized_keys. Instead of ssh_public_keys_files_list,
 # it is possible to use ssh_public_keys_list containing public keys as text values.

Diff for: variables.tf

@@ -99,7 +99,7 @@ variable "source_postgres_port" {
 
 variable "source_postgres_username" {
   description = "Source database username"
-  sensitive   = true
+  default = "postgres"
 }
 
 variable "source_postgres_password" {