refactor: change crendetials

noxasch · noxasch · commit 8758f55ed147 · 2024-03-17T03:07:58.000+08:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
     env:
       COVERAGE_RUBY_VERSION: 2.6
       BUNDLE_PATH: vendor/bundle
-      RAILS_MASTER_KEY: 0e29551e5c31acf7c769d64397af54e4 # rails 7.1 use master key to decrypt creds
+      RAILS_MASTER_KEY: 0e29551e5c31acf7c769d64397af54e4 # rails require to decrypt creds
     strategy:
       fail-fast: false
       matrix:
diff --git a/lib/config.rb b/lib/config.rb
@@ -50,10 +50,10 @@ def self.load_files(*sources)
     config.add_source!(Sources::EnvSource.new(ENV)) if Config.use_env
 
     if defined?(::Rails::Railtie) && Config.use_rails_credentials
-      if Rails.version < '7.1'
-        config.add_source!(Sources::HashSource.new(secret: Rails.application.secrets.to_h.deep_stringify_keys))
+      if Gem::Version.new(Rails.version) < Gem::Version.new('6.0.0')
+        config.add_source!(Sources::HashSource.new(Rails.application.secrets.to_h.deep_stringify_keys))
       else
-        config.add_source!(Sources::HashSource.new(secret: Rails.application.credentials.config))
+        config.add_source!(Sources::HashSource.new(Rails.application.credentials.config.deep_stringify_keys))
       end
     end
 
diff --git a/spec/app/rails_5.2/config/credentials.yml.enc b/spec/app/rails_5.2/config/credentials.yml.enc
@@ -1 +1 @@
-A2UDbxJDfWG0plzucsHjLA6QIqFzAoXntTM6UZzmqRRWwXT+rQJQEOgIOqeOdW9aNe8AhJJvc4tEMtw3DZ2LSKQ2O06MRhbBbpQRU8UDhEeUUvadNXN7xYW3qS10UINn0kIDUdzAwYxYpo4Ux+p6pvcRcV2+pimvoLoKIcwqsPxGSyVhAuymqn29WMS6JddRNj8LXshYnceVtEtw25Pzc+J5POXQRnF9CCrRV/XWrqtF5qROIMQepiIxizIkwSQA2+qFIL3oOlLBTyPf6I3ybGk/wlTqVnZNRoKI6GP6iJ0uTTKFYIBXSHUjTS/oC91f4xFOWgSvIojcavmeTWKxobaGur8LqUL9/cJ3rirhHyMdCJuVQr+m5ySUyto8Z25/1IdPsRyleGl/k23kXjzwJmzChdq9mElsXJSE--hgxYDA7y8hacPoA2--Rxd34YfrAzf1jlxy3b/FGA==
+m3lysAv8wqGjFAsBDZ4YvmZfbwUKEi7umoQungfPdOGS9AvPvlyCzc6WZZxD47zeEUUYGA2N9ZsKtyZSotx1A1EABrosT5lGmBkdlFHAw03CPIlYNllt+b4fGPtWEJRo--LDfMlQx4Y/bRk8vp--dfNGYxQFI7KUBKnUU5efcA==
diff --git a/spec/app/rails_5.2/config/credentials/test.yml.enc b/spec/app/rails_5.2/config/credentials/test.yml.enc
diff --git a/spec/app/rails_6.0/config/credentials/test.yml.enc b/spec/app/rails_6.0/config/credentials/test.yml.enc
diff --git a/spec/app/rails_6.1/config/credentials.yml.enc b/spec/app/rails_6.1/config/credentials.yml.enc
@@ -1 +1 @@
-jzup5kRgbmiI0F89h0xPvPGGpYC1FQsTvFQQBj0sED/K0rltK+3pv8E2YonXPgHdd8qkKdqKfhm91SlEt/y/vBvcdgklocYFVTlEJpggaPjxkXjIoyYc8/55EAOSt35rWBwyKoINvUYa0X/xlKzp/G0Q9PWmdmnum5+rwA/adEL49qLKofAQoum0XRzj5sIyNfmhJ0nQ+N3LEsGKQZ5nkvD6nCI5ZBQVcyrXpVngzLSXzabNEY7ecMDdMnI9wx+qUxh48f0uro1vHOAmf6uQ+OY3gEX6ctIEKuGEMVaIql5WIxwYXII1GgeKbl8coyKs54Llo/yaMen25NFM3HN8LHZySGa3mH7k3XR9wQVOC2DO00ntgUtpxiszQcEu/mouZnaVBPSVL3EcD45wxBOf88/7SMDxy7cmUoLP--s+KOPMDaTNvlD2T2--Q48zotFsOULqsWoCRU2fDg==
+m3lysAv8wqGjFAsBDZ4YvmZfbwUKEi7umoQungfPdOGS9AvPvlyCzc6WZZxD47zeEUUYGA2N9ZsKtyZSotx1A1EABrosT5lGmBkdlFHAw03CPIlYNllt+b4fGPtWEJRo--LDfMlQx4Y/bRk8vp--dfNGYxQFI7KUBKnUU5efcA==
diff --git a/spec/app/rails_6.1/config/credentials/test.key b/spec/app/rails_6.1/config/credentials/test.key
@@ -0,0 +1 @@
+0e29551e5c31acf7c769d64397af54e4
diff --git a/spec/app/rails_6.1/config/credentials/test.yml.enc b/spec/app/rails_6.1/config/credentials/test.yml.enc
@@ -1 +1 @@
-qU0cAsjfKz4lnoJPU36JuM7Yh3qm6B2YV7LhqJROKCu4AsOW0AfFY9FM+aTeRsZOIdIBHyyargCI1xmq3N5o4rdVZRXxWIt2PD93xZPlcMrlAb645m8hyni1cW4=--dPokgPsIyoKhzMzD--nb/fnuH1FaTNT5iF8J3TfQ==
+m3lysAv8wqGjFAsBDZ4YvmZfbwUKEi7umoQungfPdOGS9AvPvlyCzc6WZZxD47zeEUUYGA2N9ZsKtyZSotx1A1EABrosT5lGmBkdlFHAw03CPIlYNllt+b4fGPtWEJRo--LDfMlQx4Y/bRk8vp--dfNGYxQFI7KUBKnUU5efcA==
diff --git a/spec/app/rails_7.0/config/credentials/test.yml.enc b/spec/app/rails_7.0/config/credentials/test.yml.enc
@@ -1 +1 @@
-qU0cAsjfKz4lnoJPU36JuM7Yh3qm6B2YV7LhqJROKCu4AsOW0AfFY9FM+aTeRsZOIdIBHyyargCI1xmq3N5o4rdVZRXxWIt2PD93xZPlcMrlAb645m8hyni1cW4=--dPokgPsIyoKhzMzD--nb/fnuH1FaTNT5iF8J3TfQ==
+m3lysAv8wqGjFAsBDZ4YvmZfbwUKEi7umoQungfPdOGS9AvPvlyCzc6WZZxD47zeEUUYGA2N9ZsKtyZSotx1A1EABrosT5lGmBkdlFHAw03CPIlYNllt+b4fGPtWEJRo--LDfMlQx4Y/bRk8vp--dfNGYxQFI7KUBKnUU5efcA==
diff --git a/spec/app/rails_7.1/.gitignore b/spec/app/rails_7.1/.gitignore
@@ -33,3 +33,5 @@
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
+
+/config/credentials/test.key
diff --git a/spec/app/rails_7.1/config/credentials/test.yml.enc b/spec/app/rails_7.1/config/credentials/test.yml.enc
@@ -1 +1 @@
-qU0cAsjfKz4lnoJPU36JuM7Yh3qm6B2YV7LhqJROKCu4AsOW0AfFY9FM+aTeRsZOIdIBHyyargCI1xmq3N5o4rdVZRXxWIt2PD93xZPlcMrlAb645m8hyni1cW4=--dPokgPsIyoKhzMzD--nb/fnuH1FaTNT5iF8J3TfQ==
+m3lysAv8wqGjFAsBDZ4YvmZfbwUKEi7umoQungfPdOGS9AvPvlyCzc6WZZxD47zeEUUYGA2N9ZsKtyZSotx1A1EABrosT5lGmBkdlFHAw03CPIlYNllt+b4fGPtWEJRo--LDfMlQx4Y/bRk8vp--dfNGYxQFI7KUBKnUU5efcA==
diff --git a/spec/config_spec.rb b/spec/config_spec.rb
@@ -490,8 +490,8 @@
         end
     
         it "shoud have secret_key_base loaded" do
-          expect(config.keys).to contain_exactly(:size, :section, :secret)
-          expect(config.secret.secret_key_base).to_not eq(nil)
+          expect(config.keys).to contain_exactly(:size, :section, :aws)
+          expect(config.aws.secret_access_key).to eq('123456')
         end
         
         context 'use_rails_credentials is false' do

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-A2UDbxJDfWG0plzucsHjLA6QIqFzAoXntTM6UZzmqRRWwXT+rQJQEOgIOqeOdW9aNe8AhJJvc4tEMtw3DZ2LSKQ2O06MRhbBbpQRU8UDhEeUUvadNXN7xYW3qS10UINn0kIDUdzAwYxYpo4Ux+p6pvcRcV2+pimvoLoKIcwqsPxGSyVhAuymqn29WMS6JddRNj8LXshYnceVtEtw25Pzc+J5POXQRnF9CCrRV/XWrqtF5qROIMQepiIxizIkwSQA2+qFIL3oOlLBTyPf6I3ybGk/wlTqVnZNRoKI6GP6iJ0uTTKFYIBXSHUjTS/oC91f4xFOWgSvIojcavmeTWKxobaGur8LqUL9/cJ3rirhHyMdCJuVQr+m5ySUyto8Z25/1IdPsRyleGl/k23kXjzwJmzChdq9mElsXJSE--hgxYDA7y8hacPoA2--Rxd34YfrAzf1jlxy3b/FGA==`
	`1`	`+m3lysAv8wqGjFAsBDZ4YvmZfbwUKEi7umoQungfPdOGS9AvPvlyCzc6WZZxD47zeEUUYGA2N9ZsKtyZSotx1A1EABrosT5lGmBkdlFHAw03CPIlYNllt+b4fGPtWEJRo--LDfMlQx4Y/bRk8vp--dfNGYxQFI7KUBKnUU5efcA==`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-jzup5kRgbmiI0F89h0xPvPGGpYC1FQsTvFQQBj0sED/K0rltK+3pv8E2YonXPgHdd8qkKdqKfhm91SlEt/y/vBvcdgklocYFVTlEJpggaPjxkXjIoyYc8/55EAOSt35rWBwyKoINvUYa0X/xlKzp/G0Q9PWmdmnum5+rwA/adEL49qLKofAQoum0XRzj5sIyNfmhJ0nQ+N3LEsGKQZ5nkvD6nCI5ZBQVcyrXpVngzLSXzabNEY7ecMDdMnI9wx+qUxh48f0uro1vHOAmf6uQ+OY3gEX6ctIEKuGEMVaIql5WIxwYXII1GgeKbl8coyKs54Llo/yaMen25NFM3HN8LHZySGa3mH7k3XR9wQVOC2DO00ntgUtpxiszQcEu/mouZnaVBPSVL3EcD45wxBOf88/7SMDxy7cmUoLP--s+KOPMDaTNvlD2T2--Q48zotFsOULqsWoCRU2fDg==`
	`1`	`+m3lysAv8wqGjFAsBDZ4YvmZfbwUKEi7umoQungfPdOGS9AvPvlyCzc6WZZxD47zeEUUYGA2N9ZsKtyZSotx1A1EABrosT5lGmBkdlFHAw03CPIlYNllt+b4fGPtWEJRo--LDfMlQx4Y/bRk8vp--dfNGYxQFI7KUBKnUU5efcA==`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-qU0cAsjfKz4lnoJPU36JuM7Yh3qm6B2YV7LhqJROKCu4AsOW0AfFY9FM+aTeRsZOIdIBHyyargCI1xmq3N5o4rdVZRXxWIt2PD93xZPlcMrlAb645m8hyni1cW4=--dPokgPsIyoKhzMzD--nb/fnuH1FaTNT5iF8J3TfQ==`
	`1`	`+m3lysAv8wqGjFAsBDZ4YvmZfbwUKEi7umoQungfPdOGS9AvPvlyCzc6WZZxD47zeEUUYGA2N9ZsKtyZSotx1A1EABrosT5lGmBkdlFHAw03CPIlYNllt+b4fGPtWEJRo--LDfMlQx4Y/bRk8vp--dfNGYxQFI7KUBKnUU5efcA==`