Update PSCustomLogDataSourceProperties.cs

Author: arolshan

src/OperationalInsights/OperationalInsights/Models/DataSourcePropertiesPerKind/PSCustomLogDataSourceProperties.cs

@@ -65,6 +65,7 @@ public class Location
         /// <summary>
         /// Gets or sets the file system locations.
         /// </summary>
+        [JsonProperty(PropertyName = "fileSystemLocations")]
         public FileSystemLocations fileSystemLocations { get; set; }
 
         #endregion
@@ -80,12 +81,14 @@ public class FileSystemLocations
         /// <summary>
         /// Gets or sets the linux file type log paths.
         /// </summary>
-        public string[] linuxFileTypeLogPaths { get; set; }
+        [JsonProperty(PropertyName = "linuxFileTypeLogPaths")]
+        public string[] LinuxFileTypeLogPaths { get; set; }
 
         /// <summary>
         /// Gets or sets the windows file type log paths.
         /// </summary>
-        public string[] windowsFileTypeLogPaths { get; set; }
+        [JsonProperty(PropertyName = "windowsFileTypeLogPaths")]
+        public string[] WindowsFileTypeLogPaths { get; set; }
 
         #endregion
     }
@@ -100,7 +103,8 @@ public class RecordDelimiter
         /// <summary>
         /// Gets or sets the regex delimiter.
         /// </summary>
-        public RegexDelimiter regexDelimiter { get; set; }
+        [JsonProperty(PropertyName = "regexDelimiter")]
+        public RegexDelimiter RegexDelimiter { get; set; }
 
         #endregion
     }
@@ -115,17 +119,20 @@ public class RegexDelimiter
         /// <summary>
         /// Gets or sets the match index.
         /// </summary>
-        public int matchIndex { get; set; }
+        [JsonProperty(PropertyName = "matchIndex")]
+        public int MatchIndex { get; set; }
 
         /// <summary>
         /// Gets or sets the numberd group.
         /// </summary>
-        public string numberdGroup { get; set; }
+        [JsonProperty(PropertyName = "numberdGroup")]
+        public string NumberdGroup { get; set; }
 
         /// <summary>
         /// Gets or sets the pattern.
         /// </summary>
-        public string pattern { get; set; }
+        [JsonProperty(PropertyName = "pattern")]
+        public string Pattern { get; set; }
 
         #endregion
     }
@@ -140,12 +147,14 @@ public class CustomLogInput
         /// <summary>
         /// Gets or sets the location.
         /// </summary>
-        public Location location { get; set; }
+        [JsonProperty(PropertyName = "location")]
+        public Location Location { get; set; }
 
         /// <summary>
         /// Gets or sets the record delimiter.
         /// </summary>
-        public RecordDelimiter recordDelimiter { get; set; }
+        [JsonProperty(PropertyName = "recordDelimiter")]
+        public RecordDelimiter RecordDelimiter { get; set; }
 
         #endregion
     }
@@ -160,19 +169,28 @@ public class DateTimeExtraction
         /// <summary>
         /// Gets or sets the join string regex.
         /// </summary>
-        public string joinStringRegex { get; set; }
+        [JsonProperty("joinStringRegex")]
+        public string JoinStringRegex { get; set; }
+
+        /// <summary>
+        /// Gets or sets the regex string.
+        /// </summary>
+        [JsonIgnore]
+        public string Regex { get; set; }
 
         /// <summary>
         /// Gets or sets the regex.
         /// </summary>
-        [CmdletParameterBreakingChange(nameof(regex), OldParamaterType = typeof(string), NewParameterTypeName = nameof(RegexDelimiter))]
+        [CmdletParameterBreakingChange(nameof(Regex), OldParamaterType = typeof(string), NewParameterTypeName = nameof(RegexDelimiter))]
         [JsonConverter(typeof(RegexDelimiterJsonConverter))]
-        public RegexDelimiter[] regex { get; set; }
+        [JsonProperty("regex")]
+        public RegexDelimiter[] RegexDelimiters { get; set; }
 
         ///<summary>
         /// Gets or sets the FormatString
         /// </summary>
-        public string formatString { get; set; }
+        [JsonProperty("formatString")]
+        public string FormatString { get; set; }
 
         #endregion
     }
@@ -187,7 +205,8 @@ public class ExtractionProperties
         /// <summary>
         /// Gets or sets the date time extraction.
         /// </summary>
-        public DateTimeExtraction dateTimeExtraction { get; set; }
+        [JsonProperty(PropertyName = "dateTimeExtraction")]
+        public DateTimeExtraction DateTimeExtraction { get; set; }
 
         #endregion
     }
@@ -202,21 +221,25 @@ public class CustomLogExtraction
         /// <summary>
         /// Gets or sets the extraction name.
         /// </summary>
-        public string extractionName { get; set; }
+        [JsonProperty(PropertyName = "extractionName")]
+        public string ExtractionName { get; set; }
 
         /// <summary>
         /// Gets or sets the extraction properties.
         /// </summary>
-        public ExtractionProperties extractionProperties { get; set; }
+        [JsonProperty(PropertyName = "extractionProperties")]
+        public ExtractionProperties ExtractionProperties { get; set; }
 
         /// <summary>
         /// Gets or sets the extraction type.
         /// </summary>
-        public string extractionType { get; set; }
+        [JsonProperty(PropertyName = "extractionType")]
+        public string ExtractionType { get; set; }
 
         #endregion
     }
 
+    // This converter allows backward compatibility
     public class RegexDelimiterJsonConverter : JsonConverter
     {
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -227,11 +250,11 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                     JToken token = JToken.Load(reader);
                     return token.ToObject<RegexDelimiter[]>();
                 case JsonToken.String:
-                    // Allow input of just regex string for backward compatibility
-                    return new[] {new RegexDelimiter {matchIndex = 0, pattern = (string) reader.Value}};
+                    // Satisfy case in which user uses the old regex property in input
+                    return new[] {new RegexDelimiter {MatchIndex = 0, Pattern = (string) reader.Value}};
+                default:
+                    throw new JsonSerializationException();
             }
-
-            throw new JsonSerializationException();
         }
 
         public override bool CanWrite => false;