ob-metaflow-extensions 1.1.42__tar.gz → 1.1.42rc0__tar.gz

{ob-metaflow-extensions-1.1.42 → ob-metaflow-extensions-1.1.42rc0}/PKG-INFO

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

ob-metaflow-extensions-1.1.42rc0/metaflow_extensions/outerbounds/__init__.py

@@ -0,0 +1,5 @@
+from metaflow_extensions.outerbounds.plugins.perimeters import (
+    override_metaflow_profile_with_perimeter,
+)
+
+override_metaflow_profile_with_perimeter()

{ob-metaflow-extensions-1.1.42 → ob-metaflow-extensions-1.1.42rc0}/metaflow_extensions/outerbounds/config/__init__.py

@@ -1,5 +1,3 @@
 DEFAULT_AWS_CLIENT_PROVIDER = "obp"
 
 DEFAULT_AZURE_CLIENT_PROVIDER = "obp"
-
-DEFAULT_GCP_CLIENT_PROVIDER = "obp"

{ob-metaflow-extensions-1.1.42 → ob-metaflow-extensions-1.1.42rc0}/metaflow_extensions/outerbounds/plugins/__init__.py

@@ -1,5 +1,4 @@
 import os
-import json
 import tempfile
 from contextlib import contextmanager
 
@@ -162,81 +161,3 @@ class ObpAzureAuthProvider(object):
 
 
 AZURE_CLIENT_PROVIDERS_DESC = [("obp", ".ObpAzureAuthProvider")]
-
-import threading
-import time
-
-_gcp_client_cache = dict()
-
-
-def _get_cache_key():
-    return os.getpid(), threading.get_ident()
-
-
-class ObpGcpAuthProvider(object):
-    name = "obp"
-
-    @staticmethod
-    def get_gs_storage_client(*args, **kwargs):
-
-        import sys
-        from metaflow_extensions.outerbounds.plugins.auth_server import get_token
-
-        cache_key = _get_cache_key()
-        if _gcp_client_cache.get(cache_key):
-            # Don't cache the client for more than 5 minutes as it may have
-            # expired.
-            if _gcp_client_cache[cache_key]._created_at < time.time() - 300:
-                del _gcp_client_cache[cache_key]
-            else:
-                return _gcp_client_cache[cache_key]
-
-        from hashlib import sha256
-        from metaflow.util import get_username
-
-        user = get_username()
-
-        token_info = get_token("/generate/gcp")
-        token_file = "/tmp/obp_token." + sha256(user.encode("utf-8")).hexdigest()[:16]
-        credentials_file = (
-            "/tmp/obp_credentials." + sha256(user.encode("utf-8")).hexdigest()[:16]
-        )
-
-        with tempfile.NamedTemporaryFile("w", delete=False) as f:
-            f.write(token_info["token"])
-            tmp_token_file = f.name
-        os.rename(tmp_token_file, token_file)
-
-        credentials_json = {
-            "type": "external_account",
-            "audience": f"//iam.googleapis.com/projects/{token_info['gcpProjectNumber']}/locations/global/workloadIdentityPools/{token_info['gcpWorkloadIdentityPool']}/providers/{token_info['gcpWorkloadIdentityPoolProvider']}",
-            "subject_token_type": "urn:ietf:params:oauth:token-type:jwt",
-            "token_url": "https://sts.googleapis.com/v1/token",
-            "service_account_impersonation_url": f"https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/{token_info['gcpServiceAccountEmail']}:generateAccessToken",
-            "credential_source": {
-                "file": token_file,
-                "format": {"type": "text"},
-            },
-        }
-
-        with tempfile.NamedTemporaryFile("w", delete=False) as f:
-            f.write(json.dumps(credentials_json))
-            tmp_credentials_file = f.name
-        os.rename(tmp_credentials_file, credentials_file)
-
-        os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = credentials_file
-        from google.cloud import storage
-
-        storage_client = storage.Client(project=token_info["gcpProjectId"])
-        storage_client._created_at = time.time()
-        _gcp_client_cache[cache_key] = storage_client
-        return storage_client
-
-    @staticmethod
-    def get_credentials(scopes, *args, **kwargs):
-        import google.auth
-
-        return google.auth.default(scopes=scopes)
-
-
-GCP_CLIENT_PROVIDERS_DESC = [("obp", ".ObpGcpAuthProvider")]

{ob-metaflow-extensions-1.1.42 → ob-metaflow-extensions-1.1.42rc0}/metaflow_extensions/outerbounds/plugins/auth_server.py

@@ -25,7 +25,7 @@ def read_mf_config():
     return config
 
 
-def get_token_url_and_headers(url_path):
+def get_token(url_path):
     from metaflow.metaflow_config import (
         SERVICE_HEADERS,
         from_conf,
@@ -44,11 +44,6 @@ def get_token_url_and_headers(url_path):
     assert url_path.startswith("/")
     url = "https://" + authServer + url_path
     headers = SERVICE_HEADERS
-    return url, headers
-
-
-def get_token(url_path):
-    url, headers = get_token_url_and_headers(url_path)
     try:
         r = requests.get(url, headers=headers)
         r.raise_for_status()

ob-metaflow-extensions-1.1.42rc0/metaflow_extensions/outerbounds/plugins/perimeters.py

@@ -0,0 +1,27 @@
+import os
+import fcntl
+from os import path
+import json
+
+
+def override_metaflow_profile_with_perimeter():
+    # If OBP_CONFIG_DIR is set, use that, otherwise use METAFLOW_HOME
+    # If neither are set, use ~/.metaflowconfig
+    obp_config_dir = path.expanduser(
+        os.environ.get(
+            "OBP_CONFIG_DIR", os.environ.get("METAFLOW_HOME", "~/.metaflowconfig")
+        )
+    )
+
+    file_path = os.path.join(obp_config_dir, "ob_config.json")
+
+    if os.path.exists(file_path):
+        # Acquire a shared read lock on the file
+        fd = os.open(file_path, os.O_RDONLY)
+        fcntl.flock(fd, fcntl.LOCK_SH)
+
+        with open(file_path, "r") as f:
+            ob_config = json.loads(f.read())
+
+        if "OB_CURRENT_PERIMETER" in ob_config:
+            os.environ["METAFLOW_PROFILE"] = ob_config["OB_CURRENT_PERIMETER"]

{ob-metaflow-extensions-1.1.42 → ob-metaflow-extensions-1.1.42rc0}/ob_metaflow_extensions.egg-info/PKG-INFO

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

{ob-metaflow-extensions-1.1.42 → ob-metaflow-extensions-1.1.42rc0}/ob_metaflow_extensions.egg-info/SOURCES.txt

@@ -4,12 +4,12 @@ metaflow_extensions/outerbounds/__init__.py
 metaflow_extensions/outerbounds/config/__init__.py
 metaflow_extensions/outerbounds/plugins/__init__.py
 metaflow_extensions/outerbounds/plugins/auth_server.py
+metaflow_extensions/outerbounds/plugins/perimeters.py
 metaflow_extensions/outerbounds/plugins/kubernetes/__init__.py
 metaflow_extensions/outerbounds/plugins/kubernetes/kubernetes_client.py
 metaflow_extensions/outerbounds/toplevel/__init__.py
 metaflow_extensions/outerbounds/toplevel/global_aliases_for_metaflow_package.py
 metaflow_extensions/outerbounds/toplevel/plugins/azure/__init__.py
-metaflow_extensions/outerbounds/toplevel/plugins/gcp/__init__.py
 metaflow_extensions/outerbounds/toplevel/plugins/kubernetes/__init__.py
 ob_metaflow_extensions.egg-info/PKG-INFO
 ob_metaflow_extensions.egg-info/SOURCES.txt

ob-metaflow-extensions-1.1.42rc0/ob_metaflow_extensions.egg-info/requires.txt

@@ -0,0 +1,3 @@
+boto3
+kubernetes
+ob-metaflow==2.11.0.3

{ob-metaflow-extensions-1.1.42 → ob-metaflow-extensions-1.1.42rc0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 from pathlib import Path
 
 
-version = "1.1.42"
+version = "1.1.42rc0"
 this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text()
 
@@ -15,5 +15,5 @@ setup(
     packages=find_namespace_packages(include=["metaflow_extensions.*"]),
     long_description=long_description,
     long_description_content_type="text/markdown",
-    install_requires=["boto3", "kubernetes", "ob-metaflow == 2.11.0.4"],
+    install_requires=["boto3", "kubernetes", "ob-metaflow == 2.11.0.3"],
 )

ob-metaflow-extensions-1.1.42/metaflow_extensions/outerbounds/toplevel/plugins/gcp/__init__.py

@@ -1 +0,0 @@
-__mf_promote_submodules__ = ["plugins.gcp.gs_storage_client_factory"]

ob-metaflow-extensions-1.1.42/ob_metaflow_extensions.egg-info/requires.txt

@@ -1,3 +0,0 @@
-boto3
-kubernetes
-ob-metaflow==2.11.0.4