clean up old replicator code

Author: whummer

aws-proxy/README.md

@@ -7,7 +7,7 @@ This enables one flavor of "hybrid" or "remocal" setups where you can easily bri
 
 ⚠️ Please note that this extension is experimental and still under active development.
 
-⚠️ Note: Given that the scope of this extension has recently changed (see [below](#resource-replicator-cli-deprecated)) - it has been recently renamed from `aws-replicator` to `aws-proxy`.
+⚠️ Note: Given that the scope of this extension has recently changed (see [below](#resource-replicator-cli-deprecated)) - it has been renamed from `aws-replicator` to `aws-proxy`.
 
 ## Prerequisites
 
@@ -120,13 +120,13 @@ In addition to the proxy services configuration shown above, the following confi
 ## Resource Replicator CLI (deprecated)
 
 Note: Previous versions of this extension also offered a "replicate" mode to copy/clone (rather than proxy) resources from an AWS account into the local instance.
-This functionality has been removed from this extension, and is now being migrated to a new extension (more details following soon).
+This functionality has been removed from this extension, and is now available directly in the LocalStack Pro image (see [here](https://docs.localstack.cloud/aws/tooling/aws-replicator)).
 
 If you wish to access the deprecated instructions, they can be found [here](https://github.com/localstack/localstack-extensions/blob/fe0c97e8a9d94f72c80358493e51ce6c1da535dc/aws-replicator/README.md#resource-replicator-cli).
 
 ## Change Log
 
-* `0.1.25`: Fix dynamodb proxying for read-only mode.
+* `0.1.25`: Fix dynamodb proxying for read-only mode
 * `0.1.24`: Fix healthcheck probe for proxy container
 * `0.1.23`: Fix unpinned React.js dependencies preventing webui from loading
 * `0.1.22`: Fix auth-related imports that prevent the AWS proxy from starting

aws-proxy/aws_proxy/client/auth_proxy.py

@@ -17,6 +17,10 @@
 from localstack.config import external_service_url
 from localstack.constants import AWS_REGION_US_EAST_1, DOCKER_IMAGE_NAME_PRO, LOCALHOST_HOSTNAME
 from localstack.http import Request
+from localstack.pro.core.bootstrap.licensingv2 import (
+    ENV_LOCALSTACK_API_KEY,
+    ENV_LOCALSTACK_AUTH_TOKEN,
+)
 from localstack.utils.aws.aws_responses import requests_response
 from localstack.utils.bootstrap import setup_logging
 from localstack.utils.collections import select_attributes
@@ -37,18 +41,6 @@
 
 from .http2_server import run_server
 
-try:
-    from localstack.pro.core.bootstrap.licensingv2 import (
-        ENV_LOCALSTACK_API_KEY,
-        ENV_LOCALSTACK_AUTH_TOKEN,
-    )
-except ImportError:
-    # TODO remove once we don't need compatibility with <3.6 anymore
-    from localstack_ext.bootstrap.licensingv2 import (
-        ENV_LOCALSTACK_API_KEY,
-        ENV_LOCALSTACK_AUTH_TOKEN,
-    )
-
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.INFO)
 if localstack_config.DEBUG:

aws-proxy/aws_proxy/client/cli.py

@@ -4,26 +4,18 @@
 import click
 import yaml
 from localstack.cli import LocalstackCli, LocalstackCliPlugin, console
+from localstack.pro.core.cli.aws import aws
+from localstack.pro.core.config import is_auth_token_configured
 from localstack.utils.files import load_file
 
 from aws_proxy.shared.models import ProxyConfig, ProxyServiceConfig
 
-try:
-    from localstack.pro.core.bootstrap.auth import get_platform_auth_headers
-    from localstack.pro.core.cli.aws import aws
-    from localstack.pro.core.config import is_auth_token_configured
-except ImportError:
-    # Only support anything over version 3.6
-    from localstack.pro.core.bootstrap.auth import get_auth_headers as get_platform_auth_headers
-    from localstack.pro.core.cli.aws import aws
-    from localstack.pro.core.config import is_api_key_configured as is_auth_token_configured
-
 
 class AwsProxyPlugin(LocalstackCliPlugin):
     name = "aws-proxy"
 
     def should_load(self) -> bool:
-        return _is_logged_in() or is_auth_token_configured()
+        return is_auth_token_configured()
 
     def attach(self, cli: LocalstackCli) -> None:
         group: click.Group = cli.group
@@ -32,15 +24,6 @@ def attach(self, cli: LocalstackCli) -> None:
         aws.add_command(cmd_aws_proxy)
 
 
-# TODO: remove over time as we're phasing out the `login` command
-def _is_logged_in() -> bool:
-    try:
-        get_platform_auth_headers()
-        return True
-    except Exception:
-        return False
-
-
 @click.command(name="proxy", help="Start up an authentication proxy against real AWS")
 @click.option(
     "-s",