ob-metaflow-extensions 1.1.89__tar.gz → 1.1.90__tar.gz

{ob-metaflow-extensions-1.1.89 → ob-metaflow-extensions-1.1.90}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow-extensions
-Version: 1.1.89
+Version: 1.1.90
 Summary: Outerbounds Platform Extensions for Metaflow
 Author: Outerbounds, Inc.
 License: Commercial

{ob-metaflow-extensions-1.1.89 → ob-metaflow-extensions-1.1.90}/metaflow_extensions/outerbounds/plugins/__init__.py

@@ -116,40 +116,39 @@ def get_boto3_session(role_arn=None, session_vars=None):
     if token_info.get("region"):
         os.environ["AWS_DEFAULT_REGION"] = token_info["region"]
 
-    with hide_access_keys():
-        if cspr_role:
-            #  The generated AWS config will be used here since we set the
-            #  AWS_CONFIG_FILE environment variable above.
-            if role_arn == USE_CSPR_ROLE_ARN_IF_SET:
-                # Otherwise start from the default profile, assuming CSPR role
-                session = boto3.session.Session(profile_name="cspr")
-            else:
-                session = boto3.session.Session(profile_name="task")
-        else:
-            # Not using AWS config, just AWS_WEB_IDENTITY_TOKEN_FILE + AWS_ROLE_ARN
-            session = boto3.session.Session()
-
-        if role_arn and role_arn != USE_CSPR_ROLE_ARN_IF_SET:
-            # If the user provided a role_arn, we assume that role
-            # using the task role credentials. CSPR role is not used.
-            fetcher = botocore.credentials.AssumeRoleCredentialFetcher(
-                client_creator=session._session.create_client,
-                source_credentials=session._session.get_credentials(),
-                role_arn=role_arn,
-                extra_args={},
-            )
-            creds = botocore.credentials.DeferredRefreshableCredentials(
-                method="assume-role", refresh_using=fetcher.fetch_credentials
-            )
-            botocore_session = botocore.session.Session(session_vars=session_vars)
-            botocore_session._credentials = creds
-            return boto3.session.Session(botocore_session=botocore_session)
+    if cspr_role:
+        #  The generated AWS config will be used here since we set the
+        #  AWS_CONFIG_FILE environment variable above.
+        if role_arn == USE_CSPR_ROLE_ARN_IF_SET:
+            # Otherwise start from the default profile, assuming CSPR role
+            session = boto3.session.Session(profile_name="cspr")
         else:
-            # If the user didn't provide a role_arn, or if the role_arn
-            # is set to USE_CSPR_ROLE_ARN_IF_SET, we return the default
-            # session which would use the CSPR role if it is set on the
-            # server, and the task role otherwise.
-            return session
+            session = boto3.session.Session(profile_name="task")
+    else:
+        # Not using AWS config, just AWS_WEB_IDENTITY_TOKEN_FILE + AWS_ROLE_ARN
+        session = boto3.session.Session()
+
+    if role_arn and role_arn != USE_CSPR_ROLE_ARN_IF_SET:
+        # If the user provided a role_arn, we assume that role
+        # using the task role credentials. CSPR role is not used.
+        fetcher = botocore.credentials.AssumeRoleCredentialFetcher(
+            client_creator=session._session.create_client,
+            source_credentials=session._session.get_credentials(),
+            role_arn=role_arn,
+            extra_args={},
+        )
+        creds = botocore.credentials.DeferredRefreshableCredentials(
+            method="assume-role", refresh_using=fetcher.fetch_credentials
+        )
+        botocore_session = botocore.session.Session(session_vars=session_vars)
+        botocore_session._credentials = creds
+        return boto3.session.Session(botocore_session=botocore_session)
+    else:
+        # If the user didn't provide a role_arn, or if the role_arn
+        # is set to USE_CSPR_ROLE_ARN_IF_SET, we return the default
+        # session which would use the CSPR role if it is set on the
+        # server, and the task role otherwise.
+        return session
 
 
 class ObpAuthProvider(object):
@@ -164,11 +163,12 @@ class ObpAuthProvider(object):
 
         from botocore.exceptions import ClientError
 
-        session = get_boto3_session(role_arn, session_vars)
-        if with_error:
-            return session.client(module, **client_params), ClientError
-        else:
-            return session.client(module, **client_params)
+        with hide_access_keys():
+            session = get_boto3_session(role_arn, session_vars)
+            if with_error:
+                return session.client(module, **client_params), ClientError
+            else:
+                return session.client(module, **client_params)
 
 
 AWS_CLIENT_PROVIDERS_DESC = [("obp", ".ObpAuthProvider")]

{ob-metaflow-extensions-1.1.89 → ob-metaflow-extensions-1.1.90}/ob_metaflow_extensions.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow-extensions
-Version: 1.1.89
+Version: 1.1.90
 Summary: Outerbounds Platform Extensions for Metaflow
 Author: Outerbounds, Inc.
 License: Commercial

{ob-metaflow-extensions-1.1.89 → ob-metaflow-extensions-1.1.90}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 from pathlib import Path
 
 
-version = "1.1.89"
+version = "1.1.90"
 this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text()