From a0fd18df17fb09e61d67d6ccd788bfdc0a7a4a79 Mon Sep 17 00:00:00 2001
From: David Szabo <38033309+daszabo@users.noreply.github.com>
Date: Mon, 13 May 2024 17:15:46 +0200
Subject: [PATCH] Added device login parameters to cdp login (#28)

---
 aws/quickstart.sh   | 5 +++--
 azure/quickstart.sh | 3 ++-
 gcp/quickstart.sh   | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/aws/quickstart.sh b/aws/quickstart.sh
index 3ea4421..1e92960 100644
--- a/aws/quickstart.sh
+++ b/aws/quickstart.sh
@@ -16,7 +16,8 @@
 
 export TF_VAR_aws_region="${1:-""}"
 export TF_VAR_env_prefix="${2:-""}"
-export TF_VAR_deployment_template="${3:-"semi-private"}"
+export ACCOUNT_ID="${3:-""}"
+export TF_VAR_deployment_template="${4:-"semi-private"}"
 export TF_VAR_env_tags='{"deploy_tool": "express-tf", "env_prefix": "'"$2"'"}'
 export TF_VAR_create_vpc_endpoints="false"
 export TF_VAR_environment_async_creation="true"
@@ -34,7 +35,7 @@ cd cdp-tf-quickstarts/aws
 # Install CDP CLI and Log In
 pip install cdpcli
 
-cdp login
+cdp login --account-id "${ACCOUNT_ID}" --use-device-code
 
 # Apply Terraform Quickstart Module
 ${HOME}/terraform init
diff --git a/azure/quickstart.sh b/azure/quickstart.sh
index 03b2cee..f78a38f 100644
--- a/azure/quickstart.sh
+++ b/azure/quickstart.sh
@@ -16,6 +16,7 @@
 
 export TF_VAR_azure_region"=${1:-""}"
 export TF_VAR_env_prefix="${2:-""}"
+export ACCOUNT_ID="${3:-""}"
 export TF_VAR_deployment_template="${4:-"semi-private"}"
 export TF_VAR_env_tags='{"deploy_tool": "express-tf", "env_prefix": "'"$2"'"}'
 export TF_VAR_environment_async_creation="true"
@@ -28,7 +29,7 @@ cd cdp-tf-quickstarts/azure
 # Install CDP CLI and Log In
 pip install cdpcli
 
-cdp login
+cdp login --account-id "${ACCOUNT_ID}" --use-device-code
 
 # Apply Terraform Quickstart Module
 terraform init
diff --git a/gcp/quickstart.sh b/gcp/quickstart.sh
index d7573da..bdedf10 100644
--- a/gcp/quickstart.sh
+++ b/gcp/quickstart.sh
@@ -17,7 +17,8 @@
 export TF_VAR_gcp_project="${1:-""}"
 export TF_VAR_gcp_region="${2:-""}"
 export TF_VAR_env_prefix="${3:-""}"
-export TF_VAR_deployment_template="${4:-"semi-private"}"
+export ACCOUNT_ID="${4:-""}"
+export TF_VAR_deployment_template="${5:-"semi-private"}"
 export TF_VAR_env_tags='{"deploy_tool": "express-tf", "env_prefix": "'"$2"'"}'
 export TF_VAR_environment_async_creation="true"
 export TF_VAR_datalake_async_creation="true"
@@ -29,7 +30,7 @@ cd cdp-tf-quickstarts/gcp
 # Install CDP CLI and Log In
 pip install cdpcli
 
-cdp login
+cdp login --account-id "${ACCOUNT_ID}" --use-device-code
 
 # Apply Terraform Quickstart Module
 terraform init