Skip to content

Commit c884e5e

Browse files
mahpatilmahpatil
authored
Merge branch 'main' into feat/gcp-parameter-manager
2 parents 6abf5cd + e8c35f9 commit c884e5e

11 files changed

Lines changed: 33 additions & 25 deletions

File tree

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
[submodule "tools/flagd-api-testkit/test-harness"]
1818
path = tools/flagd-api-testkit/test-harness
1919
url = https://github.com/open-feature/test-harness.git
20-
branch = v3.1.0
20+
branch = v3.5.0

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
distributionType=only-script
2-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
2+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@
455455
<plugin>
456456
<groupId>com.github.spotbugs</groupId>
457457
<artifactId>spotbugs-maven-plugin</artifactId>
458-
<version>4.9.8.2</version>
458+
<version>4.9.8.3</version>
459459
<configuration>
460460
<excludeFilterFile>spotbugs-exclusions.xml</excludeFilterFile>
461461
<plugins>
@@ -489,7 +489,7 @@
489489
<plugin>
490490
<groupId>com.diffplug.spotless</groupId>
491491
<artifactId>spotless-maven-plugin</artifactId>
492-
<version>3.3.0</version>
492+
<version>3.4.0</version>
493493
<configuration>
494494
<!-- optional: limit format enforcement to just the files changed by this feature branch -->
495495
<!-- <ratchetFrom>origin/main</ratchetFrom>-->

‎providers/flagd/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@
101101
<dependency>
102102
<groupId>org.testcontainers</groupId>
103103
<artifactId>testcontainers</artifactId>
104-
<version>2.0.3</version>
104+
<version>2.0.4</version>
105105
<scope>test</scope>
106106
</dependency>
107107
<dependency>
108108
<groupId>org.testcontainers</groupId>
109109
<artifactId>testcontainers-junit-jupiter</artifactId>
110-
<version>2.0.3</version>
110+
<version>2.0.4</version>
111111
<scope>test</scope>
112112
</dependency>
113113
<dependency>
@@ -164,7 +164,7 @@
164164
<plugin>
165165
<groupId>org.codehaus.mojo</groupId>
166166
<artifactId>exec-maven-plugin</artifactId>
167-
<version>3.6.2</version>
167+
<version>3.6.3</version>
168168
<executions>
169169
<execution>
170170
<id>update-schemas-submodule</id>
@@ -219,7 +219,7 @@
219219
<plugin>
220220
<groupId>com.github.spotbugs</groupId>
221221
<artifactId>spotbugs-maven-plugin</artifactId>
222-
<version>4.9.8.2</version>
222+
<version>4.9.8.3</version>
223223
<configuration>
224224
<onlyAnalyze>dev.openfeature.contrib.-</onlyAnalyze>
225225
</configuration>
@@ -259,7 +259,7 @@
259259
<plugin>
260260
<groupId>org.codehaus.mojo</groupId>
261261
<artifactId>exec-maven-plugin</artifactId>
262-
<version>3.6.2</version>
262+
<version>3.6.3</version>
263263
<executions>
264264
<execution>
265265
<id>update-test-harness-submodule</id>

‎providers/flipt/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>com.fasterxml.jackson.core</groupId>
4747
<artifactId>jackson-databind</artifactId>
48-
<version>2.21.1</version>
48+
<version>2.21.2</version>
4949
</dependency>
5050

5151
<dependency>
@@ -58,14 +58,14 @@
5858
<dependency>
5959
<groupId>com.fasterxml.jackson.core</groupId>
6060
<artifactId>jackson-core</artifactId>
61-
<version>2.21.1</version>
61+
<version>2.21.2</version>
6262
<scope>test</scope>
6363
</dependency>
6464

6565
<dependency>
6666
<groupId>com.fasterxml.jackson.core</groupId>
6767
<artifactId>jackson-databind</artifactId>
68-
<version>2.21.1</version>
68+
<version>2.21.2</version>
6969
<scope>test</scope>
7070
</dependency>
7171

‎providers/go-feature-flag/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@
3636
<dependency>
3737
<groupId>com.fasterxml.jackson.datatype</groupId>
3838
<artifactId>jackson-datatype-jsr310</artifactId>
39-
<version>2.21.1</version>
39+
<version>2.21.2</version>
4040
</dependency>
4141

4242
<dependency>
4343
<groupId>com.fasterxml.jackson.core</groupId>
4444
<artifactId>jackson-core</artifactId>
45-
<version>2.21.1</version>
45+
<version>2.21.2</version>
4646
</dependency>
4747

4848
<dependency>
4949
<groupId>com.fasterxml.jackson.core</groupId>
5050
<artifactId>jackson-databind</artifactId>
51-
<version>2.21.1</version>
51+
<version>2.21.2</version>
5252
</dependency>
5353

5454
<dependency>
@@ -79,7 +79,7 @@
7979
<dependency>
8080
<groupId>com.dylibso.chicory</groupId>
8181
<artifactId>wasi</artifactId>
82-
<version>1.6.0</version>
82+
<version>1.7.5</version>
8383
</dependency>
8484

8585
<dependency>
@@ -115,7 +115,7 @@
115115
<plugin>
116116
<groupId>com.dylibso.chicory</groupId>
117117
<artifactId>chicory-compiler-maven-plugin</artifactId>
118-
<version>1.6.0</version>
118+
<version>1.7.5</version>
119119
<executions>
120120
<execution>
121121
<id>gofeatureflag</id>

‎providers/ofrep/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@
3636
<dependency>
3737
<groupId>com.fasterxml.jackson.datatype</groupId>
3838
<artifactId>jackson-datatype-jsr310</artifactId>
39-
<version>2.21.1</version>
39+
<version>2.21.2</version>
4040
</dependency>
4141

4242
<dependency>
4343
<groupId>com.fasterxml.jackson.core</groupId>
4444
<artifactId>jackson-core</artifactId>
45-
<version>2.21.1</version>
45+
<version>2.21.2</version>
4646
</dependency>
4747

4848
<dependency>
4949
<groupId>com.fasterxml.jackson.core</groupId>
5050
<artifactId>jackson-databind</artifactId>
51-
<version>2.21.1</version>
51+
<version>2.21.2</version>
5252
</dependency>
5353

5454
<dependency>

‎tools/flagd-api-testkit/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<module-name>${groupId}.flagdapitestkit</module-name>
1717
<!-- Match any flagd-api version locally; CI sets exact version -->
1818
<flagd-api.version>[0.0.1,)</flagd-api.version>
19-
<jackson-databind.version>2.21.1</jackson-databind.version>
19+
<jackson-databind.version>2.21.2</jackson-databind.version>
2020
<assertj.version>3.27.7</assertj.version>
2121
</properties>
2222

@@ -98,7 +98,7 @@
9898
<plugin>
9999
<groupId>org.codehaus.mojo</groupId>
100100
<artifactId>exec-maven-plugin</artifactId>
101-
<version>3.6.2</version>
101+
<version>3.6.3</version>
102102
<executions>
103103
<execution>
104104
<id>update-test-harness-submodule</id>

‎tools/flagd-api-testkit/src/main/java/dev/openfeature/contrib/tools/flagd/api/testkit/EvaluationSteps.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,14 @@ public void flagEvaluatedWithDetails() {
7777
.errorCode(ErrorCode.TYPE_MISMATCH)
7878
.errorMessage(e.getMessage())
7979
.build();
80+
} catch (dev.openfeature.sdk.exceptions.OpenFeatureError e) {
81+
// Mirror the OpenFeature SDK client behaviour: on any provider error, return the
82+
// caller-supplied default value together with the error code and message.
83+
state.evaluation = dev.openfeature.sdk.ProviderEvaluation.builder()
84+
.value(state.defaultValue)
85+
.errorCode(e.getErrorCode())
86+
.errorMessage(e.getMessage())
87+
.build();
8088
}
8189
}
8290

‎tools/flagd-api-testkit/test-harness‎

0 commit comments

Comments
 (0)