ops_backups 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d1cc538be0d6d4d093b408d7479a71bdb5b127d0d7ee4d34638c204ec1bff0d
-  data.tar.gz: eaf0ee80ac34ad175fce340d8e58c4291facbdfe95fc349b3332b2a3a9144b53
+  metadata.gz: 676b08b7df0898e0bc8fbc2572b8aa7801f09c74cba43f5544836d6111a27cfe
+  data.tar.gz: 6377a44547eb4a34e97d13ccdf16db48a3739ca2c61ed43c5f8cf371be6fbfe1
 SHA512:
-  metadata.gz: 715640d119469926a5ec0babe36f82909c164d00964259be61c1df2912af8b7f23c61f53ad23718e96b17dcf4787fae0b47bced9fd0e0536f1c93e4d686cc717
-  data.tar.gz: bc0924697d406c27160cada6abcab128ef172c652f10f87f99cd3fbbfc67091eeef44e30e7a53e55a4ef0041c546b1d14d0713026577aea6a46de1cf556ed731
+  metadata.gz: 0d03c15b798b0fe5cef8ced86cbb27ff14cf657ceb9052883e88e6e24d132cf28e712797ac87c3f436a2e04da5fc4c1dfc65540877648615c9c9fade12658da8
+  data.tar.gz: f3cbf7c12f6f54feaeca3a05fed9c667fbcc559936b36eb2b81408f02bd802c1e6354a9b7574e42c236427de6700acb47965180d57b26809e9262cd5fa38e33f

data/app/controllers/ops_backups/application_controller.rb

@@ -1,4 +1,17 @@
 module OpsBackups
   class ApplicationController < ActionController::Base
+    before_action :set_locale
+
+    private
+
+    def set_locale
+      # set the locale only if the locale is available
+      locale = extract_locale
+      I18n.locale = locale if I18n.available_locales.map(&:to_s).include?(locale)
+    end
+
+    def extract_locale
+      request.env["HTTP_ACCEPT_LANGUAGE"].split(",")&.first&.split(";")&.first.to_s
+    end
   end
 end

data/app/controllers/ops_backups/backups_controller.rb

@@ -1,12 +1,40 @@
 module OpsBackups
   class BackupsController < ApplicationController
     def index
-      @backups = OpsBackups::Backup.limit(20)
+      @backups = OpsBackups::Backup.all.order(updated_at: :desc)
+      @jobs = jobs
     end
 
     def download
       backup = OpsBackups::Backup.find(params[:id])
       redirect_to backup.backup_file.url(disposition: :attachment), allow_other_host: true
     end
+
+    def destroy
+      backup = OpsBackups::Backup.find(params[:id])
+      backup.destroy
+      redirect_to backups_url, notice: "#{backup} destroyed."
+    end
+
+    def trigger_job
+      job_name = params[:job_name]
+      job_config = jobs[job_name]
+
+      job_class = job_config["class"].constantize
+      args = job_config["args"] || []
+
+      Rails.logger.info "Triggering job: #{job_name} with args: #{args.reduce({}, :merge).symbolize_keys}"
+
+      job_class.perform_later(args.reduce({}, :merge).symbolize_keys)
+
+      redirect_to backups_url, notice: "#{job_name} triggered successfully."
+    end
+
+    private
+
+    def jobs
+      jobs = YAML.load_file(Rails.root.join("config", "recurring.yml"))[Rails.env]
+      jobs&.select { |k, v| v["class"].start_with?("OpsBackups") }
+    end
   end
 end

data/app/jobs/ops_backups/backup_db_job.rb

@@ -12,6 +12,7 @@ class OpsBackups::BackupDbJob < ApplicationJob
     exclude_tables = options[:exclude_tables] || []
     tag = options[:tag] || (exclude_tables.empty? ? "db_pg_full" : "db_pg_partial")
     cleanup = options[:cleanup]
+    Rails.logger.info "Performing backup with tag: #{tag} and exclude_tables: #{exclude_tables}"
     OpsBackups::Backup.new.db_pg_backup(exclude_tables:, tag:)
     OpsBackups::Backup.send("#{cleanup}_cleanup_policy", tag: tag) if cleanup.present?
   end

data/app/models/ops_backups/backup.rb

@@ -8,10 +8,6 @@ module OpsBackups
 
     default_scope { order(updated_at: :desc) }
 
-    def self.ransackable_attributes(auth_object = nil)
-      [ "created_at", "id", "name", "new_id", "tag", "updated_at" ]
-    end
-
     def size
       backup_file.attached? ? number_to_human_size(backup_file.byte_size) : "N/A"
     end
@@ -21,6 +17,11 @@ module OpsBackups
     end
 
     def db_pg_backup(tag: nil, exclude_tables: [])
+      if ENV["DATABASE_URL"].blank?
+        Rails.logger.error("Failed to backup database: DATABASE_URL is not set")
+        return
+      end
+
       db_url = ENV["DATABASE_URL"]
       tag ||= exclude_tables.empty? ? "db_pg_full" : "db_pg_partial" # if tag.empty?
       self.tag = tag

data/app/views/ops_backups/backups/index.html.erb

@@ -1,46 +1,119 @@
 <style>
+  @keyframes fadeOut {
+    to {
+      opacity: 0;
+    }
+  }
+  /* all elements have a border */
+  ops-backups * {
+    /* border: 1px solid red; */
+  }
   ops-backups {
     display: flex;
-    padding: 1em;
-    /* flex column */
+    padding: 0.5em;
     flex-direction: column;
+    & h1 {
+      margin: 0;
+      margin-bottom: 0.25em;
+    }
     & ops-backup {
       display: grid;
-      grid-template-columns: 1fr 1fr 10em 10em 18em 3em;
+      grid-template-columns: 3em 3fr 2fr 6em 6em 12em 6em;
+      gap: 0.5em;
       padding: 0.25em;
-      & ops-backup-size,
+      & ops-backup-index,
+        ops-backup-size,
         ops-backup-duration,
         ops-backup-created_at,
-        ops-backup-download {
+        ops-backup-actions {
         text-align: right;
       }
+      & ops-backup-actions {
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-end;
+        gap: 0.5em;
+      }
     }
     & ops-backup.header {
       font-weight: bold;
+      border-bottom: 1px solid black;
+      margin-bottom: 0.25em;
+    }
+    & ops-backup-jobs {
+      display: flex;
+      gap: 0.5em;
+      margin-bottom: 0.5em;
+      /* padding: 0.5em; */
+    }
+  }
+  .alerts {
+    /* position these alerts at the bottom right */
+    position: fixed;
+    bottom: 1em;
+    right: 1em;
+    animation: fadeOut 3s forwards 3s;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    gap: 0.5em;
+    & .alert {
+      padding: 0.5em;
+      border-radius: 0.25em;
+    }
+    & .alert-notice {
+      background-color: lightgreen;
+    }
+    & .alert-danger {
+      background-color: lightcoral;
     }
   }
 </style>
-<h1>Backups</h1>
 <ops-backups>
+  <h1>Backups</h1>
+  <% if @jobs.present? %>
+    <ops-backup-jobs>
+      <% @jobs.each do |name, config| %>
+        <%= button_to name, trigger_job_path(job_name: name), method: :post %>
+      <% end %>
+    </ops-backup-jobs>
+  <% end %>
   <ops-backup class="header">
+    <ops-backup-index>Index</ops-backup-index>
     <ops-backup-name>Name</ops-backup-name>
     <ops-backup-tag>Tag</ops-backup-tag>
     <ops-backup-size>Size</ops-backup-size>
     <ops-backup-duration>Duration</ops-backup-duration>
     <ops-backup-created_at>Created At</ops-backup-created_at>
+    <ops-backup-actions>Actions</ops-backup-actions>
   </ops-backup>
-  <% @backups.each do |backup| %>
-    <ops-backup>
+  <% @backups.each.with_index do |backup, i| %>
+    <ops-backup id="ops-backup-<%= i %>">
+      <ops-backup-index><%= i %></ops-backup-index>
       <ops-backup-name><%= backup.name %></ops-backup-name>
-      <ops-backup-tag><%= backup.name %></ops-backup-tag>
+      <ops-backup-tag><%= backup.tag %></ops-backup-tag>
       <ops-backup-size><%= backup.size %></ops-backup-size>
       <ops-backup-duration><%= backup.duration %></ops-backup-duration>
-      <ops-backup-created_at><%= backup.created_at %></ops-backup-created_at>
-      <ops-backup-download>
+      <ops-backup-created_at data-time="<%= backup.created_at.iso8601 %>"><%= l backup.created_at, format: :short %></ops-backup-created_at>
+      <ops-backup-actions>
         <% if backup.backup_file.attached? %>
-          <a href="<%= download_backup_path(backup) %>" download>📎</a>
+          <%= button_to "📎", download_backup_path(backup), method: :get %>
         <% end %>
-      </ops-backup-download>
+        <%= button_to "🗑️", backup_path(backup), method: :delete %>
+      </ops-backup-actions>
     </ops-backup>
   <% end %>
 </ops-backups>
+<div class="alerts">
+  <% flash.each do |key, value| %>
+    <div class="alert alert-<%= key %>"><%= value %></div>
+  <% end %>
+</div>
+<script>
+  // document.addEventListener("DOMContentLoaded", function() {
+  //   document.querySelectorAll("ops-backup-created_at").forEach(function(element) {
+  //     const time = new Date(element.getAttribute("data-time"));
+  //     element.textContent = time.toLocaleString();
+  //   });
+  // });
+</script>

data/config/routes.rb

@@ -1,4 +1,6 @@
 OpsBackups::Engine.routes.draw do
-  get 'backups', to: 'backups#index'
-  get 'backups/:id/download', to: 'backups#download', as: 'download_backup'
+  get "backups", to: "backups#index"
+  get "backups/:id/download", to: "backups#download", as: "download_backup"
+  delete "backups/:id", to: "backups#destroy", as: "backup"
+  post "backups/trigger_job", to: "backups#trigger_job", as: "trigger_job"
 end

data/lib/generators/ops_backups/activeadmin/templates/backup.rb

@@ -1,3 +1,13 @@
+# monkey patch the Backup model to allow for ransackable_attributes
+module OpsBackups
+  class Backup < ActiveRecord::Base
+    def self.ransackable_attributes(auth_object = nil)
+      [ "created_at", "id", "name", "new_id", "tag", "updated_at" ]
+    end
+  end
+end
+
+# ActiveAdmin resource for OpsBackups::Backup
 ActiveAdmin.register OpsBackups::Backup do
   menu parent: "Ops", label: I18n.t("admin.ops.backup")
 

data/lib/generators/ops_backups/install/install_generator.rb

@@ -39,7 +39,7 @@ class OpsBackups::InstallGenerator < Rails::Generators::Base
       recurring_config = <<~YAML.lines.map { |line| "  #{line}" }.join
         backup_db:
           class: OpsBackups::BackupDbJob
-          args: [tag: "db_pg_backup", cleanup: "retain_tiered_cleanup_policy"]
+          args: [tag: "db_pg_backup", cleanup: "retain_tiered"]
           schedule: every hour
       YAML
 

data/lib/ops_backups/version.rb

@@ -1,3 +1,3 @@
 module OpsBackups
-  VERSION = "0.1.12"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_backups
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Koen Handekyn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails