tinybird 0.0.1.dev120__py3-none-any.whl → 0.0.1.dev121__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.dev120'
-__revision__ = 'a558f0d'
+__version__ = '0.0.1.dev121'
+__revision__ = '3609440'

tinybird/tb/client.py

@@ -1177,14 +1177,23 @@ class TinyB:
         except Exception:
             return False
 
-    async def get_trust_policy(self, service: str) -> Dict[str, Any]:
-        return await self._req(f"/v0/integrations/{service}/policies/trust-policy")
+    async def get_trust_policy(self, service: str, external_id_seed: Optional[str] = None) -> Dict[str, Any]:
+        params = {}
+        if external_id_seed:
+            params["external_id_seed"] = external_id_seed
+        return await self._req(f"/v0/integrations/{service}/policies/trust-policy?{urlencode(params)}")
 
-    async def get_access_write_policy(self, service: str) -> Dict[str, Any]:
-        return await self._req(f"/v0/integrations/{service}/policies/write-access-policy")
+    async def get_access_write_policy(self, service: str, bucket: Optional[str] = None) -> Dict[str, Any]:
+        params = {}
+        if bucket:
+            params["bucket"] = bucket
+        return await self._req(f"/v0/integrations/{service}/policies/write-access-policy?{urlencode(params)}")
 
-    async def get_access_read_policy(self, service: str) -> Dict[str, Any]:
-        return await self._req(f"/v0/integrations/{service}/policies/read-access-policy")
+    async def get_access_read_policy(self, service: str, bucket: Optional[str] = None) -> Dict[str, Any]:
+        params = {}
+        if bucket:
+            params["bucket"] = bucket
+        return await self._req(f"/v0/integrations/{service}/policies/read-access-policy?{urlencode(params)}")
 
     async def sql_get_format(self, sql: str, with_clickhouse_format: bool = False) -> str:
         try:

tinybird/tb/modules/common.py

@@ -1758,6 +1758,7 @@ async def run_aws_iamrole_connection_flow(
     client: TinyB,
     service: str,
     environment: str,
+    connection_name: str,
 ) -> Tuple[str, str, str]:
     if service == DataConnectorType.AMAZON_DYNAMODB:
         raise NotImplementedError("DynamoDB is not supported")
@@ -1771,8 +1772,9 @@ async def run_aws_iamrole_connection_flow(
     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, _ = await get_aws_iamrole_policies(client, service=service, policy="read")
-    access_policy = access_policy.replace("<bucket>", bucket_name)
+    access_policy, trust_policy, _ = await get_aws_iamrole_policies(
+        client, service=service, policy="read", bucket=bucket_name, external_id_seed=connection_name
+    )
 
     click.echo(FeedbackManager.prompt_s3_iamrole_connection_login_aws())
     click.echo(FeedbackManager.click_enter_to_continue())
@@ -1834,8 +1836,11 @@ async def production_aws_iamrole_only(
     region: str,
     bucket_name: str,
     environment: str,
+    connection_name: str,
 ) -> Tuple[str, str, str]:
-    _, trust_policy, external_id = await get_aws_iamrole_policies(prod_client, service=service, policy="read")
+    _, trust_policy, external_id = await get_aws_iamrole_policies(
+        prod_client, service=service, policy="read", bucket=bucket_name, external_id_seed=connection_name
+    )
 
     trust_policy_copied = True
     try:
@@ -1868,15 +1873,21 @@ async def production_aws_iamrole_only(
     return role_arn, region, external_id
 
 
-async def get_aws_iamrole_policies(client: TinyB, service: str, policy: str = "write"):
+async def get_aws_iamrole_policies(
+    client: TinyB,
+    service: str,
+    policy: str = "write",
+    bucket: Optional[str] = None,
+    external_id_seed: Optional[str] = None,
+):
     access_policy: Dict[str, Any] = {}
     if service == DataConnectorType.AMAZON_S3_IAMROLE:
         service = DataConnectorType.AMAZON_S3
     try:
         if policy == "write":
-            access_policy = await client.get_access_write_policy(service)
+            access_policy = await client.get_access_write_policy(service, bucket)
         elif policy == "read":
-            access_policy = await client.get_access_read_policy(service)
+            access_policy = await client.get_access_read_policy(service, bucket)
         else:
             raise Exception(f"Access policy {policy} not supported. Choose from 'read' or 'write'")
         if not len(access_policy) > 0:
@@ -1886,7 +1897,7 @@ async def get_aws_iamrole_policies(client: TinyB, service: str, policy: str = "w
 
     trust_policy: Dict[str, Any] = {}
     try:
-        trust_policy = await client.get_trust_policy(service)
+        trust_policy = await client.get_trust_policy(service, external_id_seed)
         if not len(trust_policy) > 0:
             raise Exception(f"{service.upper()} Integration not supported in this region")
     except Exception as e:
@@ -2187,30 +2198,6 @@ async def get_user_token(config: CLIConfig, user_token: Optional[str] = None) ->
     return user_token
 
 
-def get_ui_url(api_host: str) -> str:
-    """Transforms API URLs into their corresponding UI URLs.
-    Examples:
-        >>> get_ui_url("http://localhost:8000")
-        'https://cloud.tinybird.co/local/8000'
-        >>> get_ui_url("https://api.europe-west2.gcp.tinybird.co")
-        'https://cloud.tinybird.co/gcp/europe-west2'
-        >>> get_ui_url("https://other-domain.com")
-        'https://other-domain.com'
-    """
-    if "//localhost" in api_host:
-        port = api_host.split(":")[-1] or "80"
-        return f"https://cloud.tinybird.co/local/{port}"
-
-    if api_host.endswith("tinybird.co") and "api." in api_host:
-        parts = api_host.split(".")
-        if len(parts) >= 4:
-            region = parts[1] or "europe-west2"
-            cloud = parts[2] or "gcp"
-            return f"https://cloud.tinybird.co/{cloud}/{region}"
-
-    return api_host
-
-
 async def ask_for_organization(
     organizations: Optional[List[Dict[str, Any]]],
     organization_id: Optional[str] = None,

tinybird/tb/modules/connection.py

@@ -167,6 +167,7 @@ async def connection_create_s3(ctx: Context) -> None:
         client,
         service=service,
         environment=obj["env"],
+        connection_name=connection_name,
     )
     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}"
@@ -188,7 +189,12 @@ async def connection_create_s3(ctx: Context) -> None:
             staging=False,
         )
         prod_role_arn, _, _ = await production_aws_iamrole_only(
-            prod_client, service=service, region=region, bucket_name=bucket_name, environment="cloud"
+            prod_client,
+            service=service,
+            region=region,
+            bucket_name=bucket_name,
+            environment="cloud",
+            connection_name=connection_name,
         )
         await prod_client.create_secret(name=secret_name, value=prod_role_arn)
 

tinybird/tb/modules/open.py

@@ -3,8 +3,9 @@ import webbrowser
 import click
 from click import Context
 
+from tinybird.tb.config import get_display_cloud_host
 from tinybird.tb.modules.cli import cli
-from tinybird.tb.modules.common import coro, get_ui_url
+from tinybird.tb.modules.common import coro
 from tinybird.tb.modules.exceptions import CLIException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import get_build_workspace_name
@@ -24,7 +25,7 @@ async def open(ctx: Context, workspace: str):
     client = ctx.ensure_object(dict)["client"]
     env = ctx.ensure_object(dict)["env"]
 
-    url_host = get_ui_url(client.host)
+    url_host = get_display_cloud_host(client.host)
 
     if not workspace:
         workspace = get_build_workspace_name(config.get("path")) if env == "build" else config.get("name")

{tinybird-0.0.1.dev120.dist-info → tinybird-0.0.1.dev121.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev120
+Version: 0.0.1.dev121
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird

{tinybird-0.0.1.dev120.dist-info → tinybird-0.0.1.dev121.dist-info}/RECORD

@@ -12,17 +12,17 @@ tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=BZuPM7MFS7vaEKK5tOMR2bwSAgJudPrJt27uVEwZmTY,40512
-tinybird/tb/__cli__.py,sha256=UPIBtmA_KZNY0wM1HvtBDT0JZJO0puY_D9DLW6X0pDw,252
+tinybird/tb/__cli__.py,sha256=1cGs_hmW4A_t0Pyv4jLB4ukdRk4CeneW1ZKTnQ0BBEI,252
 tinybird/tb/cli.py,sha256=uDLwcbwSJfVFw-pceijZJqaq26z5jNsey0QaUGFjt7w,1097
-tinybird/tb/client.py,sha256=MxhpIC5lkL8JOaS1CxftmE_GxjYGBw4xx9yJzMFm3fM,55664
+tinybird/tb/client.py,sha256=oa0pR46WvzDoqpyaDU-lRu33I0cZhtZVDqDQz2RHMWQ,56085
 tinybird/tb/config.py,sha256=3bEyh6sECiAm41L9Nr_ALkvprMyuzvQSvVPrljFbg68,3790
 tinybird/tb/modules/auth.py,sha256=_OeYnmTH83lnqCgQEdS6K0bx1KBUeRmZk2M7JnRmWpk,9037
 tinybird/tb/modules/build.py,sha256=4yP8QJd2YYr1w9XWCSRqB6CztfVzN6gL75p32UYJvdc,15566
 tinybird/tb/modules/cicd.py,sha256=A7zJZF9HkJ6NPokplgNjmefMrpUlRbFxBbjMZhq5OTI,7110
 tinybird/tb/modules/cli.py,sha256=Y_5hu9xwyTIZw4bQoe0MYLnRIzmR7hUjql_oZBxd4Qg,13407
-tinybird/tb/modules/common.py,sha256=d5h5jSibRXcaDY3d4XkQ5cBjLwSWDPPPQOQFeAuNlV0,84081
+tinybird/tb/modules/common.py,sha256=J2Wjt1jTVMyUjQfgMKPwBKZ2qjHH8Zw-WvEYz0Kuc7Y,83466
 tinybird/tb/modules/config.py,sha256=ziqW_t_mRVvWOd85VoB4vKyvgMkEfpXDf9H4v38p2xc,11422
-tinybird/tb/modules/connection.py,sha256=BPU5Q4gGv6z0aJ8qjKoh5OLa6DTcBaOvEG7EtqJBoQg,6757
+tinybird/tb/modules/connection.py,sha256=ctrcZCksfBKJHv3pMoDzsmgmx-rlkfeyn2GkxM0Zlw0,6892
 tinybird/tb/modules/copy.py,sha256=2Mm4FWKehOG7CoOhiF1m9UZJgJn0W1_cMolqju8ONYg,5805
 tinybird/tb/modules/create.py,sha256=s0Hx4s4fqqJPlo3Nl2JvybrlaObzBt9ej4Cv5C93HdM,16576
 tinybird/tb/modules/datasource.py,sha256=-aQCK_-wEmoo92Ki7zr2wm424RchDgWvT6yhfFY5kko,16909
@@ -41,7 +41,7 @@ tinybird/tb/modules/login.py,sha256=rLYdV7MLCTT1F4VBAWGv6SO9efMiM9-977ayLecUzjI,
 tinybird/tb/modules/logout.py,sha256=ULooy1cDBD02-r7voZmhV7udA0ML5tVuflJyShrh56Y,1022
 tinybird/tb/modules/materialization.py,sha256=yIns8ypdFVLWwuCcvAZPBChsuJl2DIxJe6M8UCBHNsU,5752
 tinybird/tb/modules/mock.py,sha256=Z_1nYMO8mmjZkBjikqHNqSd4ssdmcfaXUqIh8jY-z6o,4519
-tinybird/tb/modules/open.py,sha256=s3eJLFtF6OnXX5OLZzBz58dYaG-TGDCYFSJHttm919g,1317
+tinybird/tb/modules/open.py,sha256=OuctINN77oexpSjth9uoIZPCelKO4Li-yyVxeSnk1io,1371
 tinybird/tb/modules/pipe.py,sha256=AQKEDagO6e3psPVjJkS_MDbn8aK-apAiLp26k7jgAV0,2432
 tinybird/tb/modules/project.py,sha256=Jpoi-3ybIixN8bHCqOMnuaKByXjrdN_Gvlpa24L-e4U,3124
 tinybird/tb/modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
@@ -79,8 +79,8 @@ tinybird/tb_cli_modules/config.py,sha256=IsgdtFRnUrkY8-Zo32lmk6O7u3bHie1QCxLwgp4
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
-tinybird-0.0.1.dev120.dist-info/METADATA,sha256=JesTFd-RCepauIp0A_ooi20zst3Gw9AoBkKxncAZbnI,1612
-tinybird-0.0.1.dev120.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev120.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev120.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev120.dist-info/RECORD,,
+tinybird-0.0.1.dev121.dist-info/METADATA,sha256=uKlfeGHHiFIM2jv7MxwcZfzCON7xyo3ErBcxCbSLKTc,1612
+tinybird-0.0.1.dev121.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev121.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev121.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev121.dist-info/RECORD,,