Consolidate source + remove tests (#145)

* Consolidate dbt source into transform

* Update issue.csv (#141)

* Q2 FY26 Automatic Package Updates (#142)

* Q2 FY26: Apply automated update.

* Q2 FY26: Update auto-release workflow only.

---------

Co-authored-by: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com>

* fixes

* Generate dbt docs via GitHub Actions

* Update README.md

* Update README.md

* Update CHANGELOG.md

Co-authored-by: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>

---------

Co-authored-by: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com>
Co-authored-by: Joe Markiewicz <74217849+fivetran-joemarkiewicz@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>

Author: 5 people

.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md

@@ -12,13 +12,15 @@ Before marking this PR as "ready for review":
 
 ## PR Overview 
 **Package version introduced in this PR:** 
- 
+- 
+
 **This PR addresses the following Issue/Feature(s):**
 <!-- Add Issue # or internal ticket reference -->
+- 
 
 **Summary of changes:**  
 <!-- 1-2 sentences describing PR changes. -->
-
+- 
 
 ### Submission Checklist  
 - [ ] Alignment meeting with the reviewer (if needed)  
@@ -27,9 +29,10 @@ Before marking this PR as "ready for review":
   - [ ] **Validation Steps:** Check for unintentional effects (e.g., add/run consistency & integrity tests)
   - [ ] **Testing Instructions:** Confirm the change addresses the issue(s)
   - [ ] **Focus Areas:** Complex logic or queries that need extra attention  
+- [ ] Merge any relevant open PRs into this PR
 
 ### Changelog  
 <!-- Recommend drafting changelog notes, then refining via ChatGPT using:  
 "Draft a changelog entry based on the following notes." -->
 - [ ] Draft changelog for PR  
-- [ ] Final changelog for release review
+- [ ] Final changelog for release review

.github/workflows/auto-release.yml

@@ -3,11 +3,12 @@ on:
   pull_request:
     types:
       - closed
-    branches:
-      - main
+      - labeled
 
 jobs:
-  call-workflow-passing-data:
-    if: github.event.pull_request.merged
+  release:
+    if: |
+      (github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main') ||
+      github.event.label.name == 'pre-release'
     uses: fivetran/dbt_package_automations/.github/workflows/auto-release.yml@main
-    secrets: inherit
+    secrets: inherit

.github/workflows/generate-docs.yml

@@ -0,0 +1,13 @@
+name: 'generate dbt docs'
+on:
+  pull_request:
+    types:
+      - labeled
+
+jobs:
+  generate-docs:
+    if: github.event.label.name == 'docs:ready'
+    uses: fivetran/dbt_package_automations/.github/workflows/generate-docs.yml@main
+    secrets: inherit
+    with:
+      schema_var_name: jira_schema

.gitignore

@@ -1,7 +1,73 @@
-target/
+# dbt
+**/package-lock.yml
+package-lock.yml
+.dbt/
 dbt_modules/
+dbt_packages/
 logs/
+profiles.yml
+target/
+*.log
+
+# IDE files
+.idea/
+.vscode/
+*~
+*.swp
+*.swo
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# OS generated files
+**/.DS_Store
 .DS_Store
+.Spotlight-V100
+.Trashes
+._*
+Thumbs.db
+ehthumbs.db
+
+# Python
+*.egg
+*.egg-info/
+*.py[cod]
+*.so
+*$py.class
+.Python
+__pycache__/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.env
+.installed.cfg
+lib/
+lib64/
+MANIFEST
+parts/
+sdist/
+var/
+wheels/
+
+# Secrets and credentials
+.env.*
+.secrets
+credentials.json
+service-account.json
+
+# Temporary files
+.cache/
+*.temp
+*.tmp
+
+# Virtual environments
+.conda/
+.env
+.venv
+ENV/
 env/
-dbt_packages/
-package-lock.yml
+env.bak/
+venv/
+venv.bak/

CHANGELOG.md

@@ -1,3 +1,27 @@
+# dbt_jira v1.0.0
+
+[PR #145](https://github.com/fivetran/dbt_jira/pull/145) includes the following updates:
+
+## Breaking Changes
+
+### Source Package Consolidation
+- Removed the dependency on the `fivetran/jira_source` package.
+  - All functionality from the source package has been merged into this transformation package for improved maintainability and clarity.
+  - If you reference `fivetran/jira_source` in your `packages.yml`, you must remove this dependency to avoid conflicts.
+  - Any source overrides referencing the `fivetran/jira_source` package will also need to be removed or updated to reference this package.
+  - Update any jira_source-scoped variables to be scoped to only under this package. See the [README](https://github.com/fivetran/dbt_jira/blob/main/README.md) for how to configure the build schema of staging models.
+- As part of the consolidation, vars are no longer used to reference staging models, and only sources are represented by vars. Staging models are now referenced directly with `ref()` in downstream models.
+
+### dbt Fusion Compatibility Updates
+- Updated package to maintain compatibility with dbt-core versions both before and after v1.10.6, which introduced a breaking change to multi-argument test syntax (e.g., `unique_combination_of_columns`).
+- Temporarily removed unsupported tests to avoid errors and ensure smoother upgrades across different dbt-core versions. These tests will be reintroduced once a safe migration path is available.
+  - Removed all `dbt_utils.unique_combination_of_columns` tests.
+  - Moved `loaded_at_field: _fivetran_synced` under the `config:` block in `src_jira.yml`.
+
+## Under the Hood
+- Updated conditions in `.github/workflows/auto-release.yml`.
+- Added `.github/workflows/generate-docs.yml`.
+
 # dbt_jira v0.21.0
 
 [PR #140](https://github.com/fivetran/dbt_jira/pull/140) includes the following updates:

README.md

@@ -1,4 +1,4 @@
-# Jira Transformation dbt Package ([Docs](https://fivetran.github.io/dbt_jira/))
+# Jira dbt Package ([Docs](https://fivetran.github.io/dbt_jira/))
 
 <p align="left">
     <a alt="License"
@@ -16,7 +16,7 @@
 </p>
 
 ## What does this dbt package do?
-- Produces modeled tables that leverage Jira data from [Fivetran's connector](https://fivetran.com/docs/applications/jira) in the format described by [this ERD](https://fivetran.com/docs/applications/jira#schemainformation) and builds off the output of our [Jira source package](https://github.com/fivetran/dbt_jira_source).
+- Produces modeled tables that leverage Jira data from [Fivetran's connector](https://fivetran.com/docs/applications/jira) in the format described by [this ERD](https://fivetran.com/docs/applications/jira#schemainformation).
 - Enables you to better understand the workload, performance, and velocity of your team's work using Jira issues. It performs the following actions:
   - Creates a daily issue history table so you can quickly create agile reports, such as burndown charts, along any issue field.
   - Enriches the core issue table with relevant data regarding its workflow and current state.
@@ -72,9 +72,11 @@ Include the following jira package version in your `packages.yml` file:
 ```yaml
 packages:
   - package: fivetran/jira
-    version: [">=0.21.0", "<0.22.0"]
-
+    version: [">=1.0.0", "<1.1.0"]
 ```
+
+> All required sources and staging models are now bundled into this transformation package. Do not include `fivetran/jira_source` in your `packages.yml` since this package has been deprecated.
+
 ### Step 3: Define database and schema variables
 By default, this package runs using your destination and the `jira` schema. If this is not where your Jira data is (for example, if your Jira schema is named `jira_fivetran`), add the following configuration to your root `dbt_project.yml` file:
 
@@ -147,12 +149,12 @@ By default, this package builds the Jira staging models within a schema titled (
 
 ```yml
 models:
-    jira_source:
-      +schema: my_new_schema_name # leave blank for just the target_schema
     jira:
-      +schema: my_new_schema_name # leave blank for just the target_schema
+      +schema: my_new_schema_name # Leave +schema: blank to use the default target_schema.
+      staging:
+        +schema: my_new_schema_name # Leave +schema: blank to use the default target_schema.
 ```
-    
+
 #### Change the source table references
 If an individual source table has a different name than the package expects, add the table name as it appears in your destination to the respective variable:
 
@@ -177,19 +179,16 @@ vars:
 ### (Optional) Step 6: Orchestrate your models with Fivetran Transformations for dbt Core™
 <details><summary>Expand for details</summary>
 <br>
-    
+
 Fivetran offers the ability for you to orchestrate your dbt project through [Fivetran Transformations for dbt Core™](https://fivetran.com/docs/transformations/dbt). Learn how to set up your project for orchestration through Fivetran in our [Transformations for dbt Core setup guides](https://fivetran.com/docs/transformations/dbt#setupguide).
 </details>
 
 ## Does this package have dependencies?
 This dbt package is dependent on the following dbt packages. These dependencies are installed by default within this package. For more information on the following packages, refer to the [dbt hub](https://hub.getdbt.com/) site.
 > IMPORTANT: If you have any of these dependent packages in your own `packages.yml` file, we highly recommend that you remove them from your root `packages.yml` to avoid package version conflicts.
-    
+
 ```yml
 packages:
-    - package: fivetran/jira_source
-      version: [">=0.9.0", "<0.10.0"]
-
     - package: fivetran/fivetran_utils
       version: [">=0.4.0", "<0.5.0"]
 

dbt_project.yml

@@ -1,32 +1,36 @@
 name: 'jira'
-version: '0.21.0'
+version: '1.0.0'
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]
-vars:
 
+vars:
   jira:
-    issue: "{{ ref('stg_jira__issue') }}"
-    project: "{{ ref('stg_jira__project') }}"
-    user: "{{ ref('stg_jira__user') }}"
-    issue_type: "{{ ref('stg_jira__issue_type') }}"
-    status: "{{ ref('stg_jira__status') }}"
-    status_category: "{{ ref('stg_jira__status_category') }}"
-    resolution: "{{ ref('stg_jira__resolution') }}"
-    priority: "{{ ref('stg_jira__priority') }}"
-    issue_multiselect_history: "{{ ref('stg_jira__issue_multiselect_history') }}"
-    issue_field_history: "{{ ref('stg_jira__issue_field_history') }}"
-    comment: "{{ ref('stg_jira__comment') }}"
-    issue_link: "{{ ref('stg_jira__issue_link') }}"
-    component: "{{ ref('stg_jira__component') }}"
-    field: "{{ ref('stg_jira__field') }}"
-    field_option: "{{ ref('stg_jira__field_option') }}"
-    sprint: "{{ ref('stg_jira__sprint') }}"
-    version: "{{ ref('stg_jira__version') }}"
+    issue: "{{ source('jira', 'issue') }}"
+    project: "{{ source('jira', 'project') }}"
+    user: "{{ source('jira', 'user') }}"
+    issue_type: "{{ source('jira', 'issue_type') }}"
+    status: "{{ source('jira', 'status') }}"
+    status_category: "{{ source('jira', 'status_category') }}"
+    resolution: "{{ source('jira', 'resolution') }}"
+    priority: "{{ source('jira', 'priority') }}"
+    issue_multiselect_history: "{{ source('jira', 'issue_multiselect_history') }}"
+    issue_field_history: "{{ source('jira', 'issue_field_history') }}"
+    comment: "{{ source('jira', 'comment') }}"
+    issue_link: "{{ source('jira', 'issue_link') }}"
+    component: "{{ source('jira', 'component') }}"
+    field: "{{ source('jira', 'field') }}"
+    field_option: "{{ source('jira', 'field_option') }}"
+    sprint: "{{ source('jira', 'sprint') }}"
+    version: "{{ source('jira', 'version') }}"
     jira_issue_history_buffer: 1
+
 models:
   jira:
     +materialized: table
     +schema: jira
     intermediate:
       +materialized: ephemeral
       +schema: int_jira
+    staging:
+      +materialized: view
+      +schema: jira_source

docs/catalog.json

@@ -1,12 +1,12 @@
 name: 'jira_integration_tests'
-version: '0.21.0'
+version: '1.0.0'
 config-version: 2
 profile: 'integration_tests'
 
 vars: 
   # Comment out the below when generating docs
-  # issue_field_history_columns: ['summary', 'components']
-  jira_source:
+  issue_field_history_columns: ['summary', 'components'] # @docs-ignore
+  jira:
     jira_schema: jira_integrations_tests_42
     jira_comment_identifier: "comment"
     jira_component_identifier: "component"
@@ -36,6 +36,8 @@ models:
     # +schema: "jira_{{ var('directed_schema','dev') }}"
 
 seeds:
+  +docs:
+    show: False
   jira_integration_tests:
     +column_types:
       _fivetran_synced: timestamp
@@ -89,3 +91,4 @@ dispatch:
 
 flags:
   send_anonymous_usage_stats: False
+  use_colors: True