Skip to content

Commit

Permalink
[Core-504] User limit client support (#12632)
Browse files Browse the repository at this point in the history
GitOrigin-RevId: e82037c43214a24bf8ffae91e2835c800637bc5b
  • Loading branch information
stephencpope authored and Descartes Labs Build committed Jul 26, 2024
1 parent d38f402 commit 411653d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
6 changes: 6 additions & 0 deletions descarteslabs/config/settings.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ iam_url = "@format https://iam.{this.DEFAULT_DOMAIN}"
metadata_url = "@format {this.PLATFORM_URL}/metadata/v1"
raster_url = "@format {this.PLATFORM_URL}/raster/v2"
usage_url = "@format {this.PLATFORM_URL}/usage/v1"
userlimit_url = "@format {this.PLATFORM_URL}/userlimit/v1"
vector_url = "@format {this.PLATFORM_URL}/vector/v1"
yaas_url = "@format {this.PLATFORM_URL}/yaas/v1"

Expand All @@ -29,6 +30,7 @@ iam_url = "@format https://iam.{this.DEFAULT_DOMAIN}"
metadata_url = "@format {this.PLATFORM_URL}/metadata/v1"
raster_url = "@format {this.PLATFORM_URL}/raster/v2"
usage_url = "@format {this.PLATFORM_URL}/usage/v1"
userlimit_url = "@format {this.PLATFORM_URL}/userlimit/v1"
vector_url = "@format {this.PLATFORM_URL}/vector/v1"
yaas_url = "@format {this.PLATFORM_URL}/yaas/v1"

Expand All @@ -43,6 +45,7 @@ iam_url = "@format https://iam.{this.DEFAULT_DOMAIN}"
metadata_url = "@format {this.PLATFORM_URL}/metadata/v1"
raster_url = "@format {this.PLATFORM_URL}/raster/v2"
usage_url = "@format {this.PLATFORM_URL}/usage/v1"
userlimit_url = "@format {this.PLATFORM_URL}/userlimit/v1"
vector_url = "@format {this.PLATFORM_URL}/vector/v1"
yaas_url = "@format {this.PLATFORM_URL}/yaas/v1"

Expand All @@ -56,6 +59,7 @@ iam_url = "@format https://iam.{this.DEFAULT_DOMAIN}"
metadata_url = "@format {this.PLATFORM_URL}/metadata/v1"
raster_url = "@format {this.PLATFORM_URL}/raster/v2"
usage_url = "@format {this.PLATFORM_URL}/usage/v1"
userlimit_url = "@format {this.PLATFORM_URL}/userlimit/v1"

[testing]
default_domain = "@format dev.aws.{this.DOMAIN}"
Expand All @@ -69,6 +73,7 @@ iam_url = "@format https://iam.{this.DEFAULT_DOMAIN}"
metadata_url = "@format {this.PLATFORM_URL}/metadata/v1"
raster_url = "@format {this.PLATFORM_URL}/raster/v2"
usage_url = "@format {this.PLATFORM_URL}/usage/v1"
userlimit_url = "@format {this.PLATFORM_URL}/userlimit/v1"
vector_url = "@format {this.PLATFORM_URL}/vector/v1"
yaas_url = "@format {this.PLATFORM_URL}/yaas/v1"

Expand All @@ -85,5 +90,6 @@ iam_url = "@format https://{this.DEFAULT_DOMAIN}:8000"
metadata_url = "@format {this.PLATFORM_URL}/metadata/v1"
raster_url = "@format {this.PLATFORM_URL}/raster/v2"
usage_url = "@format {this.PLATFORM_URL}/usage/v1"
userlimit_url = "@format {this.PLATFORM_URL}/userlimit/v1"
vector_url = "@format {this.PLATFORM_URL}/vector/v1"
yaas_url = "@format {this.PLATFORM_URL}/yaas/v1"
5 changes: 5 additions & 0 deletions descarteslabs/config/tests/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ class VerifyValues(unittest.TestCase):
"PLATFORM_URL": "https://platform.dev.aws.descarteslabs.com",
"RASTER_URL": "https://platform.dev.aws.descarteslabs.com/raster/v2",
"USAGE_URL": "https://platform.dev.aws.descarteslabs.com/usage/v1",
"USERLIMIT_URL": "https://platform.dev.aws.descarteslabs.com/userlimit/v1",
"VECTOR_URL": "https://platform.dev.aws.descarteslabs.com/vector/v1",
"YAAS_URL": "https://platform.dev.aws.descarteslabs.com/yaas/v1",
},
Expand All @@ -156,6 +157,7 @@ class VerifyValues(unittest.TestCase):
"PLATFORM_URL": "https://platform.freemium.aws.descarteslabs.com",
"RASTER_URL": "https://platform.freemium.aws.descarteslabs.com/raster/v2",
"USAGE_URL": "https://platform.freemium.aws.descarteslabs.com/usage/v1",
"USERLIMIT_URL": "https://platform.freemium.aws.descarteslabs.com/userlimit/v1",
},
"aws-production": {
"APP_URL": "https://packaged-analytics.production.aws.descarteslabs.com",
Expand All @@ -167,6 +169,7 @@ class VerifyValues(unittest.TestCase):
"PLATFORM_URL": "https://platform.production.aws.descarteslabs.com",
"RASTER_URL": "https://platform.production.aws.descarteslabs.com/raster/v2",
"USAGE_URL": "https://platform.production.aws.descarteslabs.com/usage/v1",
"USERLIMIT_URL": "https://platform.production.aws.descarteslabs.com/userlimit/v1",
"VECTOR_URL": "https://platform.production.aws.descarteslabs.com/vector/v1",
"YAAS_URL": "https://platform.production.aws.descarteslabs.com/yaas/v1",
},
Expand All @@ -180,6 +183,7 @@ class VerifyValues(unittest.TestCase):
"PLATFORM_URL": "https://platform.staging.aws.descarteslabs.com",
"RASTER_URL": "https://platform.staging.aws.descarteslabs.com/raster/v2",
"USAGE_URL": "https://platform.staging.aws.descarteslabs.com/usage/v1",
"USERLIMIT_URL": "https://platform.staging.aws.descarteslabs.com/userlimit/v1",
"VECTOR_URL": "https://platform.staging.aws.descarteslabs.com/vector/v1",
"YAAS_URL": "https://platform.staging.aws.descarteslabs.com/yaas/v1",
},
Expand All @@ -194,6 +198,7 @@ class VerifyValues(unittest.TestCase):
"RASTER_URL": "https://platform.dev.aws.descarteslabs.com/raster/v2",
"TESTING": True,
"USAGE_URL": "https://platform.dev.aws.descarteslabs.com/usage/v1",
"USERLIMIT_URL": "https://platform.dev.aws.descarteslabs.com/userlimit/v1",
"VECTOR_URL": "https://platform.dev.aws.descarteslabs.com/vector/v1",
"YAAS_URL": "https://platform.dev.aws.descarteslabs.com/yaas/v1",
},
Expand Down

0 comments on commit 411653d

Please sign in to comment.