localstack 4.13.2.dev53__tar.gz → 4.14.0__tar.gz

{localstack-4.13.2.dev53 → localstack-4.14.0}/.github/workflows/tests-cli.yml

@@ -88,6 +88,14 @@ jobs:
             --log-cli-level=${{ env.PYTEST_LOGLEVEL }} \
             -v -s
 
+      - name: Run unit tests
+        env:
+          LOCALSTACK_AUTH_TOKEN: ${{ secrets.TEST_LOCALSTACK_AUTH_TOKEN }}
+        run: |
+          python -m pytest tests/unit/ \
+            --log-cli-level=${{ env.PYTEST_LOGLEVEL }} \
+            -v -s
+
   publish:
     if: >-
       (github.event.inputs.publish_to_pypi == 'true' && github.ref == 'refs/heads/main') ||

{localstack-4.13.2.dev53/localstack.egg-info → localstack-4.14.0}/PKG-INFO

@@ -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 → localstack-4.14.0/localstack.egg-info}/PKG-INFO

@@ -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 → localstack-4.14.0}/localstack.egg-info/SOURCES.txt

@@ -234,13 +234,14 @@ tests/cli/conftest.py
 tests/cli/test_cli.py
 tests/cli/test_cli_pro.py
 tests/integration/__init__.py
+tests/integration/cli/__init__.py
+tests/integration/cli/test_cli.py
+tests/integration/cli/test_lpm.py
 tests/integration/replicator/__init__.py
 tests/integration/replicator/core/__init__.py
 tests/integration/replicator/core/test_replicator_cli.py
 tests/unit/__init__.py
 tests/unit/cli/__init__.py
-tests/unit/cli/test_cli.py
-tests/unit/cli/test_lpm.py
 tests/unit/cli/test_profiles.py
 tests/unit/pro/__init__.py
 tests/unit/pro/test_cli.py

{localstack-4.13.2.dev53 → localstack-4.14.0}/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-4.13.2.dev53 → localstack-4.14.0}/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 = 'g9339dde9f'
+__commit_id__ = commit_id = 'ga77cc7d02'

{localstack-4.13.2.dev53 → localstack-4.14.0}/tests/unit/replicator/test_profile_loading.py

@@ -1,8 +1,11 @@
 import pytest
+
+from localstack_cli.cli.exceptions import CLIError
 from localstack_cli.pro.core.cli.replicator import (
     ProfileLoadError,
     get_config_from_profile,
     get_source_config,
+    get_awscli_config,
 )
 from localstack_cli.utils.strings import short_uid
 
@@ -24,7 +27,7 @@ def secret_key():
 
 @pytest.fixture
 def profile_region():
-    return "us-east-1"
+    return "us-east-7"
 
 
 @pytest.fixture
@@ -50,7 +53,9 @@ aws_secret_access_key = {secret_key}
     return tmpdir
 
 
-def test_load_profile(tmpdir, profile_name, profile_dir, profile_region, access_key_id, secret_key):
+def test_load_profile_from_config_file(
+    profile_name, profile_dir, profile_region, access_key_id, secret_key
+):
     config = get_config_from_profile(profile_name, profile_dir)
 
     assert config["aws_access_key_id"] == access_key_id
@@ -68,9 +73,7 @@ def test_load_missing_profile(tmpdir, profile_dir):
     assert str(exc_info.value) == f"Could not find profile '{invalid_profile_name}'"
 
 
-def test_envars_override_profile(
-    tmpdir, access_key_id, profile_dir, secret_key, profile_name, profile_region, monkeypatch
-):
+def test_envars_override_profile(profile_dir, profile_name, monkeypatch):
     monkeypatch.setenv("AWS_PROFILE", profile_name)
 
     test_access_key = short_uid()
@@ -85,3 +88,49 @@ def test_envars_override_profile(
     assert env.get("aws_access_key_id") == test_access_key
     assert env.get("aws_secret_access_key") == test_secret_key
     assert env.get("region_name") == test_region
+
+
+def test_envars_partial_override_profile(
+    access_key_id, profile_dir, profile_name, profile_region, monkeypatch
+):
+    monkeypatch.setenv("AWS_PROFILE", profile_name)
+
+    test_access_key = short_uid()
+    monkeypatch.setenv("AWS_ACCESS_KEY_ID", test_access_key)
+    test_secret_key = short_uid()
+    monkeypatch.setenv("AWS_SECRET_ACCESS_KEY", test_secret_key)
+
+    env = get_source_config(profile_dir=profile_dir)
+
+    assert env.get("aws_access_key_id") == test_access_key
+    assert env.get("aws_secret_access_key") == test_secret_key
+    assert env.get("region_name") == profile_region
+
+
+def test_envars_partial_override_profile_error(
+    access_key_id, profile_dir, profile_name, profile_region, monkeypatch
+):
+    monkeypatch.setenv("AWS_PROFILE", profile_name)
+
+    test_access_key = short_uid()
+    monkeypatch.setenv("AWS_ACCESS_KEY_ID", test_access_key)
+
+    with pytest.raises(CLIError) as e:
+        get_source_config(profile_dir=profile_dir)
+
+    assert "Partial credentials found in env" in e.value.message
+
+
+def test_loading_from_aws_cli(
+    profile_name, profile_dir, profile_region, access_key_id, secret_key, monkeypatch
+):
+    monkeypatch.setenv("AWS_CONFIG_FILE", str(profile_dir / "config"))
+    monkeypatch.setenv("AWS_SHARED_CREDENTIALS_FILE", str(profile_dir / "credentials"))
+    monkeypatch.setenv("AWS_PROFILE", profile_name)
+
+    config = get_awscli_config()
+
+    assert config["aws_access_key_id"] == access_key_id
+    assert config["aws_secret_access_key"] == secret_key
+    assert config.get("aws_session_token") is None
+    assert config["region_name"] == profile_region