Merge branch 'main' into copilot/update-selector-handling

Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

.gitignore

@@ -16,6 +16,7 @@ node_modules
 *.launch
 .settings/
 *.sublime-workspace
+.cursor
 
 # IDE - VSCode
 .vscode/*

.gitmodules

@@ -17,3 +17,6 @@
 [submodule "libs/shared/flagd-core/spec"]
 	path = libs/shared/flagd-core/spec
 	url = https://github.com/open-feature/spec
+[submodule "libs/providers/go-feature-flag/wasm-releases"]
+	path = libs/providers/go-feature-flag/wasm-releases
+	url = https://github.com/go-feature-flag/wasm-releases.git

.release-please-manifest.json

@@ -8,9 +8,9 @@
   "libs/providers/launchdarkly-client": "0.3.3",
   "libs/providers/go-feature-flag-web": "0.2.6",
   "libs/shared/flagd-core": "1.1.0",
-  "libs/shared/ofrep-core": "1.1.0",
+  "libs/shared/ofrep-core": "2.0.0",
   "libs/providers/ofrep": "0.2.1",
-  "libs/providers/ofrep-web": "0.3.3",
+  "libs/providers/ofrep-web": "0.3.5",
   "libs/providers/flipt": "0.1.3",
   "libs/providers/flagsmith-client": "0.1.3",
   "libs/providers/flipt-web": "0.1.5",

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright OpenFeature Maintainers
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

libs/providers/flagd/package.json

@@ -7,7 +7,7 @@
     "current-version": "echo $npm_package_version"
   },
   "peerDependencies": {
-    "@grpc/grpc-js": "~1.8.0 || ~1.9.0 || ~1.10.0 || ~1.11.0 || ~1.12.0 || ~1.13.0",
+    "@grpc/grpc-js": "~1.8.0 || ~1.9.0 || ~1.10.0 || ~1.11.0 || ~1.12.0 || ~1.13.0 || ~1.14.0",
     "@openfeature/server-sdk": "^1.17.0"
   },
   "dependencies": {

libs/providers/flagd/src/e2e/constants.ts

@@ -1,19 +1,6 @@
 import { getGherkinTestPath } from '@openfeature/flagd-core';
 
-export const FLAGD_NAME = 'flagd';
 export const UNSTABLE_CLIENT_NAME = 'unstable';
 export const UNAVAILABLE_CLIENT_NAME = 'unavailable';
 
 export const GHERKIN_FLAGD = getGherkinTestPath('*.feature');
-export const CONNECTION_FEATURE = getGherkinTestPath('connection.feature');
-export const CONTEXT_ENRICHMENT_FEATURE = getGherkinTestPath('contextEnrichment.feature');
-export const EVALUATION_FEATURE = getGherkinTestPath('evaluation.feature');
-export const EVENTS_FEATURE = getGherkinTestPath('events.feature');
-export const METADATA_FEATURE = getGherkinTestPath('metadata.feature');
-export const RPC_CACHING_FEATURE = getGherkinTestPath('rpc-caching.feature');
-export const SELECTOR_FEATURE = getGherkinTestPath('selector.feature');
-export const TARGETING_FEATURE = getGherkinTestPath('targeting.feature');
-export const GHERKIN_EVALUATION_FEATURE = getGherkinTestPath(
-  'evaluation.feature',
-  'spec/specification/assets/gherkin/',
-);

libs/providers/flagd/src/e2e/step-definitions/providerSteps.ts

@@ -1,3 +1,4 @@
+import { ProviderStatus } from '@openfeature/server-sdk';
 import { OpenFeature } from '@openfeature/server-sdk';
 import { FlagdContainer } from '../tests/flagdContainer';
 import type { State, Steps } from './state';
@@ -6,7 +7,7 @@ import type { FlagdProviderOptions } from '../../lib/configuration';
 
 export const providerSteps: Steps =
   (state: State) =>
-  ({ given, when, then }) => {
+  ({ given, when, then, and }) => {
     const container: FlagdContainer = FlagdContainer.build();
     beforeAll(async () => {
       console.log('Setting flagd provider...');
@@ -33,26 +34,29 @@ export const providerSteps: Steps =
       const flagdOptions: FlagdProviderOptions = {
         resolverType: state.resolverType,
         deadlineMs: 2000,
+        ...state.config,
+        ...state.options,
       };
+
       let type = 'default';
       switch (providerType) {
-        default:
-          flagdOptions['port'] = container.getPort(state.resolverType);
-          if (state?.options?.['selector']) {
-            flagdOptions['selector'] = state?.options?.['selector'] as string;
-          }
-          break;
         case 'unavailable':
           flagdOptions['port'] = 9999;
           break;
         case 'ssl':
           // TODO: modify this to support ssl
           flagdOptions['port'] = container.getPort(state.resolverType);
-          if (state?.config?.selector) {
-            flagdOptions['selector'] = state.config.selector;
-          }
           type = 'ssl';
           break;
+        case 'stable':
+          flagdOptions['port'] = container.getPort(state.resolverType);
+          break;
+        case 'syncpayload':
+          flagdOptions['port'] = container.getPort(state.resolverType);
+          type = 'sync-payload';
+          break;
+        default:
+          throw new Error('unknown provider type: ' + providerType);
       }
 
       await fetch('http://' + container.getLaunchpadUrl() + '/start?config=' + type);
@@ -67,6 +71,21 @@ export const providerSteps: Steps =
       state.providerType = providerType;
     });
 
+    function mapProviderState(state: string): ProviderStatus {
+      const mappedState = state.toUpperCase().replace('-', '_');
+      const status = Object.values(ProviderStatus).find((s) => s === mappedState);
+
+      if (!status) {
+        throw new Error(`Unknown provider status: ${state}`);
+      }
+
+      return status;
+    }
+
+    then(/^the client should be in (.*) state/, (providerState: string) => {
+      expect(state.client?.providerStatus).toBe(mapProviderState(providerState));
+    });
+
     when(/^the connection is lost for (\d+)s$/, async (time) => {
       console.log('stopping flagd');
       await fetch('http://' + container.getLaunchpadUrl() + '/restart?seconds=' + time);

libs/providers/flagd/src/e2e/step-definitions/utils.ts

@@ -19,6 +19,8 @@ export function mapValueToType(value: string, type: string): any {
       return value.toLowerCase() as ResolverType;
     case 'CacheType':
       return value as CacheOption;
+    case 'StringList':
+      return value.split(',').map((item) => item.trim());
     case 'Object':
       if (value == 'null') {
         return undefined;

libs/providers/flagd/src/e2e/tests/in-process.spec.ts

@@ -22,7 +22,7 @@ describe('in-process', () => {
       // remove filters as we add support for features
       // see: https://github.com/open-feature/js-sdk-contrib/issues/1096 and child issues
       tagFilter:
-        '@in-process and not @targetURI and not @customCert and not @events and not @sync and not @grace and not @metadata and not @contextEnrichment',
+        '@in-process and not @targetURI and not @forbidden and not @customCert and not @events and not @sync and not @grace and not @metadata and not @unixsocket',
       scenarioNameTemplate: (vars) => {
         return `${vars.scenarioTitle} (${vars.scenarioTags.join(',')} ${vars.featureTags.join(',')})`;
       },

libs/providers/flagd/src/e2e/tests/rpc.spec.ts

@@ -23,7 +23,7 @@ describe('rpc', () => {
       tagFilter:
         // remove filters as we add support for features
         // see: https://github.com/open-feature/js-sdk-contrib/issues/1096 and child issues
-        '@rpc and not @targetURI and not @customCert and not @events and not @stream and not @grace and not @metadata and not @contextEnrichment and not @caching',
+        '@rpc and not @targetURI and not @customCert and not @forbidden and not @events and not @stream and not @grace and not @metadata and not @caching and not @unixsocket',
       scenarioNameTemplate: (vars) => {
         return `${vars.scenarioTitle} (${vars.scenarioTags.join(',')} ${vars.featureTags.join(',')})`;
       },