From cbf291b6725f9359e6b95d9a707b299bc4db1a58 Mon Sep 17 00:00:00 2001
From: "Stephen C. Pope" <stephen@descarteslabs.com>
Date: Mon, 21 Oct 2024 06:07:15 -0600
Subject: [PATCH] [Core-550] Change packaged-analytics URLS to
 app.descarteslabs.com URLs (#12710)

GitOrigin-RevId: ff637befbe31d454416c87605537da9fcbca089c
---
 descarteslabs/config/settings.toml        | 12 ++++++------
 descarteslabs/config/tests/test_config.py | 10 +++++-----
 descarteslabs/core/client/auth/cli/cli.py |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/descarteslabs/config/settings.toml b/descarteslabs/config/settings.toml
index 08618ef6..3b4f5c06 100644
--- a/descarteslabs/config/settings.toml
+++ b/descarteslabs/config/settings.toml
@@ -8,7 +8,7 @@ default_domain = ""
 default_domain = "@format production.aws.{this.DOMAIN}"
 platform_url = "@format https://platform.{this.DEFAULT_DOMAIN}"
 
-app_url = "@format https://packaged-analytics.production.aws.{this.DOMAIN}"
+app_url = "@format https://app.{this.DOMAIN}"
 catalog_v2_url = "@format {this.PLATFORM_URL}/metadata/v1/catalog/v2"
 compute_url = "@format {this.PLATFORM_URL}/compute/v1"
 iam_url = "@format https://iam.{this.DEFAULT_DOMAIN}"
@@ -23,7 +23,7 @@ yaas_url = "@format {this.PLATFORM_URL}/yaas/v1"
 default_domain = "@format staging.aws.{this.DOMAIN}"
 platform_url = "@format https://platform.{this.DEFAULT_DOMAIN}"
 
-app_url = "@format https://packaged-analytics.production.aws.{this.DOMAIN}"
+app_url = "@format https://app.{this.DOMAIN}"
 catalog_v2_url = "@format {this.PLATFORM_URL}/metadata/v1/catalog/v2"
 compute_url = "@format {this.PLATFORM_URL}/compute/v1"
 iam_url = "@format https://iam.{this.DEFAULT_DOMAIN}"
@@ -38,7 +38,7 @@ yaas_url = "@format {this.PLATFORM_URL}/yaas/v1"
 default_domain = "@format dev.aws.{this.DOMAIN}"
 platform_url = "@format https://platform.{this.DEFAULT_DOMAIN}"
 
-app_url = "@format https://packaged-analytics.production.aws.{this.DOMAIN}"
+app_url = "@format https://app.{this.DOMAIN}"
 catalog_v2_url = "@format {this.PLATFORM_URL}/metadata/v1/catalog/v2"
 compute_url = "@format {this.PLATFORM_URL}/compute/v1"
 iam_url = "@format https://iam.{this.DEFAULT_DOMAIN}"
@@ -53,7 +53,7 @@ yaas_url = "@format {this.PLATFORM_URL}/yaas/v1"
 default_domain = "@format freemium.aws.{this.DOMAIN}"
 platform_url = "@format https://platform.{this.DEFAULT_DOMAIN}"
 
-app_url = "@format https://packaged-analytics.production.aws.{this.DOMAIN}"
+app_url = "@format https://app.{this.DOMAIN}"
 catalog_v2_url = "@format {this.PLATFORM_URL}/metadata/v1/catalog/v2"
 iam_url = "@format https://iam.{this.DEFAULT_DOMAIN}"
 metadata_url = "@format {this.PLATFORM_URL}/metadata/v1"
@@ -66,7 +66,7 @@ default_domain = "@format dev.aws.{this.DOMAIN}"
 platform_url = "@format https://platform.{this.DEFAULT_DOMAIN}"
 testing = true
 
-app_url = "@format https://packaged-analytics.production.aws.{this.DOMAIN}"
+app_url = "@format https://app.{this.DOMAIN}"
 catalog_v2_url = "@format {this.PLATFORM_URL}/metadata/v1/catalog/v2"
 compute_url = "@format {this.PLATFORM_URL}/compute/v1"
 iam_url = "@format https://iam.{this.DEFAULT_DOMAIN}"
@@ -83,7 +83,7 @@ default_domain = "dev.localhost"
 platform_url = "@format https://platform.dev.aws.descarteslabs.com"
 testing = true
 
-app_url = "@format https://packaged-analytics.production.aws.{this.DOMAIN}"
+app_url = "@format https://app.{this.DOMAIN}"
 catalog_v2_url = "@format {this.PLATFORM_URL}/metadata/v1/catalog/v2"
 compute_url = "@format {this.PLATFORM_URL}/compute/v1"
 iam_url = "@format https://{this.DEFAULT_DOMAIN}:8000"
diff --git a/descarteslabs/config/tests/test_config.py b/descarteslabs/config/tests/test_config.py
index e5170c3a..030c9c90 100644
--- a/descarteslabs/config/tests/test_config.py
+++ b/descarteslabs/config/tests/test_config.py
@@ -135,7 +135,7 @@ def test_env(self):
 class VerifyValues(unittest.TestCase):
     configs = {
         "aws-dev": {
-            "APP_URL": "https://packaged-analytics.production.aws.descarteslabs.com",
+            "APP_URL": "https://app.descarteslabs.com",
             "CATALOG_V2_URL": "https://platform.dev.aws.descarteslabs.com/metadata/v1/catalog/v2",
             "COMPUTE_URL": "https://platform.dev.aws.descarteslabs.com/compute/v1",
             "IAM_URL": "https://iam.dev.aws.descarteslabs.com",
@@ -149,7 +149,7 @@ class VerifyValues(unittest.TestCase):
             "YAAS_URL": "https://platform.dev.aws.descarteslabs.com/yaas/v1",
         },
         "aws-freemium": {
-            "APP_URL": "https://packaged-analytics.production.aws.descarteslabs.com",
+            "APP_URL": "https://app.descarteslabs.com",
             "CATALOG_V2_URL": "https://platform.freemium.aws.descarteslabs.com/metadata/v1/catalog/v2",
             "IAM_URL": "https://iam.freemium.aws.descarteslabs.com",
             "LOG_LEVEL": "WARNING",
@@ -160,7 +160,7 @@ class VerifyValues(unittest.TestCase):
             "USERLIMIT_URL": "https://platform.freemium.aws.descarteslabs.com/userlimit/v1",
         },
         "aws-production": {
-            "APP_URL": "https://packaged-analytics.production.aws.descarteslabs.com",
+            "APP_URL": "https://app.descarteslabs.com",
             "CATALOG_V2_URL": "https://platform.production.aws.descarteslabs.com/metadata/v1/catalog/v2",
             "COMPUTE_URL": "https://platform.production.aws.descarteslabs.com/compute/v1",
             "IAM_URL": "https://iam.production.aws.descarteslabs.com",
@@ -174,7 +174,7 @@ class VerifyValues(unittest.TestCase):
             "YAAS_URL": "https://platform.production.aws.descarteslabs.com/yaas/v1",
         },
         "aws-staging": {
-            "APP_URL": "https://packaged-analytics.production.aws.descarteslabs.com",
+            "APP_URL": "https://app.descarteslabs.com",
             "CATALOG_V2_URL": "https://platform.staging.aws.descarteslabs.com/metadata/v1/catalog/v2",
             "COMPUTE_URL": "https://platform.staging.aws.descarteslabs.com/compute/v1",
             "IAM_URL": "https://iam.staging.aws.descarteslabs.com",
@@ -188,7 +188,7 @@ class VerifyValues(unittest.TestCase):
             "YAAS_URL": "https://platform.staging.aws.descarteslabs.com/yaas/v1",
         },
         "testing": {
-            "APP_URL": "https://packaged-analytics.production.aws.descarteslabs.com",
+            "APP_URL": "https://app.descarteslabs.com",
             "CATALOG_V2_URL": "https://platform.dev.aws.descarteslabs.com/metadata/v1/catalog/v2",
             "COMPUTE_URL": "https://platform.dev.aws.descarteslabs.com/compute/v1",
             "IAM_URL": "https://iam.dev.aws.descarteslabs.com",
diff --git a/descarteslabs/core/client/auth/cli/cli.py b/descarteslabs/core/client/auth/cli/cli.py
index d0836431..b5df44a4 100644
--- a/descarteslabs/core/client/auth/cli/cli.py
+++ b/descarteslabs/core/client/auth/cli/cli.py
@@ -31,7 +31,7 @@
 )
 
 
-LOGIN_URL = f"{get_auth_refresh_domain()}/refresh_token"
+LOGIN_URL = f"{get_auth_refresh_domain()}/account/refresh-token"
 
 
 # this is defined this way to support mocking in the tests
@@ -49,7 +49,7 @@ def cli():
 @cli.command()
 def login():
     """Log in to Descartes Labs"""
-    click.echo(f"Follow this link to login:\n\n    {LOGIN_URL}\n")
+    click.echo(f"Follow this link to login and request a token:\n\n    {LOGIN_URL}\n")
 
     while True:
         try: