fix: Respect backup.enabled flag in backup workflow template #342
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
## Problem The backup workflow template was creating backup jobs for ALL resources regardless of their backup.enabled configuration. When a user set backup.enabled: false, the job was still created in backup.yaml, causing unnecessary CI/CD jobs to run. ## Root Cause While commit eacb38c added the IsBackupEnabled() method and infrastructure, the template was never updated to check this flag before creating backup jobs. The template only checked resource type (postgres, s3, sqlite) but not whether backup was enabled. ## Solution Updated backup.yaml.tmpl to check .IsBackupEnabled before creating backup jobs: - Line 10: Added check for postgres resources - Line 113: Added check for s3 resources - Line 163: Added check for sqlite resources - Line 328: Updated sync-to-gdrive dependencies to only include enabled backups ## Tests Added comprehensive test coverage: - Test for single resource with backup disabled - Test for mixed enabled/disabled resources - Test for all resources with backup disabled - Verified backup jobs are only created when enabled - Verified sync-to-gdrive only depends on enabled backup jobs ## Example For this resource definition: ```json { "name": "store", "type": "s3", "backup": { "enabled": false } } ``` Before: backup-resource-store job was created After: No backup job created (as expected)
This comment has been minimized.
This comment has been minimized.
Move resource filtering logic from the backup.yaml.tmpl template layer to the Go layer in backup.go, following the established pattern in vm_maintenance.go. This improves code maintainability, testability, and separates concerns between business logic (Go) and presentation (templates). Changes: - Add filterBackupableResources() helper function to filter resources based on backup.enabled flag and provider compatibility (S3 must be DigitalOcean, SQLite must be Turso) - Update BackupWorkflow to use filtered resources for secretData loop and template data - Remove provider compatibility checks from secretData loop (now handled in Go via filterBackupableResources) - Simplify backup.yaml.tmpl template by removing .IsBackupEnabled checks from conditional job creation (all resources in template are already backupable) - Simplify sync-to-gdrive dependencies to iterate only over backupable resources - All existing tests pass without modification, validating identical output Benefits: - Business logic in Go (easier to test and maintain) - Template simpler with fewer conditionals - Follows established codebase patterns - 100% backward compatible 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
ainsleyclark
force-pushed
the
claude/setup-s3-storage-cdn-01KhtQPh3e4kF5B3Q8WEVKuT
branch
from
9655827 to
62c6118
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #342 +/- ##
==========================================
+ Coverage 64.59% 69.46% +4.87%
==========================================
Files 154 184 +30
Lines 6064 7277 +1213
==========================================
+ Hits 3917 5055 +1138
+ Misses 2064 2025 -39
- Partials 83 197 +114 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
ainsleyclark
deleted the
claude/setup-s3-storage-cdn-01KhtQPh3e4kF5B3Q8WEVKuT
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
The backup workflow template was creating backup jobs for ALL resources
regardless of their backup.enabled configuration. When a user set
backup.enabled: false, the job was still created in backup.yaml,
causing unnecessary CI/CD jobs to run.
Root Cause
While commit eacb38c added the IsBackupEnabled() method and infrastructure,
the template was never updated to check this flag before creating backup jobs.
The template only checked resource type (postgres, s3, sqlite) but not whether
backup was enabled.
Solution
Updated backup.yaml.tmpl to check .IsBackupEnabled before creating backup jobs:
Tests
Added comprehensive test coverage:
Example
For this resource definition:
{ "name": "store", "type": "s3", "backup": { "enabled": false } }Before: backup-resource-store job was created
After: No backup job created (as expected)