tinybird 0.0.1.dev117__py3-none-any.whl → 0.0.1.dev119__py3-none-any.whl

tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev117'
-__revision__ = 'f1a78c6'
+__version__ = '0.0.1.dev119'
+__revision__ = 'bbe4729'

tinybird/{client.py → tb/client.py}

@@ -15,7 +15,7 @@ from urllib3 import Retry
 
 from tinybird.ch_utils.constants import COPY_ENABLED_TABLE_FUNCTIONS
 from tinybird.syncasync import sync_to_async
-from tinybird.tb_cli_modules.telemetry import add_telemetry_event
+from tinybird.tb.modules.telemetry import add_telemetry_event
 
 HOST = "https://api.tinybird.co"
 LIMIT_RETRIES = 10

tinybird/tb/config.py

@@ -0,0 +1,96 @@
+import json
+from os import environ, getcwd
+from pathlib import Path
+from typing import Any, Dict, Optional
+
+import aiofiles
+import click
+
+from tinybird.tb import __cli__
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+
+try:
+    from tinybird.tb.__cli__ import __revision__
+except Exception:
+    __revision__ = ""
+
+DEFAULT_API_HOST = "https://api.tinybird.co"
+DEFAULT_LOCALHOST = "http://localhost:8001"
+CURRENT_VERSION = f"{__cli__.__version__}"
+VERSION = f"{__cli__.__version__} (rev {__revision__})"
+DEFAULT_UI_HOST = "https://cloud.tinybird.co"
+SUPPORTED_CONNECTORS = ["bigquery", "snowflake"]
+PROJECT_PATHS = ["datasources", "datasources/fixtures", "endpoints", "pipes", "tests", "scripts", "deploy"]
+DEPRECATED_PROJECT_PATHS = ["endpoints"]
+MIN_WORKSPACE_ID_LENGTH = 36
+
+CLOUD_HOSTS = {
+    "https://api.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west3",
+    "https://api.us-east.tinybird.co": "https://cloud.tinybird.co/gcp/us-east4",
+    "https://api.us-east.aws.tinybird.co": "https://cloud.tinybird.co/aws/us-east-1",
+    "https://api.us-west-2.aws.tinybird.co": "https://cloud.tinybird.co/aws/us-west-2",
+    "https://api.eu-central-1.aws.tinybird.co": "https://cloud.tinybird.co/aws/eu-central-1",
+    "https://api.eu-west-1.aws.tinybird.co": "https://cloud.tinybird.co/aws/eu-west-1",
+    "https://api.europe-west2.gcp.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west2",
+    "https://api.ap-east.aws.tinybird.co": "https://cloud.tinybird.co/aws/ap-east",
+    "https://ui.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west3",
+    "https://ui.us-east.tinybird.co": "https://cloud.tinybird.co/gcp/us-east4",
+    "https://ui.us-east.aws.tinybird.co": "https://cloud.tinybird.co/aws/us-east-1",
+    "https://ui.us-west-2.aws.tinybird.co": "https://cloud.tinybird.co/aws/us-west-2",
+    "https://ui.eu-central-1.aws.tinybird.co": "https://cloud.tinybird.co/aws/eu-central-1",
+    "https://ui.europe-west2.gcp.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west2",
+}
+
+
+async def get_config(
+    host: str, token: Optional[str], semver: Optional[str] = None, config_file: Optional[str] = None
+) -> Dict[str, Any]:
+    if host:
+        host = host.rstrip("/")
+
+    config = {}
+    try:
+        async with aiofiles.open(config_file or Path(getcwd()) / ".tinyb") as file:
+            res = await file.read()
+            config = json.loads(res)
+    except OSError:
+        pass
+    except json.decoder.JSONDecodeError:
+        click.echo(FeedbackManager.error_load_file_config(config_file=config_file))
+        return config
+
+    config["token_passed"] = token
+    config["token"] = token or config.get("token", None)
+    config["semver"] = semver or config.get("semver", None)
+    config["host"] = host or config.get("host", DEFAULT_API_HOST)
+    config["workspaces"] = config.get("workspaces", [])
+    config["cwd"] = config.get("cwd", getcwd())
+    return config
+
+
+async def write_config(config: Dict[str, Any], dest_file: str = ".tinyb"):
+    config_file = Path(getcwd()) / dest_file
+    async with aiofiles.open(config_file, "w") as file:
+        await file.write(json.dumps(config, indent=4, sort_keys=True))
+
+
+def get_display_cloud_host(api_host: str) -> str:
+    is_local = "localhost" in api_host
+    if is_local:
+        port = api_host.split(":")[-1]
+        return f"http://cloud.tinybird.co/local/{port}"
+    return CLOUD_HOSTS.get(api_host, api_host)
+
+
+class FeatureFlags:
+    @classmethod
+    def ignore_sql_errors(cls) -> bool:  # Context: #1155
+        return "TB_IGNORE_SQL_ERRORS" in environ
+
+    @classmethod
+    def is_localhost(cls) -> bool:
+        return "SET_LOCALHOST" in environ
+
+    @classmethod
+    def enable_snowflake_connector_command(cls) -> bool:
+        return "ENABLE_SNOWFLAKE_CONNECTOR_COMMAND" in environ

tinybird/tb/modules/auth.py

@@ -9,7 +9,7 @@ from typing import Any, Dict, List, Optional
 import click
 import humanfriendly.tables
 
-from tinybird.config import get_display_cloud_host
+from tinybird.tb.config import get_display_cloud_host
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import (
     configure_connector,

tinybird/tb/modules/build.py

@@ -14,7 +14,7 @@ import click
 import requests
 
 import tinybird.context as context
-from tinybird.client import TinyB
+from tinybird.tb.client import TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import push_data
 from tinybird.tb.modules.config import CLIConfig

tinybird/tb/modules/cli.py

@@ -17,25 +17,22 @@ import click
 import humanfriendly
 from click import Context
 
-from tinybird.client import (
+from tinybird.tb import __cli__
+from tinybird.tb.client import (
     AuthException,
     AuthNoTokenException,
-    TinyB,
 )
-from tinybird.tb import __cli__
 from tinybird.tb.modules.common import (
     CatchAuthExceptions,
     CLIException,
     _get_tb_client,
     coro,
     echo_safe_format_table,
-    get_current_main_workspace,
     getenv_bool,
     try_update_config_with_remote,
 )
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.datafile.build import build_graph
-from tinybird.tb.modules.datafile.diff import diff_command
 from tinybird.tb.modules.datafile.pull import folder_pull
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import get_tinybird_local_client
@@ -165,74 +162,6 @@ async def pull(ctx: Context, force: bool, fmt: bool) -> None:
     return await folder_pull(client, project.path, force, fmt=fmt)
 
 
-@cli.command(
-    name="diff",
-    short_help="Diff local datafiles to the corresponding remote files in the workspace. Only diffs VERSION and SCHEMA for .datasource files.",
-)
-@click.argument("filename", type=click.Path(exists=True), nargs=-1, required=False)
-@click.option(
-    "--fmt/--no-fmt",
-    is_flag=True,
-    default=True,
-    help="Format files before doing the diff, default is True so both files match the format",
-)
-@click.option("--no-color", is_flag=True, default=False, help="Don't colorize diff")
-@click.option(
-    "--no-verbose", is_flag=True, default=False, help="List the resources changed not the content of the diff"
-)
-@click.option(
-    "--main",
-    is_flag=True,
-    default=False,
-    help="Diff local datafiles to the corresponding remote files in the main workspace. Only works when authenticated on a Branch.",
-    hidden=True,
-)
-@click.pass_context
-@coro
-async def diff(
-    ctx: Context, filename: Optional[Tuple], fmt: bool, no_color: bool, no_verbose: bool, main: bool
-) -> None:
-    only_resources_changed = no_verbose
-    client: TinyB = ctx.ensure_object(dict)["client"]
-
-    if not main:
-        changed = await diff_command(
-            list(filename) if filename else None, fmt, client, no_color, with_print=not only_resources_changed
-        )
-    else:
-        config = CLIConfig.get_project_config()
-
-        response = await client.user_workspaces_and_branches(version="v1")
-        ws_client = None
-        for workspace in response["workspaces"]:
-            if config["id"] == workspace["id"]:
-                if not workspace.get("is_branch"):
-                    raise CLIException(FeedbackManager.error_not_a_branch())
-
-                origin = workspace["main"]
-                workspace = await get_current_main_workspace(config)
-
-                if not workspace:
-                    raise CLIException(FeedbackManager.error_workspace(workspace=origin))
-
-                ws_client = _get_tb_client(workspace["token"], config["host"])
-                break
-
-        if not ws_client:
-            raise CLIException(FeedbackManager.error_workspace(workspace=origin))
-        changed = await diff_command(
-            list(filename) if filename else None, fmt, ws_client, no_color, with_print=not only_resources_changed
-        )
-
-    if only_resources_changed:
-        click.echo("\n")
-        for resource, status in dict(sorted(changed.items(), key=lambda item: str(item[1]))).items():
-            if status is None:
-                continue
-            status = "changed" if status not in ["remote", "local", "shared"] else status
-            click.echo(f"{status}: {resource}")
-
-
 @cli.command()
 @click.argument("query", required=False)
 @click.option("--rows_limit", default=100, help="Max number of rows retrieved")

tinybird/tb/modules/common.py

@@ -35,7 +35,7 @@ from humanfriendly.tables import format_pretty_table
 from packaging.version import Version
 from thefuzz import process
 
-from tinybird.client import (
+from tinybird.tb.client import (
     AuthException,
     AuthNoTokenException,
     DoesNotExistException,
@@ -43,7 +43,7 @@ from tinybird.client import (
     OperationCanNotBePerformed,
     TinyB,
 )
-from tinybird.config import (
+from tinybird.tb.config import (
     DEFAULT_API_HOST,
     DEFAULT_UI_HOST,
     SUPPORTED_CONNECTORS,
@@ -518,7 +518,10 @@ def get_region_info(ctx, region=None):
     api_host = format_host(
         region["api_host"] if region else ctx.obj["config"].get("host", DEFAULT_API_HOST), subdomain="api"
     )
-    ui_host = format_host(region["host"] if region else ctx.obj["config"].get("host", DEFAULT_UI_HOST), subdomain="ui")
+    ui_host = format_host(
+        region["host"] if region else ctx.obj["config"].get("host", DEFAULT_UI_HOST), subdomain="cloud"
+    )
+
     return name, api_host, ui_host
 
 
@@ -553,13 +556,13 @@ def format_host(host: str, subdomain: Optional[str] = None) -> str:
     if subdomain and not is_localhost:
         url_info = urlparse(host)
         current_subdomain = url_info.netloc.split(".")[0]
-        if current_subdomain in ("api", "ui"):
+        if current_subdomain in ("api", "ui", "app", "cloud"):
             host = host.replace(current_subdomain, subdomain)
     if "localhost" in host or is_localhost:
         host = f"http://{host}" if "http" not in host else host
     elif not host.startswith("http"):
         host = f"https://{host}"
-    return host
+    return host.replace("app.tinybird.co", "cloud.tinybird.co")
 
 
 def region_from_host(region_name_or_host, regions):
@@ -1506,7 +1509,7 @@ async def try_authenticate(
     ui_host: str
     token: Optional[str]
     if host and not selected_region:
-        name, api_host, ui_host = (host, format_host(host, subdomain="api"), format_host(host, subdomain="ui"))
+        name, api_host, ui_host = (host, format_host(host, subdomain="api"), format_host(host, subdomain="cloud"))
         token = config.get_token()
     else:
         name, api_host, ui_host = get_region_info(config, selected_region)
@@ -1754,27 +1757,26 @@ async def remove_release(
 async def run_aws_iamrole_connection_flow(
     client: TinyB,
     service: str,
-    policy: str = "read",
-):
+    environment: str,
+) -> Tuple[str, str, str]:
     if service == DataConnectorType.AMAZON_DYNAMODB:
-        raise NotImplementedError("DynamoDB is not supported yet")
+        raise NotImplementedError("DynamoDB is not supported")
 
-    resource_type = "table" if service == DataConnectorType.AMAZON_DYNAMODB else "bucket"
-    resource_name = click.prompt(f"Enter the name of the {resource_type}")
-    validate_string_connector_param(resource_type.capitalize(), resource_name)
+    bucket_name = click.prompt(
+        "📦 Bucket name (specific name recommended, use '*' for unrestricted access in IAM policy)",
+        prompt_suffix="\n> ",
+    )
+    validate_string_connector_param("Bucket", bucket_name)
 
-    resource_region = click.prompt(f"Enter the region where the {resource_type} is located")
-    validate_string_connector_param("Region", resource_region)
+    region = click.prompt("🌐 Region (the region where the bucket is located, e.g. 'us-east-1')", prompt_suffix="\n> ")
+    validate_string_connector_param("Region", region)
 
-    access_policy, trust_policy, external_id = await get_aws_iamrole_policies(client, service=service, policy=policy)
-    access_policy = access_policy.replace("<bucket>", resource_name)
+    access_policy, trust_policy, _ = await get_aws_iamrole_policies(client, service=service, policy="read")
+    access_policy = access_policy.replace("<bucket>", bucket_name)
 
-    if not click.confirm(
-        FeedbackManager.prompt_s3_iamrole_connection_login_aws(),
-        show_default=False,
-        prompt_suffix="Press y to continue:",
-    ):
-        sys.exit(1)
+    click.echo(FeedbackManager.prompt_s3_iamrole_connection_login_aws())
+    click.echo(FeedbackManager.click_enter_to_continue())
+    input()
 
     access_policy_copied = True
     try:
@@ -1782,16 +1784,58 @@ async def run_aws_iamrole_connection_flow(
     except Exception:
         access_policy_copied = False
 
-    if not click.confirm(
+    # Display message and wait for user to press Enter
+    click.echo(
+        FeedbackManager.prompt_s3_iamrole_connection_policy(
+            access_policy=access_policy, aws_region=region, bucket=bucket_name
+        )
+        if access_policy_copied
+        else FeedbackManager.prompt_s3_iamrole_connection_policy_not_copied(
+            access_policy=access_policy, aws_region=region, bucket=bucket_name
+        )
+    )
+    click.echo(FeedbackManager.click_enter_to_continue())
+    input()
+
+    trust_policy_copied = True
+    try:
+        pyperclip.copy(trust_policy)
+    except Exception:
+        trust_policy_copied = False
+
+    role_arn = click.prompt(
         (
-            FeedbackManager.prompt_s3_iamrole_connection_policy(access_policy=access_policy)
-            if access_policy_copied
-            else FeedbackManager.prompt_s3_iamrole_connection_policy_not_copied(access_policy=access_policy)
+            FeedbackManager.prompt_s3_iamrole_connection_role(
+                trust_policy=trust_policy,
+                aws_region=region,
+                bucket=bucket_name,
+                environment=environment.upper(),
+                step="3",
+            )
+            if trust_policy_copied
+            else FeedbackManager.prompt_s3_iamrole_connection_role_not_copied(
+                trust_policy=trust_policy,
+                aws_region=region,
+                bucket=bucket_name,
+                environment=environment.upper(),
+                step="3",
+            )
         ),
         show_default=False,
-        prompt_suffix="Press y to continue:",
-    ):
-        sys.exit(1)
+    )
+    validate_string_connector_param("Role ARN", role_arn)
+
+    return role_arn, region, bucket_name
+
+
+async def production_aws_iamrole_only(
+    prod_client: TinyB,
+    service: str,
+    region: str,
+    bucket_name: str,
+    environment: str,
+) -> Tuple[str, str, str]:
+    _, trust_policy, external_id = await get_aws_iamrole_policies(prod_client, service=service, policy="read")
 
     trust_policy_copied = True
     try:
@@ -1799,21 +1843,29 @@ async def run_aws_iamrole_connection_flow(
     except Exception:
         trust_policy_copied = False
 
-    if not click.confirm(
+    role_arn = click.prompt(
         (
-            FeedbackManager.prompt_s3_iamrole_connection_role(trust_policy=trust_policy)
+            FeedbackManager.prompt_s3_iamrole_connection_role(
+                trust_policy=trust_policy,
+                aws_region=region,
+                bucket=bucket_name,
+                environment=environment.upper(),
+                step="4",
+            )
             if trust_policy_copied
-            else FeedbackManager.prompt_s3_iamrole_connection_role_not_copied(trust_policy=trust_policy)
+            else FeedbackManager.prompt_s3_iamrole_connection_role_not_copied(
+                trust_policy=trust_policy,
+                aws_region=region,
+                bucket=bucket_name,
+                environment=environment.upper(),
+                step="4",
+            )
         ),
         show_default=False,
-        prompt_suffix="Press y to continue:",
-    ):
-        sys.exit(1)
-
-    role_arn = click.prompt("Enter the ARN of the role you just created")
+    )
     validate_string_connector_param("Role ARN", role_arn)
 
-    return role_arn, resource_region, external_id
+    return role_arn, region, external_id
 
 
 async def get_aws_iamrole_policies(client: TinyB, service: str, policy: str = "write"):
@@ -1846,16 +1898,35 @@ async def get_aws_iamrole_policies(client: TinyB, service: str, policy: str = "w
     return json.dumps(access_policy, indent=4), json.dumps(trust_policy, indent=4), external_id
 
 
-async def validate_aws_iamrole_connection_name(client: TinyB) -> str:
+def get_s3_connection_name(project_folder: str) -> str:
     connection_name = None
+    valid_pattern = r"^[a-zA-Z][a-zA-Z0-9_]*$"
+
     while not connection_name:
-        connection_name = click.prompt("Enter the name for this connection", default=None, show_default=False)
+        connection_name = click.prompt(
+            "🔗 Enter a name for your new Tinybird S3 connection (use alphanumeric characters, and underscores)",
+            prompt_suffix="\n> ",
+            show_default=True,
+        )
         assert isinstance(connection_name, str)
 
-        if await client.get_connector(connection_name) is not None:
-            click.echo(FeedbackManager.info_connection_already_exists(name=connection_name))
+        # Validate against invalid characters
+        if not re.match(valid_pattern, connection_name):
+            if not connection_name[0].isalpha():
+                click.echo("Error: Connection name must start with a letter.")
+            else:
+                click.echo("Error: Connection name can only contain letters, numbers, and underscores.")
             connection_name = None
-    assert isinstance(connection_name, str)
+            continue
+
+        # Check for existing connection with the same name
+        project_folder_path = Path(project_folder)
+        connection_files = list(project_folder_path.glob("*.connection"))
+        for conn_file in connection_files:
+            if conn_file.stem == connection_name:
+                click.echo(FeedbackManager.error_connection_file_already_exists(name=f"{connection_name}.connection"))
+                connection_name = None
+                break
     return connection_name
 
 

tinybird/tb/modules/config.py

@@ -8,8 +8,8 @@ from urllib.parse import urlparse
 
 from packaging import version
 
-import tinybird.client as tbc
-from tinybird.config import CURRENT_VERSION, DEFAULT_API_HOST, DEFAULT_LOCALHOST
+import tinybird.tb.client as tbc
+from tinybird.tb.config import CURRENT_VERSION, DEFAULT_API_HOST, DEFAULT_LOCALHOST
 
 APP_CONFIG_NAME = "tinybird"
 

tinybird/tb/modules/connection.py

@@ -3,22 +3,24 @@
 # - If it makes sense and only when strictly necessary, you can create utility functions in this file.
 # - But please, **do not** interleave utility functions and command definitions.
 
+import uuid
 from typing import Any, Dict, List, Optional
 
 import click
 from click import Context
 
-from tinybird.client import TinyB
+from tinybird.tb.client import TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import (
     DataConnectorType,
     _get_setting_value,
     coro,
     echo_safe_humanfriendly_tables_format_smart_table,
+    get_s3_connection_name,
+    production_aws_iamrole_only,
     run_aws_iamrole_connection_flow,
-    validate_aws_iamrole_connection_name,
 )
-from tinybird.tb.modules.create import generate_aws_iamrole_connection_file
+from tinybird.tb.modules.create import generate_aws_iamrole_connection_file_with_secret
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
 
@@ -148,20 +150,50 @@ async def connection_create_s3(ctx: Context) -> None:
     project: Project = ctx.ensure_object(dict)["project"]
     obj: Dict[str, Any] = ctx.ensure_object(dict)
     client: TinyB = obj["client"]
+
     service = DataConnectorType.AMAZON_S3
-    connection_name = await validate_aws_iamrole_connection_name(client)
-    role_arn, region, external_id = await run_aws_iamrole_connection_flow(
+    click.echo(FeedbackManager.prompt_s3_connection_header())
+    connection_name = get_s3_connection_name(project.folder)
+    role_arn, region, bucket_name = await run_aws_iamrole_connection_flow(
         client,
         service=service,
-        policy="read",  # For now only read since we only support import from S3
+        environment=obj["env"],
+    )
+    unique_suffix = uuid.uuid4().hex[:8]  # Use first 8 chars of a UUID for brevity
+    secret_name = f"s3_role_arn_{connection_name}_{unique_suffix}"
+    await client.create_secret(name=secret_name, value=role_arn)
+
+    create_in_cloud = (
+        click.confirm(FeedbackManager.prompt_s3_iamrole_success_cloud(), default=True)
+        if obj["env"] == "local"
+        else False
     )
 
-    await generate_aws_iamrole_connection_file(
-        name=connection_name, service=service, role_arn=role_arn, region=region, folder=project.folder
+    if create_in_cloud:
+        prod_config = obj["config"]
+        host = prod_config["host"]
+        token = prod_config["token"]
+        prod_client = TinyB(
+            token=token,
+            host=host,
+            staging=False,
+        )
+        prod_role_arn, _, _ = await production_aws_iamrole_only(
+            prod_client, service=service, region=region, bucket_name=bucket_name, environment="cloud"
+        )
+        await prod_client.create_secret(name=secret_name, value=prod_role_arn)
+
+    connection_file_path = await generate_aws_iamrole_connection_file_with_secret(
+        name=connection_name,
+        service=service,
+        role_arn_secret_name=secret_name,
+        region=region,
+        folder=project.folder,
     )
-    if external_id:
-        click.echo(
-            FeedbackManager.success_s3_iam_connection_created(
-                connection_name=connection_name, external_id=external_id, role_arn=role_arn
-            )
+
+    click.echo(
+        FeedbackManager.prompt_s3_iamrole_success(
+            connection_name=connection_name,
+            connection_path=str(connection_file_path),
         )
+    )

tinybird/tb/modules/copy.py

@@ -10,7 +10,7 @@ from typing import Optional, Tuple
 import click
 from click import Context
 
-from tinybird.client import AuthNoTokenException, TinyB
+from tinybird.tb.client import AuthNoTokenException, TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import coro, echo_safe_humanfriendly_tables_format_smart_table, wait_job
 from tinybird.tb.modules.datafile.common import get_name_version

tinybird/tb/modules/create.py

@@ -5,8 +5,8 @@ from typing import Optional, Tuple
 
 import click
 
-from tinybird.client import TinyB
 from tinybird.prompts import create_prompt, mock_prompt, readme_prompt, rules_prompt
+from tinybird.tb.client import TinyB
 from tinybird.tb.modules.cicd import init_cicd
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import _generate_datafile, coro, generate_datafile
@@ -362,26 +362,27 @@ def generate_pipe_file(name: str, content: str, folder: str) -> Path:
     return f.relative_to(folder)
 
 
-def generate_connection_file(name: str, content: str, folder: str) -> Path:
+def generate_connection_file(name: str, content: str, folder: str, skip_feedback: bool = False) -> Path:
     base = Path(folder) / "connections"
     if not base.exists():
         base.mkdir()
     f = base / (f"{name}.connection")
     with open(f"{f}", "w") as file:
         file.write(content)
-    click.echo(FeedbackManager.info_file_created(file=f.relative_to(folder)))
+    if not skip_feedback:
+        click.echo(FeedbackManager.info_file_created(file=f.relative_to(folder)))
     return f.relative_to(folder)
 
 
-async def generate_aws_iamrole_connection_file(
-    name: str, service: str, role_arn: str, region: str, folder: str
-) -> None:
+async def generate_aws_iamrole_connection_file_with_secret(
+    name: str, service: str, role_arn_secret_name: str, region: str, folder: str
+) -> Path:
     content = f"""TYPE {service}
-
-S3_ARN {role_arn}
+S3_ARN {{{{ tb_secret("{role_arn_secret_name}") }}}}
 S3_REGION {region}
 """
-    generate_connection_file(name, content, folder)
+    file_path = generate_connection_file(name, content, folder, skip_feedback=True)
+    return file_path
 
 
 def create_rules(folder: str, source: str, agent: str):

tinybird/tb/modules/datafile/build.py

@@ -11,9 +11,9 @@ from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Union
 import click
 from toposort import toposort
 
-from tinybird.client import TinyB
 from tinybird.sql import parse_table_structure, schema_to_sql_columns
 from tinybird.sql_template import get_used_tables_in_template, render_sql_template
+from tinybird.tb.client import TinyB
 from tinybird.tb.modules.common import get_ca_pem_content
 from tinybird.tb.modules.datafile.build_datasource import is_datasource
 from tinybird.tb.modules.datafile.build_pipe import (

tinybird/tb/modules/datafile/build_common.py

@@ -2,7 +2,7 @@ from typing import Any, Dict, List, Optional, Tuple
 
 import click
 
-from tinybird.client import DoesNotExistException, TinyB
+from tinybird.tb.client import DoesNotExistException, TinyB
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 

tinybird/tb/modules/datafile/build_datasource.py

@@ -5,7 +5,7 @@ from typing import Any, Dict, List, Optional
 
 import click
 
-from tinybird.client import DoesNotExistException, TinyB
+from tinybird.tb.client import DoesNotExistException, TinyB
 from tinybird.tb.modules.datafile.common import PREVIEW_CONNECTOR_SERVICES, ImportReplacements
 from tinybird.tb.modules.feedback_manager import FeedbackManager