feat: use namespaced schemas for flagd json schemas (#843) (#850)

Signed-off-by: Sanket Mehta <mehtasankets@gmail.com>
open-feature · Jun 28, 2024 · efc3a9e · efc3a9e
1 parent b7c9c33
commit efc3a9e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/providers/flagd/pom.xml b/providers/flagd/pom.xml
@@ -234,11 +234,11 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <!-- run: cp schemas/json/flags.json src/main/resources/ -->
+                            <!-- run: cp schemas/json/flags.json src/main/resources/flagd/schemas/ -->
                             <executable>cp</executable>
                             <arguments>
                                 <argument>schemas/json/flags.json</argument>
-                                <argument>src/main/resources/</argument>
+                                <argument>src/main/resources/flagd/schemas/</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -249,11 +249,11 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <!-- run: cp schemas/json/targeting.json src/main/resources/ -->
+                            <!-- run: cp schemas/json/targeting.json src/main/resources/flagd/schemas/ -->
                             <executable>cp</executable>
                             <arguments>
                                 <argument>schemas/json/targeting.json</argument>
-                                <argument>src/main/resources/</argument>
+                                <argument>src/main/resources/flagd/schemas/</argument>
                             </arguments>
                         </configuration>
                     </execution>

diff --git a/.../main/java/dev/openfeature/contrib/providers/flagd/resolver/process/model/FlagParser.java b/.../main/java/dev/openfeature/contrib/providers/flagd/resolver/process/model/FlagParser.java
@@ -43,8 +43,8 @@ private FlagParser() {
             // load both schemas from resources (root (flags.json) and referenced (targeting.json)
             // we don't want to resolve anything from the network
             Map<String, String> mappings = new HashMap<>();
-            mappings.put("https://flagd.dev/schema/v0/targeting.json", "classpath:targeting.json");
-            mappings.put("https://flagd.dev/schema/v0/flags.json", "classpath:flags.json");
+            mappings.put("https://flagd.dev/schema/v0/targeting.json", "classpath:flagd/schemas/targeting.json");
+            mappings.put("https://flagd.dev/schema/v0/flags.json", "classpath:flagd/schemas/flags.json");
 
             SCHEMA_VALIDATOR = JsonSchemaFactory
                     .getInstance(SpecVersion.VersionFlag.V7,

diff --git a/providers/flagd/src/main/resources/.gitignore b/providers/flagd/src/main/resources/.gitignore
diff --git a/providers/flagd/src/main/resources/flagd/schemas/.gitignore b/providers/flagd/src/main/resources/flagd/schemas/.gitignore
@@ -0,0 +1 @@
+*.json