tinybird-cli 3.9.1.dev3__tar.gz → 3.9.1.dev5__tar.gz

{tinybird-cli-3.9.1.dev3 → tinybird-cli-3.9.1.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.9.1.dev3
+Version: 3.9.1.dev5
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -16,7 +16,18 @@ Tinybird CLI
 The Tinybird command-line tool allows you to use all the Tinybird functionality directly from the command line. Additionally, it includes several functions to create and manage data projects easily.
 
 Changelog
----------
+----------
+
+3.9.1.dev5
+************
+
+- `Added` support for adding multiple tokens when pushing a `.datasource` file
+
+
+3.9.1.dev4
+************
+
+- `Fixed` s3 iamrole connection creation will not fail when `pbcopy` dependency is not available
 
 3.9.1.dev3
 ************

{tinybird-cli-3.9.1.dev3 → tinybird-cli-3.9.1.dev5}/tinybird/__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__ = '3.9.1.dev3'
-__revision__ = '0a0da3f'
+__version__ = '3.9.1.dev5'
+__revision__ = 'af5d9ca'

{tinybird-cli-3.9.1.dev3 → tinybird-cli-3.9.1.dev5}/tinybird/datafile.py

@@ -2943,20 +2943,18 @@ async def new_ds(
         for tk in ds["tokens"]:
             token_name = tk["token_name"]
             t = await client.get_token_by_name(token_name)
-            if t:
-                break
-        if not t:
-            token_name = tk["token_name"]
-            click.echo(FeedbackManager.info_create_not_found_token(token=token_name))
-            # DS == token_origin.Origins.DATASOURCE
-            await client.create_token(token_name, f"DATASOURCES:{tk['permissions']}:{ds_name}", "DS", ds_name)
-        else:
-            click.echo(FeedbackManager.info_create_found_token(token=token_name))
-            scopes = [f"DATASOURCES:{tk['permissions']}:{ds_name}"]
-            for x in t["scopes"]:
-                sc = x["type"] if "resource" not in x else f"{x['type']}:{x['resource']}"
-                scopes.append(sc)
-            await client.alter_tokens(token_name, scopes)
+            if not t:
+                token_name = tk["token_name"]
+                click.echo(FeedbackManager.info_create_not_found_token(token=token_name))
+                # DS == token_origin.Origins.DATASOURCE
+                await client.create_token(token_name, f"DATASOURCES:{tk['permissions']}:{ds_name}", "DS", ds_name)
+            else:
+                click.echo(FeedbackManager.info_create_found_token(token=token_name))
+                scopes = [f"DATASOURCES:{tk['permissions']}:{ds_name}"]
+                for x in t["scopes"]:
+                    sc = x["type"] if "resource" not in x else f"{x['type']}:{x['resource']}"
+                    scopes.append(sc)
+                await client.alter_tokens(token_name, scopes)
 
     try:
         existing_ds = await client.get_datasource(ds_name)

{tinybird-cli-3.9.1.dev3 → tinybird-cli-3.9.1.dev5}/tinybird/feedback_manager.py

@@ -405,10 +405,15 @@ Ready? """
     prompt_s3_iamrole_connection_policy = prompt_message(
         """\n[2] Go to IAM > Policies. Create a new policy with the following permissions. Please, replace <bucket> with your bucket name:\n\n{access_policy}\n\n(The policy has been copied to your clipboard)\n\n"""
     )
+    prompt_s3_iamrole_connection_policy_not_copied = prompt_message(
+        """\n[2] Go to IAM > Policies. Create a new policy with the following permissions. Please, copy this policy and replace <bucket> with your bucket name:\n\n{access_policy}\n\n"""
+    )
     prompt_s3_iamrole_connection_role = prompt_message(
         """\n[3] Go to IAM > Roles. Create a new IAM Role using the following custom trust policy and attach the access policy you just created in the previous step:\n\n{trust_policy}\n\n(The policy has been copied to your clipboard)\n\n"""
     )
-
+    prompt_s3_iamrole_connection_role_not_copied = prompt_message(
+        """\n[3] Go to IAM > Roles. Create a new IAM Role using the following custom trust policy and attach the access policy you just created in the previous step:\n\n{trust_policy}\n\n"""
+    )
     prompt_init_git_release_pull = prompt_message(
         "❓ Download the Data Project to continue, otherwise you can't initialize Workspace with Git. Execute '{pull_command}'?"
     )

{tinybird-cli-3.9.1.dev3 → tinybird-cli-3.9.1.dev5}/tinybird/tb_cli_modules/connection.py

@@ -772,17 +772,35 @@ async def connection_create_s3_iamrole(
                 ):
                     sys.exit(1)
 
-                pyperclip.copy(access_policy)
+                access_policy_copied = True
+                try:
+                    pyperclip.copy(access_policy)
+                except Exception:
+                    access_policy_copied = False
+
                 if not click.confirm(
-                    FeedbackManager.prompt_s3_iamrole_connection_policy(access_policy=access_policy),
+                    (
+                        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)
+                    ),
                     show_default=False,
                     prompt_suffix="Press y to continue:",
                 ):
                     sys.exit(1)
 
-                pyperclip.copy(trust_policy)
+                trust_policy_copied = True
+                try:
+                    pyperclip.copy(trust_policy)
+                except Exception:
+                    trust_policy_copied = False
+
                 if not click.confirm(
-                    FeedbackManager.prompt_s3_iamrole_connection_role(trust_policy=trust_policy),
+                    (
+                        FeedbackManager.prompt_s3_iamrole_connection_role(trust_policy=trust_policy)
+                        if trust_policy_copied
+                        else FeedbackManager.prompt_s3_iamrole_connection_role_not_copied(trust_policy=trust_policy)
+                    ),
                     show_default=False,
                     prompt_suffix="Press y to continue:",
                 ):

{tinybird-cli-3.9.1.dev3 → tinybird-cli-3.9.1.dev5}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.9.1.dev3
+Version: 3.9.1.dev5
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -16,7 +16,18 @@ Tinybird CLI
 The Tinybird command-line tool allows you to use all the Tinybird functionality directly from the command line. Additionally, it includes several functions to create and manage data projects easily.
 
 Changelog
----------
+----------
+
+3.9.1.dev5
+************
+
+- `Added` support for adding multiple tokens when pushing a `.datasource` file
+
+
+3.9.1.dev4
+************
+
+- `Fixed` s3 iamrole connection creation will not fail when `pbcopy` dependency is not available
 
 3.9.1.dev3
 ************