tinybird-cli 3.4.1.dev6__tar.gz → 3.4.1.dev8__tar.gz

{tinybird-cli-3.4.1.dev6 → tinybird-cli-3.4.1.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.4.1.dev6
+Version: 3.4.1.dev8
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+3.4.1.dev7
+************
+
+- `Changed` error message when trying to modify a datasource without bumping the major semver version to add a link to the documentation.
+
+3.4.1.dev7
+************
+
+- `Changed` GH workflow files and secret includes the workspace name when generated from the UI and CLI
+
 3.4.1.dev6
 ************
 
@@ -27,7 +37,7 @@ Changelog
 3.4.1.dev5
 ************
 
-- `Added` Better error report on `tb push` when try to push a pipe with bad templating
+- `Added` Better error report on `tb push` when trying to push a pipe with bad templating
 
 3.4.1.dev4
 ************

{tinybird-cli-3.4.1.dev6 → tinybird-cli-3.4.1.dev8}/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.4.1.dev6'
-__revision__ = '8321773'
+__version__ = '3.4.1.dev8'
+__revision__ = '861be8e'

{tinybird-cli-3.4.1.dev6 → tinybird-cli-3.4.1.dev8}/tinybird/context.py

@@ -6,6 +6,7 @@ table_id: ContextVar[str] = ContextVar("table_id")
 hfi_frequency: ContextVar[float] = ContextVar("hfi_frequency")
 hfi_frequency_gatherer: ContextVar[float] = ContextVar("hfi_frequency_gatherer")
 hfi_use_gatherer: ContextVar[bool] = ContextVar("hfi_use_gatherer")
+use_gatherer: ContextVar[bool] = ContextVar("use_gatherer")
 disable_template_security_validation: ContextVar[bool] = ContextVar("disable_template_security_validation")
 origin: ContextVar[str] = ContextVar("origin")
 request_id: ContextVar[str] = ContextVar("request_id")

{tinybird-cli-3.4.1.dev6 → tinybird-cli-3.4.1.dev8}/tinybird/feedback_manager.py

@@ -334,7 +334,7 @@ class FeedbackManager:
         "Materialized view {pipe} has the datasource definition in the same file as the SQL transformation. This is no longer supported while using Versions. Please, split the datasource definition into a separate file."
     )
     error_check_backfill_required = error_message(
-        "Not safe to deploy to live resource '{resource_name}', backfill might be required. Consider to deploy to preview bumping semver to major or disable 'TB_AUTO_PROMOTE'. In case you want to disable this check use 'TB_CHECK_BACKFILL_REQUIRED=0'"
+        "Not safe to deploy to live resource '{resource_name}', backfill might be required. Consider deploying to preview bumping SemVer to major or disabling 'TB_AUTO_PROMOTE'. In case you want to disable this check use 'TB_CHECK_BACKFILL_REQUIRED=0'. For more information about the deployment process, please visit https://www.tinybird.co/docs/version-control/deployment-strategies"
     )
 
     info_ignoring_incl_file = info_message(

{tinybird-cli-3.4.1.dev6 → tinybird-cli-3.4.1.dev8}/tinybird/git_settings.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from enum import Enum
-from typing import NamedTuple, Optional
+from typing import Dict, NamedTuple, Optional
 
 from tinybird.tb_cli_modules.cicd import (
     APPEND_FIXTURES_SH,
@@ -147,3 +147,12 @@ def bump_version(version: str, next_version: Optional[str]) -> str:
         return f"{major}.{minor}.{patch}"
     # TODO validate next version
     return next_version
+
+
+def get_default_init_files_deploy(workspace_name: str) -> Dict[str, str]:
+    modified_files = {
+        path.replace("tinybird_", f"tinybird_{workspace_name.lower()}_"): content
+        for path, content in DEFAULT_INIT_FILES_DEPLOY.items()
+    }
+
+    return modified_files

{tinybird-cli-3.4.1.dev6 → tinybird-cli-3.4.1.dev8}/tinybird/tb_cli_modules/cicd.py

@@ -1,4 +1,3 @@
-from dataclasses import dataclass
 from enum import Enum
 from os import getcwd
 from pathlib import Path
@@ -26,7 +25,7 @@ GITHUB_CI_YML = """
     ###   for more details or custom CI/CD         ###
     ##################################################
 
-    name: Tinybird - CI Workflow
+    name: Tinybird {{ workspace_name }} - CI Workflow
 
     on:
       workflow_dispatch:
@@ -47,7 +46,7 @@ GITHUB_CI_YML = """
             data_project_dir: {{ data_project_dir }}
             tb_format: false
           secrets:
-            tb_admin_token: ${{! secrets.TB_ADMIN_TOKEN }}  # set the Workspace admin token in GitHub secrets
+            tb_admin_token: ${{! secrets.{{ tb_admin_token_name }} }}  # set the Workspace admin token in GitHub secrets
             tb_host: {{ tb_host }}
 """
 
@@ -57,7 +56,7 @@ GITHUB_CD_YML = """
     ###   for more details or custom CI/CD         ###
     ##################################################
 
-    name: Tinybird - CD Workflow
+    name: Tinybird {{ workspace_name }} - CD Workflow
 
     on:
       workflow_dispatch:
@@ -73,7 +72,7 @@ GITHUB_CD_YML = """
         with:
           data_project_dir: {{ data_project_dir }}
         secrets:
-          tb_admin_token: ${{! secrets.TB_ADMIN_TOKEN }}  # set the Workspace admin token in GitHub secrets
+          tb_admin_token: ${{! secrets.{{ tb_admin_token_name }} }}  # set the Workspace admin token in GitHub secrets
           tb_host: {{ tb_host }}
 """
 
@@ -83,7 +82,7 @@ GITHUB_RELEASES_YML = """
     ###   for more details or custom CI/CD         ###
     ##################################################
 
-    name: Tinybird - Releases Workflow
+    name: Tinybird {{ workspace_name }} - Releases Workflow
 
     on:
       workflow_dispatch:
@@ -100,7 +99,7 @@ GITHUB_RELEASES_YML = """
           job_to_run: ${{! inputs.job_to_run }}
           data_project_dir: {{ data_project_dir }}
         secrets:
-          tb_admin_token: ${{! secrets.TB_ADMIN_TOKEN }}  # set the Workspace admin token in GitHub secrets
+          tb_admin_token: ${{! secrets.{{ tb_admin_token_name }} }}  # set the Workspace admin token in GitHub secrets
           tb_host: {{ tb_host }}
 """
 
@@ -141,7 +140,7 @@ GITLAB_YML = """
     .cicd_variables:
       variables: &cicd_variables
         TB_HOST: "{{ tb_host }}"
-        TB_ADMIN_TOKEN: $TB_ADMIN_TOKEN  # set the Workspace admin token in GitLab CI/CD Variables
+        TB_ADMIN_TOKEN: ${{ tb_admin_token_name }}  # set the Workspace admin token in GitLab CI/CD Variables
         DATA_PROJECT_DIR: "{{ data_project_dir }}"
 
     deploy_ci:  # ci using branches from workspace '{{ workspace_name }}'
@@ -296,12 +295,23 @@ done
 """
 
 
-@dataclass
 class CICDFile:
-    template: str
-    file_name: str
-    dir_path: Optional[str] = None
-    warning_message: Optional[str] = None
+    def __init__(
+        self,
+        template: str,
+        file_name_template: str,
+        dir_path: Optional[str] = None,
+        warning_message: Optional[str] = None,
+    ):
+        self.template = template
+        self.file_name_template = file_name_template
+        self.dir_path = dir_path
+        self.warning_message = warning_message
+        self.file_name = ""
+
+    def generate_file_name(self, params: Dict[str, Any]):
+        file_name_template = Template(self.file_name_template)
+        self.file_name = str(file_name_template.generate(**params).decode()).lower()
 
     @property
     def full_path(self) -> str:
@@ -313,6 +323,7 @@ class CICDGeneratorBase:
 
     def __call__(self, path: str, params: Dict[str, Any]):
         for cicd_file in self.cicd_files:
+            cicd_file.generate_file_name(params)
             if cicd_file.dir_path:
                 Path(f"{path}/{cicd_file.dir_path}").mkdir(parents=True, exist_ok=True)
             content = Template(cicd_file.template).generate(**params)
@@ -326,7 +337,7 @@ class CICDGeneratorBase:
 
     def is_already_generated(self, path: str) -> bool:
         for cicd_file in self.cicd_files:
-            if Path(f"{path}/{cicd_file.full_path}").exists():
+            if cicd_file.file_name and Path(f"{path}/{cicd_file.full_path}").exists():
                 return True
         return False
 
@@ -341,17 +352,21 @@ class CICDGeneratorBase:
 
 class GitHubCICDGenerator(CICDGeneratorBase):
     cicd_files = [
-        CICDFile(template=GITHUB_CI_YML, file_name="tinybird_ci.yml", dir_path=".github/workflows"),
+        CICDFile(
+            template=GITHUB_CI_YML,
+            file_name_template="tinybird_{{workspace_name}}_ci.yml",
+            dir_path=".github/workflows",
+        ),
         CICDFile(
             template=GITHUB_CD_YML,
-            file_name="tinybird_cd.yml",
+            file_name_template="tinybird_{{workspace_name}}_cd.yml",
             dir_path=".github/workflows",
         ),
         CICDFile(
             template=GITHUB_RELEASES_YML,
-            file_name="tinybird_release.yml",
+            file_name_template="tinybird_{{workspace_name}}_release.yml",
             dir_path=".github/workflows",
-            warning_message="Set TB_ADMIN_TOKEN in GitHub secrets. Use the Workspace admin token. Hint: use `tb token copy {token_id}` to copy clipboard",
+            warning_message="Set {tb_admin_token_name} in GitHub secrets. Use the Workspace admin token. Hint: use `tb token copy {token_id}` to copy clipboard",
         ),
     ]
 
@@ -360,8 +375,8 @@ class GitLabCICDGenerator(CICDGeneratorBase):
     cicd_files = [
         CICDFile(
             template=GITLAB_YML,
-            file_name=".gitlab-ci.yml",
-            warning_message="Set TB_ADMIN_TOKEN in GitLab CI/CD Variables. Use the Workspace admin token. Hint: use `tb token copy {token_id}` to copy clipboard",
+            file_name_template=".gitlab-ci.yml",
+            warning_message="Set {tb_admin_token_name} in GitLab CI/CD Variables. Use the Workspace admin token. Hint: use `tb token copy {token_id}` to copy clipboard",
         )
     ]
 
@@ -411,6 +426,7 @@ async def init_cicd(
             "token_id": token["id"],
             "data_project_dir": data_project_dir,
             "workflow_version": WORKFLOW_VERSION,
+            "tb_admin_token_name": f"TB_{str(workspace_info['name']).upper()}_ADMIN_TOKEN",
         }
         warning_message = generator(path, params)
         if warning_message:

{tinybird-cli-3.4.1.dev6 → tinybird-cli-3.4.1.dev8}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.4.1.dev6
+Version: 3.4.1.dev8
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+3.4.1.dev7
+************
+
+- `Changed` error message when trying to modify a datasource without bumping the major semver version to add a link to the documentation.
+
+3.4.1.dev7
+************
+
+- `Changed` GH workflow files and secret includes the workspace name when generated from the UI and CLI
+
 3.4.1.dev6
 ************
 
@@ -27,7 +37,7 @@ Changelog
 3.4.1.dev5
 ************
 
-- `Added` Better error report on `tb push` when try to push a pipe with bad templating
+- `Added` Better error report on `tb push` when trying to push a pipe with bad templating
 
 3.4.1.dev4
 ************