Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ jobs:
run: bundle exec rake --trace
env:
REFORGE_INTEGRATION_TEST_SDK_KEY: ${{ secrets.REFORGE_INTEGRATION_TEST_SDK_KEY }}
PREFAB_INTEGRATION_TEST_ENCRYPTION_KEY: c87ba22d8662282abe8a0e4651327b579cb64a454ab0f4c170b45b15f049a221
REFORGE_INTEGRATION_TEST_ENCRYPTION_KEY: c87ba22d8662282abe8a0e4651327b579cb64a454ab0f4c170b45b15f049a221
NOT_A_NUMBER: "abcd"
IS_A_NUMBER: "1234"
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "test/shared-integration-test-data"]
path = test/shared-integration-test-data
url = git@github.com:ReforgeHQ/sdk-integration-test-data.git
url = git@github.com:ReforgeHQ/integration-test-data.git
2 changes: 1 addition & 1 deletion lib/reforge/criteria_evaluator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def value_from_properties(criterion, properties)
case criterion.property_name
when NAMESPACE_KEY
@namespace
when 'prefab.current-time','reforge-sdk.current-time'
when 'prefab.current-time','reforge.current-time'
Time.now.utc.to_i * 1000
else
properties.get(criterion.property_name)
Expand Down
2 changes: 1 addition & 1 deletion lib/reforge/errors/initialization_timeout_error.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Reforge
module Errors
class InitializationTimeoutError < Reforge::Error
def initialize(timeout_sec, key)
message = "Reforge SDK couldn't initialize in #{timeout_sec} second timeout. Trying to fetch key `#{key}`."
message = "Reforge couldn't initialize in #{timeout_sec} second timeout. Trying to fetch key `#{key}`."
super(message)
end
end
Expand Down
6 changes: 3 additions & 3 deletions lib/reforge/options.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module DATASOURCES
sources: nil,
sdk_key: ENV['SDK_API_KEY'] || ENV['PREFAB_API_KEY'],
namespace: '',
prefab_api_url: nil,
reforge_api_url: nil,
on_no_default: ON_NO_DEFAULT::RAISE, # options :raise, :warn_and_return_nil,
initialization_timeout_sec: 10, # how long to wait before on_init_failure
on_init_failure: ON_INITIALIZATION_FAILURE::RAISE,
Expand Down Expand Up @@ -121,8 +121,8 @@ module DATASOURCES
source.sub(/(belt|suspenders)\./, 'telemetry.')
end[0]

if prefab_api_url
warn '[DEPRECATION] prefab_api_url is deprecated. Please provide `sources` if you need to override the default sources'
if reforge_api_url
warn '[DEPRECATION] reforge_api_url is deprecated. Please provide `sources` if you need to override the default sources'
end

case context_upload_mode
Expand Down
2 changes: 1 addition & 1 deletion test/integration_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def last_post_endpoint
def parse_client_overrides(overrides)
Hash[
(overrides || {}).map do |(k, v)|
if k.to_s == "prefab_api_url"
if k.to_s == "reforge_api_url"
[:sources, [v]]
else
[k.to_sym, v]
Expand Down
2 changes: 1 addition & 1 deletion test/shared-integration-test-data