tinybird 0.0.1.dev230__tar.gz → 0.0.1.dev232__tar.gz

{tinybird-0.0.1.dev230 → tinybird-0.0.1.dev232}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev230
+Version: 0.0.1.dev232
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev230 → tinybird-0.0.1.dev232}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev230'
-__revision__ = '45e2fd2'
+__version__ = '0.0.1.dev232'
+__revision__ = 'd58086c'

{tinybird-0.0.1.dev230 → tinybird-0.0.1.dev232}/tinybird/tb/modules/connection.py

@@ -398,6 +398,15 @@ async def connection_create_kafka(ctx: Context) -> Tuple[str, str, str, str, str
         except Exception as e:
             raise CLIConnectionException(FeedbackManager.error(message=str(e)))
 
+    security_protocol_options = ["SASL_SSL", "PLAINTEXT"]
+    security_protocol = click.prompt(
+        FeedbackManager.highlight(message="? Security Protocol (SASL_SSL, PLAINTEXT) [SASL_SSL]"),
+        type=click.Choice(security_protocol_options),
+        show_default=False,
+        show_choices=False,
+        default="SASL_SSL",
+    )
+
     sasl_mechanism_options = ["PLAIN", "SCRAM-SHA-256", "SCRAM-SHA-512"]
     sasl_mechanism = click.prompt(
         FeedbackManager.highlight(message="? SASL Mechanism (PLAIN, SCRAM-SHA-256, SCRAM-SHA-512) [PLAIN]"),
@@ -455,7 +464,7 @@ async def connection_create_kafka(ctx: Context) -> Tuple[str, str, str, str, str
     )
     validate_kafka_auto_offset_reset(auto_offset_reset)
     click.echo(FeedbackManager.gray(message="» Validating connection..."))
-    security_protocol = "SASL_SSL"
+
     topics = list_kafka_topics(bootstrap_servers, key, secret, security_protocol, sasl_mechanism)
 
     if topics is None:
@@ -470,11 +479,11 @@ async def connection_create_kafka(ctx: Context) -> Tuple[str, str, str, str, str
         tb_secret_key=tb_secret_key,
         secret=secret,
         tb_secret_secret=tb_secret_secret,
-        security_protocol="SASL_SSL",
+        security_protocol=security_protocol,
         sasl_mechanism=sasl_mechanism,
         folder=project.folder,
     )
-    click.echo(FeedbackManager.info(message=f"/connections/{name}.connection"))
+    click.echo(FeedbackManager.info_file_created(file=f"connections/{name}.connection"))
     click.echo(FeedbackManager.success(message="✓ Connection created!"))
     return (
         name,

{tinybird-0.0.1.dev230 → tinybird-0.0.1.dev232}/tinybird/tb/modules/datasource.py

@@ -788,7 +788,6 @@ async def datasource_create(
     connection_required = datasource_type in ("kafka", "s3", "gcs")
 
     if connection_required:
-        click.echo(FeedbackManager.gray(message="\n» Creating .connection file..."))
 
         def get_connection_files():
             connection_files = []
@@ -801,6 +800,8 @@ async def datasource_create(
             return connection_files
 
         connection_files = get_connection_files()
+
+        click.echo(FeedbackManager.gray(message="\n» Selecting connection..."))
         connection_name = ""
         topics: List[str] = []
         if len(connection_files) == 0:
@@ -849,7 +850,7 @@ async def datasource_create(
                         folder=project.folder,
                     )
                 if datasource_type != "kafka":
-                    click.echo(FeedbackManager.info(message=f"/connections/{connection_name}.connection"))
+                    click.echo(FeedbackManager.info_file_created(file=f"connections/{connection_name}.connection"))
                     click.echo(FeedbackManager.success(message="✓ .connection created!"))
                 connection_files = get_connection_files()
             else:
@@ -857,9 +858,29 @@ async def datasource_create(
                 return
 
         if not connection_file:
-            connection_file = connection_files[0]
-            connection_path = Path(connection_file)
-            connection = connection_path.stem
+            if len(connection_files) > 1:
+                click.echo(
+                    FeedbackManager.highlight(
+                        message=f"? Multiple {datasource_types[datasource_type][0]} connections found. Please select one:"
+                    )
+                )
+                connection_index = -1
+                while connection_index == -1:
+                    for index, conn_file in enumerate(connection_files):
+                        conn_path = Path(conn_file)
+                        click.echo(f"  [{index + 1}] {conn_path.stem}")
+                    connection_index = click.prompt("\nSelect option", default=1)
+                    try:
+                        connection_file = connection_files[int(connection_index) - 1]
+                        connection_path = Path(connection_file)
+                        connection = connection_path.stem
+                    except Exception:
+                        connection_index = -1
+            else:
+                connection_file = connection_files[0]
+                connection_path = Path(connection_file)
+                connection = connection_path.stem
+                click.echo(FeedbackManager.info(message=f"Using connection: {connection}"))
 
     click.echo(FeedbackManager.gray(message="\n» Creating .datasource file..."))
 

{tinybird-0.0.1.dev230 → tinybird-0.0.1.dev232}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev230
+Version: 0.0.1.dev232
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird