Skip to content

build(flagd): OS agnostic flagd provider build #998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 3, 2024
Merged

build(flagd): OS agnostic flagd provider build #998

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34ab258
build(flagd): Compile proto files directly from schemas submodule
guidobrei Oct 3, 2024
cf28cc9
build(flagd): Use maven-maven-resource plugin for copying schema files
guidobrei Oct 3, 2024
3d4a22d
build(flagd): Fix resource loading issue on windows
guidobrei Oct 3, 2024
a7f0fba
build(flagd): Remove unused json schema files.
guidobrei Oct 3, 2024
9447957
fixup: update local json
toddbaert Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 23 additions & 86 deletions providers/flagd/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@
<executions>
<execution>
<id>update-schemas-submodule</id>
<phase>validate</phase>
<phase>initialize</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<!-- run: git submodule update \-\-init \-\-recursive -->
<!-- run: git submodule update \-\-init schemas -->
<executable>git</executable>
<arguments>
<argument>submodule</argument>
Expand All @@ -177,94 +177,30 @@
</arguments>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>copy-schema-definition</id>
<phase>validate</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<!-- run: cp schemas/protobuf/schema/v1/schema.proto src/main/proto/ -->
<executable>cp</executable>
<arguments>
<argument>schemas/protobuf/schema/v1/schema.proto</argument>
<argument>src/main/proto/</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>copy-sync-definition</id>
<phase>validate</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<!-- run: cp schemas/protobuf/sync/v1/sync_service.proto src/main/proto/ -->
<executable>cp</executable>
<arguments>
<argument>schemas/protobuf/sync/v1/sync_service.proto</argument>
<argument>src/main/proto/</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>copy-evaluation.proto</id>
<phase>validate</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<!-- run: cp schemas/protobuf/flagd/evaluation/v1/evaluation.proto src/main/proto/ -->
<executable>cp</executable>
<arguments>
<argument>schemas/protobuf/flagd/evaluation/v1/evaluation.proto</argument>
<argument>src/main/proto/</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>copy-sync.proto</id>
<phase>validate</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<!-- run: cp schemas/protobuf/flagd/sync/v1/sync.proto src/main/proto/ -->
<executable>cp</executable>
<arguments>
<argument>schemas/protobuf/flagd/sync/v1/sync.proto</argument>
<argument>src/main/proto/</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>copy-flags-json-schema</id>
<phase>validate</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<!-- 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/flagd/schemas/</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>copy-flags-targeting-schema</id>
<phase>validate</phase>
<id>copy-json-schemas</id>
<phase>generate-resources</phase>
<goals>
<goal>exec</goal>
<goal>copy-resources</goal>
</goals>
<configuration>
<!-- 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/flagd/schemas/</argument>
</arguments>
<outputDirectory>${basedir}/src/main/resources/flagd/schemas/</outputDirectory>
<resources>
<resource>
<directory>${basedir}/schemas/json/</directory>
<includes>
<include>flags.json</include>
<include>targeting.json</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
Expand All @@ -278,6 +214,7 @@
<protocArtifact>com.google.protobuf:protoc:3.21.1:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.48.1:exe:${os.detected.classifier}</pluginArtifact>
<protoSourceRoot>${project.basedir}/schemas/protobuf/</protoSourceRoot>
</configuration>
<executions>
<execution>
Expand Down
1 change: 0 additions & 1 deletion providers/flagd/src/main/proto/.gitignore
View file
Open in desktop

This file was deleted.

Empty file removed providers/flagd/src/main/proto/.gitkeep
View file
Open in desktop
Empty file.
184 changes: 0 additions & 184 deletions providers/flagd/src/main/resources/flags.json
View file
Open in desktop

This file was deleted.

Loading