paasta-tools 1.20.0__tar.gz → 1.21.1__tar.gz

{paasta-tools-1.20.0/paasta_tools.egg-info → paasta-tools-1.21.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 1.20.0
+Version: 1.21.1
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp

{paasta-tools-1.20.0 → paasta-tools-1.21.1}/paasta_tools/__init__.py

@@ -17,4 +17,4 @@
 # setup phase, the dependencies may not exist on disk yet.
 #
 # Don't bump version manually. See `make release` docs in ./Makefile
-__version__ = "1.20.0"
+__version__ = "1.21.1"

{paasta-tools-1.20.0 → paasta-tools-1.21.1}/paasta_tools/cli/authentication.py

@@ -71,7 +71,15 @@ def get_service_auth_token() -> str:
     return response["data"]["token"]
 
 
-def get_sso_service_auth_token() -> str:
-    """Generate an authentication token for the calling user from the Single Sign On provider"""
-    client_id = load_system_paasta_config().get_service_auth_sso_oidc_client_id()
+def get_sso_auth_token(paasta_apis: bool = False) -> str:
+    """Generate an authentication token for the calling user from the Single Sign On provider
+
+    :param bool paasta_apis: authenticate for PaaSTA APIs
+    """
+    system_config = load_system_paasta_config()
+    client_id = (
+        system_config.get_api_auth_sso_oidc_client_id()
+        if paasta_apis
+        else system_config.get_service_auth_sso_oidc_client_id()
+    )
     return get_and_cache_jwt_default(client_id)

{paasta-tools-1.20.0 → paasta-tools-1.21.1}/paasta_tools/cli/cmds/local_run.py

@@ -35,7 +35,7 @@ from mypy_extensions import TypedDict
 
 from paasta_tools.adhoc_tools import get_default_interactive_config
 from paasta_tools.cli.authentication import get_service_auth_token
-from paasta_tools.cli.authentication import get_sso_service_auth_token
+from paasta_tools.cli.authentication import get_sso_auth_token
 from paasta_tools.cli.cmds.check import makefile_responds_to
 from paasta_tools.cli.cmds.cook_image import paasta_cook_image
 from paasta_tools.cli.utils import figure_out_service_name
@@ -936,7 +936,7 @@ def run_docker_container(
     if use_service_auth_token:
         environment["YELP_SVC_AUTHZ_TOKEN"] = get_service_auth_token()
     elif use_sso_service_auth_token:
-        environment["YELP_SVC_AUTHZ_TOKEN"] = get_sso_service_auth_token()
+        environment["YELP_SVC_AUTHZ_TOKEN"] = get_sso_auth_token()
 
     local_run_environment = get_local_run_environment_vars(
         instance_config=instance_config, port0=chosen_port, framework=framework

{paasta-tools-1.20.0 → paasta-tools-1.21.1}/paasta_tools/cli/utils.py

@@ -46,7 +46,7 @@ from paasta_tools.adhoc_tools import load_adhoc_job_config
 from paasta_tools.api.client import get_paasta_oapi_client
 from paasta_tools.api.client import PaastaOApiClient
 from paasta_tools.cassandracluster_tools import load_cassandracluster_instance_config
-from paasta_tools.cli.authentication import get_sso_service_auth_token
+from paasta_tools.cli.authentication import get_sso_auth_token
 from paasta_tools.eks_tools import EksDeploymentConfig
 from paasta_tools.eks_tools import load_eks_service_config
 from paasta_tools.flink_tools import load_flink_instance_config
@@ -1093,7 +1093,7 @@ def get_paasta_oapi_client_with_auth(
         cluster=cluster,
         system_paasta_config=system_paasta_config,
         http_res=http_res,
-        auth_token=get_sso_service_auth_token(),
+        auth_token=get_sso_auth_token(paasta_apis=True),
     )
 
 

{paasta-tools-1.20.0 → paasta-tools-1.21.1}/paasta_tools/kubernetes_tools.py

@@ -1199,13 +1199,6 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
             "git_sha", ""
         )
 
-        # Our workloads interact with AWS quite a lot, so it comes handy to
-        # propagate an "application ID" in the user-agent of API requests
-        # for debugging purposes (max length is 50 chars from AWS docs).
-        # TODO: temporarily setting this here rather than in `InstanceConfig`
-        # to only affect long running services.
-        env["AWS_SDK_UA_APP_ID"] = f"{self.service}.{self.instance}"[:50]
-
         # We drop PAASTA_CLUSTER here because it will be added via `get_kubernetes_environment()`
         env.pop("PAASTA_CLUSTER", None)
 

{paasta-tools-1.20.0 → paasta-tools-1.21.1}/paasta_tools/utils.py

@@ -697,6 +697,10 @@ class InstanceConfig:
         instance_type = self.get_instance_type()
         if instance_type:
             env["PAASTA_INSTANCE_TYPE"] = instance_type
+        # Our workloads interact with AWS quite a lot, so it comes handy to
+        # propagate an "application ID" in the user-agent of API requests
+        # for debugging purposes (max length is 50 chars from AWS docs).
+        env["AWS_SDK_UA_APP_ID"] = f"{self.service}.{self.instance}"[:50]
         user_env = self.config_dict.get("env", {})
         env.update(user_env)
         return {str(k): str(v) for (k, v) in env.items()}
@@ -1947,6 +1951,7 @@ class SystemPaastaConfigDict(TypedDict, total=False):
     api_client_timeout: int
     api_endpoints: Dict[str, str]
     api_profiling_config: Dict
+    api_auth_sso_oidc_client_id: str
     auth_certificate_ttl: str
     auto_config_instance_types_enabled: Dict[str, bool]
     auto_config_instance_type_aliases: Dict[str, str]
@@ -2782,6 +2787,9 @@ class SystemPaastaConfig:
     def get_service_auth_sso_oidc_client_id(self) -> str:
         return self.config_dict.get("service_auth_sso_oidc_client_id", "")
 
+    def get_api_auth_sso_oidc_client_id(self) -> str:
+        return self.config_dict.get("api_auth_sso_oidc_client_id", "")
+
     def get_always_authenticating_services(self) -> List[str]:
         return self.config_dict.get("always_authenticating_services", [])
 

{paasta-tools-1.20.0 → paasta-tools-1.21.1/paasta_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 1.20.0
+Version: 1.21.1
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp