localstack 4.13.2.dev53__py3-none-any.whl → 4.14.0__py3-none-any.whl

{localstack-4.13.2.dev53.dist-info → localstack-4.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack
-Version: 4.13.2.dev53
+Version: 4.14.0
 Summary: The LocalStack Command Line Interface
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0

{localstack-4.13.2.dev53.dist-info → localstack-4.14.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 localstack_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack_cli/config.py,sha256=kjt-tEH5TG3EPtHReLr23DzAw5XI_hZF5d8GEzCfuns,67164
 localstack_cli/constants.py,sha256=Z65z7evTRQGRf1buYMMvLwKZOI0XfzlUsNmeUGcONzQ,6304
-localstack_cli/version.py,sha256=3I42U3YyhfokzXbjISyosAx6wqRUCvQ9vOovMDUic5U,721
+localstack_cli/version.py,sha256=HK99J01s1g57btZFIWMu5zC8IUJbQB-DbpgMyQ_kkgE,706
 localstack_cli/cli/__init__.py,sha256=S0u4eNluwhhLkiCC8UZNjhh27Pk-W7jeUiEv4k3VrXo,176
 localstack_cli/cli/console.py,sha256=eMz2PfQRDG493uzXFqQZTbYTC4NhO6UOpx4ZricsGLI,346
 localstack_cli/cli/core_plugin.py,sha256=bVbkbhIOegsfQvD3BF_T477K6v6yjK0lRn4eE5PpnSI,382
@@ -53,7 +53,7 @@ localstack_cli/pro/core/cli/extensions.py,sha256=8TBDd02J1VnUag-x7ppVxC9N0tgMP0O
 localstack_cli/pro/core/cli/iam.py,sha256=iTRztn5Q01Q1kpcAE1RUyJWAuHe2iRK5mUO2JnOGjjw,6352
 localstack_cli/pro/core/cli/license.py,sha256=kdtATn3j6HnpzUpj48ozKj0IRbbYCdVTG1FJgdZ9y8Q,2780
 localstack_cli/pro/core/cli/localstack.py,sha256=Z3_7W7UgUGoNgh3m9NS6JjX9nFU1o9O8LbmV17S1Hu0,3620
-localstack_cli/pro/core/cli/replicator.py,sha256=sreAt9hSSDyAHj2wLM2EYClVTLK97pWybAiAu4_veuA,11189
+localstack_cli/pro/core/cli/replicator.py,sha256=GKA-PqluhaJzcu9sTGf4cbnqN-rfh4GXZx3o1mnGhPE,12824
 localstack_cli/pro/core/cli/state.py,sha256=iS8_qSqoxUlQj21nrVToazqjfM7PfBs-3RqoiwpIKn0,6696
 localstack_cli/pro/core/cli/tree_view.py,sha256=K443WkwIxNRDi_rzPiQW5wBTq3dCgzfTiGbVNpeIJ68,7254
 localstack_cli/runtime/__init__.py,sha256=sdfCHRYcw9uvUZsUNzRPh1vEh9kx8w1v1wgOORYnfZs,231
@@ -105,8 +105,8 @@ localstack_cli/utils/container_utils/docker_cmd_client.py,sha256=4UPKOZTyu2TgPlE
 localstack_cli/utils/container_utils/docker_sdk_client.py,sha256=6lnBhjT03otVGBm15WDq3LAfZnxLc4Q1lyjHAyFHsbM,40460
 localstack_cli/utils/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack_cli/utils/server/tcp_proxy.py,sha256=0ehOD5muo2cBCg0boXzKhzF14KfwlJ7VUtM5i8X7M5A,4006
-localstack-4.13.2.dev53.dist-info/METADATA,sha256=W6nIj7w2PCotu0C2VWaC_MTjEM7MxKS8ex6shusRQok,2709
-localstack-4.13.2.dev53.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-localstack-4.13.2.dev53.dist-info/entry_points.txt,sha256=ogxbxjXC9xK1eksf9CUvOEl09SY2qpUt19SVya0WYAY,933
-localstack-4.13.2.dev53.dist-info/top_level.txt,sha256=02blzxjv7TnyriE5gkWIM_UqKTSBiCFPgRG5ZBO5R0Y,15
-localstack-4.13.2.dev53.dist-info/RECORD,,
+localstack-4.14.0.dist-info/METADATA,sha256=-P-9fsQsX_XqJl2dG7JbKvz3T-XvpQE2CpE-8xeMLS0,2703
+localstack-4.14.0.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+localstack-4.14.0.dist-info/entry_points.txt,sha256=ogxbxjXC9xK1eksf9CUvOEl09SY2qpUt19SVya0WYAY,933
+localstack-4.14.0.dist-info/top_level.txt,sha256=02blzxjv7TnyriE5gkWIM_UqKTSBiCFPgRG5ZBO5R0Y,15
+localstack-4.14.0.dist-info/RECORD,,

localstack_cli/pro/core/cli/replicator.py

@@ -1,5 +1,6 @@
 import json
 import os
+import re
 import subprocess as sp
 import sys
 import time
@@ -40,6 +41,10 @@ The replicator command group allows you to replicate AWS resources into LocalSta
 )
 
 
+def run_check_output(cmd) -> str:
+    return sp.check_output(cmd, stderr=sp.PIPE, env=os.environ).decode("utf-8").strip()
+
+
 class ProfileLoadError(RuntimeError):
     def __init__(self, profile_name: str):
         super().__init__(f"Could not find profile '{profile_name}'")
@@ -96,49 +101,58 @@ def get_awscli_config() -> AWSConfig | None:
     try:
         # get credentials values
         cmd = ["aws", "configure", "export-credentials"]
-        output = sp.check_output(cmd, stderr=sp.PIPE)
-        credentials = json.loads(output.decode("utf8"))
+        credentials = json.loads(run_check_output(cmd))
     except sp.CalledProcessError as exc:
         if b"AWS CLI version 2" in exc.stderr:
             print(
                 "Warning: awscli v1 installed. Please use v2 for auto detection of credentials",
                 file=sys.stderr,
             )
-            return None
+        return None
 
     try:
         # try to get the endpoint url
         cmd = ["aws", "configure", "get", "endpoint_url"]
-        endpoint_url = sp.check_output(cmd, stderr=sp.PIPE).decode("utf8")
+        endpoint_url = run_check_output(cmd)
     except sp.CalledProcessError:
         # If there are no endpoint configured an exception is raised we do a last
         # check in the environment to find the endpoint url
         endpoint_url = os.getenv("AWS_ENDPOINT_URL")
 
     try:
-        # get default region
-        cmd = ["aws", "configure", "list"]
-        output = sp.check_output(cmd, stderr=sp.PIPE)
-        for line in output.decode().splitlines():
-            if "region" not in line:
-                continue
-
-            words = line.split()
-            try:
-                region = words[1]
-                return AWSConfig(
-                    aws_access_key_id=credentials["AccessKeyId"],
-                    aws_secret_access_key=credentials["SecretAccessKey"],
-                    aws_session_token=credentials.get("SessionToken"),
-                    region_name=region,
-                    endpoint_url=endpoint_url,
-                )
-
-            except IndexError:
-                return None
-
-    except (sp.CalledProcessError, FileNotFoundError):
-        return None
+        # try to get the region from configure
+        cmd = ["aws", "configure", "get", "region"]
+        region_name = run_check_output(cmd)
+    except sp.CalledProcessError:
+        # If there are no default configured an exception is raised we do a last
+        # check in the environment to find the region
+        region_name = os.getenv("AWS_DEFAULT_REGION")
+
+    if not region_name:
+        try:
+            # older awscli versions do not return the region to the command `aws configure get region`.
+            # We need to rely on the configure list in this case
+            cmd = ["aws", "configure", "list"]
+            for line in run_check_output(cmd).splitlines():
+                if "region" not in line:
+                    continue
+                # aws changed the format of configure and added `:` in delimiters
+                words = re.split(r"[:\s]+", line)
+                try:
+                    region_name = words[1]
+                    break
+                except IndexError:
+                    return None
+        except (sp.CalledProcessError, FileNotFoundError):
+            return None
+
+    return AWSConfig(
+        aws_access_key_id=credentials["AccessKeyId"],
+        aws_secret_access_key=credentials["SecretAccessKey"],
+        aws_session_token=credentials.get("SessionToken"),
+        region_name=region_name,
+        endpoint_url=endpoint_url,
+    )
 
 
 def get_source_config(profile_dir: Path | None = None) -> AWSConfig:
@@ -148,13 +162,36 @@ def get_source_config(profile_dir: Path | None = None) -> AWSConfig:
         return awscli_source_config
 
     source_config = get_aws_env_config("AWS")
+    profile_name = source_config.get("profile_name")
+
+    if source_config.get("aws_access_key_id") and not source_config.get("aws_secret_access_key"):
+        raise CLIError(
+            "Unable to retrieve credentials: Partial credentials found in env."
+            " Need both 'AWS_ACCESS_KEY_ID' and 'AWS_SECRET_ACCESS_KEY'"
+        )
+
+    if profile_name:
+        config_file_source_config = get_config_from_profile(
+            profile_name=profile_name, profile_dir=profile_dir
+        )
+        if source_config.get("aws_secret_access_key"):
+            # before merging, if the secret access key is in the env vars we need to ensure the session token from the
+            # config file isn't carried along
+            config_file_source_config.pop("aws_session_token", None)
+        config_file_source_config.update(source_config)
+        source_config = config_file_source_config
+
+    errors = []
 
     if not source_config.get("region_name"):
-        raise CLIError("'AWS_DEFAULT_REGION' must bet set in environment.")
+        errors.append("'AWS_DEFAULT_REGION' must bet set in environment or in profile.")
     if not source_config.get("aws_access_key_id"):
-        raise CLIError("'AWS_ACCESS_KEY_ID' must bet set in environment.")
+        errors.append("'AWS_ACCESS_KEY_ID' must bet set in environment or in profile.")
     if not source_config.get("aws_secret_access_key"):
-        raise CLIError("'AWS_SECRET_ACCESS_KEY' must bet set in environment.")
+        errors.append("'AWS_SECRET_ACCESS_KEY' must bet set in environment or in profile.")
+
+    if errors:
+        raise CLIError("\n".join(errors))
 
     return source_config
 

localstack_cli/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.13.2.dev53'
-__version_tuple__ = version_tuple = (4, 13, 2, 'dev53')
+__version__ = version = '4.14.0'
+__version_tuple__ = version_tuple = (4, 14, 0)
 
 __commit_id__ = commit_id = None