Skip to content

Commit 80787a6

Browse files
Move the constants for config injection into the built-in config interface module.
1 parent b0af5a0 commit 80787a6

File tree

5 files changed

+21
-13
lines changed

5 files changed

+21
-13
lines changed

src/planet_auth_utils/builtins.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@
1717

1818
from planet_auth import AuthClientConfig
1919
from planet_auth_utils.profile import ProfileException
20-
from planet_auth_utils.constants import EnvironmentVariables
2120
from planet_auth.logging.auth_logger import getAuthLogger
22-
from .builtins_provider import BuiltinConfigurationProviderInterface, EmptyBuiltinProfileConstants
21+
from .builtins_provider import (
22+
BuiltinConfigurationProviderInterface,
23+
EmptyBuiltinProfileConstants,
24+
AUTH_BUILTIN_PROVIDER,
25+
)
2326

2427
auth_logger = getAuthLogger()
2528

@@ -61,7 +64,7 @@ def _load_builtins() -> BuiltinConfigurationProviderInterface:
6164
# Undermining it can undermine client or service security.
6265
# It is a convenience for seamless developer experience, but maybe
6366
# we should not be so eager to please.
64-
builtin_provider = _load_builtins_worker(os.getenv(EnvironmentVariables.AUTH_BUILTIN_PROVIDER))
67+
builtin_provider = _load_builtins_worker(os.getenv(AUTH_BUILTIN_PROVIDER))
6568
if builtin_provider:
6669
return builtin_provider
6770

src/planet_auth_utils/builtins_provider.py

+10
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@
1616
from typing import Dict, List, Optional
1717

1818

19+
# Unlike other environment variables, AUTH_BUILTIN_PROVIDER is not name-spaced.
20+
# It is intended for libraries and applications to inject configuration by
21+
# being set within the program. It's not generally expected to be set by
22+
# users.
23+
AUTH_BUILTIN_PROVIDER = "PL_AUTH_BUILTIN_CONFIG_PROVIDER"
24+
"""
25+
Specify a python module and class that implement the BuiltinConfigurationProviderInterface abstract
26+
interface to provide the library and utility commands with some built-in configurations.
27+
"""
28+
1929
_NOOP_AUTH_CLIENT_CONFIG = {
2030
"client_type": "none",
2131
}

src/planet_auth_utils/constants.py

-6
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,3 @@ class EnvironmentVariables:
9898
"""
9999
Specify the log level.
100100
"""
101-
102-
AUTH_BUILTIN_PROVIDER = "PL_AUTH_BUILTIN_CONFIG_PROVIDER"
103-
"""
104-
Specify a python module and class that implement the BuiltinConfigurationProviderInterface abstract
105-
interface to provide the library and utility commands with some built-in configurations.
106-
"""

tests/test_planet_auth_utils/unit/auth_utils/test_builtins.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import pytest
1717
import unittest
1818

19+
from planet_auth_utils.builtins_provider import AUTH_BUILTIN_PROVIDER
1920
from planet_auth_utils.builtins import Builtins, BuiltinsException
20-
from planet_auth_utils.constants import EnvironmentVariables
2121

2222
from tests.test_planet_auth_utils.util import TestWithHomeDirProfiles
2323
from tests.test_planet_auth_utils.unit.auth_utils.builtins_test_impl import BuiltinConfigurationProviderMockTestImpl
@@ -56,7 +56,7 @@ def test_builtin_all_profile_dicts_are_valid(self):
5656

5757
class TestAuthClientContextInitHelpers(TestWithHomeDirProfiles, unittest.TestCase):
5858
def setUp(self):
59-
os.environ[EnvironmentVariables.AUTH_BUILTIN_PROVIDER] = (
59+
os.environ[AUTH_BUILTIN_PROVIDER] = (
6060
"tests.test_planet_auth_utils.unit.auth_utils.builtins_test_impl.BuiltinConfigurationProviderMockTestImpl"
6161
)
6262
Builtins._builtin = None # Reset built-in state.

tests/test_planet_auth_utils/unit/auth_utils/test_plauth_factory.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import planet_auth.storage_utils
2121
from planet_auth.constants import AUTH_CONFIG_FILE_PLAIN
2222

23+
from planet_auth_utils.builtins_provider import AUTH_BUILTIN_PROVIDER
2324
from planet_auth_utils.builtins import Builtins
2425
from planet_auth_utils.constants import EnvironmentVariables
2526
from planet_auth_utils.plauth_factory import PlanetAuthFactory, MissingArgumentException
@@ -37,7 +38,7 @@
3738

3839
class TestAuthClientContextInitHelpers(TestWithHomeDirProfiles, unittest.TestCase):
3940
def setUp(self):
40-
os.environ[EnvironmentVariables.AUTH_BUILTIN_PROVIDER] = (
41+
os.environ[AUTH_BUILTIN_PROVIDER] = (
4142
"tests.test_planet_auth_utils.unit.auth_utils.builtins_test_impl.BuiltinConfigurationProviderMockTestImpl"
4243
)
4344
Builtins._builtin = None # Reset built-in state.
@@ -391,7 +392,7 @@ def test_save_profile_does_not_save_when_false(self):
391392

392393
class TestResourceServerValidatorInitHelper(TestWithHomeDirProfiles, unittest.TestCase):
393394
def setUp(self):
394-
os.environ[EnvironmentVariables.AUTH_BUILTIN_PROVIDER] = (
395+
os.environ[AUTH_BUILTIN_PROVIDER] = (
395396
"tests.test_planet_auth_utils.unit.auth_utils.builtins_test_impl.BuiltinConfigurationProviderMockTestImpl"
396397
)
397398
Builtins._builtin = None # Reset built-in state.

0 commit comments

Comments
 (0)