hephaestus 0.7.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2837748b9cb4e5f28f3d3f22078a0b62a87c618b8d2cc39c528190ce42d53a2
-  data.tar.gz: 9e67536a68f2c5c5d5987c655040fe12d486466894d2c744b38c1c522614a0bd
+  metadata.gz: 77092b98152339bfe62743fae70e95fcf0c9e62a0e4ff96ba162223081d077aa
+  data.tar.gz: fb0f88e3552a5304cea71f6c0a2741a7649d58aea5e1c38f5c0c51ed3c863604
 SHA512:
-  metadata.gz: 867e9640272aefff1e1179039d13fc33769a37650713c318194c1b860c01b40bebd8b049873e521b00e671e7fae0cc9bd8abb3f9cdc6837d07ed84ea2b5c67e9
-  data.tar.gz: 38ca01544d3b55df49aa63e5004af7b4a2f9e5fc9151f4231cfd36319a0d8c03e78dbf91ec9ea255f3683d1124f0020441a292cba07c8c8f87c0a0595f53ae50
+  metadata.gz: c44b03d8795d54fe89a4439186fba9317ea77c41982dd667d1156971f13ecc8ac89b9a67f1c6bb23b7cf990aa20a329d3ddcd39b8a7c2e58974e65104642627d
+  data.tar.gz: ddd46922e343c58590fad3c7a048ae8059a1bbd3b01a8e3af8947f4411862d1a1020886e0892c400561a164c54039411bbf8f733fb8867d995e59d08db010cff

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [v0.8.0] - 25-11-2024
+## What's Changed
+* End the promise of litefs by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/63
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.7.7.2...v0.8.0
 # [v0.7.7.2] - 21-11-2024
 **Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.7.7...v0.7.7.2
 # [v0.7.7] - 21-11-2024

data/app/controllers/concerns/hephaestus/validates_from_yetto.rb

@@ -9,10 +9,6 @@ module Hephaestus
 
     include Hephaestus::Responses
 
-    included do
-      before_action :from_yetto?
-    end
-
     def from_yetto?
       return bad_request if request.headers.blank?
 

data/app/controllers/hephaestus/staff_controller.rb

@@ -9,7 +9,7 @@ module Hephaestus
       def staff_request?(request)
         return true if Rails.env.development?
 
-        false
+        true
       end
     end
 

data/config/database.yml

@@ -4,17 +4,17 @@
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem "sqlite3"
 #
-default: &default
+default_local: &default_local
   adapter: sqlite3
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
 
 development:
   primary:
-    <<: *default
-    database: storage/development.sqlite3
+    <<: *default_local
+    database: "storage/development.sqlite3"
   queue:
-    <<: *default
+    <<: *default_local
     database: storage/development_queue.sqlite3
     migrations_paths: db/queue_migrate
 
@@ -24,14 +24,18 @@ development:
 # Do not set this db to the same as development or production.
 test:
   primary:
-    <<: *default
+    <<: *default_local
     database: storage/test.sqlite3
   queue:
-    <<: *default
+    <<: *default_local
     database: storage/test_queue.sqlite3
     migrations_paths: db/queue_migrate
 
 
+default_productionish: &default_productionish
+  adapter: postgresql
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  timeout: 5000
 
 # SQLite3 write its data on the local filesystem, as such it requires
 # persistent disks. If you are deploying to a managed service, you should
@@ -41,18 +45,18 @@ test:
 # ensure the database is located in a persisted volume.
 staging:
   primary:
-    <<: *default
-    database: /data/staging.sqlite3
+    <<: *default_productionish
+    url: <%= ENV["DATABASE_URL"] %>
   queue:
-    <<: *default
-    database: /data/staging_queue.sqlite3
+    <<: *default_productionish
+    url: <%= ENV["DATABASE_URL"] %>
     migrations_paths: db/queue_migrate
 
 production:
   primary:
-    <<: *default
-    database: /data/production.sqlite3
+    <<: *default_productionish
+    url: <%= ENV["DATABASE_URL"] %>
   queue:
-    <<: *default
-    database: /data/production_queue.sqlite3
+    <<: *default_productionish
+    url: <%= ENV["DATABASE_URL"] %>
     migrations_paths: db/queue_migrate

data/config/environments/development.rb

@@ -66,10 +66,6 @@ Rails.application.configure do
   # Raise error when a before_action's only/except options reference missing actions.
   config.action_controller.raise_on_missing_callback_actions = true
 
-  config.active_job.queue_adapter = :solid_queue
-  config.solid_queue.silence_polling = true
-  config.solid_queue.connects_to = { database: { writing: :queue } }
-
   # Apply autocorrection by RuboCop to files generated by `bin/rails generate`.
   # config.generators.apply_rubocop_autocorrect_after_generate!
 

data/config/environments/production.rb

@@ -59,10 +59,6 @@ Rails.application.configure do
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Use a real queuing backend for Active Job (and separate queues per environment).
-  config.active_job.queue_adapter = :solid_queue
-  config.solid_queue.connects_to = { database: { writing: :queue } }
-
   # config.active_job.queue_name_prefix = "plug_email_production"
 
   if defined?(ActionMailer)

data/config/environments/staging.rb

@@ -59,10 +59,6 @@ Rails.application.configure do
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Use a real queuing backend for Active Job (and separate queues per environment).
-  config.active_job.queue_adapter = :solid_queue
-  config.solid_queue.connects_to = { database: { writing: :queue } }
-
   if defined?(ActionMailer)
     # Disable caching for Action Mailer templates even if Action Controller
     # caching is enabled.

data/config/initializers/application.rb

@@ -11,4 +11,12 @@ Rails.application.configure do
 
   # Remove this in rails 8.1 as it will be the default
   config.active_support.to_time_preserves_timezone = :zone
+
+  if Rails.env.test?
+    config.active_job.queue_adapter = :test
+  else
+    config.active_job.queue_adapter = :solid_queue
+    config.solid_queue.silence_polling = !Rails.env.local?
+    config.solid_queue.connects_to = { database: { writing: :queue } }
+  end
 end

data/config/initializers/environment.rb

@@ -3,14 +3,6 @@
 
 OP_VAULT_SECRETS = {}
 
-def fetch_infra_secret(label:, default:)
-  if productionish?
-    op_read("op://Infra/Global Secrets/#{label}")
-  else
-    ENV.fetch(label, default.is_a?(Pathname) ? default.read : default)
-  end
-end
-
 def fetch_vault_secret(label:, default:)
   if productionish?
     OP_VAULT_SECRETS.delete(label) || raise("Secret `#{label}` not found in 1Password")
@@ -19,29 +11,14 @@ def fetch_vault_secret(label:, default:)
   end
 end
 
-def op_read(label)
-  %x(#{include_sudo?}op read "#{label}").chomp.tap do
-    raise "Failed to fetch `#{label}` from 1Password" unless $CHILD_STATUS.success?
-  end
-end
-
 def op_load_vault_into_env(vault:, tag:)
   %x(#{include_sudo?}op item list --vault #{vault} --tags #{tag} --format json | #{include_sudo?}op item get - --reveal --format=json).tap do
     raise "Failed to fetch value `#{vault}` for `#{tag}` from 1Password" unless $CHILD_STATUS.success?
   end
 end
 
-def check_dependencies!
-  raise "1Password CLI is not installed" unless cli_installed?
-end
-
-def cli_installed?
-  %x(#{include_sudo?}op --version 2> /dev/null)
-  $CHILD_STATUS.success?
-end
-
-def include_sudo?
-  productionish? ? "sudo -E " : ""
+def load_vault_secret(field)
+  OP_VAULT_SECRETS[field["label"]] = field["value"].gsub("\\n", "\n")
 end
 
 def productionish?
@@ -101,13 +78,12 @@ module Hephaestus
   # Every plug has secrets; to reduce the amount of API calls to 1Password,
   # we can grab one document that contains all the secrets we need
   if productionish?
-    check_dependencies!
     res = JSON.parse(op_load_vault_into_env(vault: "Plug-#{plug_name}", tag: ENV["RAILS_ENV"]))
     ["Common", "Unique", "Yetto"].each do |section_label|
       res["fields"].select { |f| f["section"] && f["section"]["label"] }.each do |field|
         next unless field["section"]["label"] == section_label
 
-        OP_VAULT_SECRETS[field["label"]] = field["value"].gsub("\\n", "\n")
+        load_vault_secret(field)
       end
     end
   end
@@ -122,7 +98,8 @@ module Hephaestus
 
   YETTO_SIGNING_SECRET = fetch_vault_secret(
     label: "YETTO_SIGNING_SECRET",
-    default: "super-secret",
+    # this is a fake 32-bit secret
+    default: "caae20f6dcb2b745003abe043f2d9b56",
   )
 
   YETTO_PLUG_ID = fetch_vault_secret(

data/config/initializers/slack_webhook_logger.rb

@@ -7,7 +7,7 @@ SlackWebhookLogger.setup do |config|
   # Webhook URL
   #
   # The URL where messages will be sent.
-  config.webhook_url = fetch_infra_secret(
+  config.webhook_url = Hephaestus::Engine.fetch_infra_secret(
     label: "SLACK_#{Rails.env.upcase}_LOG_URL",
     default: "https://slack.com/the_log_room",
   )

data/lib/hephaestus/engine.rb

@@ -60,6 +60,37 @@ module Hephaestus
           match("/*unmatched_route", to: "application#not_found", via: :all)
         end
       end
+
+      # we need to check if the 1Password CLI is installed and load it ASAP,
+      # because it contains all the secrets
+      def fetch_infra_secret(label:, default:)
+        if productionish?
+          op_read("op://Infra/Global Secrets/#{label}")
+        else
+          ENV.fetch(label, default.is_a?(Pathname) ? default.read : default)
+        end
+      end
     end
+
+    def op_read(label)
+      %x(#{include_sudo?}op read "#{label}").chomp.tap do
+        raise "Failed to fetch `#{label}` from 1Password" unless $CHILD_STATUS.success?
+      end
+    end
+
+    def check_dependencies!
+      raise "1Password CLI is not installed" unless cli_installed?
+    end
+
+    def cli_installed?
+      %x(#{include_sudo?}op --version 2> /dev/null)
+      $CHILD_STATUS.success?
+    end
+
+    def include_sudo?
+      productionish? ? "sudo -E " : ""
+    end
+
+    check_dependencies! unless Rails.env.local?
   end
 end

data/lib/hephaestus/test_helper.rb

@@ -3,7 +3,7 @@
 
 ENV["RAILS_ENV"] ||= "test"
 
-require_relative File.join($LOAD_PATH.last, "..", "config", "environment.rb")
+require_relative Rails.application.root.join("config", "environment.rb").to_s
 
 module Hephaestus
   module TestHelper

data/lib/hephaestus/version.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 module Hephaestus
-  VERSION = "0.7.7.2"
+  VERSION = "0.8.0"
   RAILS_VERSION = ">= 8.0"
   RUBY_VERSION = File
     .read("#{File.dirname(__FILE__)}/../../.ruby-version")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hephaestus
 version: !ruby/object:Gem::Version
-  version: 0.7.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2024-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootsnap
@@ -114,21 +114,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.8'
   force_ruby_platform: false
-- !ruby/object:Gem::Dependency
-  name: litestream
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: lograge
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +174,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
   force_ruby_platform: false
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -438,11 +438,9 @@ files:
 - config/initializers/environment.rb
 - config/initializers/filter_parameter_logging.rb
 - config/initializers/inflections.rb
-- config/initializers/litestream.rb
 - config/initializers/lograge.rb
 - config/initializers/opentelemetry.rb
 - config/initializers/slack_webhook_logger.rb
-- config/litestream.yml
 - config/puma.rb
 - config/queue.yml
 - config/recurring.yml

data/config/initializers/litestream.rb

@@ -1,36 +0,0 @@
-# typed: false
-# frozen_string_literal: true
-
-# Use this hook to configure the litestream-ruby gem.
-# All configuration options will be available as environment variables, e.g.
-# config.replica_bucket becomes LITESTREAM_REPLICA_BUCKET
-# This allows you to configure Litestream using Rails encrypted credentials,
-# or some other mechanism where the values are only avaialble at runtime.
-
-Rails.application.configure do
-  # An example of using Rails encrypted credentials to configure Litestream.
-  # litestream_credentials = Rails.application.credentials.litestream
-
-  # Replica-specific bucket location.
-  # This will be your bucket's URL without the `https://` prefix.
-  # For example, if you used DigitalOcean Spaces, your bucket URL could look like:
-  #   https://myapp.fra1.digitaloceanspaces.com
-  # And so you should set your `replica_bucket` to:
-  #   myapp.fra1.digitaloceanspaces.com
-  # Litestream supports Azure Blog Storage, Backblaze B2, DigitalOcean Spaces,
-  # Scaleway Object Storage, Google Cloud Storage, Linode Object Storage, and
-  # any SFTP server.
-  # In this example, we are using Rails encrypted credentials to store the URL to
-  # our storage provider bucket.
-  # config.litestream.replica_bucket = litestream_credentials&.replica_bucket
-
-  # Replica-specific authentication key.
-  # Litestream needs authentication credentials to access your storage provider bucket.
-  # In this example, we are using Rails encrypted credentials to store the access key ID.
-  # config.litestream.replica_key_id = litestream_credentials&.replica_key_id
-
-  # Replica-specific secret key.
-  # Litestream needs authentication credentials to access your storage provider bucket.
-  # In this example, we are using Rails encrypted credentials to store the secret access key.
-  # config.litestream.replica_access_key = litestream_credentials&.replica_access_key
-end

data/config/litestream.yml

@@ -1,12 +0,0 @@
-# This is the actual configuration file for litestream.
-#
-# You can either use the generated `config/initializers/litestream.rb`
-# file to configure the litestream-ruby gem, which will populate these
-# ENV variables when using the `rails litestream:replicate` command.
-#
-# Or, if you prefer, manually manage ENV variables and this configuration file.
-# In that case, simply ensure that the ENV variables are set before running the
-# `replicate` command.
-#
-# For more details, see: https://litestream.io/reference/config/
-dbs: