hephaestus 0.7.2.1 → 0.7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c2f9d61793dbe5625865f819df27d6c9d63af6a8b62d24baad0179cb18292a
-  data.tar.gz: 2b3b19c2cf731b161b8d669e82613ef734b3724580ffaed458912e16ea2dee4e
+  metadata.gz: aa434c3350cbeb0ba0f33457265f2f191196762b7b29d0857ed974cee9f8c008
+  data.tar.gz: 1ac324371d86e09c465918289d7ab64024d35ab3b3331de831816f37d150c6b8
 SHA512:
-  metadata.gz: 0dab68747b8859e1f6d0b24bb2d5d3243f4bb0278602d132eaa4a822d18b7ffaf69b9f683edf1fe1af807bfced0e009010433095725c083582decf8b0a4116f8
-  data.tar.gz: aaf595de123fbb62eb0582e05d94f3f437c2e0eca9564c563ec6485ba65aede1f690c8d91b266be5235c5755770136b7c46a7646c0b49006131dff1978b78c13
+  metadata.gz: 16c8f996fffbbda083c2c399e17691566a3b7a57ae83cf3f2653c7f8b01be60add0da975c47b99d5c7ce0ee3989dc92edab07396b320bf498fb29dc02d5eabb8
+  data.tar.gz: 7fac9568440247732d5c8f946f1992639d428c02424613e84a7be9f5b8f887cc17f6cd0598d1bd406d5fd4331c2078b2a187e7eff3fd6b99463b24565f761f66

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [v0.7.2.2] - 16-11-2024
+## What's Changed
+*  is not yet available by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/33
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.7.2.1...v0.7.2.2
 # [v0.7.2.1] - 16-11-2024
 ## What's Changed
 * include all files in the gem by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/31

data/config/initializers/environment.rb

@@ -1,17 +1,28 @@
 # typed: false
 # frozen_string_literal: true
 
-def set_env_var(production:, staging:, local:)
-  case Rails.env
-  when "production"
-    %x(op read "#{production}").chomp
-  when "staging"
-    %x(op read "#{staging}").chomp
+def fetch_plug_env_secret(label:, default:)
+  case ENV["RAILS_ENV"]
+  when "production", "staging"
+    op_read("op://Plug-#{plug_name}/#{ENV["RAILS_ENV"].capitalize}/#{label}")
   else
-    local
+    ENV.fetch(label.to_s, default)
   end
 end
 
+def fetch_infra_secret(label:, default:)
+  case ENV["RAILS_ENV"]
+  when "production", "staging"
+    op_read("op://Infra/Global Secrets/#{label}")
+  else
+    ENV.fetch(label.to_s, default)
+  end
+end
+
+def op_read(label)
+  %x(op read "#{label}").chomp
+end
+
 def productionish?
   Rails.env.production? || Rails.env.staging?
 end
@@ -66,29 +77,16 @@ module Hephaestus
     "web.yetto.test"
   end
 
-  SLACK_LOG_URL = set_env_var(
-    production: "op://Infra/Secrets/SLACK_LOG_URL",
-    staging: "op://Infra/Secrets/SLACK_LOG_URL",
-    local: ENV.fetch("SLACK_LOG_URL", "https://slack.com/the_log_room"),
+  SLACK_LOG_URL = fetch_infra_secret(
+    label: "SLACK_LOG_URL",
+    default: "https://slack.com/the_log_room",
   )
 
   YETTO_API_URL = "#{YETTO_URL}/api"
   YETTO_REDIRECT_URL = productionish? ? "#{PROTOCOL}#{YETTO_URL}" : "#{PROTOCOL}127.0.0.1:3000"
 
   # Every plug has these secrets
-  YETTO_PLUG_PEM = set_env_var(
-    production: "op://Plug-#{plug_name}/Production/YETTO_PLUG_PEM",
-    staging: "op://Plug-#{plug_name}/Staging/YETTO_PLUG_PEM",
-    local: ENV.fetch("YETTO_PLUG_PEM", Rails.root.join("test/fixtures/files/fake_pem_file/fake.pem").read),
-  )
-  YETTO_SIGNING_SECRET = set_env_var(
-    production: "op://Plug-#{plug_name}/Production/YETTO_SIGNING_SECRET",
-    staging: "op://Plug-#{plug_name}/Staging/YETTO_SIGNING_SECRET",
-    local: ENV.fetch("YETTO_SIGNING_SECRET", "super-secret"),
-  )
-  YETTO_PLUG_ID = set_env_var(
-    production: "op://Plug-#{plug_name}/Production/YETTO_PLUG_ID",
-    staging: "op://Plug-#{plug_name}/Staging/YETTO_PLUG_ID",
-    local: ENV.fetch("YETTO_PLUG_ID", "plug-id"),
-  )
+  YETTO_PLUG_PEM = fetch_plug_env_secret(label: "YETTO_PLUG_PEM", default: Rails.root.join("test/fixtures/files/fake_pem_file/fake.pem").read)
+  YETTO_SIGNING_SECRET = fetch_plug_env_secret(label: "YETTO_SIGNING_SECRET", default: "super-secret")
+  YETTO_PLUG_ID = fetch_plug_env_secret(label: "YETTO_PLUG_ID", default: "plug-id")
 end

data/config/initializers/opentelemetry.rb

@@ -5,10 +5,9 @@ unless Rails.env.development?
   # establish the environment for OTEL
   ENV["OTEL_EXPORTER_OTLP_ENDPOINT"] = "https://api.honeycomb.io"
 
-  ENV["OTEL_EXPORTER_OTLP_HEADERS"] = set_env_var(
-    production: "op://Plug-#{plug_name}/Production/OTEL_EXPORTER_OTLP_HEADERS",
-    staging: "op://Plug-#{plug_name}/Staging/OTEL_EXPORTER_OTLP_HEADERS",
-    local: ENV.fetch("OTEL_EXPORTER_OTLP_HEADERS", "x-honeycomb-team=your-api-key"),
+  ENV["OTEL_EXPORTER_OTLP_HEADERS"] = fetch_plug_env_secret(
+    label: "OTEL_EXPORTER_OTLP_HEADERS",
+    default: "x-honeycomb-team=your-api-key",
   )
 
   ENV["OTEL_SERVICE_NAME"] = "plug-#{plug_shortname}-#{Rails.env}"

data/lib/hephaestus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hephaestus
 version: !ruby/object:Gem::Version
-  version: 0.7.2.1
+  version: 0.7.2.2
 platform: ruby
 authors:
 - Garen Torikian