From 887ccaa3d132c0100c79a5094499aad1ca39011b Mon Sep 17 00:00:00 2001 From: Todd Baert Date: Tue, 29 Oct 2024 13:58:00 -0400 Subject: [PATCH] fix!: change FLAGD_GRPC_TARGET env to FLAGD_TARGET_URI Signed-off-by: Todd Baert --- providers/flagd/README.md | 4 ++-- .../java/dev/openfeature/contrib/providers/flagd/Config.java | 2 +- .../dev/openfeature/contrib/providers/flagd/FlagdOptions.java | 2 +- .../openfeature/contrib/providers/flagd/FlagdOptionsTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/providers/flagd/README.md b/providers/flagd/README.md index cc070f8dc..ce8c22e3b 100644 --- a/providers/flagd/README.md +++ b/providers/flagd/README.md @@ -104,11 +104,11 @@ variables. Given below are the supported configurations: | Option name | Environment variable name | Type & Values | Default | Compatible resolver | -|-----------------------|--------------------------------|--------------------------|-----------|---------------------| +| --------------------- | ------------------------------ | ------------------------ | --------- | ------------------- | | resolver | FLAGD_RESOLVER | String - rpc, in-process | rpc | | | host | FLAGD_HOST | String | localhost | rpc & in-process | | port | FLAGD_PORT | int | 8013 | rpc & in-process | -| targetUri | FLAGD_GRPC_TARGET | string | null | rpc & in-process | +| targetUri | FLAGD_TARGET_URI | string | null | rpc & in-process | | tls | FLAGD_TLS | boolean | false | rpc & in-process | | socketPath | FLAGD_SOCKET_PATH | String | null | rpc & in-process | | certPath | FLAGD_SERVER_CERT_PATH | String | null | rpc & in-process | diff --git a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/Config.java b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/Config.java index 04571658b..2df30ec6d 100644 --- a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/Config.java +++ b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/Config.java @@ -37,7 +37,7 @@ public final class Config { static final String OFFLINE_SOURCE_PATH = "FLAGD_OFFLINE_FLAG_SOURCE_PATH"; static final String KEEP_ALIVE_MS_ENV_VAR_NAME_OLD = "FLAGD_KEEP_ALIVE_TIME"; static final String KEEP_ALIVE_MS_ENV_VAR_NAME = "FLAGD_KEEP_ALIVE_TIME_MS"; - static final String GRPC_TARGET_ENV_VAR_NAME = "FLAGD_GRPC_TARGET"; + static final String TARGET_URI_ENV_VAR_NAME = "FLAGD_TARGET_URI"; static final String RESOLVER_RPC = "rpc"; static final String RESOLVER_IN_PROCESS = "in-process"; diff --git a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdOptions.java b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdOptions.java index 8184c246d..8741dd905 100644 --- a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdOptions.java +++ b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdOptions.java @@ -132,7 +132,7 @@ public class FlagdOptions { * resolution. For more visit (https://grpc.io/docs/guides/custom-name-resolution/) */ @Builder.Default - private String targetUri = fallBackToEnvOrDefault(Config.GRPC_TARGET_ENV_VAR_NAME, null); + private String targetUri = fallBackToEnvOrDefault(Config.TARGET_URI_ENV_VAR_NAME, null); /** diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdOptionsTest.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdOptionsTest.java index acaa66a56..71adc687f 100644 --- a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdOptionsTest.java +++ b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdOptionsTest.java @@ -191,7 +191,7 @@ void testRpcProviderFromEnv_portConfigured_usesConfiguredPort() { } @Test - @SetEnvironmentVariable(key = GRPC_TARGET_ENV_VAR_NAME, value = "envoy://localhost:1234/foo.service") + @SetEnvironmentVariable(key = TARGET_URI_ENV_VAR_NAME, value = "envoy://localhost:1234/foo.service") void testTargetOverrideFromEnv() { FlagdOptions flagdOptions = FlagdOptions.builder().build();