Generating Default Config using CLI #930
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
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 |
|---|---|---|
|
|
@@ -28,7 +28,7 @@ public void MssqlDatabase() | |
|
|
||
| _basicRuntimeConfig = | ||
| @"{ | ||
| ""$schema"": ""dab.draft.schema.json"", | ||
| ""data-source"": { | ||
| ""database-type"": ""mssql"", | ||
| ""connection-string"": ""testconnectionstring"" | ||
|
|
@@ -67,7 +67,7 @@ public void TestInitializingConfigWithoutConnectionString() | |
|
|
||
| _basicRuntimeConfig = | ||
| @"{ | ||
| ""$schema"": ""dab.draft.schema.json"", | ||
| ""data-source"": { | ||
| ""database-type"": ""mssql"", | ||
| ""connection-string"": """" | ||
|
|
@@ -104,7 +104,7 @@ public void CosmosDatabase() | |
| devModeDefaultAuth: null); | ||
|
|
||
| _basicRuntimeConfig = @"{ | ||
| ""$schema"": ""dab.draft.schema.json"", | ||
| ""data-source"": { | ||
| ""database-type"": ""cosmos"", | ||
| ""connection-string"": ""testconnectionstring"" | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -5,6 +5,15 @@ public static class TestHelper | |
| // Config file name for tests | ||
| public static string _testRuntimeConfig = "dab-config-test.json"; | ||
|
|
||
| // Name of an invalid config file that can be used for tests. | ||
| public static string InvalidConfigFileName | ||
|
Contributor
There was a problem hiding this comment. Elaborate in comment what you are trying to achieve with an invalid config file name.
|
||
| { | ||
| get | ||
| { | ||
| return "dab-config.invalid.json"; | ||
| } | ||
|
Comment on lines
+11
to
+14
Contributor
There was a problem hiding this comment. any reason you chose property/getter vs. constant? SO discussion ( just for consideration, I'm not suggesting one implementation vs. another) |
||
| } | ||
|
|
||
| /// <summary> | ||
| /// Adds the entity properties to the configuration and returns the updated configuration json as a string. | ||
| /// </summary> | ||
|
|
@@ -49,13 +58,25 @@ public static Process StartDabProcess(string command, string flags) | |
| } | ||
|
|
||
| public const string SAMPLE_SCHEMA_DATA_SOURCE = @" | ||
| ""$schema"": ""dab.draft.schema.json"", | ||
| ""data-source"": { | ||
| ""database-type"": ""mssql"", | ||
| ""connection-string"": ""testconnectionstring"" | ||
| } | ||
| "; | ||
|
|
||
| /// <summary> | ||
| /// Sample data source element with an empty connection string. | ||
| /// Used for generating an invalid config for tests. | ||
| /// </summary> | ||
| public const string SAMPLE_SCHEMA_DATA_SOURCE_WITH_EMPTY_CONNSTRING = @" | ||
| ""$schema"": ""dab.draft.schema.json"", | ||
| ""data-source"": { | ||
| ""database-type"": ""mssql"", | ||
| ""connection-string"": """" | ||
| } | ||
| "; | ||
|
|
||
| public const string INITIAL_CONFIG = | ||
| "{" + | ||
| SAMPLE_SCHEMA_DATA_SOURCE + "," + | ||
|
|
@@ -113,6 +134,34 @@ public static Process StartDabProcess(string command, string flags) | |
| ""entities"": {}" + | ||
| "}"; | ||
|
|
||
| /// <summary> | ||
| /// Initial config with an empty connection string | ||
| /// </summary> | ||
| public const string CONFIG_WTIH_INVALID_CONNECTION_STRING = "{" + | ||
| SAMPLE_SCHEMA_DATA_SOURCE_WITH_EMPTY_CONNSTRING + "," + | ||
| @" | ||
| ""runtime"": { | ||
| ""rest"": { | ||
| ""path"": ""/api"" | ||
| }, | ||
| ""graphql"": { | ||
| ""path"": ""/graphql"", | ||
| ""allow-introspection"": true | ||
| }, | ||
| ""host"": { | ||
| ""mode"": ""development"", | ||
| ""cors"": { | ||
| ""origins"": [], | ||
| ""allow-credentials"": false | ||
| }, | ||
| ""authentication"": { | ||
| ""provider"": ""StaticWebApps"" | ||
| } | ||
| } | ||
| }, | ||
| ""entities"": {}" + | ||
| "}"; | ||
|
|
||
| public const string SINGLE_ENTITY = @" | ||
| { | ||
| ""entities"": { | ||
|
|
@@ -318,7 +367,7 @@ public static Process StartDabProcess(string command, string flags) | |
|
|
||
| public const string CONFIG_WITH_SINGLE_ENTITY = @" | ||
| { | ||
| ""$schema"": ""dab.draft.schema.json"", | ||
|
Contributor
There was a problem hiding this comment. Could you use the const that you defined elsewhere in this PR: |
||
| ""data-source"": { | ||
| ""database-type"": ""mssql"", | ||
| ""connection-string"": ""localhost:5000"" | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -71,7 +71,7 @@ public record RuntimeConfig( | |
| Dictionary<string, Entity> Entities) | ||
| { | ||
| public const string SCHEMA_PROPERTY_NAME = "$schema"; | ||
| public const string SCHEMA = "dab.draft.schema.json"; | ||
|
|
||
| // use camel case | ||
| // convert Enum to strings | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -456,7 +456,7 @@ public void VerifyExceptionOnNullModelinFilterParser() | |
| public void TestReadingRuntimeConfig() | ||
| { | ||
| Mock<ILogger> logger = new(); | ||
| string jsonString = File.ReadAllText($"{RuntimeConfigPath.CONFIGFILE_NAME}." + $"{COSMOS_ENVIRONMENT}{RuntimeConfigPath.CONFIG_EXTENSION}"); | ||
| RuntimeConfig.TryGetDeserializedRuntimeConfig(jsonString, out RuntimeConfig runtimeConfig, logger.Object); | ||
| Assert.IsNotNull(runtimeConfig.Schema); | ||
| Assert.IsInstanceOfType(runtimeConfig.DataSource, typeof(DataSource)); | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -40,7 +40,7 @@ public class CorsUnitTests | |
| public void TestCorsConfigReadCorrectly() | ||
| { | ||
| Mock<ILogger> logger = new(); | ||
| string jsonString = File.ReadAllText($"{RuntimeConfigPath.CONFIGFILE_NAME}." + $"{TestCategory.COSMOS}{RuntimeConfigPath.CONFIG_EXTENSION}"); | ||
| RuntimeConfig.TryGetDeserializedRuntimeConfig(jsonString, out RuntimeConfig runtimeConfig, logger.Object); | ||
| HostGlobalSettings hostGlobalSettings = | ||
| JsonSerializer.Deserialize<HostGlobalSettings>( | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ namespace Azure.DataApiBuilder.Service.Tests.UnitTests | |
| public class RestServiceUnitTests | ||
| { | ||
| private static RestService _restService; | ||
| private static string _testCategory = "MsSql"; | ||
|
Contributor
There was a problem hiding this comment. Is this variable necessary? could you use |
||
|
|
||
| #region Positive Cases | ||
|
|
||
|
|
||
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 |
|---|---|---|
|
|
@@ -46,16 +46,6 @@ | |
| <Watch Include="**\*.json;**\*.gql" Exclude="obj\**\*;bin\**\*" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="HotChocolate" Version="$(HotChocolateVersion)" /> | ||
| <PackageReference Include="HotChocolate.AspNetCore" Version="$(HotChocolateVersion)" /> | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is Visual Studio smart enough to know which of these to run per platform? or do both attempt to run?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, are these just file references for what is in the solution? I'm not recognizing why these lines are added to this file/what the significance is.