Merge pull request #92 from dbt-labs/fix/remove-custom-branch

Author: b-per

example_jobs_file/jobs.yml

@@ -23,7 +23,6 @@ jobs:
       threads: 4
     state: 1
     triggers:
-      custom_branch_only: true
       git_provider_webhook: false
       github_webhook: false
       schedule: true
@@ -50,7 +49,6 @@ jobs:
       threads: 4
     state: 1
     triggers:
-      custom_branch_only: true
       git_provider_webhook: false
       github_webhook: true # this job runs from webhooks
       schedule: false # this doesn't run on a schedule

example_jobs_file/jobs_templated.yml

@@ -23,7 +23,6 @@ jobs:
       threads: 4
     state: 1
     triggers:
-      custom_branch_only: false
       git_provider_webhook: false
       github_webhook: false
       # we can add more complex logic in Jinja based on our variables
@@ -52,7 +51,6 @@ jobs:
       threads: 4
     state: 1
     triggers:
-      custom_branch_only: true
       git_provider_webhook: false
       github_webhook: true # this job runs from webhooks
       schedule: false # this doesn't run on a schedule

example_jobs_file/jobs_with_anchors.yml

@@ -45,7 +45,6 @@ jobs:
       threads: 4
     state: 1
     triggers:
-      custom_branch_only: true
       git_provider_webhook: false
       github_webhook: false
       schedule: true
@@ -66,7 +65,6 @@ jobs:
       target_name: TEST
       threads: 4
     triggers:
-      custom_branch_only: true
       git_provider_webhook: false
       github_webhook: true # this job runs from webhooks
       schedule: false # this doesn't run on a schedule

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dbt-jobs-as-code"
-version = "0.8.0"
+version = "0.8.1"
 description = "A CLI to allow defining dbt Cloud jobs as code"
 authors = ["dbt Labs <info@dbtlabs.com>"]
 license = "Apache License 2.0"

src/schemas/common_types.py

@@ -38,7 +38,6 @@ def set_any_of_string_boolean(schema: Dict[str, Any]):
 class Triggers(BaseModel):
     github_webhook: bool = field_optional_bool_allowed_as_string_in_schema
     git_provider_webhook: Optional[bool] = field_optional_bool_allowed_as_string_in_schema
-    custom_branch_only: Optional[bool] = field_optional_bool_allowed_as_string_in_schema
     schedule: Optional[bool] = field_optional_bool_allowed_as_string_in_schema
     on_merge: Optional[bool] = field_optional_bool_allowed_as_string_in_schema
 

src/schemas/job.py

@@ -154,3 +154,8 @@ class JobMissingFields(JobDefinition):
     next_run: Optional[str] = ""
     next_run_humanized: Optional[str] = ""
     is_system: bool
+    account: Any
+    project: Any
+    environment: Any
+    most_recent_run: Any
+    most_recent_completed_run: Any

src/schemas/load_job_schema.json

@@ -248,6 +248,11 @@
           "title": "State",
           "type": "integer"
         },
+        "run_compare_changes": {
+          "default": false,
+          "title": "Run Compare Changes",
+          "type": "boolean"
+        },
         "job_type": {
           "default": "scheduled",
           "enum": [
@@ -418,18 +423,6 @@
           "default": false,
           "title": "Git Provider Webhook"
         },
-        "custom_branch_only": {
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "boolean"
-            }
-          ],
-          "default": false,
-          "title": "Custom Branch Only"
-        },
         "schedule": {
           "anyOf": [
             {

tests/exporter/test_export.py

@@ -38,7 +38,6 @@ def test_export_jobs_yml(capsys):
     triggers:
       github_webhook: false
       git_provider_webhook: false
-      custom_branch_only: true
       schedule: false
       on_merge: false
     description: ''
@@ -75,7 +74,6 @@ def test_export_jobs_yml(capsys):
         triggers=Triggers(
             github_webhook=False,
             git_provider_webhook=False,
-            custom_branch_only=True,
             schedule=False,
         ),
         state=1,

tests/integration-tests/jobs_template.yml

@@ -27,7 +27,6 @@ jobs:
     triggers:
       github_webhook: false
       git_provider_webhook: false
-      custom_branch_only: false
       schedule: false
     job_completion_trigger_condition:
       condition:
@@ -60,7 +59,6 @@ jobs:
     triggers:
       github_webhook: false
       git_provider_webhook: false
-      custom_branch_only: false
       schedule: false
     custom_environment_variables:
       - DBT_ALPHA: "true"

tests/loader/jobs.yml

@@ -26,7 +26,6 @@ jobs:
     triggers:
       github_webhook: false
       git_provider_webhook: "false"
-      custom_branch_only: true
       schedule: true
       on_merge: false
     job_completion_trigger_condition:
@@ -54,7 +53,6 @@ jobs:
     triggers:
       github_webhook: true
       git_provider_webhook: false
-      custom_branch_only: true
       schedule: false
       on_merge: true
     job_type: other