feat: the user can choose the location of the deployment

IaC/main.tf

@@ -56,6 +56,8 @@ module "mlflow" {
   oauth_client_secret          = var.oauth_client_secret
   create_brand                 = var.create_brand
   brand_name                   = var.brand_name
+  location                     = var.location
+  app_engine_location          = var.app_engine_location
 }
 
 module "log_pusher" {

IaC/modules/mlflow/artifacts/variables.tf

@@ -22,7 +22,6 @@ variable "bucket_name" {
 variable "bucket_location" {
   description = "Location of the bucket."
   type        = string
-  default     = "EUROPE-WEST1"
 }
 variable "versioning_enabled" {
   description = "True if you want to version your bucket."

IaC/modules/mlflow/database/variables.tf

@@ -28,7 +28,6 @@ variable "database_version" {
 variable "region" {
   type        = string
   description = "Region of the database instance"
-  default     = "europe-west1"
 }
 variable "size" {
   type        = string

IaC/modules/mlflow/main.tf

@@ -19,7 +19,7 @@
 module "artifacts" {
   source            = "./artifacts"
   bucket_name       = var.artifacts_bucket_name
-  bucket_location   = var.artifacts_bucket_location
+  bucket_location   = var.location
   number_of_version = var.artifacts_number_of_version
   storage_class     = var.artifacts_storage_class
 }
@@ -33,7 +33,7 @@ module "database" {
   source            = "./database"
   instance_prefix   = var.db_instance_prefix
   database_version  = var.db_version
-  region            = var.db_region
+  region            = var.location
   size              = var.db_size
   availability_type = var.db_availability_type
   database_name     = var.db_name
@@ -46,7 +46,7 @@ module "server" {
   source                       = "./server"
   mlflow_server                = var.mlflow_server
   create_default_service       = var.create_default_service
-  location                     = var.server_location
+  app_engine_location          = var.app_engine_location
   docker_image_name            = var.server_docker_image
   env_variables                = var.server_env_variables
   db_private_ip                = module.database.private_ip

IaC/modules/mlflow/server/main.tf

@@ -31,7 +31,7 @@ data "google_project" "project" {
 }
 
 resource "google_app_engine_application" "app" {
-  location_id = var.location
+  location_id = var.app_engine_location
   iap {
     enabled              = true
     oauth2_client_id     = var.oauth_client_id == "" ? google_iap_client.project_client[0].client_id : var.oauth_client_id

IaC/modules/mlflow/server/variables.tf

@@ -15,10 +15,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-variable "location" {
+variable "app_engine_location" {
   type        = string
   description = "Location to deploy your server"
-  default     = "europe-west"
 }
 variable "docker_image_name" {
   type        = string

IaC/modules/mlflow/variables.tf

@@ -19,10 +19,9 @@ variable "artifacts_bucket_name" {
   description = "Name of the mlflow bucket created to store artifacts"
   type        = string
 }
-variable "artifacts_bucket_location" {
-  description = "Location of the mlflow artifact bucket deployed"
+variable "location" {
+  description = "mlflow artifact bucket and data base location"
   type        = string
-  default     = "EUROPE-WEST1"
 }
 variable "artifacts_number_of_version" {
   description = "Number of file version kept in your artifacts bucket"
@@ -54,11 +53,6 @@ variable "db_version" {
   type        = string
   default     = "MYSQL_5_7"
 }
-variable "db_region" {
-  description = "Database region"
-  type        = string
-  default     = "europe-west1"
-}
 variable "db_size" {
   description = "Database instance size"
   type        = string
@@ -82,10 +76,9 @@ variable "mlflow_server" {
   description = "Name of the mlflow server deployed to app engine. If a service already have this name, it will be overwritten."
   type        = string
 }
-variable "server_location" {
-  description = "Location to deploy cloud run server"
+variable "app_engine_location" {
+  description = "Location to deploy app engine server"
   type        = string
-  default     = "europe-west"
 }
 variable "server_docker_image" {
   description = "Docker image name of your mlflow server"

IaC/prerequesites/main.tf

@@ -46,7 +46,7 @@ module "services" {
 module "bucket_backend" {
   source             = "./../modules/mlflow/artifacts"
   bucket_name        = var.backend_bucket
-  bucket_location    = var.backend_bucket_location
+  bucket_location    = var.location
   number_of_version  = var.backend_bucket_number_of_version
   storage_class      = var.backend_bucket_storage_class
   storage_uniform    = var.storage_uniform

IaC/prerequesites/variables.tf

@@ -23,10 +23,9 @@ variable "backend_bucket" {
   description = "Name of the terraform backend"
   type        = string
 }
-variable "backend_bucket_location" {
-  description = "Location of the bucket."
+variable "location" {
+  description = "Location of the backend bucket."
   type        = string
-  default     = "EUROPE-WEST1"
 }
 variable "versioning_enabled" {
   description = "True if you want to version your bucket."

IaC/variables.tf

@@ -71,3 +71,11 @@ variable "brand_name" {
   default     = ""
   description = "Name of the brand if it exists"
 }
+variable "app_engine_location" {
+  description = "Location to deploy app engine server"
+  type        = string
+}
+variable "location" {
+  description = "mlflow artifact bucket and data base location"
+  type        = string
+}

Makefile

@@ -52,7 +52,7 @@ destroy-terraform:
 	@echo
 
 .PHONY: pre-requisites
-pre-requisites: init-config set-project
+pre-requisites: init-config set-project set-location
 	@echo "Setting up your GCP project..."
 	@source vars && cd IaC/prerequesites && terraform init $(OUTPUT_SUPPRESSOR) && terraform apply $(AUTO_APPROVE) $(OUTPUT_SUPPRESSOR)
 	@echo "Done"
@@ -103,6 +103,15 @@ set-project:
 	@chmod +x ./bin/set_project.sh
 	@cd bin && ./set_project.sh
 
+.PHONY: set-location
+set-location:
+	@chmod +x ./bin/set_location.sh
+	@cd bin && ./set_location.sh
+
+.PHONY: get-uri
+get-uri:
+	@chmod +x ./bin/get-uri.sh
+	@cd bin && ./get-uri.sh
 
 #################
 #     MISC      #
@@ -129,10 +138,10 @@ dependencies-checks:
 	@cd bin && ./check_dependencies.sh
 
 .PHONY: goodbye
-goodbye:
+goodbye: get-uri
 	@echo
 	@echo "Congratulations, you successfully deployed MLFlow on your project! 🎉"
-	@source vars && echo "The web app is available at https://mlflow-dot-$${TF_VAR_project_id}.ew.r.appspot.com (You may have trouble connecting for a few minutes after the deployment, while IAP gets setup)"
+	@source vars && echo "The web app is available at https://mlflow-dot-$${APP_DEFAULT_URI} (You may have trouble connecting for a few minutes after the deployment, while IAP gets setup)"
 	@echo "To push your first experiment, take a look at the bottom of the readme for an example."
 
 

bin/get-uri.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+APP_DESCRIBE=$(gcloud --format json app describe) 
+APP_DEFAULT_URI=$(echo "$APP_DESCRIBE" | jq -r '.defaultHostname')
+
+./save_var.sh APP_DEFAULT_URI "$APP_DEFAULT_URI"

bin/set_location.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -e
+
+echo
+echo "In which region do you want to deploy MLFlow ?"
+echo
+
+APP_REGIONS_LIST=$(gcloud --format json app regions list)
+APP_REGIONS_NAMES=$(echo "$APP_REGIONS_LIST" | jq -r '.[].region')
+
+counter=1
+for REGION in $APP_REGIONS_NAMES
+do
+  echo [$((counter++))] "$REGION"
+done
+
+MAX_CHOICE=$((counter - 1))
+read -p 'Please enter your numeric choice: ' NUMERIC_CHOICE
+
+while echo "$NUMERIC_CHOICE" | grep -vqE "^\-?[0-9]+$" || (( NUMERIC_CHOICE < 1 )) || (( NUMERIC_CHOICE > MAX_CHOICE ))
+do
+  read -p "Please enter a value between 1 and $MAX_CHOICE: " NUMERIC_CHOICE
+done
+echo
+
+APP_ENGINE_REGION="$(echo "$APP_REGIONS_LIST" | jq -r --argjson NUMERIC_CHOICE "$(( NUMERIC_CHOICE - 1 ))" '.[$NUMERIC_CHOICE].region')"
+
+#locations europe-west1 and us-central1 are called europe-west and us-central in APP Engine commands 
+if [ $APP_ENGINE_REGION == 'europe-west' ];
+    then REGION='europe-west1'
+elif [ $APP_ENGINE_REGION == 'us-central' ];
+    then REGION='us-central1'
+else
+    REGION=$APP_ENGINE_REGION
+fi
+
+./save_var.sh TF_VAR_location "$REGION"
+./save_var.sh TF_VAR_app_engine_location "$APP_ENGINE_REGION"