hephaestus 0.8.5 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44a6ef560eaf3539cd8bde7d6e0bebd03d527151d3cf1b6dc6514c8b0901f03b
-  data.tar.gz: 59de90522a1ce2df7bc841c8d6af6ff94d3624591dcf05fc78a84146fb19abcd
+  metadata.gz: b3c1fc749a8387f060bd64519a41ff75516668a53e4960d2ad36b5f876b58d6d
+  data.tar.gz: 4818733c054814165462e31b131ca1edbfde01d2d1d34f8c0715a497421679c6
 SHA512:
-  metadata.gz: 56f28075c9a0722b687092e376a7de1d906612e00a919cc6bd0cb7100e92d46424c223670f9311971c376dc29ec23f25de1b1fa42e552e0623dca3f0746ef527
-  data.tar.gz: d7cc7da306bc4c19eaa56ee8eebed915d1dadf246f678d7e1eb772973c14e2a2285896571a1b7fbc5bd5c16f7e8b1749c708829aca6f416ba07b5c755062cade
+  metadata.gz: 95ca846fca450e6df9221e933c28d041fabb91715b9b57f952951d350c50bf87bce4ce183495348c4df812133a8d068b41317855dc8f3e74457ca9664d4b463e
+  data.tar.gz: a6ca9a870d6e9423ca066c3c11541b1ef5d458b875f4f2f02e88e6f5c0ba3c30482a84f19e5b4f52b9a4d3e202338cc9b3486112db195267c100ffae87d3c6ce

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [v0.8.7] - 04-12-2024
+## What's Changed
+* Load infra better by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/77
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.8.6...v0.8.7
+# [v0.8.6] - 03-12-2024
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.8.5...v0.8.6
 # [v0.8.5] - 03-12-2024
 ## What's Changed
 * Queue jobs based on plug name by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/74

data/config/initializers/environment.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 OP_VAULT_SECRETS = {}
+OP_INFRA_SECRETS = {}
 
 def fetch_vault_secret(label:, default:)
   if productionish?
@@ -11,9 +12,18 @@ def fetch_vault_secret(label:, default:)
   end
 end
 
-def op_load_vault_into_env(vault:, tag:)
+def fetch_infra_secret(label:, default:)
+  if productionish?
+    OP_INFRA_SECRETS.delete(label) || raise("Secret `#{label}` not found in 1Password")
+  else
+    ENV.fetch(label, default.is_a?(Pathname) ? default.read : default)
+  end
+end
+
+def op_load_vault_into_env(vault:, tag: nil)
   include_sudo = !Rails.env.local? ? "sudo -E " : ""
-  %x(#{include_sudo}op item list --vault #{vault} --tags #{tag} --format json | #{include_sudo}op item get - --reveal --format=json).tap do
+  include_tag = tag ? " --tags #{tag} " : ""
+  %x(#{include_sudo}op item list --vault #{vault}#{include_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
@@ -22,6 +32,10 @@ def load_vault_secret(field)
   OP_VAULT_SECRETS[field["label"]] = field["value"].gsub("\\n", "\n")
 end
 
+def load_infra_secret(field)
+  OP_INFRA_SECRETS[field["label"]] = field["value"].gsub("\\n", "\n")
+end
+
 def productionish?
   Rails.env.production? || Rails.env.staging?
 end
@@ -87,6 +101,15 @@ module Hephaestus
         load_vault_secret(field)
       end
     end
+
+    res = JSON.parse(op_load_vault_into_env(vault: "Infra", tag: ENV["RAILS_ENV"]))
+    ["Common"].each do |section_label|
+      res["fields"].select { |f| f["section"] && f["section"]["label"] }.each do |field|
+        next unless field["section"]["label"] == section_label
+
+        load_infra_secret(field)
+      end
+    end
   end
 
   YETTO_API_URL = "#{YETTO_URL}/api"

data/config/initializers/opentelemetry.rb

@@ -5,7 +5,7 @@ unless Rails.env.development?
   # establish the environment for OTEL
   ENV["OTEL_EXPORTER_OTLP_ENDPOINT"] = "https://api.honeycomb.io"
 
-  ENV["OTEL_EXPORTER_OTLP_HEADERS"] = fetch_vault_secret(
+  ENV["OTEL_EXPORTER_OTLP_HEADERS"] = Hephaestus::Engine.fetch_infra_secret(
     label: "OTEL_EXPORTER_OTLP_HEADERS",
     default: "x-honeycomb-team=your-api-key",
   )

data/config/initializers/slack_webhook_logger.rb

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

data/config/queue.yml

@@ -5,7 +5,7 @@ default: &default
   workers:
     - queues: [plug_<%= plug_shortname %>_high_priority*, plug_<%= plug_shortname %>_mid_priority*, plug_<%= plug_shortname %>_low_priority*]
       threads: 5
-    - queues: "*" # default, mailers, etc
+    - queues: "plug_<%= plug_shortname %>_*" # default, mailers, etc
       threads: 3
 
 development:

data/lib/hephaestus/version.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 module Hephaestus
-  VERSION = "0.8.5"
+  VERSION = "0.8.7"
   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.8.5
+  version: 0.8.7
 platform: ruby
 authors:
 - Garen Torikian
 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: bootsnap