activerecord-cipherstash-pg-adapter 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a76ecda67534aee78fe658b78c5ba3f7834f59c229b7391d75fd736d7aa4e23
-  data.tar.gz: 13284339b37ab578d8ce181a9c291bb4826f556caedbac55f9cc2b9cb1fb3084
+  metadata.gz: f49b439e9bfe2874fc67bf0f4064ba66a3659a9e67b207e156ddb2b3cf8c5bb2
+  data.tar.gz: 02347f9e3efe1f15da8dd6c11e8745c424d7dd9f65b493640ea57f41370dd7b3
 SHA512:
-  metadata.gz: 9644a5705b513fa4356f193995fc5b462acac8d66fba7c02031a51e3a0ad2e864865d84f561ea70ec0582129815a38920b3e557c1a29753597c86f0346c6d5df
-  data.tar.gz: cc240e5e9b255e4075cfc9ea13c40cf9b5715b8cd1b4a82f4dff8b98ae9112999413afaff9a10984947a2629d334868d95888e36b5ff3ea29fb82d5f29344ee4
+  metadata.gz: 703fb309bb186e2350856b0f5fabae1e373685e13552afb53cfb04fb2630866f271cbbf2efebe305e9a06bc5f62dbc3808379d2037286e4af42a9052bae8185a
+  data.tar.gz: 5885728f591239c6f6893dbd9f2b19bb75976bd01237fedb24a9fcf42804ce78315b5da1831af0cf35961ea6210c072fc28c520bfbc703157cd163dc369a9c60

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [0.6.0] - 2023-04-20
+
+### Changed
+
+- Updated the adapter name constant to be the same as the ActiveRecord PostgreSQL adapter.
+
+### Fixed
+
+- Logic around Rails credentials taking precedence over local env vars.
+
 ## [0.5.0] - 2023-04-19
 
 ### Added

data/lib/active_record/connection_adapters/6.1/postgres_cipherstash_adapter.rb

@@ -53,7 +53,7 @@ module ActiveRecord
 
   module ConnectionAdapters
     class CipherStashPGAdapter < AbstractAdapter
-      ADAPTER_NAME = "CipherStash PostgreSQL"
+      ADAPTER_NAME = "PostgreSQL"
 
       class << self
         def new_client(conn_params)

data/lib/active_record/connection_adapters/7.0/postgres_cipherstash_adapter.rb

@@ -54,7 +54,7 @@ module ActiveRecord
 
   module ConnectionAdapters
     class CipherStashPGAdapter < AbstractAdapter
-      ADAPTER_NAME = "CipherStash PostgreSQL"
+      ADAPTER_NAME = "PostgreSQL"
 
       class << self
         def new_client(conn_params)

data/lib/active_record/connection_adapters/postgres_cipherstash_adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # Why the funky filename
-# (lib/active_record/connection_adapters/cipherstash_pg_adapter.rb)
+# (lib/active_record/connection_adapters/postgres_cipherstash_adapter.rb)
 # that doesn't match the gem structure? It's to hook into Rails.
 #
 # See this chunk from:

data/lib/activerecord-cipherstash-pg-adapter.rb

@@ -15,10 +15,27 @@ module ActiveRecord
         initializer "postgres_cipherstash_adapter.configure" do
           if defined?(Rails.application.credentials)
             cs_credentials = Rails.application.credentials.try(:cipherstash)
-            ENV["CS_CLIENT_ID"] = cs_credentials&.fetch(:client_id, nil)
-            ENV["CS_CLIENT_KEY"] = cs_credentials&.fetch(:client_key, nil)
-            ENV["CS_WORKSPACE_ID"] = cs_credentials&.fetch(:workspace_id, nil)
-            ENV["CS_CLIENT_ACCESS_KEY"] = cs_credentials&.fetch(:client_access_key, nil)
+
+            client_id = cs_credentials&.fetch(:client_id, nil)
+            client_key = cs_credentials&.fetch(:client_key, nil)
+            workspace_id = cs_credentials&.fetch(:workspace_id, nil)
+            client_access_key = cs_credentials&.fetch(:client_access_key, nil)
+
+            unless client_id.nil?
+              ENV["CS_CLIENT_ID"] = client_id
+            end
+
+            unless client_key.nil?
+              ENV["CS_CLIENT_KEY"] = client_key
+            end
+
+            unless workspace_id.nil?
+              ENV["CS_WORKSPACE_ID"] = workspace_id
+            end
+
+            unless client_access_key.nil?
+              ENV["CS_CLIENT_ACCESS_KEY"] = client_access_key
+            end
           end
         end
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecord
-  CIPHERSTASH_PG_ADAPTER_VERSION = "0.5.0"
+  CIPHERSTASH_PG_ADAPTER_VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cipherstash-pg-adapter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Robin Howard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord