revert(aws_mock): remove aws_mock, moto based tested replaces it

since we have replacement for the tests using this mock, we remove
all the code related to it

Author: fruch

Jenkinsfile

@@ -138,24 +138,6 @@ pipeline {
                 }
             }
         }
-        stage("run mocked tests") {
-            options {
-                timeout(time: 10, unit: 'MINUTES')
-            }
-            steps {
-                script {
-                    try {
-                        sh ''' ./docker/env/hydra.sh run-aws-mock -r us-east-1 '''
-                        sleep 10  // seconds
-                        sh ''' ./docker/env/hydra.sh --aws-mock run-pytest functional_tests/mocked '''
-                        pullRequestSetResult('success', 'jenkins/mocked_tests', 'All mocked tests are passed')
-                    } catch(Exception ex) {
-                        pullRequestSetResult('failure', 'jenkins/mocked_tests', 'Some mocked tests failed')
-                    }
-                    sh ''' ./docker/env/hydra.sh clean-aws-mocks '''
-                }
-            }
-        }
         stage("integration tests") {
             when {
                 expression {

docker/env/hydra.sh

@@ -21,7 +21,6 @@ CREATE_RUNNER_INSTANCE=""
 RUNNER_IP_FILE="${SCT_DIR}/sct_runner_ip"
 RUNNER_IP=""
 RUNNER_CMD=""
-AWS_MOCK=""
 
 HYDRA_DRY_RUN=""
 HYDRA_HELP=""
@@ -55,10 +54,6 @@ while [[ $# -gt 0 ]]; do
             RUNNER_IP="$2"
             shift 2
             ;;
-        --aws-mock)
-            AWS_MOCK="1"
-            shift
-            ;;
         --dry-run-hydra)
             HYDRA_DRY_RUN="1"
             shift
@@ -371,23 +366,6 @@ fi
 
 PREPARE_CMD="test"
 
-if [[ -n "${AWS_MOCK}" ]]; then
-    if [[ -z "${HYDRA_DRY_RUN}" ]]; then
-        AWS_MOCK_IP=$(${RUNNER_CMD} cat aws_mock_ip)
-        MOCKED_HOSTS=$(${RUNNER_CMD} openssl s_client -connect "${AWS_MOCK_IP}:443" </dev/null 2>/dev/null \
-                       | openssl x509 -noout -text \
-                       | grep -Po '(?<=DNS:)[^,]+')
-    else
-        AWS_MOCK_IP=127.0.0.1
-        MOCKED_HOSTS="aws-mock.itself scylla-qa-keystore.s3.amazonaws.com ec2.eu-west-2.amazonaws.com"
-    fi
-    for host in ${MOCKED_HOSTS}; do
-        echo "Mock requests to ${host} using ${AWS_MOCK_IP}"
-        DOCKER_ADD_HOST_ARGS+=(--add-host "${host}:${AWS_MOCK_IP}")
-    done
-    PREPARE_CMD+="; curl -sSk https://aws-mock.itself/install-ca.sh | bash"
-fi
-
 COMMAND=${HYDRA_COMMAND[0]}
 
 if [[ "$COMMAND" == *'bash'* ]] || [[ "$COMMAND" == *'python'* ]]; then

functional_tests/mocked/__init__.py

@@ -24,7 +24,6 @@
 import time
 import subprocess
 import traceback
-import uuid
 import pprint
 from concurrent.futures import ProcessPoolExecutor
 from pathlib import Path
@@ -109,7 +108,7 @@
 from sdcm.send_email import get_running_instances_for_email_report, read_email_data_from_file, build_reporter, \
     send_perf_email
 from sdcm.parallel_timeline_report.generate_pt_report import ParallelTimelinesReportGenerator
-from sdcm.utils.aws_utils import AwsArchType, is_using_aws_mock
+from sdcm.utils.aws_utils import AwsArchType
 from sdcm.utils.aws_okta import try_auth_with_okta
 from sdcm.utils.gce_utils import SUPPORTED_PROJECTS, gce_public_addresses
 from sdcm.utils.context_managers import environment
@@ -119,7 +118,6 @@
 import sdcm.provision.azure.utils as azure_utils
 from utils.build_system.create_test_release_jobs import JenkinsPipelines  # pylint: disable=no-name-in-module,import-error
 from utils.get_supported_scylla_base_versions import UpgradeBaseVersion  # pylint: disable=no-name-in-module,import-error
-from utils.mocks.aws_mock import AwsMock  # pylint: disable=no-name-in-module,import-error
 
 
 SUPPORTED_CLOUDS = ("aws", "gce", "azure",)
@@ -196,11 +194,10 @@ def cli():
     disable_loggers_during_startup()
     try_auth_with_okta()
 
-    if not is_using_aws_mock():
-        key_store = KeyStore()
-        # TODO: still leaving old keys, until we'll rebuild runner images - and reconfigure jenkins
-        key_store.sync(keys=['scylla-qa-ec2', 'scylla-test', 'scylla_test_id_ed25519'],
-                       local_path=Path('~/.ssh/').expanduser(), permissions=0o0600)
+    key_store = KeyStore()
+    # TODO: still leaving old keys, until we'll rebuild runner images - and reconfigure jenkins
+    key_store.sync(keys=['scylla-qa-ec2', 'scylla-test', 'scylla_test_id_ed25519'],
+                   local_path=Path('~/.ssh/').expanduser(), permissions=0o0600)
 
     docker_hub_login(remoter=LOCALRUNNER)
 
@@ -1643,40 +1640,6 @@ def clean_runner_instances(runner_ip, test_status, backend, dry_run, force):
         test_runner_ip=runner_ip, test_status=test_status, backend=backend, dry_run=dry_run, force=force)
 
 
-@cli.command("run-aws-mock", help="Start AWS Mock server Docker container")
-@click.option(
-    "-r", "--mock-region",
-    required=True,
-    multiple=True,
-    type=CloudRegion(cloud_provider="aws"),
-    help="Mock this AWS region",
-)
-@click.option("-f", "--force", is_flag=True, default=False, help="don't check aws_mock_ip")
-@click.option("-t", "--test-id", required=False, help="SCT Test ID")
-def run_aws_mock(mock_region: list[str], force: bool = False, test_id: str | None = None) -> None:
-    add_file_logger()
-    if test_id is None:
-        test_id = str(uuid.uuid4())
-    aws_mock_ip = AwsMock(test_id=test_id, regions=mock_region).run(force=force)
-    LOGGER.info("New mock for %r AWS regions started and listen on %s:443 (TestId=%s)",
-                mock_region, aws_mock_ip, test_id)
-
-
-@cli.command("clean-aws-mocks", help="Clean running AWS mock Docker containers")
-@click.option("-t", "--test-id", required=False, help="Clean AWS Mock container for test id")
-@click.option(
-    "-a", "--all", "all_mocks",
-    is_flag=True,
-    default=False,
-    help="Clean all AWS Mock containers running on this host",
-)
-@click.option('--verbose', is_flag=True, default=False, help="if enable, will log progress")
-@click.option("--dry-run", is_flag=True, default=False, help="dry run")
-def clean_aws_mocks(test_id: str | None, all_mocks: bool, verbose: bool, dry_run: bool) -> None:
-    add_file_logger()
-    AwsMock.clean(test_id=test_id, all_mocks=all_mocks, verbose=verbose, dry_run=dry_run)
-
-
 @cli.command("generate-pt-report", help="Generate parallel timelines representation for the SCT test events")
 @click.option("-t", "--test-id", envvar='SCT_TEST_ID', help="Test ID to search in sct-results")
 @click.option("-d", "--logdir", envvar='HOME', type=click.Path(exists=True),