chore(flagd): Rename overrideAuthority to defaultAuthority and add the env var

Signed-off-by: Maks Osowski <[email protected]>

Author: cupofcat

providers/flagd/README.md

@@ -110,6 +110,7 @@ Given below are the supported configurations:
 | port                  | FLAGD_PORT                     | int                      | 8013      | rpc & in-process        |
 | targetUri             | FLAGD_TARGET_URI               | string                   | null      | rpc & in-process        |
 | tls                   | FLAGD_TLS                      | boolean                  | false     | rpc & in-process        |
+| defaultAuthority      | FLAGD_DEFAULT_AUTHORITY        | String                   | null      | rpc & in-process        |
 | socketPath            | FLAGD_SOCKET_PATH              | String                   | null      | rpc & in-process        |
 | certPath              | FLAGD_SERVER_CERT_PATH         | String                   | null      | rpc & in-process        |
 | deadline              | FLAGD_DEADLINE_MS              | int                      | 500       | rpc & in-process & file |
@@ -182,7 +183,7 @@ FlagdProvider flagdProvider = new FlagdProvider(
 
 ### Configuring gRPC credentials and headers
 
-The `clientInterceptors` and `authorityOverride` are meant for connection of the in-process resolver to a Sync API implementation on a host/port, that might require special credentials or headers.
+The `clientInterceptors` and `defaultAuthority` are meant for connection of the in-process resolver to a Sync API implementation on a host/port, that might require special credentials or headers.
 
 ```java
 private static ClientInterceptor createHeaderInterceptor() {
@@ -219,7 +220,7 @@ FlagdProvider flagdProvider = new FlagdProvider(
                 .host("example.com/flagdSyncApi")
                 .port(443)
                 .tls(true)
-                .overrideAuthority("authority-host.sync.example.com")
+                .defaultAuthority("authority-host.sync.example.com")
                 .clientInterceptors(clientInterceptors)
                 .build());
 ```

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/Config.java

@@ -24,6 +24,7 @@ public final class Config {
     static final String HOST_ENV_VAR_NAME = "FLAGD_HOST";
     static final String PORT_ENV_VAR_NAME = "FLAGD_PORT";
     static final String TLS_ENV_VAR_NAME = "FLAGD_TLS";
+    static final String DEFAULT_AUTHORITY_ENV_VAR_NAME = "FLAGD_DEFAULT_AUTHORITY";
     static final String SOCKET_PATH_ENV_VAR_NAME = "FLAGD_SOCKET_PATH";
     static final String SERVER_CERT_PATH_ENV_VAR_NAME = "FLAGD_SERVER_CERT_PATH";
     static final String CACHE_ENV_VAR_NAME = "FLAGD_CACHE";

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdOptions.java

@@ -176,7 +176,7 @@ public class FlagdOptions {
      * Authority header to be used when creating a gRPC channel.
      */
     @Builder.Default
-    private String authorityOverride = null;
+    private String defaultAuthority = fallBackToEnvOrDefault(Config.DEFAULT_AUTHORITY_ENV_VAR_NAME, null);
 
     /**
      * Builder overwrite in order to customize the "build" method.

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/common/ChannelBuilder.java

@@ -63,8 +63,8 @@ public static ManagedChannel nettyChannel(final FlagdOptions options) {
             final NettyChannelBuilder builder =
                     NettyChannelBuilder.forTarget(targetUri).keepAliveTime(keepAliveMs, TimeUnit.MILLISECONDS);
 
-            if (options.getAuthorityOverride() != null) {
-                builder.overrideAuthority(options.getAuthorityOverride());
+            if (options.getDefaultAuthority() != null) {
+                builder.overrideAuthority(options.getDefaultAuthority());
             }
             if (options.getClientInterceptors() != null) {
                 builder.intercept(options.getClientInterceptors());

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdOptionsTest.java

@@ -49,7 +49,7 @@ void TestDefaults() {
         assertNull(builder.getOfflineFlagSourcePath());
         assertEquals(Resolver.RPC, builder.getResolverType());
         assertEquals(0, builder.getKeepAlive());
-        assertNull(builder.getAuthorityOverride());
+        assertNull(builder.getDefaultAuthority());
         assertNull(builder.getClientInterceptors());
     }
 
@@ -72,7 +72,7 @@ void TestBuilderOptions() {
                 .resolverType(Resolver.IN_PROCESS)
                 .targetUri("dns:///localhost:8016")
                 .keepAlive(1000)
-                .authorityOverride("test-authority.sync.example.com")
+                .defaultAuthority("test-authority.sync.example.com")
                 .clientInterceptors(clientInterceptors)
                 .build();
 
@@ -88,7 +88,7 @@ void TestBuilderOptions() {
         assertEquals(Resolver.IN_PROCESS, flagdOptions.getResolverType());
         assertEquals("dns:///localhost:8016", flagdOptions.getTargetUri());
         assertEquals(1000, flagdOptions.getKeepAlive());
-        assertEquals("test-authority.sync.example.com", flagdOptions.getAuthorityOverride());
+        assertEquals("test-authority.sync.example.com", flagdOptions.getDefaultAuthority());
         assertEquals(clientInterceptors, flagdOptions.getClientInterceptors());
     }
 

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/common/ChannelBuilderTest.java

@@ -118,7 +118,7 @@ void testNettyChannel_withTlsAndCert() {
     }
 
     @Test
-    void testNettyChannel_withAuthorityOverride() {
+    void testNettyChannel_withDefaultAuthority() {
         try (MockedStatic<NettyChannelBuilder> nettyMock = mockStatic(NettyChannelBuilder.class)) {
             // Mocks
             NettyChannelBuilder mockBuilder = mock(NettyChannelBuilder.class);
@@ -138,7 +138,7 @@ void testNettyChannel_withAuthorityOverride() {
                     .port(8080)
                     .keepAlive(5000)
                     .tls(true)
-                    .authorityOverride("test-authority.sync.example.com")
+                    .defaultAuthority("test-authority.sync.example.com")
                     .build();
 
             // Call method under test