Fix for connection-string issue (#9)

* fix connection-string issue

* removing temp files

* removing resolver config as it is specific to cosmosDB

* updating .gitignore

* updating .gitignore

Author: abhishekkumams

Hawaii-Cli/.gitignore

@@ -14,4 +14,8 @@
 *.code-workspace
 
 # Nuget package
-/nupkg
+/nupkg
+
+#generated json file for testing
+*.json
+

Hawaii-Cli/Classes/CommandLineOptions.cs

@@ -5,48 +5,48 @@ namespace Hawaii.Cli.Classes
 {
     public sealed class CommandLineOptions
     {
-        [Option('n', "name", Required = false, HelpText = "file name")]
-        public String? name { get; set; }
+        [Option('n', "name", Required = false, HelpText = "Specify the file name, Default value = hawaii-config")]
+        public string? name { get; set; }
 
         [Option("database-type", Required = false, HelpText = "Type of database to connect")]
-        public String? databaseType { get; set; }
+        public string? databaseType { get; set; }
 
         [Option("connection-string", Required = false, HelpText = "Connection details to connect to database")]
-        public String? connectionString { get; set; }
+        public string? connectionString { get; set; }
 
         //TODO: Link options with Specidied commands
         // we need to make sure certain options are only required with certain commands.
         // for example: source is required only with add/update and not init
 
-        [Option('s', "source", Required = false, HelpText = "name of the table")]
-        public String? source { get; set; }
+        [Option('s', "source", Required = false, HelpText = "Name of the table")]
+        public string? source { get; set; }
 
-        [Option("rest", Required = false, HelpText = "route for rest api")]
-        public String? restRoute { get; set; }
+        [Option("rest", Required = false, HelpText = "Route for rest api")]
+        public string? restRoute { get; set; }
 
         [Option("graphql", Required = false, HelpText = "Type of graphQL")]
-        public String? graphQLType { get; set; }
+        public string? graphQLType { get; set; }
 
-        [Option("permission", Required = false, HelpText = "permission required to acess source table")]
-        public String? permission { get; set; }
+        [Option("permission", Required = false, HelpText = "Permission required to acess source table")]
+        public string? permission { get; set; }
 
-        [Option("fields.include", Required = false, HelpText = "fields that are allowed access to permission")]
-        public String? fieldsToInclude { get; set; }
+        [Option("fields.include", Required = false, HelpText = "Fields that are allowed access to permission")]
+        public string? fieldsToInclude { get; set; }
 
-        [Option("fields.exclude", Required = false, HelpText = "fields that are excluded from the action lists")]
-        public String? fieldsToExclude { get; set; }
+        [Option("fields.exclude", Required = false, HelpText = "Fields that are excluded from the action lists")]
+        public string? fieldsToExclude { get; set; }
 
-        [Option("relationship", Required = false, HelpText = "specify relationship between two entities")]
-        public String? relationship { get; set; }
+        [Option("relationship", Required = false, HelpText = "Specify relationship between two entities")]
+        public string? relationship { get; set; }
 
-        [Option("target.entity", Required = false, HelpText = "specify relationship between two entities")]
-        public String? targetEntity { get; set; }
+        [Option("target.entity", Required = false, HelpText = "Specify relationship between two entities")]
+        public string? targetEntity { get; set; }
 
-        [Option("cardinality", Required = false, HelpText = "specify relationship between two entities")]
-        public String? cardinality { get; set; }
+        [Option("cardinality", Required = false, HelpText = "Specify cardinality between two entities")]
+        public string? cardinality { get; set; }
 
-        [Option("mapping.fields", Required = false, HelpText = "specify relationship between two entities")]
-        public String? mappingFields { get; set; }
+        [Option("mapping.fields", Required = false, HelpText = "Specify fields to be used for mapping the entities")]
+        public string? mappingFields { get; set; }
 
         [Option(Default = false, HelpText = "Prints all messages to standard output.")]
         public bool Verbose { get; set; }

Hawaii-Cli/Classes/ConfigGenerator.cs

@@ -10,7 +10,8 @@ public static bool GenerateConfig(string fileName, string database_type, string
         {
 
             DatabaseType dbType = Enum.Parse<DatabaseType>(database_type);
-            DataSource dataSource = new DataSource(dbType, connection_string);
+            DataSource dataSource = new DataSource(dbType);
+            dataSource.ConnectionString = connection_string;
 
             string file = fileName + ".json";
 

Hawaii-Cli/Classes/Utils.cs

@@ -2,7 +2,6 @@
 using System.Text.Json.Serialization;
 using Azure.DataGateway.Config;
 using Humanizer;
-using System.Runtime.Serialization;
 
 namespace Hawaii.Cli.Classes
 {
@@ -93,7 +92,6 @@ public static object[] CreateActions(string actions, string? fieldsToInclude, st
                 action_items =  new object[]{Action.GetAction(actions, fieldsToInclude, fieldsToExclude)};
             } else {
                 string[] action_elements = actions.Split(",");
-                //#action_items should be 1, if either fieldsTOInclude or fieldsToExclude is not null.
                 if(fieldsToInclude!=null || fieldsToExclude!=null ) {
                     List<object> action_list = new List<object>();
                     foreach(string action_element in action_elements) {