Skip to content
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

Fix: double underscore in case uppercase character is preceeded by an underscore #190

Merged
merged 8 commits into from
Aug 22, 2022
Merged

Fix: double underscore in case uppercase character is preceeded by an underscore #190

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a2d2368
Correct path to deploy.sh (#154)
russcam Jun 3, 2021
6003eb7
deploy from within container (#155)
russcam Jun 3, 2021
9a057a4
Fix double underscore when uppercase character is preceeded with an u…
Jul 21, 2022
03762b1
Fix double underscore when uppercase character is preceeded with an u…
Jul 21, 2022
915d7b3
Merge branch 'fix/underscore-and-uppercase-in-snake-case-naming-polic…
Jul 29, 2022
e8a1157
Merge branch 'main' into fix/underscore-and-uppercase-in-snake-case-n…
andreycha Jul 29, 2022
b09f7a1
Merge branch 'main' into fix/underscore-and-uppercase-in-snake-case-n…
andreycha Jul 29, 2022
5153a66
Merge branch 'main' into fix/underscore-and-uppercase-in-snake-case-n…
Mpdreamz Aug 22, 2022
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
18 changes: 7 additions & 11 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,18 +198,14 @@ def dotnet(Closure body){

def deploy(Map args = [:]) {
def secret = args.secret
def repo = getVaultSecret(secret: secret)
wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [
[var: 'REPO_API_KEY', password: repo.data.apiKey],
[var: 'REPO_API_URL', password: repo.data.url],
]]) {
if (isUnix()) {
dotnet(){
def repo = getVaultSecret(secret: secret)
wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [
[var: 'REPO_API_KEY', password: repo.data.apiKey],
[var: 'REPO_API_URL', password: repo.data.url],
]]) {
withEnv(["REPO_API_KEY=${repo.data.apiKey}", "REPO_API_URL=${repo.data.url}"]) {
sh(label: 'Deploy', script: '.ci/linux/deploy.sh ${REPO_API_KEY} ${REPO_API_URL}')
}
} else {
withEnv(["REPO_API_KEY=${repo.data.apiKey}", "REPO_API_URL=${repo.data.url}"]) {
bat(label: 'Deploy', script: '.ci/deploy.bat ${REPO_API_KEY} ${REPO_API_URL}')
sh(label: 'Deploy', script: '.ci/deploy.sh ${REPO_API_KEY} ${REPO_API_URL}')
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/Elastic.CommonSchema/Serialization/SnakeCaseJsonNamingPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ public static string ToSnakeCase(string s)
sb.Append(char.ToLowerInvariant(c));
else if (char.IsUpper(s[i - 1])) // WriteIO => write_io
sb.Append(char.ToLowerInvariant(c));
else if (s[i - 1] == '_') // User_Id => user_id
sb.Append(char.ToLowerInvariant(c));
else
{
sb.Append("_");
Expand Down
26 changes: 26 additions & 0 deletions tests/Elastic.CommonSchema.Tests/Serializes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information

using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using Elastic.CommonSchema.Serialization;
using FluentAssertions;
Expand Down Expand Up @@ -30,6 +31,31 @@ public void SerializesSomethingToString()
deserialized.Log.Level.Should().Be("debug");
}

[Fact]
public void SerializesMetadataPropertiesToSnakeCase()
{
var b = new Base
{
Metadata = new Dictionary<string, object>
{
["MessageTemplate"] = "some-template",
["WriteIO"] = "some-io",
["User_Id"] = 1,
["eventId"] = "some-id",
["rule"] = "some-rule",
}
};

var serialized = b.Serialize();
var deserialized = Base.Deserialize(serialized);

deserialized.Metadata.Should().ContainKey("message_template");
deserialized.Metadata.Should().ContainKey("write_io");
deserialized.Metadata.Should().ContainKey("user_id");
deserialized.Metadata.Should().ContainKey("event_id");
deserialized.Metadata.Should().ContainKey("rule");
}

public class SubclassedBase : Base
{
[DataMember(Name = "agent2")]
Expand Down