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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.0.0.dev3
+Version: 3.0.0.dev5
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,17 @@ Changelog
 
 ---------
 
+3.0.0.dev5
+************
+
+- `Fixed` Error while pushing Sink Pipes using IAM Role Connector for S3
+
+3.0.0.dev4
+************
+
+- `Changed` Unify generation of ci/cd script resources
+- `Changed` Update clickhouse-toolset to 0.29.dev0
+
 3.0.0.dev3
 ************
 
@@ -67,7 +78,7 @@ Changelog
 
 - `Changed` `tb init --git` update to get ready to use cicd with releases
 - `Changed` Use `tb branch` instead of `tb env`. `tb env` is still usable but deprecated and will be removed in the next version.
-- `Fixed` command `tb pipe regression-tests` to handle the edge case when all the requests to the endpoint that we want to check fails as the value returned is no what we expect. 
+- `Fixed` command `tb pipe regression-tests` to handle the edge case when all the requests to the endpoint that we want to check fails as the value returned is no what we expect.
 - `Fixed` `tb deploy` fixes to work with `--dry-run` and push changes of new and modified files
 - `Fixed` `tb check` doesn't exit with error when checking a `.incl` file.
 - `Fixed` `tb fmt` adds empty quoted strings in .datasource connection section.
@@ -111,7 +122,7 @@ Released new version 2.0.0 with all these changes:
 Released new version 1.3.0 with all these changes:
 
 - `Added` Support for Copy pipes in `tb fmt`
-- `Added` Support for `.datasource.incl` files in `tb fmt` 
+- `Added` Support for `.datasource.incl` files in `tb fmt`
 - `Fixed` `tb auth use` to move between regions saved in the config file
 - `Fixed` Skip `regression.yaml` in `tb test run` since it's reserved for regression tests
 - `Fixed` Skip replacing `.incl` files in `tb fmt`
@@ -134,7 +145,7 @@ Released new version 1.2.0 with all these changes:
 
 Released new version 1.1.0 with all these changes:
 
-- `Added` Support `skip` individual regression tests through the regression.yaml configuration file. CI/CD guide at https://www.tinybird.co/docs/guides/continuous-integration.html 
+- `Added` Support `skip` individual regression tests through the regression.yaml configuration file. CI/CD guide at https://www.tinybird.co/docs/guides/continuous-integration.html
 - `Added` Fail `tb env regression-tests` if no tests are run for any pipe, use `skip` to avoid the error
 - `Added` Skip POST requests by default in `tb env regression-tests` until it's supported
 - `Added` Support append `--fixtures` to shared Data Sources in Environments
@@ -147,7 +158,7 @@ Released new version 1.1.0 with all these changes:
 - `Changed` Expose resources and ids when removing releases `tb release rm`
 - `Changed` `--override-commit` option to not require needing to pass the `--git` option as well. Now, running `tb init --override-commit` should work as expected.
 - `Changed` Copy and Sink on-demand jobs now return the job URL.
-- `Changed` allow Workspace admin tokens for CI/CD workflows. Previously, you were asked for user admin token. You can update your TB_ADMIN_TOKEN to be the Workspace admin token instead the admin token from a specific user. CI/CD guide at https://www.tinybird.co/docs/guides/continuous-integration.html 
+- `Changed` allow Workspace admin tokens for CI/CD workflows. Previously, you were asked for user admin token. You can update your TB_ADMIN_TOKEN to be the Workspace admin token instead the admin token from a specific user. CI/CD guide at https://www.tinybird.co/docs/guides/continuous-integration.html
 - `Changed` Improve CI/CD output. Added warning hint in custom deployments.
 - `Fixed` `tb deploy` raises an error if it detects resources renamed in git
 - `Fixed` On `tb push --force --yes` a BigQuery Data Source, it updates both the `SCHEMA` and connector settings.
@@ -473,7 +484,7 @@ Released new version 1.0.1 with all these changes:
 1.0.0b393
 *********
 
-- `Changed` Upgrade version of generated cicd templates 
+- `Changed` Upgrade version of generated cicd templates
 
 1.0.0b393
 *********

{tinybird-cli-3.0.0.dev3 → tinybird-cli-3.0.0.dev5}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://docs.tinybird.co/cli.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '3.0.0.dev3'
-__revision__ = 'aa44775'
+__version__ = '3.0.0.dev5'
+__revision__ = 'd34f713'

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

@@ -173,7 +173,7 @@ class ImportReplacements:
 
 
 class ExportReplacements:
-    SERVICES = ("gcs_hmac", "s3")
+    SERVICES = ("gcs_hmac", "s3", "s3_iamrole")
     NODE_TYPES = PipeNodeTypes.DATA_SINK
     _REPLACEMENTS = (
         ("export_service", "service", None),

{tinybird-cli-3.0.0.dev3 → tinybird-cli-3.0.0.dev5}/tinybird/git_settings.py

@@ -2,7 +2,13 @@ from dataclasses import dataclass
 from enum import Enum
 from typing import NamedTuple, Optional
 
-from tinybird.tb_cli_modules.cicd import GITHUB_CD_YML, GITHUB_CI_YML, GITHUB_RELEASES_YML
+from tinybird.tb_cli_modules.cicd import (
+    APPEND_FIXTURES_SH,
+    EXEC_TEST_SH,
+    GITHUB_CD_YML,
+    GITHUB_CI_YML,
+    GITHUB_RELEASES_YML,
+)
 
 
 class GitProviders(Enum):
@@ -78,11 +84,11 @@ GITHUB_DEFAULT_EMPTY_TREE_HASH = "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
 
 WORKFLOW_VERSION = "main"
 
-TB_DEPLOY = "true"
-
 DEFAULT_INIT_FILES = {
-    ".tinyenv": DEFAULT_TINYENV_FILE,
     "requirements.txt": DEFAULT_REQUIREMENTS_FILE,
+    ".tinyenv": DEFAULT_TINYENV_FILE,
+    "scripts/exec_test.sh": EXEC_TEST_SH,
+    "scripts/append_fixtures.sh": APPEND_FIXTURES_SH,
 }
 
 GITHUB_CI_YML_PATH = ".github/workflows/tinybird_ci.yml"

{tinybird-cli-3.0.0.dev3 → tinybird-cli-3.0.0.dev5}/tinybird/tb_cli_modules/cicd.py

@@ -18,8 +18,6 @@ class Provider(Enum):
 
 WORKFLOW_VERSION = "main"
 
-TB_DEPLOY = "true"
-
 GITHUB_CI_YML = """
     ##################################################
     ###   Visit https://github.com/tinybirdco/ci   ###
@@ -44,7 +42,6 @@ GITHUB_CI_YML = """
         ci: # ci using branches from workspace '{{ workspace_name }}'
           uses: tinybirdco/ci/.github/workflows/ci.yml@{{ workflow_version }}
           with:
-            tb_deploy: {{ tb_deploy }}
             data_project_dir: {{ data_project_dir }}
           secrets:
             tb_admin_token: ${{! secrets.TB_ADMIN_TOKEN }}  # set the Workspace admin token in GitHub secrets
@@ -71,7 +68,6 @@ GITHUB_CD_YML = """
       cd:  # deploy changes to workspace '{{ workspace_name }}'
         uses: tinybirdco/ci/.github/workflows/cd.yml@{{ workflow_version }}
         with:
-          tb_deploy: {{ tb_deploy }}
           data_project_dir: {{ data_project_dir }}
         secrets:
           tb_admin_token: ${{! secrets.TB_ADMIN_TOKEN }}  # set the Workspace admin token in GitHub secrets
@@ -100,7 +96,6 @@ GITHUB_RELEASES_YML = """
         with:
           job_to_run: ${{! inputs.job_to_run }}
           data_project_dir: {{ data_project_dir }}
-          tb_deploy: {{ tb_deploy }}
         secrets:
           tb_admin_token: ${{! secrets.TB_ADMIN_TOKEN }}  # set the Workspace admin token in GitHub secrets
           tb_host: {{ tb_host }}
@@ -145,7 +140,6 @@ GITLAB_YML = """
         TB_HOST: "{{ tb_host }}"
         TB_ADMIN_TOKEN: $TB_ADMIN_TOKEN  # set the Workspace admin token in GitLab CI/CD Variables
         DATA_PROJECT_DIR: "{{ data_project_dir }}"
-        TB_DEPLOY: "{{ tb_deploy }}"
 
     deploy_ci:  # ci using branches from workspace '{{ workspace_name }}'
       extends: .tb_deploy_ci
@@ -208,6 +202,67 @@ GITLAB_YML = """
 """
 
 
+EXEC_TEST_SH = """
+  #!/usr/bin/env bash
+
+export TB_VERSION_WARNING=0
+export VERSION=$1
+
+run_test() {
+    t=$1
+    echo "** Running $t **"
+    # Check if VERSION is provided
+    if [[ -n $VERSION ]]; then
+        echo "VERSION found: $VERSION"
+        sed -i "s/tb/tb --semver $VERSION/" $t
+    else
+        echo "VERSION not found"
+    fi
+    echo "** $(cat $t)"
+    if res=$(bash $t $2 | diff -B ${t}.result -); then
+        echo 'OK';
+    else
+        echo "failed, diff:";
+        echo "$res";
+        return 1
+    fi
+    echo ""
+}
+export -f run_test
+
+fail=0
+find ./tests -name "*.test" -print0 | xargs -0 -I {} -P 4 bash -c 'run_test "$@"' _ {} $VERSION || fail=1
+
+if [ $fail == 1 ]; then
+  exit -1;
+fi
+"""
+
+APPEND_FIXTURES_SH = """
+#!/usr/bin/env bash
+
+VERSION=$1
+
+directory="datasources/fixtures"
+extensions=("csv" "ndjson")
+
+absolute_directory=$(realpath "$directory")
+
+for extension in "${extensions[@]}"; do
+  file_list=$(find "$absolute_directory" -type f -name "*.$extension")
+
+  for file_path in $file_list; do
+    file_name=$(basename "$file_path")
+    file_name_without_extension="${file_name%.*}"
+
+    command="tb --semver $VERSION datasource append $file_name_without_extension datasources/fixtures/$file_name"
+    echo $command
+    $command
+  done
+done
+"""
+
+
 @dataclass
 class CICDFile:
     template: str
@@ -323,7 +378,6 @@ async def init_cicd(
             "token_id": token["id"],
             "data_project_dir": data_project_dir,
             "workflow_version": WORKFLOW_VERSION,
-            "tb_deploy": TB_DEPLOY,
         }
         warning_message = generator(path, params)
         if warning_message:

{tinybird-cli-3.0.0.dev3 → tinybird-cli-3.0.0.dev5}/tinybird/tb_cli_modules/common.py

@@ -57,6 +57,7 @@ if TYPE_CHECKING:
 from tinybird.feedback_manager import FeedbackManager, warning_message
 from tinybird.git_settings import DEFAULT_TINYENV_FILE
 from tinybird.syncasync import async_to_sync
+from tinybird.tb_cli_modules.cicd import APPEND_FIXTURES_SH, EXEC_TEST_SH
 from tinybird.tb_cli_modules.config import CLIConfig
 from tinybird.tb_cli_modules.exceptions import (
     CLIAuthException,
@@ -406,74 +407,14 @@ async def folder_init(
         f = base / ("exec_test.sh")
         if not f.exists() or force:
             with open(f"{f}", "w") as t_file:
-                t_file.write(
-                    """
-#!/usr/bin/env bash
-
-export TB_VERSION_WARNING=0
-export VERSION=$1
-
-run_test() {
-    t=$1
-    echo "** Running $t **"
-    # Check if VERSION is provided
-    if [[ -n $VERSION ]]; then
-        echo "VERSION found: $VERSION"
-        sed -i "s/tb/tb --semver $VERSION/" $t
-    else
-        echo "VERSION not found"
-    fi
-    echo "** $(cat $t)"
-    if res=$(bash $t $2 | diff -B ${t}.result -); then
-        echo 'OK';
-    else
-        echo "failed, diff:";
-        echo "$res";
-        return 1
-    fi
-    echo ""
-}
-export -f run_test
-
-fail=0
-find ./tests -name "*.test" -print0 | xargs -0 -I {} -P 4 bash -c 'run_test "$@"' _ {} $VERSION || fail=1
-
-if [ $fail == 1 ]; then
-  exit -1;
-fi
-"""
-                )
+                t_file.write(EXEC_TEST_SH)
             click.echo(FeedbackManager.info_file_created(file="scripts/exec_test.sh"))
         chmod(f, 0o755)
 
         f = base / ("append_fixtures.sh")
         if not f.exists() or force:
             with open(f"{f}", "w") as t_file:
-                t_file.write(
-                    """
-#!/usr/bin/env bash
-
-VERSION=$1
-
-directory="datasources/fixtures"
-extensions=("csv" "ndjson")
-
-absolute_directory=$(realpath "$directory")
-
-for extension in "${extensions[@]}"; do
-  file_list=$(find "$absolute_directory" -type f -name "*.$extension")
-
-  for file_path in $file_list; do
-    file_name=$(basename "$file_path")
-    file_name_without_extension="${file_name%.*}"
-
-    command="tb --semver $VERSION datasource append $file_name_without_extension datasources/fixtures/$file_name"
-    echo $command
-    $command
-  done
-done
-"""
-                )
+                t_file.write(APPEND_FIXTURES_SH)
             click.echo(FeedbackManager.info_file_created(file="scripts/append_fixtures.sh"))
         chmod(f, 0o755)
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.0.0.dev3
+Version: 3.0.0.dev5
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,17 @@ Changelog
 
 ---------
 
+3.0.0.dev5
+************
+
+- `Fixed` Error while pushing Sink Pipes using IAM Role Connector for S3
+
+3.0.0.dev4
+************
+
+- `Changed` Unify generation of ci/cd script resources
+- `Changed` Update clickhouse-toolset to 0.29.dev0
+
 3.0.0.dev3
 ************
 
@@ -67,7 +78,7 @@ Changelog
 
 - `Changed` `tb init --git` update to get ready to use cicd with releases
 - `Changed` Use `tb branch` instead of `tb env`. `tb env` is still usable but deprecated and will be removed in the next version.
-- `Fixed` command `tb pipe regression-tests` to handle the edge case when all the requests to the endpoint that we want to check fails as the value returned is no what we expect. 
+- `Fixed` command `tb pipe regression-tests` to handle the edge case when all the requests to the endpoint that we want to check fails as the value returned is no what we expect.
 - `Fixed` `tb deploy` fixes to work with `--dry-run` and push changes of new and modified files
 - `Fixed` `tb check` doesn't exit with error when checking a `.incl` file.
 - `Fixed` `tb fmt` adds empty quoted strings in .datasource connection section.
@@ -111,7 +122,7 @@ Released new version 2.0.0 with all these changes:
 Released new version 1.3.0 with all these changes:
 
 - `Added` Support for Copy pipes in `tb fmt`
-- `Added` Support for `.datasource.incl` files in `tb fmt` 
+- `Added` Support for `.datasource.incl` files in `tb fmt`
 - `Fixed` `tb auth use` to move between regions saved in the config file
 - `Fixed` Skip `regression.yaml` in `tb test run` since it's reserved for regression tests
 - `Fixed` Skip replacing `.incl` files in `tb fmt`
@@ -134,7 +145,7 @@ Released new version 1.2.0 with all these changes:
 
 Released new version 1.1.0 with all these changes:
 
-- `Added` Support `skip` individual regression tests through the regression.yaml configuration file. CI/CD guide at https://www.tinybird.co/docs/guides/continuous-integration.html 
+- `Added` Support `skip` individual regression tests through the regression.yaml configuration file. CI/CD guide at https://www.tinybird.co/docs/guides/continuous-integration.html
 - `Added` Fail `tb env regression-tests` if no tests are run for any pipe, use `skip` to avoid the error
 - `Added` Skip POST requests by default in `tb env regression-tests` until it's supported
 - `Added` Support append `--fixtures` to shared Data Sources in Environments
@@ -147,7 +158,7 @@ Released new version 1.1.0 with all these changes:
 - `Changed` Expose resources and ids when removing releases `tb release rm`
 - `Changed` `--override-commit` option to not require needing to pass the `--git` option as well. Now, running `tb init --override-commit` should work as expected.
 - `Changed` Copy and Sink on-demand jobs now return the job URL.
-- `Changed` allow Workspace admin tokens for CI/CD workflows. Previously, you were asked for user admin token. You can update your TB_ADMIN_TOKEN to be the Workspace admin token instead the admin token from a specific user. CI/CD guide at https://www.tinybird.co/docs/guides/continuous-integration.html 
+- `Changed` allow Workspace admin tokens for CI/CD workflows. Previously, you were asked for user admin token. You can update your TB_ADMIN_TOKEN to be the Workspace admin token instead the admin token from a specific user. CI/CD guide at https://www.tinybird.co/docs/guides/continuous-integration.html
 - `Changed` Improve CI/CD output. Added warning hint in custom deployments.
 - `Fixed` `tb deploy` raises an error if it detects resources renamed in git
 - `Fixed` On `tb push --force --yes` a BigQuery Data Source, it updates both the `SCHEMA` and connector settings.
@@ -473,7 +484,7 @@ Released new version 1.0.1 with all these changes:
 1.0.0b393
 *********
 
-- `Changed` Upgrade version of generated cicd templates 
+- `Changed` Upgrade version of generated cicd templates
 
 1.0.0b393
 *********

{tinybird-cli-3.0.0.dev3 → tinybird-cli-3.0.0.dev5}/tinybird_cli.egg-info/requires.txt

@@ -1,5 +1,5 @@
 click<8.2,>=8.1.6
-clickhouse-toolset==0.28.dev0
+clickhouse-toolset==0.29.dev0
 colorama==0.4.6
 cryptography>=3.4.8
 croniter==1.3.8