Skip to content

fix(flagd): fix wrong environment variable and test execution #1589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 23, 2025
Merged

fix(flagd): fix wrong environment variable and test execution #1589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd5644d
fix(flagd): fix wrong environment variable and test execution
aepfli Sep 17, 2025
962ff0b
fixup: adapt tests to the new sdk version
aepfli Sep 17, 2025
85ca651
fixup: adding fallback for old version
aepfli Sep 23, 2025
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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.3</version>
<version>3.5.4</version>
<configuration>
<excludes>
<!-- tests to exclude -->
Expand Down
9 changes: 8 additions & 1 deletion providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,19 @@ public final class Config {
static final String SERVER_CERT_PATH_ENV_VAR_NAME = "FLAGD_SERVER_CERT_PATH";
static final String CACHE_ENV_VAR_NAME = "FLAGD_CACHE";
static final String MAX_CACHE_SIZE_ENV_VAR_NAME = "FLAGD_MAX_CACHE_SIZE";
static final String MAX_EVENT_STREAM_RETRIES_ENV_VAR_NAME = "FLAGD_MAX_EVENT_STREAM_RETRIES";
static final String BASE_EVENT_STREAM_RETRY_BACKOFF_MS_ENV_VAR_NAME = "FLAGD_RETRY_BACKOFF_MS";
static final String DEADLINE_MS_ENV_VAR_NAME = "FLAGD_DEADLINE_MS";
static final String STREAM_DEADLINE_MS_ENV_VAR_NAME = "FLAGD_STREAM_DEADLINE_MS";
static final String SOURCE_SELECTOR_ENV_VAR_NAME = "FLAGD_SOURCE_SELECTOR";
/**
* Environment variable to fetch Provider id.
*
* @deprecated please use {@link #PROVIDER_ID_ENV_VAR_NAME}
*/
@Deprecated(forRemoval = true)
static final String SOURCE_PROVIDER_ID_ENV_VAR_NAME = "FLAGD_SOURCE_PROVIDER_ID";

static final String PROVIDER_ID_ENV_VAR_NAME = "FLAGD_PROVIDER_ID";
static final String OFFLINE_SOURCE_PATH = "FLAGD_OFFLINE_FLAG_SOURCE_PATH";
static final String OFFLINE_POLL_MS = "FLAGD_OFFLINE_POLL_MS";
static final String KEEP_ALIVE_MS_ENV_VAR_NAME_OLD = "FLAGD_KEEP_ALIVE_TIME";
Expand Down
6 changes: 4 additions & 2 deletions providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ public class FlagdOptions {

// TODO: remove the metadata call entirely after https://github.com/open-feature/flagd/issues/1584
/**
* Disables call to sync.GetMetadata (see: https://buf.build/open-feature/flagd/docs/main:flagd.sync.v1#flagd.sync.v1.FlagSyncService.GetMetadata).
* Disables call to sync.GetMetadata (see:
* https://buf.build/open-feature/flagd/docs/main:flagd.sync.v1#flagd.sync.v1.FlagSyncService.GetMetadata).
* Disabling will prevent static context from flagd being used in evaluations.
* GetMetadata and this option will be removed.
*/
Expand Down Expand Up @@ -123,7 +124,8 @@ public class FlagdOptions {
* ProviderId to be used with flag sync gRPC contract.
**/
@Builder.Default
private String providerId = fallBackToEnvOrDefault(Config.SOURCE_PROVIDER_ID_ENV_VAR_NAME, null);
private String providerId = fallBackToEnvOrDefault(
Config.PROVIDER_ID_ENV_VAR_NAME, fallBackToEnvOrDefault(Config.SOURCE_PROVIDER_ID_ENV_VAR_NAME, null));

/**
* gRPC client KeepAlive in milliseconds. Disabled with 0.
Expand Down
16 changes: 4 additions & 12 deletions ...dev/openfeature/contrib/providers/gofeatureflag/hook/EnrichEvaluationContextHookTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,8 @@ void shouldReturnNothingIfNoOptionsProvided() {
@Test
void shouldReturnSameContextIfNoMetadataProvided() {
EnrichEvaluationContextHook hook = new EnrichEvaluationContextHook(null);
val hookContext = HookContext.<String>builder()
.ctx(TestUtils.defaultEvaluationContext)
.flagKey("testFlagKey")
.type(FlagValueType.BOOLEAN)
.defaultValue("default")
.build();
val hookContext = HookContext.<String>from(
"testFlagKey", FlagValueType.BOOLEAN, null, null, TestUtils.defaultEvaluationContext, "default");
val res = hook.before(hookContext, null);
assertEquals(Optional.of(hookContext.getCtx()), res);
}
Expand All @@ -42,12 +38,8 @@ void shouldReturnSameContextIfNoMetadataProvided() {
@Test
void shouldReturnSameContextIfMetadataEmpty() {
EnrichEvaluationContextHook hook = new EnrichEvaluationContextHook(Collections.emptyMap());
val hookContext = HookContext.<String>builder()
.ctx(TestUtils.defaultEvaluationContext)
.flagKey("testFlagKey")
.type(FlagValueType.BOOLEAN)
.defaultValue("default")
.build();
val hookContext = HookContext.<String>from(
"testFlagKey", FlagValueType.BOOLEAN, null, null, TestUtils.defaultEvaluationContext, "default");
val res = hook.before(hookContext, null);
assertEquals(Optional.of(hookContext.getCtx()), res);
}
Expand Down