-
Notifications
You must be signed in to change notification settings - Fork 43
refactor(flagd): Remove HTTP call when validating JSON schema #547
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.
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
Open
kylejuliandev
wants to merge
8
commits into
open-feature:main
Choose a base branch
from
kylejuliandev:fetch-schema-from-embedded-resource
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
cbf6e7c
Refactor Flagd JSON schema validator to use embedded resource
kylejuliandev e2e156f
Address gemini comments
kylejuliandev 08757f0
Merge branch 'main' into fetch-schema-from-embedded-resource
kylejuliandev d853271
Replace checked in schema json files for submodule references
kylejuliandev cc5e0ec
Make reader NativeAOT compliant
kylejuliandev e40070e
Add nullable warnings to new classes
kylejuliandev 97101bb
Merge branch 'main' into fetch-schema-from-embedded-resource
kylejuliandev e6892fa
Merge branch 'main' into fetch-schema-from-embedded-resource
kylejuliandev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
...ature.Contrib.Providers.Flagd/Resolver/InProcess/FlagdJsonSchemaEmbeddedResourceReader.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| using System; | ||
| using System.IO; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
|
|
||
| #nullable enable | ||
|
|
||
| namespace OpenFeature.Contrib.Providers.Flagd.Resolver.InProcess; | ||
|
|
||
| internal sealed class FlagdJsonSchemaEmbeddedResourceReader : IFlagdJsonSchemaProvider | ||
| { | ||
| const string TargetingJsonResourceName = "OpenFeature.Contrib.Providers.Flagd.Resources.targeting.json"; | ||
| const string FlagJsonResourceName = "OpenFeature.Contrib.Providers.Flagd.Resources.flags.json"; | ||
|
|
||
| public Task<string> ReadTargetingSchemaAsync(CancellationToken cancellationToken = default) | ||
| { | ||
| return this.ReadAsStringAsync(TargetingJsonResourceName, cancellationToken); | ||
| } | ||
|
|
||
| public Task<string> ReadFlagSchemaAsync(CancellationToken cancellationToken = default) | ||
| { | ||
| return this.ReadAsStringAsync(FlagJsonResourceName, cancellationToken); | ||
| } | ||
|
|
||
| private async Task<string> ReadAsStringAsync(string resourceName, CancellationToken cancellationToken = default) | ||
| { | ||
| var assembly = typeof(FlagdJsonSchemaEmbeddedResourceReader).Assembly; | ||
| if (assembly == null) | ||
| { | ||
| throw new InvalidOperationException($"Unable to locate assembly for {nameof(FlagdJsonSchemaEmbeddedResourceReader)}."); | ||
| } | ||
|
|
||
| using var stream = assembly.GetManifestResourceStream(resourceName); | ||
| if (stream == null) | ||
| { | ||
| throw new InvalidOperationException($"Embedded resource not found: '{resourceName}'."); | ||
| } | ||
|
|
||
| using var streamReader = new StreamReader(stream); | ||
|
|
||
| #if NET8_0_OR_GREATER | ||
| return await streamReader.ReadToEndAsync(cancellationToken).ConfigureAwait(false); | ||
| #else | ||
| return await streamReader.ReadToEndAsync().ConfigureAwait(false); | ||
| #endif | ||
| } | ||
| } | ||
13 changes: 13 additions & 0 deletions
13
src/OpenFeature.Contrib.Providers.Flagd/Resolver/InProcess/IFlagdJsonSchemaProvider.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace OpenFeature.Contrib.Providers.Flagd.Resolver.InProcess; | ||
|
|
||
| #nullable enable | ||
|
|
||
| internal interface IFlagdJsonSchemaProvider | ||
| { | ||
| Task<string> ReadTargetingSchemaAsync(CancellationToken cancellationToken = default); | ||
|
|
||
| Task<string> ReadFlagSchemaAsync(CancellationToken cancellationToken = default); | ||
| } |
12 changes: 12 additions & 0 deletions
12
src/OpenFeature.Contrib.Providers.Flagd/Resolver/InProcess/IJsonSchemaValidator.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
|
|
||
| #nullable enable | ||
|
|
||
| namespace OpenFeature.Contrib.Providers.Flagd.Resolver.InProcess; | ||
|
|
||
| internal interface IJsonSchemaValidator | ||
| { | ||
| Task InitializeAsync(CancellationToken cancellationToken = default); | ||
| void Validate(string configuration); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.