Merge remote-tracking branch 'upstream/main' into feat/gherkinmigration

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

Author: aepfli

.github/workflows/build.yml

@@ -60,7 +60,7 @@ jobs:
 
       - if: matrix.python-version == '3.11'
         name: Upload coverage to Codecov
-        uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
+        uses: codecov/codecov-action@5a605bd92782ce0810fa3b8acc235c921b497052 # v5.2.0
         with:
           name: Code Coverage for ${{ matrix.package }} on Python ${{ matrix.python-version }}
           directory: ${{ matrix.package }}
@@ -91,10 +91,10 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3
+        uses: github/codeql-action/init@dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7 # v3
         with:
           languages: python
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3
+        uses: github/codeql-action/analyze@dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7 # v3

.github/workflows/lint-pr.yml

@@ -25,7 +25,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2
+      - uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 # v2
         # When the previous steps fails, the workflow would stop. By adding this
         # condition you can continue the execution with the populated error message.
         if: always() && (steps.lint_pr_title.outputs.error_message != null)
@@ -44,7 +44,7 @@ jobs:
 
       # Delete a previous comment when the issue has been resolved
       - if: ${{ steps.lint_pr_title.outputs.error_message == null }}
-        uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2
+        uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 # v2
         with:
           header: pr-title-lint-error
           delete: true

.github/workflows/release.yml

@@ -45,14 +45,16 @@ jobs:
     permissions:
       # IMPORTANT: this permission is mandatory for trusted publishing to pypi
       id-token: write
-    container:
-      image: "python:3.13"
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           submodules: recursive
 
+      - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
+        with:
+          python-version: '3.13'
+
       - name: Upgrade pip
         run: pip install --upgrade pip
 

.gitignore

@@ -51,3 +51,6 @@ docs/_build/
 
 # Virtual env directories
 .venv
+
+# vscode
+.vscode/

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 default_stages: [commit]
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.6
+    rev: v0.9.2
     hooks:
       - id: ruff
         args: [--fix]

.release-please-manifest.json

@@ -1,5 +1,6 @@
 {
   "hooks/openfeature-hooks-opentelemetry": "0.1.3",
   "providers/openfeature-provider-flagd": "0.1.5",
-  "providers/openfeature-provider-ofrep": "0.1.0"
+  "providers/openfeature-provider-ofrep": "0.1.1",
+  "providers/openfeature-provider-flipt": "0.1.3"
 }

providers/openfeature-provider-flagd/openfeature/test-harness

@@ -2,8 +2,9 @@
 # Python 3.8 does not fully support tagging, hence that it will run all cases
 import sys
 
-from e2e.paths import TEST_HARNESS_PATH
 from pytest_bdd import scenarios
 
+from tests.e2e.paths import TEST_HARNESS_PATH
+
 if sys.version_info >= (3, 9):
     scenarios(f"{TEST_HARNESS_PATH}/gherkin")

providers/openfeature-provider-flagd/tests/e2e/file/test_flaqd.py

@@ -1,8 +1,9 @@
 import sys
 
-from e2e.paths import TEST_HARNESS_PATH
 from pytest_bdd import scenarios
 
+from tests.e2e.paths import TEST_HARNESS_PATH
+
 # as soon as we support all the features, we can actually remove this limitation to not run on Python 3.8
 # Python 3.8 does not fully support tagging, hence that it will run all cases
 if sys.version_info >= (3, 9):

providers/openfeature-provider-flagd/tests/e2e/rpc/test_flaqd.py

@@ -1,5 +1,6 @@
 import pytest
 
+# not sure if we still need this test, as this is also covered with gherkin tests.
 from openfeature.contrib.provider.flagd.config import (
     DEFAULT_CACHE,
     DEFAULT_CACHE_SIZE,
@@ -20,7 +21,6 @@
     ENV_VAR_KEEP_ALIVE_TIME_MS,
     ENV_VAR_OFFLINE_FLAG_SOURCE_PATH,
     ENV_VAR_PORT,
-    ENV_VAR_RESOLVER_TYPE,
     ENV_VAR_RETRY_BACKOFF_MS,
     ENV_VAR_STREAM_DEADLINE_MS,
     ENV_VAR_TLS,
@@ -84,7 +84,6 @@ def test_overrides_defaults_with_environment(monkeypatch, resolver_type):  # noq
     monkeypatch.setenv(ENV_VAR_KEEP_ALIVE_TIME_MS, str(keep_alive))
     monkeypatch.setenv(ENV_VAR_OFFLINE_FLAG_SOURCE_PATH, offline_path)
     monkeypatch.setenv(ENV_VAR_PORT, str(port))
-    monkeypatch.setenv(ENV_VAR_RESOLVER_TYPE, str(resolver_type.value))
     monkeypatch.setenv(ENV_VAR_RETRY_BACKOFF_MS, str(retry_backoff))
     monkeypatch.setenv(ENV_VAR_STREAM_DEADLINE_MS, str(stream_deadline))
     monkeypatch.setenv(ENV_VAR_TLS, str(tls))
@@ -97,7 +96,6 @@ def test_overrides_defaults_with_environment(monkeypatch, resolver_type):  # noq
     assert config.keep_alive_time == keep_alive
     assert config.offline_flag_source_path == offline_path
     assert config.port == port
-    assert config.resolver == resolver_type
     assert config.retry_backoff_ms == retry_backoff
     assert config.stream_deadline_ms == stream_deadline
     assert config.tls is tls
@@ -122,7 +120,6 @@ def test_uses_arguments_over_environments_and_defaults(monkeypatch, resolver_typ
     monkeypatch.setenv(ENV_VAR_KEEP_ALIVE_TIME_MS, str(keep_alive) + "value")
     monkeypatch.setenv(ENV_VAR_OFFLINE_FLAG_SOURCE_PATH, offline_path + "value")
     monkeypatch.setenv(ENV_VAR_PORT, str(port) + "value")
-    monkeypatch.setenv(ENV_VAR_RESOLVER_TYPE, str(resolver_type) + "value")
     monkeypatch.setenv(ENV_VAR_RETRY_BACKOFF_MS, str(retry_backoff) + "value")
     monkeypatch.setenv(ENV_VAR_STREAM_DEADLINE_MS, str(stream_deadline) + "value")
     monkeypatch.setenv(ENV_VAR_TLS, str(tls) + "value")
@@ -147,7 +144,6 @@ def test_uses_arguments_over_environments_and_defaults(monkeypatch, resolver_typ
     assert config.keep_alive_time == keep_alive
     assert config.offline_flag_source_path == offline_path
     assert config.port == port
-    assert config.resolver == resolver_type
     assert config.retry_backoff_ms == retry_backoff
     assert config.stream_deadline_ms == stream_deadline
     assert config.tls is tls