From 0daa262fdbaa98be0f7daca017c7896b4f3c3753 Mon Sep 17 00:00:00 2001 From: Vladimir Domnich Date: Thu, 7 Jul 2022 10:16:01 +0400 Subject: [PATCH] Add parameter S3_GATE_PUB_KEY. This enables us to test s3 gateway in real environment, not just in devenv. --- robot/resources/lib/python_keywords/s3_gate_bucket.py | 4 ++-- robot/variables/common.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/robot/resources/lib/python_keywords/s3_gate_bucket.py b/robot/resources/lib/python_keywords/s3_gate_bucket.py index 70561dd..fa38078 100644 --- a/robot/resources/lib/python_keywords/s3_gate_bucket.py +++ b/robot/resources/lib/python_keywords/s3_gate_bucket.py @@ -12,7 +12,7 @@ from robot.api import logger from robot.api.deco import keyword from cli_helpers import _run_with_passwd, log_command_execution -from common import GATE_PUB_KEY, NEOFS_ENDPOINT, S3_GATE +from common import S3_GATE_PUB_KEY, NEOFS_ENDPOINT, S3_GATE ########################################################## # Disabling warnings on self-signed certificate which the @@ -38,7 +38,7 @@ def init_s3_credentials(wallet, s3_bearer_rules_file: str = None): s3_bearer_rules = s3_bearer_rules_file or 'robot/resources/files/s3_bearer_rules.json' cmd = ( f'{NEOFS_EXEC} --debug --with-log --timeout {CREDENTIALS_CREATE_TIMEOUT} ' - f'issue-secret --wallet {wallet} --gate-public-key={GATE_PUB_KEY} ' + f'issue-secret --wallet {wallet} --gate-public-key={S3_GATE_PUB_KEY} ' f'--peer {NEOFS_ENDPOINT} --container-friendly-name {bucket} ' f'--bearer-rules {s3_bearer_rules}' ) diff --git a/robot/variables/common.py b/robot/variables/common.py index 2b70337..15cb3d4 100644 --- a/robot/variables/common.py +++ b/robot/variables/common.py @@ -31,7 +31,7 @@ NEOFS_CONTRACT = os.getenv("NEOFS_IR_CONTRACTS_NEOFS") ASSETS_DIR = os.getenv("ASSETS_DIR", "TemporaryDir/") MORPH_MAGIC = os.getenv("MORPH_MAGIC") -GATE_PUB_KEY = '0313b1ac3a8076e155a7e797b24f0b650cccad5941ea59d7cfd51a024a8b2a06bf' +S3_GATE_PUB_KEY = os.getenv("S3_GATE_PUB_KEY", '0313b1ac3a8076e155a7e797b24f0b650cccad5941ea59d7cfd51a024a8b2a06bf') DEVENV_SERVICES_PATH = f"{os.getenv('DEVENV_PATH')}/services"