megfile 3.1.4__py3-none-any.whl → 3.1.5__py3-none-any.whl

megfile/cli.py

@@ -589,6 +589,7 @@ def _safe_makedirs(path: str):
 @click.argument("aws_access_key_id")
 @click.argument("aws_secret_access_key")
 @click.option("-e", "--endpoint-url", help="endpoint-url")
+@click.option("-st", "--session-token", help="session-token")
 @click.option("-as", "--addressing-style", help="addressing-style")
 @click.option("-sv", "--signature-version", help="signature-version")
 @click.option("--no-cover", is_flag=True, help="Not cover the same-name config")
@@ -598,6 +599,7 @@ def s3(
     aws_access_key_id,
     aws_secret_access_key,
     endpoint_url,
+    session_token,
     addressing_style,
     signature_version,
     no_cover,
@@ -608,6 +610,7 @@ def s3(
         "name": profile_name,
         "aws_access_key_id": aws_access_key_id,
         "aws_secret_access_key": aws_secret_access_key,
+        "aws_session_token": session_token,
     }
     s3_config_dict = {
         "endpoint_url": endpoint_url,
@@ -615,14 +618,16 @@ def s3(
         "signature_version": signature_version,
     }
 
+    config_dict = {k: v for k, v in config_dict.items() if v}
     s3_config_dict = {k: v for k, v in s3_config_dict.items() if v}
     if s3_config_dict:
         config_dict["s3"] = s3_config_dict
 
     def dumps(config_dict: dict) -> str:
         content = "[{}]\n".format(config_dict["name"])
-        for key in ("aws_access_key_id", "aws_secret_access_key"):
-            content += "{} = {}\n".format(key, config_dict[key])
+        for key in ("aws_access_key_id", "aws_secret_access_key", "session_token"):
+            if key in config_dict:
+                content += "{} = {}\n".format(key, config_dict[key])
         if "s3" in config_dict.keys():
             content += "\ns3 = \n"
             for key, value in config_dict["s3"].items():

megfile/s3_path.py

@@ -235,10 +235,16 @@ def get_access_token(profile_name=None):
         if profile_name
         else "AWS_SECRET_ACCESS_KEY"
     )
+    session_token_env_name = (
+        f"{profile_name}__AWS_SESSION_TOKEN".upper()
+        if profile_name
+        else "AWS_SESSION_TOKEN"
+    )
     access_key = os.getenv(access_key_env_name)
     secret_key = os.getenv(secret_key_env_name)
+    session_token = os.getenv(session_token_env_name)
     if access_key and secret_key:
-        return access_key, secret_key
+        return access_key, secret_key, session_token
 
     try:
         credentials = get_s3_session(profile_name=profile_name).get_credentials()
@@ -249,7 +255,9 @@ def get_access_token(profile_name=None):
             access_key = credentials.access_key
         if not secret_key:
             secret_key = credentials.secret_key
-    return access_key, secret_key
+        if not session_token:
+            session_token = credentials.token
+    return access_key, secret_key, session_token
 
 
 def get_s3_client(
@@ -290,7 +298,7 @@ def get_s3_client(
             botocore.config.Config(s3={"addressing_style": addressing_style})
         )
 
-    access_key, secret_key = get_access_token(profile_name)
+    access_key, secret_key, session_token = get_access_token(profile_name)
     try:
         session = get_s3_session(profile_name=profile_name)
     except botocore.exceptions.ProfileNotFound:
@@ -301,6 +309,7 @@ def get_s3_client(
         config=config,
         aws_access_key_id=access_key,
         aws_secret_access_key=secret_key,
+        aws_session_token=session_token,
     )
     client = _patch_make_request(client)
     return client

megfile/version.py

@@ -1 +1 @@
-VERSION = "3.1.4"
+VERSION = "3.1.5"

{megfile-3.1.4.dist-info → megfile-3.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: megfile
-Version: 3.1.4
+Version: 3.1.5
 Summary: Megvii file operation library
 Author-email: megvii <megfile@megvii.com>
 Project-URL: Homepage, https://github.com/megvii-research/megfile
@@ -166,6 +166,7 @@ You can use environments and configuration file for configuration, and priority
 You can use environments to setup authentication credentials for your `s3` account:
 - `AWS_ACCESS_KEY_ID`: access key
 - `AWS_SECRET_ACCESS_KEY`: secret key
+- `AWS_SESSION_TOKEN`: session token
 - `OSS_ENDPOINT` / `AWS_ENDPOINT_URL_S3` / `AWS_ENDPOINT_URL`: endpoint url of s3
 - `AWS_S3_ADDRESSING_STYLE`: addressing style
 

{megfile-3.1.4.dist-info → megfile-3.1.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 docs/conf.py,sha256=sfDSly5jO8W_RmuAptOIp4hd8dNcO-9a5XrHTbxFnNo,2448
 megfile/__init__.py,sha256=i2Lbq_VxIgppaqwkxG0_H35dRfcjJ4mCYWjprOf4hHo,7318
-megfile/cli.py,sha256=hMSzaHRYs9omxDErTekJxJbWNWVHU8XpxrjlQSCgB0g,23222
+megfile/cli.py,sha256=miI1fEHY3zBxWwwN5F5AHjO14-AI920oPxD4sfi94gY,23465
 megfile/config.py,sha256=_SkJRaVWUdfW1Q9uX0vao-6YVQKJtfej22Z8DykuRps,2331
 megfile/errors.py,sha256=KyHvK3CgiSgiXT_5kqKa7Nb8Bdwh7U6mBh_H7Gj-Z84,14125
 megfile/fs.py,sha256=dgj5fW-EEzQNdjMF2tkB5DjXu3iHQbtLi5PSIMxR8fc,11966
@@ -12,14 +12,14 @@ megfile/http_path.py,sha256=BhMNjQVB85IaCGGIKzgEfY73mAVdCzJP08W1RuGeMRA,16119
 megfile/interfaces.py,sha256=7C53Q2FAVFmOEnplfplvWqHab29HJE5RQnpfdb4loVY,8679
 megfile/pathlike.py,sha256=vKuCMlSAPYNSojp03wEj2i3Cq3E3ROp_-UkkdgBElws,30802
 megfile/s3.py,sha256=7SdfLjAePVh-bpRyuj566VB4Qa7KP86rCJGzYANR7wQ,13008
-megfile/s3_path.py,sha256=fHXDwndXz3X9zicdyxRhCgXzCSnPyEPs56MAxAaN6BY,93440
+megfile/s3_path.py,sha256=YvIRVI4d6kd2m2wvcIqiu43nPOYZpaPgG9-BospF81w,93803
 megfile/sftp.py,sha256=vyDnYXX3i1j2fhXMC8YCeX-66MDb9wrBQQjQVhZx0uo,13004
 megfile/sftp_path.py,sha256=4tByWvUJK1KBJoa3t5aoWYnZpaRWN9nQIE6ZyiGHrbk,53519
 megfile/smart.py,sha256=Vr4R7HpjXjt587KOc2-1QGbQ5EsZ48YRzCaK0rz3IS0,36108
 megfile/smart_path.py,sha256=22ZTrA7j9Kd5PJsUJOxBdGg0Uu5FxwdT_XQjQDxUHo4,7637
 megfile/stdio.py,sha256=UYe-h440Wc4f5COOzOTG1svnp5nFzrfpixehJ0_0_NY,653
 megfile/stdio_path.py,sha256=7jzVdreamO18yBWZM7Pp71cO7GmrYb0M0qyQde2Ypq4,2706
-megfile/version.py,sha256=b8VrXFA3EThDrSnsc79plKJ0XORYz27w8iHVlyAAkew,19
+megfile/version.py,sha256=kh8D3nOB4xuR3KqckCcukx60UxptlmvEx5kjmgZinIA,19
 megfile/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megfile/lib/base_prefetch_reader.py,sha256=CaYWuiKmlk4Utr0IFDPwPC58wV2jBAhqpxhwhRHc734,13652
 megfile/lib/combine_reader.py,sha256=uSzo3PmhD5ck6_Vv6dFU5vVx4boeA97VS-puPyhF_BE,4657
@@ -46,10 +46,10 @@ megfile/utils/__init__.py,sha256=NfO5vNxfeceGvMB3dgZNudyPFTmPY096JbC4iYroX6o,900
 megfile/utils/mutex.py,sha256=asb8opGLgK22RiuBJUnfsvB8LnMmodP8KzCVHKmQBWA,2561
 scripts/convert_results_to_sarif.py,sha256=nDiOfsedb22Ps7ZodmYdlXZlxv54fRxCQgOZsB2OkNk,2833
 scripts/generate_file.py,sha256=-mTcBiqiQ1juvqojVfVZ-uZWgpANHJNdhrF7s68zNfc,10903
-megfile-3.1.4.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-megfile-3.1.4.dist-info/LICENSE.pyre,sha256=9lf5nT-5ZH25JijpYAequ0bl8E8z5JmZB1qrjiUMp84,1080
-megfile-3.1.4.dist-info/METADATA,sha256=Bvk8nkQFxkIv7GMmErY08F4YXR_o1kH3ythet97kgRg,9141
-megfile-3.1.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-megfile-3.1.4.dist-info/entry_points.txt,sha256=M6ZWSSv5_5_QtIpZafy3vq7WuOJ_5dSGQQnEZbByt2Q,49
-megfile-3.1.4.dist-info/top_level.txt,sha256=oTnYXo1Z3V61qSWAKtnY9RkDgRSHvfRN38FQae6E0W0,50
-megfile-3.1.4.dist-info/RECORD,,
+megfile-3.1.5.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+megfile-3.1.5.dist-info/LICENSE.pyre,sha256=9lf5nT-5ZH25JijpYAequ0bl8E8z5JmZB1qrjiUMp84,1080
+megfile-3.1.5.dist-info/METADATA,sha256=jPBOY1WWbh-Jxdam48x2RxcXGVV2liPW4kQTw8VtBl0,9178
+megfile-3.1.5.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+megfile-3.1.5.dist-info/entry_points.txt,sha256=M6ZWSSv5_5_QtIpZafy3vq7WuOJ_5dSGQQnEZbByt2Q,49
+megfile-3.1.5.dist-info/top_level.txt,sha256=oTnYXo1Z3V61qSWAKtnY9RkDgRSHvfRN38FQae6E0W0,50
+megfile-3.1.5.dist-info/RECORD,,