diff --git a/micronaut/README.md b/micronaut/README.md index 1ea8721..3584d2e 100644 --- a/micronaut/README.md +++ b/micronaut/README.md @@ -20,7 +20,7 @@ Maven com.reforge sdk-micronaut-extension - 1.0.0 + LATEST ``` diff --git a/micronaut/pom.xml b/micronaut/pom.xml index 4ac0226..4f4ce22 100644 --- a/micronaut/pom.xml +++ b/micronaut/pom.xml @@ -4,7 +4,7 @@ com.reforge sdk-parent - 1.0.0 + 1.0.1 sdk-micronaut-extension diff --git a/pom.xml b/pom.xml index 7643fbd..68a653e 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.reforge sdk-parent - 1.0.0 + 1.0.1 pom Reforge SDK Parent POM Parent POM for Reforge SDK modules providing feature flags, configuration management, and A/B testing capabilities diff --git a/sdk/README.md b/sdk/README.md index e434536..7a716a4 100644 --- a/sdk/README.md +++ b/sdk/README.md @@ -13,7 +13,7 @@ See full documentation https://docs.reforge.com/docs/java-sdk/java com.reforge sdk - 0.3.26 + LATEST ``` @@ -25,7 +25,7 @@ For an uber-jar including relocated guava and failsafe dependencies add the "ube com.reforge sdk - 0.3.26 + LATEST uberjar ``` diff --git a/sdk/pom.xml b/sdk/pom.xml index 6cfa189..401e642 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -4,7 +4,7 @@ com.reforge sdk-parent - 1.0.0 + 1.0.1 sdk diff --git a/sdk/src/main/java/com/reforge/sdk/Options.java b/sdk/src/main/java/com/reforge/sdk/Options.java index 1864f68..0d32e07 100644 --- a/sdk/src/main/java/com/reforge/sdk/Options.java +++ b/sdk/src/main/java/com/reforge/sdk/Options.java @@ -45,7 +45,7 @@ public enum CollectContextMode { PERIODIC_EXAMPLE, } - private String apikey; + private String sdkKey; private Datasources datasources = Datasources.ALL; private int initializationTimeoutSec = 10; private OnInitializationFailure onInitializationFailure = OnInitializationFailure.RAISE; @@ -72,7 +72,7 @@ public enum CollectContextMode { private ContextSetReadable globalContext; public Options() { - setApikey( + setSdkKey( Optional .ofNullable(System.getenv("REFORGE_BACKEND_SDK_KEY")) .orElse(System.getenv("PREFAB_API_KEY")) @@ -87,21 +87,21 @@ public boolean isLocalOnly() { return Datasources.LOCAL_ONLY == datasources; } - public String getApikey() { - return apikey; + public String getSdkKey() { + return sdkKey; } /** * Sets the API key to be used to communicate with the Reforge APIs - * Can also be specified with env var `REFORGE_API_KEY` - * @param apikey the key + * Can also be specified with env var `REFORGE_BACKEND_SDK_KEY` + * @param sdkKey the key * @return Options */ - public Options setApikey(String apikey) { - if (apikey == null) { - this.apikey = null; + public Options setSdkKey(String sdkKey) { + if (sdkKey == null) { + this.sdkKey = null; } else { - this.apikey = apikey.trim(); + this.sdkKey = sdkKey.trim(); } return this; } @@ -223,7 +223,7 @@ public Options setCollectEvaluationSummaries(boolean collectEvaluationSummaries) } public String getApiKeyId() { - return getApikey().split("\\-")[0]; + return getSdkKey().split("\\-")[0]; } public Options setContextStore(ContextStore contextStore) { diff --git a/sdk/src/main/java/com/reforge/sdk/Sdk.java b/sdk/src/main/java/com/reforge/sdk/Sdk.java index f42cf50..2327a00 100644 --- a/sdk/src/main/java/com/reforge/sdk/Sdk.java +++ b/sdk/src/main/java/com/reforge/sdk/Sdk.java @@ -19,14 +19,14 @@ public Sdk(Options options) { this.options = options; if (options.isLocalOnly()) { - LOG.info("Initializing Prefab LocalOnly"); + LOG.info("Initializing Reforge SDK LocalOnly"); } else if (options.isLocalDatafileMode()) { - LOG.info("Initializing Prefab from local file {}", options.getLocalDatafile()); + LOG.info("Initializing Reforge SDK from local file {}", options.getLocalDatafile()); } else { - if (options.getApikey() == null || options.getApikey().isEmpty()) { - throw new RuntimeException("PREFAB_API_KEY not set"); + if (options.getSdkKey() == null || options.getSdkKey().isEmpty()) { + throw new RuntimeException("REFORGE_BACKEND_SDK_KEY not set"); } - LOG.info("Initializing Prefab for apiKeyId {}", options.getApiKeyId()); + LOG.info("Initializing Reforge SDK for sdkKeyId {}", options.getApiKeyId()); } this.closed = new AtomicBoolean(false); diff --git a/sdk/src/main/java/com/reforge/sdk/internal/HttpClient.java b/sdk/src/main/java/com/reforge/sdk/internal/HttpClient.java index 80fe1fa..d785b4e 100644 --- a/sdk/src/main/java/com/reforge/sdk/internal/HttpClient.java +++ b/sdk/src/main/java/com/reforge/sdk/internal/HttpClient.java @@ -356,7 +356,7 @@ private HttpRequest.Builder getClientBuilderWithStandardHeaders() { .header(VERSION_HEADER, NEW_CLIENT_HEADER_VALUE) .header( "Authorization", - getBasicAuthenticationHeader(options.getApiKeyId(), options.getApikey()) + getBasicAuthenticationHeader(options.getApiKeyId(), options.getSdkKey()) ); } @@ -375,7 +375,7 @@ private void checkForAuthFailure(HttpResponse httpResponse, Throwable throwab if (throwable == null) { if (AUTH_PROBLEM_STATUS_CODES.contains(httpResponse.statusCode())) { LOG.error( - "*** Prefab Auth failure, please check your credentials. Fetching configuration returned HTTP Status code {} (from {}) ", + "*** Reforge SDK Auth failure, please check your credentials. Fetching configuration returned HTTP Status code {} (from {}) ", httpResponse.statusCode(), httpResponse.uri() ); diff --git a/sdk/src/test/java/com/reforge/sdk/OptionsTest.java b/sdk/src/test/java/com/reforge/sdk/OptionsTest.java index d1417b3..f2c7edd 100644 --- a/sdk/src/test/java/com/reforge/sdk/OptionsTest.java +++ b/sdk/src/test/java/com/reforge/sdk/OptionsTest.java @@ -36,7 +36,7 @@ public void testStreamDomain() { @Test public void apiKeyIsTrimmed() { Options options = new Options(); - options.setApikey("my-key\n"); - assertThat(options.getApikey()).isEqualTo("my-key"); + options.setSdkKey("my-key\n"); + assertThat(options.getSdkKey()).isEqualTo("my-key"); } } diff --git a/sdk/src/test/java/com/reforge/sdk/integration/BaseIntegrationTestCaseDescriptor.java b/sdk/src/test/java/com/reforge/sdk/integration/BaseIntegrationTestCaseDescriptor.java index 65962c3..aaf3ad5 100644 --- a/sdk/src/test/java/com/reforge/sdk/integration/BaseIntegrationTestCaseDescriptor.java +++ b/sdk/src/test/java/com/reforge/sdk/integration/BaseIntegrationTestCaseDescriptor.java @@ -84,7 +84,7 @@ private Sdk buildClient(IntegrationTestClientOverrides clientOverrides) { } Options options = new Options() - .setApikey(apiKey) + .setSdkKey(apiKey) .setTelemetryHost("https://telemetry.goatsofreforge.com") .setApiHosts(List.of("https://api.goatsofreforge.com")) .setStreamHosts(List.of("https://stream.goatsofreforge.com")) diff --git a/sdk/src/test/java/com/reforge/sdk/internal/ConfigClientImplTest.java b/sdk/src/test/java/com/reforge/sdk/internal/ConfigClientImplTest.java index 83327ce..80ebcef 100644 --- a/sdk/src/test/java/com/reforge/sdk/internal/ConfigClientImplTest.java +++ b/sdk/src/test/java/com/reforge/sdk/internal/ConfigClientImplTest.java @@ -44,7 +44,7 @@ void localModeUnlocks() { void initializationTimeout() { final Sdk baseClient = new Sdk( new Options() - .setApikey("0-P1-E1-SDK-1234-123-23") + .setSdkKey("0-P1-E1-SDK-1234-123-23") .setInitializationTimeoutSec(1) .setOnInitializationFailure(Options.OnInitializationFailure.RAISE) ); @@ -57,7 +57,7 @@ void initializationTimeout() { void initializationUnlock() { final Sdk baseClient = new Sdk( new Options() - .setApikey("0-P1-E1-SDK-1234-123-23") + .setSdkKey("0-P1-E1-SDK-1234-123-23") .setInitializationTimeoutSec(1) .setOnInitializationFailure(Options.OnInitializationFailure.UNLOCK) ); diff --git a/sdk/src/test/java/com/reforge/sdk/internal/HttpClientTest.java b/sdk/src/test/java/com/reforge/sdk/internal/HttpClientTest.java index 3f081e2..4a48581 100644 --- a/sdk/src/test/java/com/reforge/sdk/internal/HttpClientTest.java +++ b/sdk/src/test/java/com/reforge/sdk/internal/HttpClientTest.java @@ -33,7 +33,7 @@ class HttpClientTest { Options options = new Options() .setApiHosts(List.of("http://a.example.com", "http://b.example.com")) .setStreamHosts(List.of("http://stream.example.com")) - .setApikey("not-a-real-key") + .setSdkKey("not-a-real-key") .setTelemetryHost("http://telemetry.example.com"); HttpClient prefabHttpClient;